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

executor: fix data race in hash join v2 spill (#57519) #57536

Merged
merged 2 commits into from
Nov 20, 2024
Merged

executor: fix data race in hash join v2 spill (#57519) #57536

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
198a3f4
save work
windtalker Nov 19, 2024
66a4074
add todo
windtalker Nov 19, 2024
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
14 changes: 5 additions & 9 deletions pkg/executor/join/hash_join_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,11 +504,6 @@ func (b *BuildWorkerV2) splitPartitionAndAppendToRowTableForRestore(inDisk *chun
}
}()

partitionNumber := b.HashJoinCtx.partitionNumber
hashJoinCtx := b.HashJoinCtx

b.builder = createRowTableBuilder(b.BuildKeyColIdx, hashJoinCtx.BuildKeyTypes, partitionNumber, b.HasNullableKey, hashJoinCtx.BuildFilter != nil, hashJoinCtx.needScanRowTableAfterProbeDone)

hasErr := false
chunkNum := inDisk.NumChunks()
for i := 0; i < chunkNum; i++ {
Expand Down Expand Up @@ -544,10 +539,6 @@ func (b *BuildWorkerV2) splitPartitionAndAppendToRowTable(typeCtx types.Context,
setMaxValue(&b.HashJoinCtx.stats.maxPartitionData, cost)
}
}()
partitionNumber := b.HashJoinCtx.partitionNumber
hashJoinCtx := b.HashJoinCtx

b.builder = createRowTableBuilder(b.BuildKeyColIdx, hashJoinCtx.BuildKeyTypes, partitionNumber, b.HasNullableKey, hashJoinCtx.BuildFilter != nil, hashJoinCtx.needScanRowTableAfterProbeDone)

hasErr := false
for chk := range srcChkCh {
Expand Down Expand Up @@ -1263,6 +1254,11 @@ func (e *HashJoinV2Exec) fetchAndBuildHashTableImpl(ctx context.Context) {

// doneCh is used by the consumer(splitAndAppendToRowTable) to info the producer(fetchBuildSideRows) that the consumer meet error and stop consume data
doneCh := make(chan struct{}, e.Concurrency)
// init builder, todo maybe the builder can be reused during the whole life cycle of the executor
hashJoinCtx := e.HashJoinCtxV2
for _, worker := range e.BuildWorkers {
worker.builder = createRowTableBuilder(worker.BuildKeyColIdx, hashJoinCtx.BuildKeyTypes, hashJoinCtx.partitionNumber, worker.HasNullableKey, hashJoinCtx.BuildFilter != nil, hashJoinCtx.needScanRowTableAfterProbeDone)
}
srcChkCh, waitForController := e.fetchBuildSideRows(ctx, fetcherAndWorkerSyncer, wg, errCh, doneCh)
e.splitAndAppendToRowTable(srcChkCh, waitForController, fetcherAndWorkerSyncer, wg, errCh, doneCh)
success := waitJobDone(wg, errCh)
Expand Down