Skip to content

Commit

Permalink
colexec: re-enable short-circuiting in the hash joiner
Browse files Browse the repository at this point in the history
This commit re-enables short-circuiting logic in the hash joiner when
the build side is empty (it was temporarily disabled because of 48785
which has been fixed).

Release note: None
  • Loading branch information
yuzefovich committed Jul 28, 2020
1 parent 4c24889 commit 60de8f0
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions pkg/sql/colexec/hashjoiner.go
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

0 comments on commit 60de8f0

Please sign in to comment.