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 dead loop for indexMergeJoin in paging. #35918

Merged
merged 5 commits into from
Jul 11, 2022
Merged

executor: fix dead loop for indexMergeJoin in paging. #35918

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6837ce
fix
wshwsh12 Jul 4, 2022
a7b27b9
Merge branch 'master' into skip-index-merge-join
hawkingrei Jul 5, 2022
5c66091
address comments
wshwsh12 Jul 6, 2022
f19c5c0
Merge branch 'master' into skip-index-merge-join
hawkingrei Jul 8, 2022
e860dc2
Merge branch 'master' into skip-index-merge-join
ti-chi-bot Jul 11, 2022
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
7 changes: 7 additions & 0 deletions executor/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3885,6 +3885,12 @@ func (builder *dataReaderBuilder) buildTableReaderForIndexJoin(ctx context.Conte
lookUpContents []*indexJoinLookUpContent, indexRanges []*ranger.Range, keyOff2IdxOff []int,
cwc *plannercore.ColWithCmpFuncManager, canReorderHandles bool, memTracker *memory.Tracker, interruptSignal *atomic.Value) (Executor, error) {
e, err := buildNoRangeTableReader(builder.executorBuilder, v)
if !canReorderHandles {
// `canReorderHandles` is set to false only in IndexMergeJoin. IndexMergeJoin will trigger a dead loop problem
// when enabling paging(tidb/issues/35831). But IndexMergeJoin is not visible to the user and is deprecated
// for now. Thus, we disable paging here.
e.paging = false
}
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -4069,6 +4075,7 @@ func (builder *dataReaderBuilder) buildTableReaderBase(ctx context.Context, e *T
SetIsStaleness(e.isStaleness).
SetFromSessionVars(e.ctx.GetSessionVars()).
SetFromInfoSchema(e.ctx.GetInfoSchema()).
SetPaging(e.paging).
Build()
if err != nil {
return nil, err
Expand Down