*: remove `ExtraPidCol` and replace it with `ExtraPhysTblIDCol` #53974

Defined2014 · 2024-06-12T12:52:59Z

What problem does this PR solve?

Issue Number: close #53929

Problem Summary:

The problem is we added ExtraPhysTblID to DataSource's schema for get the partition id. But it returns table id instead of partition id when using indexReader executor working with global index, because we decode index key to get it. After deep into the code, I found it's hard to fix it elegantly. In logical plan builder phase, we can't determined it will select a global index path or not which means we can't addExtraPidColID column into DataSource in this phase.

Then I think maybe we could combine two columns, let it gets return values from different place(Seems ExtraPhysTblID is useless for global index, always return table ID for every records). When it is a global index, we could decode pid by index value, otherwise we could decode table id by index/row key. Also it could reduce potential errors, no need to select to use ExtraPhysTblID or ExtraPidColID when we write the code.

Related PR in TiKV side tikv/tikv#17141

What changed and how does it work?

Check List

Tests

Unit test
Integration test
Manual test (add detailed scripts or steps below)
No need to test
- I checked and no code files have been changed.

Side effects

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

Documentation

Release note

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

None

ti-chi-bot · 2024-06-12T12:53:02Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

tiprow · 2024-06-12T12:53:17Z

Hi @Defined2014. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

codecov · 2024-06-13T02:31:12Z

Codecov Report

Attention: Patch coverage is 96.29630% with 1 line in your changes missing coverage. Please review.

Project coverage is 56.2551%. Comparing base (7a18952) to head (44d9a31).
Report is 45 commits behind head on master.

Additional details and impacted files

@@                Coverage Diff                @@
##             master     #53974         +/-   ##
=================================================
- Coverage   72.5434%   56.2551%   -16.2884%     
=================================================
  Files          1508       1638        +130     
  Lines        431744     616321     +184577     
=================================================
+ Hits         313202     346712      +33510     
- Misses        99141     246330     +147189     
- Partials      19401      23279       +3878

