From 60de8f036198f5082537e183f82152f4ebe0568b Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Tue, 28 Jul 2020 10:43:25 -0700 Subject: [PATCH] colexec: re-enable short-circuiting in the hash joiner 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 --- pkg/sql/colexec/hashjoiner.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/sql/colexec/hashjoiner.go b/pkg/sql/colexec/hashjoiner.go index 347862ea28ed..16f2d3a9cb5e 100644 --- a/pkg/sql/colexec/hashjoiner.go +++ b/pkg/sql/colexec/hashjoiner.go @@ -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 } }