Skip to content

planner: fix panic when the join key is scalarFunction (#30002)#30776

Merged
ti-chi-bot merged 8 commits intopingcap:release-5.2from
ti-srebot:release-5.2-05ccb8a206da
Apr 12, 2022
Merged

planner: fix panic when the join key is scalarFunction (#30002)#30776
ti-chi-bot merged 8 commits intopingcap:release-5.2from
ti-srebot:release-5.2-05ccb8a206da

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 16, 2021 •
edited
Loading

cherry-pick #30002 to release-5.2
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/30776

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

git push git@github.com:ti-srebot/tidb.git pr/30776:release-5.2-05ccb8a206da

Signed-off-by: yisaer disxiaofei@163.com

What problem does this PR solve?

Issue Number: close #29401

Problem Summary:

If one side of the join key is string, and the another is json, the expression of the string would be cast to json and marked ParseToJSONFlag which will let WrapWithCastAsJSON wrap extra cast function.

In order to avoid this problem, we remove ParseToJSONFlag temporary during updateEQCond.

The final explain info result for the original issue is like following:

mysql> explain select /*+ inl_hash_join(t1) */ * from t t1 join t t2 on t1.b=t2.e;
+-----------------------------+----------+-----------+---------------+---------------------------------------------------------------------------------------------------------------+
| id                          | estRows  | task      | access object | operator info                                                                                                 |
+-----------------------------+----------+-----------+---------------+---------------------------------------------------------------------------------------------------------------+
| HashJoin_8                  | 12500.00 | root      |               | inner join, equal:[eq(Column#15, test.t.e)]                                                                   |
| ├─TableReader_14(Build)     | 10000.00 | root      |               | data:TableFullScan_13                                                                                         |
| │ └─TableFullScan_13        | 10000.00 | cop[tikv] | table:t2      | keep order:false, stats:pseudo                                                                                |
| └─Projection_10(Probe)      | 10000.00 | root      |               | test.t.id, test.t.a, test.t.b, test.t.c, test.t.d, test.t.e, test.t.f, cast(test.t.b, json BINARY)->Column#15 |
|   └─TableReader_12          | 10000.00 | root      |               | data:TableFullScan_11                                                                                         |
|     └─TableFullScan_11      | 10000.00 | cop[tikv] | table:t1      | keep order:false, stats:pseudo                                                                                |
+-----------------------------+----------+-----------+---------------+---------------------------------------------------------------------------------------------------------------+
6 rows in set, 1 warning (0.00 sec)

What is changed and how it works?

This request fixs this case.

Check List

Tests

  • Unit test

Release note

Fix the bug that sql got cancel if including json column joins char column.

@Yisaer @ti-srebot
cherry pick pingcap#30002 to release-5.2
5e73d17 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 16, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • Yisaer

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.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 16, 2021

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 16, 2021
@ti-srebot ti-srebot mentioned this pull request Dec 16, 2021
Merged
1 task
@ti-srebot ti-srebot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/5.2-cherry-pick type/bugfix This PR fixes a bug. labels Dec 16, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 16, 2021

@Yisaer you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 16, 2021
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 12, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 12, 2022
@Yisaer
Copy link
Contributor

Yisaer commented Apr 12, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 12, 2022

@Yisaer: /merge in this pull request requires 2 approval(s).

Details

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.

@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 12, 2022
@Yisaer
fix conflict
de43fc4 
Signed-off-by: yisaer <disxiaofei@163.com>
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 12, 2022
@Yisaer
fix conflict
70bda1c 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer
Copy link
Contributor

Yisaer commented Apr 12, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 12, 2022

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

DetailsCommit hash: 70bda1c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 12, 2022
@Yisaer
fix conflict
97cdb4b 
Signed-off-by: yisaer <disxiaofei@163.com>
@Yisaer Yisaer force-pushed the release-5.2-05ccb8a206da branch from 298a26c to 97cdb4b Compare April 12, 2022 07:53
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 12, 2022
@Yisaer
Copy link
Contributor

Yisaer commented Apr 12, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 12, 2022

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

DetailsCommit hash: 97cdb4b

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 12, 2022
@Yisaer
Copy link
Contributor

Yisaer commented Apr 12, 2022

/run-unit-test

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Apr 12, 2022

@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.

Details

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.

@Yisaer
Copy link
Contributor

Yisaer commented Apr 12, 2022

/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented Apr 12, 2022

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/1ed6c5f734092aeda1bdaef38a24b65a7d67982b

@ti-chi-bot ti-chi-bot merged commit a37ad32 into pingcap:release-5.2 Apr 12, 2022
@zhouqiang-cl zhouqiang-cl added this to the v5.2.4 milestone Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@JmPotato JmPotato JmPotato approved these changes

@chrysan chrysan Awaiting requested review from chrysan

@rebelice rebelice Awaiting requested review from rebelice

@winoros winoros Awaiting requested review from winoros

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

+1 more reviewer

@Yisaer Yisaer Yisaer approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@Yisaer Yisaer

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 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.2-cherry-pick

Projects

None yet

Milestone

v5.2.4

Development

Successfully merging this pull request may close these issues.

7 participants

@ti-srebot @ti-chi-bot @Yisaer @sre-bot @JmPotato @VelocityLight @zhouqiang-cl