Flag	Coverage Δ
integration	`36.3879% <92.5925%> (?)`
unit	`71.7910% <88.8888%> (+0.2613%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components	Coverage Δ
dumpling	`52.9656% <ø> (ø)`
parser	`∅ <ø> (∅)`
br	`51.8404% <ø> (+9.7072%)`	⬆️

Defined2014 · 2024-06-18T01:32:14Z

/retest

tiprow · 2024-06-18T01:32:39Z

@Defined2014: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

AilinKid

Rest LGTM

AilinKid · 2024-06-18T07:19:40Z

pkg/store/mockstore/unistore/cophandler/closure_exec.go

@@ -932,8 +925,16 @@ func (e *closureExecutor) indexScanProcessCore(key, value []byte) error {
 	}
 	// Add ExtraPhysTblID if requested
 	// Assumes it is always last!
-	if e.columnInfos[len(e.columnInfos)-1].ColumnId == model.ExtraPhysTblID {
-		tblID := tablecodec.DecodeTableID(key)
+	if e.columnInfos[len(e.columnInfos)-1].ColumnId == model.ExtraPhysTblID && min(len(e.fieldTps), len(values)) < len(e.columnInfos) {


this min func usage should be added with comments

AilinKid · 2024-06-18T07:20:33Z

pkg/store/mockstore/unistore/cophandler/mpp_exec.go

-		tblID := tablecodec.DecodeTableID(key)
+
+	// when *e.physTblIDColIdx < min(len(e.fieldTypes), len(values)), pid is included in values and already filled in e.chk
+	if e.physTblIDColIdx != nil && *e.physTblIDColIdx >= min(len(e.fieldTypes), len(values)) {


same here，better add a small case？

what the main reason for mismatch of len(e.fieldTypes) and len(values)？

Made some mistakes and updated.

mjonss

LGTM, with some minor questions.

pkg/executor/partition_table_test.go

pkg/planner/core/find_best_task.go

pkg/store/mockstore/unistore/cophandler/closure_exec.go

ti-chi-bot · 2024-06-18T08:10:27Z

[LGTM Timeline notifier]

Timeline:

2024-06-18 06:57:53.810150864 +0000 UTC m=+98000.295639696: ☑️ agreed by tangenta.
2024-06-18 08:10:26.994172935 +0000 UTC m=+102353.479661767: ☑️ agreed by mjonss.

ti-chi-bot · 2024-06-18T08:51:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AilinKid, mjonss, tangenta, XuHuaiyu

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [AilinKid,XuHuaiyu,mjonss,tangenta]
~~pkg/expression/OWNERS~~ [XuHuaiyu]
~~pkg/parser/OWNERS~~ [tangenta]
~~pkg/planner/OWNERS~~ [AilinKid]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

…cap#53974) close pingcap#53929

Defined2014 added 2 commits June 12, 2024 20:29

remove extraPid

46afe04

add test

53e3eea

update

32acfda

Defined2014 marked this pull request as ready for review June 13, 2024 02:08

ti-chi-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 13, 2024

Defined2014 requested a review from mjonss June 14, 2024 06:21

update test cases

f4865ec

ti-chi-bot bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 17, 2024

Defined2014 requested review from bb7133, AilinKid and XuHuaiyu June 17, 2024 06:33

Defined2014 requested a review from tangenta June 18, 2024 02:28

tangenta approved these changes Jun 18, 2024

View reviewed changes

ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jun 18, 2024

AilinKid reviewed Jun 18, 2024

View reviewed changes

mjonss approved these changes Jun 18, 2024

View reviewed changes

pkg/executor/partition_table_test.go Show resolved Hide resolved

pkg/planner/core/find_best_task.go Show resolved Hide resolved

pkg/store/mockstore/unistore/cophandler/closure_exec.go Outdated Show resolved Hide resolved

ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jun 18, 2024

follow comments

20fa0b4

ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jun 18, 2024

update comments

44d9a31

AilinKid approved these changes Jun 18, 2024

View reviewed changes

XuHuaiyu approved these changes Jun 18, 2024

View reviewed changes

ti-chi-bot bot added the approved label Jun 18, 2024

ti-chi-bot bot merged commit 9008d23 into pingcap:master Jun 18, 2024
21 checks passed

Defined2014 deleted the fix-53929 branch June 18, 2024 09:59

RidRisR pushed a commit to RidRisR/tidb that referenced this pull request Jun 18, 2024

*: remove ExtraPidCol and replace it with ExtraPhysTblIDCol (ping…

0a3f34c

…cap#53974) close pingcap#53929

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

*: remove `ExtraPidCol` and replace it with `ExtraPhysTblIDCol` #53974

*: remove `ExtraPidCol` and replace it with `ExtraPhysTblIDCol` #53974

Defined2014 commented Jun 12, 2024 •

edited

Loading

ti-chi-bot bot commented Jun 12, 2024

tiprow bot commented Jun 12, 2024

codecov bot commented Jun 13, 2024 •

edited

Loading

Defined2014 commented Jun 18, 2024

tiprow bot commented Jun 18, 2024

AilinKid left a comment

AilinKid Jun 18, 2024

AilinKid Jun 18, 2024

AilinKid Jun 18, 2024

Defined2014 Jun 18, 2024

mjonss left a comment

ti-chi-bot bot commented Jun 18, 2024

ti-chi-bot bot commented Jun 18, 2024

*: remove ExtraPidCol and replace it with ExtraPhysTblIDCol #53974

*: remove ExtraPidCol and replace it with ExtraPhysTblIDCol #53974

Conversation

Defined2014 commented Jun 12, 2024 • edited Loading

What problem does this PR solve?

What changed and how does it work?

Check List

Release note

ti-chi-bot bot commented Jun 12, 2024

tiprow bot commented Jun 12, 2024

codecov bot commented Jun 13, 2024 • edited Loading

Codecov Report

Defined2014 commented Jun 18, 2024

tiprow bot commented Jun 18, 2024

AilinKid left a comment

Choose a reason for hiding this comment

AilinKid Jun 18, 2024

Choose a reason for hiding this comment

AilinKid Jun 18, 2024

Choose a reason for hiding this comment

AilinKid Jun 18, 2024

Choose a reason for hiding this comment

Defined2014 Jun 18, 2024

Choose a reason for hiding this comment

mjonss left a comment

Choose a reason for hiding this comment

ti-chi-bot bot commented Jun 18, 2024

[LGTM Timeline notifier]

ti-chi-bot bot commented Jun 18, 2024

*: remove `ExtraPidCol` and replace it with `ExtraPhysTblIDCol` #53974

*: remove `ExtraPidCol` and replace it with `ExtraPhysTblIDCol` #53974

Defined2014 commented Jun 12, 2024 •

edited

Loading

codecov bot commented Jun 13, 2024 •

edited

Loading