Skip to content

executor: support Intersection of IndexMerge#38636

Merged
ti-chi-bot merged 55 commits intopingcap:masterfrom
guo-shaoge:intersect_index_merge
Nov 29, 2022
Merged

executor: support Intersection of IndexMerge#38636
ti-chi-bot merged 55 commits intopingcap:masterfrom
guo-shaoge:intersect_index_merge

Conversation

@guo-shaoge
Copy link
Collaborator

@guo-shaoge guo-shaoge commented Oct 25, 2022 •
edited
Loading

Signed-off-by: guo-shaoge shaoge1994@163.com

What problem does this PR solve?

Issue Number: close #39334

Problem Summary: Support intersection of IndexMerge

What is changed and how it works?

  1. index_merge_reader.go: use a map to record handle count of each partial path. For partition table, we use one goroutine for one or multiple partitions.
  2. mem_reader.go: Handle data in mem_table. Same logic as above, but only one goroutine, because the data in mem_table is not large.

Check List

Tests

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

executor: support Intersection of IndexMerge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 25, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • time-and-fate

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 25, 2022
@guo-shaoge
executor: support Intersection of IndexMerge
a3e9b08 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix fmt
2c1f53b 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Copy link
Collaborator Author

guo-shaoge commented Oct 25, 2022

/build

@guo-shaoge
Merge branch 'master' into intersect_index_merge
9b2f030
@guo-shaoge
fix trivial bug
3f6dbb5 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
add unit test
fd03889 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Merge branch 'intersect_index_merge' of github.com:guo-shaoge/tidb in…
9ba60c7 
…to intersect_index_merge
@guo-shaoge
fix lint
79af3c0 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 6, 2022
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 14, 2022
@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Nov 22, 2022
@guo-shaoge
refine processWorker
425a7b2 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Merge branch 'intersect_index_merge' of github.com:guo-shaoge/tidb in…
631e1ef 
…to intersect_index_merge
@guo-shaoge
refine intersectionProcessWorker
2b450b4 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
refine intersectionProcessWorker
816b378 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix fmt
096dfdd 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge guo-shaoge mentioned this pull request Nov 23, 2022
Merged
12 tasks
@guo-shaoge
fix comment
742dbf3 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix
0addbf5 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
Merge branch 'master' into intersect_index_merge
4e3b731
@guo-shaoge
remove defer for last consume
3bf600e 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
change var name
7486eff 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix lint
f7a4bcb 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge
fix lint
8cca18a 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge guo-shaoge requested a review from XuHuaiyu November 29, 2022 08:50
wshwsh12
wshwsh12 reviewed Nov 29, 2022
View reviewed changes
wshwsh12
wshwsh12 reviewed Nov 29, 2022
View reviewed changes
@guo-shaoge
fix comment; update usage of memtracker
5cfbe24 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@guo-shaoge guo-shaoge requested a review from wshwsh12 November 29, 2022 09:40
@guo-shaoge
Copy link
Collaborator Author

guo-shaoge commented Nov 29, 2022

/run-unit-test

@guo-shaoge
Copy link
Collaborator Author

guo-shaoge commented Nov 29, 2022

/rebuild

XuHuaiyu
XuHuaiyu approved these changes Nov 29, 2022
View reviewed changes
executor/index_merge_reader.go Outdated
partCnt = len(w.indexMerge.prunedPartitions)
}
workerCnt := partCnt
if workerCnt > maxWorkerCnt {
Copy link
Contributor

@XuHuaiyu XuHuaiyu Nov 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use mathutil.Max is simpler

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 29, 2022
@guo-shaoge
Copy link
Collaborator Author

guo-shaoge commented Nov 29, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 29, 2022

This pull request has been accepted and is ready to merge.

DetailsCommit hash: b1a2ef7

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 29, 2022
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Nov 29, 2022
@guo-shaoge
Copy link
Collaborator Author

guo-shaoge commented Nov 29, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 29, 2022

This pull request has been accepted and is ready to merge.

DetailsCommit hash: 9233461

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 29, 2022
@guo-shaoge
Copy link
Collaborator Author

guo-shaoge commented Nov 29, 2022

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit e135608 into pingcap:master Nov 29, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Nov 29, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test 🟥 2 min 42 sec New failing
idc-jenkins-ci/integration-cdc-test 🟢 all 40 tests passed 23 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 18 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 14 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 38 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 6 min 19 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 6 min 2 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 2 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 2 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@time-and-fate time-and-fate time-and-fate approved these changes

@wshwsh12 wshwsh12 Awaiting requested review from wshwsh12

Assignees

No one assigned

Labels

release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Support IndexMerge Intersection (executor part)

6 participants

@guo-shaoge @ti-chi-bot @time-and-fate @sre-bot @XuHuaiyu @wshwsh12