fix bug

Signed-off-by: xufei <xufeixw@mail.ustc.edu.cn>
pingcap · Sep 5, 2024 · 7a8972f · 7a8972f
1 parent 6efb5be
commit 7a8972f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pkg/executor/join/base_join_probe.go b/pkg/executor/join/base_join_probe.go
@@ -494,7 +494,7 @@ func (j *baseJoinProbe) buildResultAfterOtherCondition(chk *chunk.Chunk, joinedC
 				j.appendBuildRowToCachedBuildRowsV2(&j.rowIndexInfos[index], chk, j.ctx.hashTableMeta.columnCountNeededForOtherCondition, false)
 			}
 		}
-		if len(j.cachedBuildRows) > 0 {
+		if j.nextCachedBuildRowIndex > 0 {
 			j.batchConstructBuildRows(chk, j.ctx.hashTableMeta.columnCountNeededForOtherCondition, false)
 		}
 	}

diff --git a/pkg/executor/join/outer_join_probe.go b/pkg/executor/join/outer_join_probe.go
@@ -113,7 +113,7 @@ func (j *outerJoinProbe) ScanRowTable(joinResult *hashjoinWorkerResult, sqlKille
 	if j.rowIter == nil {
 		panic("scanRowTable before init")
 	}
-	j.cachedBuildRows = j.cachedBuildRows[:0]
+	j.nextCachedBuildRowIndex = 0
 	meta := j.ctx.hashTableMeta
 	insertedRows := 0
 	remainCap := joinResult.chk.RequiredRows() - joinResult.chk.NumRows()
@@ -131,7 +131,7 @@ func (j *outerJoinProbe) ScanRowTable(joinResult *hashjoinWorkerResult, sqlKille
 		joinResult.err = err
 		return joinResult
 	}
-	if len(j.cachedBuildRows) > 0 {
+	if j.nextCachedBuildRowIndex > 0 {
 		j.batchConstructBuildRows(joinResult.chk, 0, false)
 	}
 	// append probe side in batch
@@ -176,7 +176,7 @@ func (j *outerJoinProbe) buildResultForMatchedRowsAfterOtherCondition(chk, joine
 		}
 	}
 	if hasRemainCols {
-		j.cachedBuildRows = j.cachedBuildRows[:0]
+		j.nextCachedBuildRowIndex = 0
 		markedJoined = true
 		meta := j.ctx.hashTableMeta
 		for index, result := range j.selected {
@@ -186,7 +186,7 @@ func (j *outerJoinProbe) buildResultForMatchedRowsAfterOtherCondition(chk, joine
 				j.appendBuildRowToCachedBuildRowsV2(&rowIndexInfo, chk, meta.columnCountNeededForOtherCondition, false)
 			}
 		}
-		if len(j.cachedBuildRows) > 0 {
+		if j.nextCachedBuildRowIndex > 0 {
 			j.batchConstructBuildRows(chk, meta.columnCountNeededForOtherCondition, false)
 		}
 	}

diff --git a/pkg/executor/join/row_table_builder_test.go b/pkg/executor/join/row_table_builder_test.go
@@ -397,7 +397,7 @@ func checkColumns(t *testing.T, withSelCol bool, buildFilter expression.CNFExprs
 				mockJoinProber.appendBuildRowToCachedBuildRowsV1(0, rowStart, resultChunk, 0, hasOtherConditionColumns)
 			}
 		}
-		if len(mockJoinProber.cachedBuildRows) > 0 {
+		if mockJoinProber.nextCachedBuildRowIndex > 0 {
 			if hasOtherConditionColumns {
 				mockJoinProber.batchConstructBuildRows(tmpChunk, 0, hasOtherConditionColumns)
 			} else {
@@ -436,7 +436,7 @@ func checkColumns(t *testing.T, withSelCol bool, buildFilter expression.CNFExprs
 			}
 			rowIndex++
 		}
-		if len(mockJoinProber.cachedBuildRows) > 0 {
+		if mockJoinProber.nextCachedBuildRowIndex > 0 {
 			if hasOtherConditionColumns {
 				mockJoinProber.batchConstructBuildRows(tmpChunk, 0, hasOtherConditionColumns)
 			} else {