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.

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

*: support order_index and no_order_index hint for planner #44111

Conversation

xuyifangreeneyes
Copy link
Contributor

What problem does this PR solve?

Cherry pick #39965 #40089 #10155 #40945

Issue Number: close #39964

Problem Summary:

Support order_index and no_order_index hint for planner.

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

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.

None

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 23, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • qw4990

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.

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 bot added do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 23, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 23, 2023
@xuyifangreeneyes
Copy link
Contributor Author

/test check-dev2

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 23, 2023
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels May 23, 2023
@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 23, 2023

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

Commit hash: f3a0599

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 23, 2023
@hawkingrei
Copy link
Member

@xuyifangreeneyes PTAL

    result.go:49: 
        	Error Trace:	/home/jenkins/.tidb/tmp/45c44f383a26fe92ddbb5dda36c71ef8/sandbox/linux-sandbox/7145/execroot/__main__/bazel-out/k8-fastbuild/bin/planner/core/core_test_/core_test.runfiles/__main__/planner/core/result.go:49
        	            				/home/jenkins/.tidb/tmp/45c44f383a26fe92ddbb5dda36c71ef8/sandbox/linux-sandbox/7145/execroot/__main__/bazel-out/k8-fastbuild/bin/planner/core/core_test_/core_test.runfiles/__main__/planner/core/integration_test.go:1371
        	Error:      	Not equal: 
        	            	expected: "[Limit_12 1.00 root  offset:0, count:1]\n[└─Projection_17 1.00 root  test.t1.a, test.t1.b]\n[  └─IndexLookUp_16 1.00 root  ]\n[    ├─Limit_15(Build) 1.00 cop[tikv]  offset:0, count:1]\n[    │ └─IndexRangeScan_13 1.00 cop[tikv] table:t1, index:idx_a(a) range:[-inf,10), keep order:true, stats:pseudo]\n[    └─TableRowIDScan_14(Probe) 1.00 cop[tikv] table:t1 keep order:false, stats:pseudo]\n"
        	            	actual  : "[Projection_17 1.00 root  test.t1.a, test.t1.b]\n[└─IndexLookUp_16 1.00 root  limit embedded(offset:0, count:1)]\n[  ├─Limit_15(Build) 1.00 cop[tikv]  offset:0, count:1]\n[  │ └─IndexRangeScan_13 1.00 cop[tikv] table:t1, index:idx_a(a) range:[-inf,10), keep order:true, stats:pseudo]\n[  └─TableRowIDScan_14(Probe) 1.00 cop[tikv] table:t1 keep order:false, stats:pseudo]\n"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1,7 +1,6 @@
        	            	-[Limit_12 1.00 root  offset:0, count:1]
        	            	-[└─Projection_17 1.00 root  test.t1.a, test.t1.b]
        	            	-[  └─IndexLookUp_16 1.00 root  ]
        	            	-[    ├─Limit_15(Build) 1.00 cop[tikv]  offset:0, count:1]
        	            	-[    │ └─IndexRangeScan_13 1.00 cop[tikv] table:t1, index:idx_a(a) range:[-inf,10), keep order:true, stats:pseudo]
        	            	-[    └─TableRowIDScan_14(Probe) 1.00 cop[tikv] table:t1 keep order:false, stats:pseudo]
        	            	+[Projection_17 1.00 root  test.t1.a, test.t1.b]
        	            	+[└─IndexLookUp_16 1.00 root  limit embedded(offset:0, count:1)]
        	            	+[  ├─Limit_15(Build) 1.00 cop[tikv]  offset:0, count:1]
        	            	+[  │ └─IndexRangeScan_13 1.00 cop[tikv] table:t1, index:idx_a(a) range:[-inf,10), keep order:true, stats:pseudo]
        	            	+[  └─TableRowIDScan_14(Probe) 1.00 cop[tikv] table:t1 keep order:false, stats:pseudo]
        	            	 
        	Test:       	TestKeepOrderHint
        	Messages:   	sql:explain select /*+ order_index(t1, idx_a) */ * from t1 where a<10 order by a limit 1;, args:[]

@hawkingrei
Copy link
Member

/hold

@ti-chi-bot ti-chi-bot bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 23, 2023
@hawkingrei
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 29, 2023
@xuyifangreeneyes
Copy link
Contributor Author

