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: donot prune all columns for Projection (#24024) #24093

Merged
merged 8 commits into from
Apr 16, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Apr 16, 2021

cherry-pick #24024 to release-5.0
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/24093

After apply modifications, you can push your change to this PR via:

git push [email protected]:ti-srebot/tidb.git pr/24093:release-5.0-4cd7fb022743

Signed-off-by: guo-shaoge [email protected]

What problem does this PR solve?

Issue Number: close #23887

Problem Summary:

Hash Join (eq("abc", tbl1.col1))
  |                     |
Projection     DataSource(tbl1)
  |
Index Join
  1. We prune all columns in Projection
  2. Resolve indices for col1, Its index is 0(because Projection's output columns are all pruned)
  3. Projection is eliminated, because its output columns are all pruned. But Index Join still has output columns
  4. Got panic when calc eq("abc", tbl1.col1). Because use index 0 to eval tbl1.col1

What is changed and how it works?

What's Changed:

  1. We donot prune all columns in Projection. If Projection is pruned to empty, we make it a Projection 1 (just like count(1))
  2. Delete some code in rule_eliminate_projection.go, because Projection cannot be empty. Check here

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects: no

Release note

  • donot prune all columns for Projection

@ti-srebot ti-srebot requested a review from a team as a code owner April 16, 2021 10:19
@ti-srebot ti-srebot requested review from lzmhhh123 and removed request for a team April 16, 2021 10:19
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/5.0-cherry-pick type/bugfix This PR fixes a bug. labels Apr 16, 2021
@ti-srebot ti-srebot requested a review from winoros April 16, 2021 10:19
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 16, 2021
@ti-srebot ti-srebot added this to the v5.0.0 ga milestone Apr 16, 2021
@ti-srebot
Copy link
Contributor Author

@guo-shaoge you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 16, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Apr 16, 2021
@ti-chi-bot
Copy link
Member

@wshwsh12: /merge in this pull request requires 2 /lgtm.

In response to this:

/merge

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 ti-community-infra/tichi repository.

Signed-off-by: guo-shaoge <[email protected]>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 16, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • lzmhhh123
  • winoros

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 writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@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 Apr 16, 2021
@guo-shaoge
Copy link
Collaborator

/run-all-tests

Signed-off-by: guo-shaoge <[email protected]>
@ti-srebot ti-srebot requested a review from a team as a code owner April 16, 2021 11:22
@github-actions github-actions bot added the sig/execution SIG execution label Apr 16, 2021
@lzmhhh123
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 5100a75

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 16, 2021
@winoros
Copy link
Member

winoros commented Apr 16, 2021

/merge

@guo-shaoge
Copy link
Collaborator

/run-integration-common-test

@ti-chi-bot
Copy link
Member

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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 ti-community-infra/tichi repository.

@zhouqiang-cl
Copy link
Contributor

/run-integration-tests

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. sig/execution SIG execution 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. type/bugfix This PR fixes a bug. type/5.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants