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

Jump to bottom

planner: update some UTs to use cost model2 #38875

Merged
merged 12 commits into from
Nov 4, 2022
Merged

planner: update some UTs to use cost model2 #38875

merged 12 commits into from
Nov 4, 2022

Conversation

qw4990
Copy link
Contributor

@qw4990 qw4990 commented Nov 3, 2022

What problem does this PR solve?

Issue Number: ref #35240

Problem Summary: planner: update some UTs to use cost model2

What is changed and how it works?

planner: update some UTs to use cost model2

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
Member

ti-chi-bot commented Nov 3, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • 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.

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 Nov 3, 2022
@qw4990 qw4990 added sig/planner SIG: Planner epic/cost-model the optimizer cost model and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 3, 2022
qw4990
qw4990 commented Nov 3, 2022
View reviewed changes
expression/testdata/expression_suite_out.json
@@ -65,11 +65,11 @@
"Result": [
"HashJoin 4166.67 root right outer join, equal:[eq(test.t1.a, test.t2.a)]",
"├─TableReader(Build) 3333.33 root data:Selection",
"│ └─Selection 3333.33 cop[tikv] gt(test.t1.a, 1), not(isnull(test.t1.a))",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Both sides are accepted since they have the same est-row 3333.33.

qw4990
qw4990 commented Nov 3, 2022
View reviewed changes
planner/core/testdata/analyze_suite_out.json
@@ -160,13 +160,13 @@
],
"Plan": [
"Limit 1.00 root offset:0, count:1",
"└─IndexJoin 1.00 root left outer semi join, inner:IndexReader, outer key:test.t.a, inner key:test.t.b, equal cond:eq(test.t.a, test.t.b)",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Expected since cost of IndexJoin is under-estimated in model1.

qw4990
qw4990 commented Nov 3, 2022
View reviewed changes
planner/core/testdata/analyze_suite_out.json
"IndexLookUp(Index(t.e)[[1,1]], Table(t))->HashAgg",
"TableReader(Table(t)->Sel([gt(test.t.e, 1)])->HashAgg)->HashAgg",
"IndexLookUp(Index(t.b)[[-inf,20]], Table(t)->HashAgg)->HashAgg",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Expected since cost of IndexLookup is under-estimated in model1.

qw4990
qw4990 commented Nov 3, 2022
View reviewed changes
planner/core/testdata/integration_suite_out.json
"StreamAgg_12 1.00 47.30 root funcs:count(1)->Column#4",
"└─TableReader_21 0.00 47.30 root data:Selection_20",
" └─Selection_20 0.00 709.52 cop[tikv] eq(test.t2.a, 0)",
" └─TableFullScan_19 3.00 559.82 cop[tikv] table:t2 keep order:false"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Expected since model2 prefers to use TiKV-Scan instead of TiFlash-Scan when est-row is small.

@ti-chi-bot ti-chi-bot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Nov 3, 2022
qw4990
qw4990 commented Nov 3, 2022
View reviewed changes
planner/core/testdata/integration_suite_out.json
" └─TableReader_22 3.00 6.56 root data:Selection_21",
" └─Selection_21 3.00 54.00 cop[tiflash] not(isnull(test.t1.a))",
" └─TableFullScan_20 3.00 45.00 cop[tiflash] table:t1 keep order:false"
"StreamAgg_10 1.00 630.77 root funcs:count(1)->Column#7",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The following five cases have no plan change.

@qw4990 qw4990 requested review from winoros and Yisaer November 3, 2022 10:12
@qw4990
Copy link
Contributor Author

qw4990 commented Nov 3, 2022

/run-build

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 3, 2022
@hawkingrei hawkingrei self-requested a review November 3, 2022 10:35
qw4990
qw4990 commented Nov 3, 2022
View reviewed changes
executor/join_test.go
@@ -1356,7 +1357,7 @@ func TestIndexLookupJoin(t *testing.T) {
tk.MustExec("analyze table s;")

tk.MustQuery("desc format = 'brief' select /*+ TIDB_INLJ(s) */ count(*) from t join s use index(idx) on s.a = t.a and s.b < t.b").Check(testkit.Rows(
"HashAgg 1.00 root funcs:count(1)->Column#6",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Expected since model2 prefers to use StreamAgg instead of HashAgg if no much data to process.

@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 3, 2022
@qw4990
Copy link
Contributor Author

qw4990 commented Nov 4, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: b3bde8a

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 4, 2022
@qw4990
Copy link
Contributor Author

qw4990 commented Nov 4, 2022

/merge

@qw4990
Copy link
Contributor Author

qw4990 commented Nov 4, 2022

/run-unit-test

@qw4990
Copy link
Contributor Author

qw4990 commented Nov 4, 2022

/merge

@qw4990
Copy link
Contributor Author

qw4990 commented Nov 4, 2022

/merge

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

sre-bot commented Nov 4, 2022

TiDB MergeCI notify

🔴 Bad News! [2] CI still failing after this pr merged.
These failed integration tests don't seem to be introduced by the current PR.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🔴 failed 5, success 34, total 39 32 min Existing failure
idc-jenkins-ci-tidb/common-test 🔴 failed 1, success 10, total 11 12 min Existing failure
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 30 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 16 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 46 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 6 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 4 min 36 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 14 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 3 min 3 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

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

@chrysan chrysan chrysan approved these changes

@winoros winoros Awaiting requested review from winoros

@Yisaer Yisaer Awaiting requested review from Yisaer

@hawkingrei hawkingrei Awaiting requested review from hawkingrei

Assignees
No one assigned
Labels
epic/cost-model the optimizer cost model release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner 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.
6 participants
@qw4990 @ti-chi-bot @sre-bot @hawkingrei @chrysan @time-and-fate