@xuyifangreeneyes PTAL

    result.go:49: 
        	Error Trace:	/home/jenkins/.tidb/tmp/45c44f383a26fe92ddbb5dda36c71ef8/sandbox/linux-sandbox/7145/execroot/__main__/bazel-out/k8-fastbuild/bin/planner/core/core_test_/core_test.runfiles/__main__/planner/core/result.go:49
        	            				/home/jenkins/.tidb/tmp/45c44f383a26fe92ddbb5dda36c71ef8/sandbox/linux-sandbox/7145/execroot/__main__/bazel-out/k8-fastbuild/bin/planner/core/core_test_/core_test.runfiles/__main__/planner/core/integration_test.go:1371
        	Error:      	Not equal: 
        	            	expected: "[Limit_12 1.00 root  offset:0, count:1]\n[└─Projection_17 1.00 root  test.t1.a, test.t1.b]\n[  └─IndexLookUp_16 1.00 root  ]\n[    ├─Limit_15(Build) 1.00 cop[tikv]  offset:0, count:1]\n[    │ └─IndexRangeScan_13 1.00 cop[tikv] table:t1, index:idx_a(a) range:[-inf,10), keep order:true, stats:pseudo]\n[    └─TableRowIDScan_14(Probe) 1.00 cop[tikv] table:t1 keep order:false, stats:pseudo]\n"
        	            	actual  : "[Projection_17 1.00 root  test.t1.a, test.t1.b]\n[└─IndexLookUp_16 1.00 root  limit embedded(offset:0, count:1)]\n[  ├─Limit_15(Build) 1.00 cop[tikv]  offset:0, count:1]\n[  │ └─IndexRangeScan_13 1.00 cop[tikv] table:t1, index:idx_a(a) range:[-inf,10), keep order:true, stats:pseudo]\n[  └─TableRowIDScan_14(Probe) 1.00 cop[tikv] table:t1 keep order:false, stats:pseudo]\n"
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1,7 +1,6 @@
        	            	-[Limit_12 1.00 root  offset:0, count:1]
        	            	-[└─Projection_17 1.00 root  test.t1.a, test.t1.b]
        	            	-[  └─IndexLookUp_16 1.00 root  ]
        	            	-[    ├─Limit_15(Build) 1.00 cop[tikv]  offset:0, count:1]
        	            	-[    │ └─IndexRangeScan_13 1.00 cop[tikv] table:t1, index:idx_a(a) range:[-inf,10), keep order:true, stats:pseudo]
        	            	-[    └─TableRowIDScan_14(Probe) 1.00 cop[tikv] table:t1 keep order:false, stats:pseudo]
        	            	+[Projection_17 1.00 root  test.t1.a, test.t1.b]
        	            	+[└─IndexLookUp_16 1.00 root  limit embedded(offset:0, count:1)]
        	            	+[  ├─Limit_15(Build) 1.00 cop[tikv]  offset:0, count:1]
        	            	+[  │ └─IndexRangeScan_13 1.00 cop[tikv] table:t1, index:idx_a(a) range:[-inf,10), keep order:true, stats:pseudo]
        	            	+[  └─TableRowIDScan_14(Probe) 1.00 cop[tikv] table:t1 keep order:false, stats:pseudo]
        	            	 
        	Test:       	TestKeepOrderHint
        	Messages:   	sql:explain select /*+ order_index(t1, idx_a) */ * from t1 where a<10 order by a limit 1;, args:[]

The plan change is caused by #43883, which is expected.

@xuyifangreeneyes
Copy link
Contributor Author

/test build

@xuyifangreeneyes
Copy link
Contributor Author

/unhold

@ti-chi-bot ti-chi-bot bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 29, 2023
@xuyifangreeneyes
Copy link
Contributor Author

/merge

@ti-chi-bot
Copy link

ti-chi-bot bot commented May 29, 2023

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

Commit hash: aa90d29

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label May 29, 2023
@xuyifangreeneyes
Copy link
Contributor Author

/test check-dev2

1 similar comment
@xuyifangreeneyes
Copy link
Contributor Author

/test check-dev2

@ti-chi-bot ti-chi-bot bot merged commit 7bd4528 into pingcap:release-6.5 May 29, 2023
@xuyifangreeneyes xuyifangreeneyes deleted the cp-39965-40089-40321-40945-to-65 branch May 29, 2023 14:47
@ti-chi-bot ti-chi-bot added cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. labels Jun 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ 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
Development

Successfully merging this pull request may close these issues.

6 participants