Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
Signed-off-by: Weizhen Wang <[email protected]>
  • Loading branch information
hawkingrei committed Dec 1, 2022
1 parent 5a05980 commit 76e8887
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions executor/index_merge_reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -632,12 +632,15 @@ func (e *IndexMergeReaderExecutor) buildFinalTableReader(ctx context.Context, tb
netDataSize: e.dataAvgRowSize * float64(len(handles)),
}
if e.isCorColInTableFilter {
e.tableRequestMu.Lock()
if tableReaderExec.dagPB.Executors, err = constructDistExec(e.ctx, e.tblPlans); err != nil {
e.tableRequestMu.Unlock()
err = func() error {
e.tableRequestMu.Lock()
defer e.tableRequestMu.Unlock()
tableReaderExec.dagPB.Executors, err = constructDistExec(e.ctx, e.tblPlans)
return err
}()
if err != nil {
return nil, err
}
e.tableRequestMu.Unlock()
}
tableReaderExec.buildVirtualColumnInfo()
// Reorder handles because SplitKeyRangesByLocations() requires startKey of kvRanges is ordered.
Expand Down

0 comments on commit 76e8887

Please sign in to comment.