Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

colexec: re-enable short-circuiting in the hash joiner #52016

Merged
merged 1 commit into from
Jul 28, 2020
Merged

colexec: re-enable short-circuiting in the hash joiner #52016

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions pkg/sql/colexec/hashjoiner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,7 @@ func (hj *hashJoiner) Next(ctx context.Context) coldata.Batch {
hj.spec.joinType == sqlbase.RightOuterJoin ||
hj.spec.joinType == sqlbase.LeftSemiJoin ||
hj.spec.joinType == sqlbase.IntersectAllJoin {
// The short-circuiting behavior is temporarily disabled
// because it causes flakiness of some tests due to #48785
// (concurrent calls to DrainMeta and Next).
// TODO(asubiotto): remove this once the issue is resolved.
// hj.state = hjDone
hj.state = hjDone
continue
}
}
Expand Down