Fix rightjoin.Free hung (#17107)

Do not read from channel in Free() Approved by: @m-schen, @aunjgr, @sukki37
matrixorigin · Jun 24, 2024 · 0eed606 · 0eed606
1 parent 22a2268
commit 0eed606
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 24 deletions.
diff --git a/pkg/sql/colexec/right/types.go b/pkg/sql/colexec/right/types.go
@@ -128,14 +128,8 @@ func (arg *Argument) Release() {
 func (arg *Argument) Free(proc *process.Process, pipelineFailed bool, err error) {
 	ctr := arg.ctr
 	if ctr != nil {
-		if !ctr.handledLast && arg.NumCPU > 1 {
-			if arg.IsMerger {
-				for i := uint64(1); i < arg.NumCPU; i++ {
-					<-arg.Channel
-				}
-			} else {
-				arg.Channel <- nil
-			}
+		if !ctr.handledLast && arg.NumCPU > 1 && !arg.IsMerger {
+			arg.Channel <- nil
 		}
 		ctr.cleanBatch(proc)
 		ctr.cleanHashMap()

diff --git a/pkg/sql/colexec/rightanti/types.go b/pkg/sql/colexec/rightanti/types.go
@@ -128,14 +128,8 @@ func (arg *Argument) Release() {
 func (arg *Argument) Free(proc *process.Process, pipelineFailed bool, err error) {
 	ctr := arg.ctr
 	if ctr != nil {
-		if !ctr.handledLast && arg.NumCPU > 1 {
-			if arg.IsMerger {
-				for i := uint64(1); i < arg.NumCPU; i++ {
-					<-arg.Channel
-				}
-			} else {
-				arg.Channel <- nil
-			}
+		if !ctr.handledLast && arg.NumCPU > 1 && !arg.IsMerger {
+			arg.Channel <- nil
 		}
 		ctr.cleanBatch(proc)
 		ctr.cleanEvalVectors()

diff --git a/pkg/sql/colexec/rightsemi/types.go b/pkg/sql/colexec/rightsemi/types.go
@@ -128,14 +128,8 @@ func (arg *Argument) Release() {
 func (arg *Argument) Free(proc *process.Process, pipelineFailed bool, err error) {
 	ctr := arg.ctr
 	if ctr != nil {
-		if !ctr.handledLast && arg.NumCPU > 1 {
-			if arg.IsMerger {
-				for i := uint64(1); i < arg.NumCPU; i++ {
-					<-arg.Channel
-				}
-			} else {
-				arg.Channel <- nil
-			}
+		if !ctr.handledLast && arg.NumCPU > 1 && !arg.IsMerger {
+			arg.Channel <- nil
 		}
 		ctr.cleanBatch(proc)
 		ctr.cleanEvalVectors()