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

planner: introduce some new hints for MPP plans #38516

Merged
merged 19 commits into from
Oct 19, 2022

Conversation

qw4990
Copy link
Contributor

@qw4990 qw4990 commented Oct 18, 2022

What problem does this PR solve?

Issue Number: close #xxx

Problem Summary: planner: introduce some new hints for MPP plans

What is changed and how it works?

Introduce some new hints for MPP plans: mpp_1phase_agg(), mpp_2phase_agg(), mpp_tidb_agg(), mpp_scalar_agg(), shuffle_join().

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

@qw4990 qw4990 added type/enhancement The issue or PR belongs to an enhancement. sig/planner SIG: Planner labels Oct 18, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 18, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Reminiscent
  • xuyifangreeneyes

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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 18, 2022
Comment on lines 1943 to 1946
shuffleJoins := p.tryToGetMppHashJoin(prop, false)
if (p.preferJoinType&preferShuffleJoin) > 0 && len(shuffleJoins) > 0 { // has shuffle_join hints
return shuffleJoins, true, nil
}
Copy link
Contributor

Choose a reason for hiding this comment

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

If we have both BCJoin hint and shuffle join hint, it seems we will chose the shuffle join. Is it expected?

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 behavior of using multiple conflict hints together seems undefined. Let's notify our users on docs and any expectation wouldn't be guaranteed here.

Comment on lines 2811 to 2819
if la.aggHints.preferAggType&preferMPP1PhaseAgg > 0 {
preferModes = append(preferModes, Mpp1Phase)
} else if la.aggHints.preferAggType&preferMPP2PhaseAgg > 0 {
preferModes = append(preferModes, Mpp2Phase)
} else if la.aggHints.preferAggType&preferMPPTiDBAgg > 0 {
preferModes = append(preferModes, MppTiDB)
} else if la.aggHints.preferAggType&preferMPPScalarAgg > 0 {
preferModes = append(preferModes, MppScalar)
}
Copy link
Contributor

Choose a reason for hiding this comment

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

If there are more one mpp aggregation hints. We can only use one?
Change this part to

if .. {}
if .. {}
if .. {}
if .. {}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good Catch. But on second thought, it seems that the behavior of using multiple agg-hints together is undefined, so I finally update this part to preferMode instead of preferModes.

Copy link
Contributor

@Reminiscent Reminiscent left a comment

Choose a reason for hiding this comment

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

Rest LGTM

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 18, 2022
@hawkingrei
Copy link
Member

/run-build
/run-unit-test

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

qw4990 commented Oct 18, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: bd8af96

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 18, 2022
return bcastJoins, true, nil
}
joins = append(joins, bcastJoins...)
joins = append(joins, shuffleJoins...)
Copy link
Contributor

Choose a reason for hiding this comment

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

If there is no hint and p.shouldUseMPPBCJ is false, the old code only adds shuffleJoins but the new code adds both bcastJoins and shuffleJoins. Is that an expected change?

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Oct 18, 2022
@hawkingrei
Copy link
Member

/run-build

@qw4990
Copy link
Contributor Author

qw4990 commented Oct 19, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: e7268f9

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

qw4990 commented Oct 19, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: cc9a3c3

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

qw4990 commented Oct 19, 2022

/rebuild

@qw4990
Copy link
Contributor Author

qw4990 commented Oct 19, 2022

/run-build

@ti-chi-bot ti-chi-bot merged commit 7a9ed6f into pingcap:master Oct 19, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Oct 19, 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 1, success 37, total 38 22 min Existing failure
idc-jenkins-ci-tidb/integration-common-test 🔴 failed 2, success 15, total 17 14 min Existing failure
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 30 min Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 15 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 15 min Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 14 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 8 min 42 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 4 min 42 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 4 min 36 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
Labels
release-note-none Denotes a PR that doesn't merit a release note. sig/planner SIG: Planner 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. type/enhancement The issue or PR belongs to an enhancement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants