executor: support index merge on cluster index #18699
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lzmhhh123
requested review from
wshwsh12,
XuHuaiyu and
coocood
and removed request for
a team
…github.com/lzmhhh123/tidb into dev/support_clustered_index_in_index_merge
…github.com/lzmhhh123/tidb into dev/support_clustered_index_in_index_merge
coocood
reviewed
Jul 21, 2020
coocood
reviewed
Jul 21, 2020
| @@ -2681,6 +2681,10 @@ func (b *executorBuilder) buildIndexMergeReader(v *plannercore.PhysicalIndexMerg | |||
| sctx.IndexNames = append(sctx.IndexNames, is.Table.Name.O+":"+is.Index.Name.O) | |||
| } else { | |||
| ret.ranges = append(ret.ranges, v.PartialPlans[i][0].(*plannercore.PhysicalTableScan).Ranges) | |||
| if ret.table.Meta().IsCommonHandle { | |||
| tblInfo := ret.table.Meta() | |||
| sctx.IndexNames = append(sctx.IndexNames, tblInfo.Name.O+":"+tables.FindPrimaryIndex(tblInfo).Name.O) | |||
There was a problem hiding this comment.
It keeps the same name as the unclustered primary key.
coocood
reviewed
Jul 21, 2020
executor/index_merge_reader.go
Outdated
| @@ -359,8 +383,11 @@ func (w *partialTableWorker) extractTaskHandles(ctx context.Context, chk *chunk. | |||
| return handles, retChk, nil | |||
| } | |||
| for i := 0; i < chk.NumRows(); i++ { | |||
| h := kv.IntHandle(chk.GetRow(i).GetInt64(handleOffset)) | |||
| handles = append(handles, h) | |||
| handle, err := handleCols.BuildHandleByOffsets(chk.GetRow(i), handleOffset) | |||
There was a problem hiding this comment.
The handleCols has resolved column index, can we call BuildHandle without handleOffset?
coocood
reviewed
Jul 21, 2020
executor/index_merge_reader.go
Outdated
| handleOffset := chk.NumCols() - 1 | ||
| var handleOffset []int | ||
| for i := 0; i < handleCols.NumCols(); i++ { | ||
| handleOffset = append(handleOffset, chk.NumCols()-handleCols.NumCols()+i) |
There was a problem hiding this comment.
Since the index row's handle columns always at the last, we can move this logic into HandleCols, and use a method BuildHandleFromIndexRow.
We don't need to build the handleOffsets.
|
/rebuild |
|
LGTM |
|
@eurekaka PTAL |
ti-srebot
approved these changes
Jul 27, 2020
|
/merge |
ti-srebot
added
the
status/can-merge
|
/run-all-tests |
|
@lzmhhh123 merge failed. |
Codecov Report
@@ Coverage Diff @@
## master #18699 +/- ##
================================================
+ Coverage 79.2262% 79.7364% +0.5102%
================================================
Files 542 544 +2
Lines 146189 149870 +3681
================================================
+ Hits 115820 119501 +3681
+ Misses 21034 21025 -9
- Partials 9335 9344 +9 |
|
/merge |
|
/run-all-tests |
|
/run-all-tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Problem Summary: as title says.
What is changed and how it works?
What's Changed: support index merge on cluster index
Related changes
Check List
Tests
Side effects
Release note