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: support IndexMergeReaderExecutor #12305

Merged
merged 8 commits into from
Dec 31, 2019
Merged

executor: support IndexMergeReaderExecutor #12305

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ba97b3
indexmerge executor
Sep 17, 2019
ea2356c
fix dev
Dec 16, 2019
3b49e7d
fix partial comments
Dec 20, 2019
3c778bd
fix some comments
Dec 20, 2019
5c8742f
fix dev
Dec 20, 2019
744b990
fix some comments
Dec 26, 2019
0d623ce
add test for disabling indexmerge
Dec 30, 2019
f89dca0
Merge branch 'master' into IndexMergeExecute
sre-bot Dec 31, 2019
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
Prev Previous commit
Next Next commit
fix some comments
  • Loading branch information
hailanwhu committed Dec 30, 2019
commit 744b990dc5780f4f10f32a0de2790d8f6d72ac78
16 changes: 1 addition & 15 deletions executor/index_merge_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package executor
import (
"context"
"runtime"
"sort"
"strconv"
"sync"
"sync/atomic"
Expand Down Expand Up @@ -129,8 +128,8 @@ func (e *IndexMergeReaderExecutor) Open(ctx context.Context) error {
fetchCh := make(chan *lookupTableTask, len(kvRangess))

e.startIndexMergeProcessWorker(ctx, workCh, fetchCh, len(kvRangess))
e.partialWorkerWg.Add(len(kvRangess))
for i := 0; i < len(kvRangess); i++ {
e.partialWorkerWg.Add(1)
if e.indexes[i] != nil {
err := e.startPartialIndexWorker(ctx, kvRangess[i], fetchCh, i)
if err != nil {
Expand Down Expand Up @@ -379,7 +378,6 @@ func (e *IndexMergeReaderExecutor) startIndexMergeTableScanWorker(ctx context.Co
workCh: workCh,
finished: e.finished,
buildTblReader: e.buildFinalTableReader,
keepOrder: false,
handleIdx: e.handleIdx,
tblPlans: e.tblPlans,
memTracker: memory.NewTracker(stringutil.MemoizeStr(func() string { return "TableWorker_" + strconv.Itoa(i) }),
Expand Down Expand Up @@ -637,7 +635,6 @@ type indexMergeTableScanWorker struct {
workCh <-chan *lookupTableTask
finished <-chan struct{}
buildTblReader func(ctx context.Context, handles []int64) (Executor, error)
keepOrder bool
handleIdx int
tblPlans []plannercore.PhysicalPlan

Expand Down Expand Up @@ -706,17 +703,6 @@ func (w *indexMergeTableScanWorker) executeTask(ctx context.Context, task *looku
memUsage = int64(cap(task.rows)) * int64(unsafe.Sizeof(chunk.Row{}))
task.memUsage += memUsage
task.memTracker.Consume(memUsage)
if w.keepOrder {
task.rowIdx = make([]int, 0, len(task.rows))
for i := range task.rows {
handle := task.rows[i].GetInt64(w.handleIdx)
task.rowIdx = append(task.rowIdx, task.indexOrder[handle])
}
memUsage = int64(cap(task.rowIdx) * 4)
task.memUsage += memUsage
task.memTracker.Consume(memUsage)
sort.Sort(task)
}
if handleCnt != len(task.rows) && len(w.tblPlans) == 1 {
return errors.Errorf("handle count %d isn't equal to value count %d", handleCnt, len(task.rows))
}
Expand Down