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

executor: fix get var expr when session var is hex literal (#23241) #23372

Merged
merged 1 commit into from
Mar 18, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 17, 2021

cherry-pick #23241 to release-4.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/23372

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

git push [email protected]:ti-srebot/tidb.git pr/23372:release-4.0-2890a8f62c32

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

What problem does this PR solve?

Issue Number: close #22949

Problem Summary:

use test;
DROP TABLE IF EXISTS `IDT_MC10146`;
CREATE TABLE `IDT_MC10146` (
  `COL1` bit(4) DEFAULT NULL,
  `COL2` bit(4) DEFAULT NULL,
  `COL3` bit(4) DEFAULT NULL,
  KEY `U_M_COL` (`COL1`,`COL2`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
INSERT INTO `IDT_MC10146` VALUES (0x0F, 0x00, 0x08);
prepare stmt from 'select * from IDT_MC10146 where col1 in (?);';
set @a=0x3135;
execute stmt using@a;

GetVar expr(@sess_var) return string type when session_var is hex literal(eg: @sess_var = 0x3135), which is converted to '15'. Actually we should return BinaryLiteral type, but we dont have BinaryLiteral eval type.

What is changed and how it works?

What's Changed:

  1. When UsingVar is GetVar expr and this session var is BinaryLiteral, we convert the result of GetVar (string) back to BinaryLiteral.
  2. Before rewrite IN expr to EQ expr, check if contain mutalbe variables.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test: expression.TestGetVarExprWithHexLiteral()

  • Side effects: no

Release note

  • fix get var expr when session var is hex literal

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot added component/expression size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Mar 17, 2021
@ti-srebot ti-srebot requested review from eurekaka and lzmhhh123 March 17, 2021 07:04
@ti-srebot ti-srebot added this to the v4.0.11 milestone Mar 17, 2021
@ti-srebot
Copy link
Contributor Author

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

@guo-shaoge
Copy link
Collaborator

@lzmhhh123 @XuHuaiyu PTAL

@XuHuaiyu
Copy link
Contributor

/lgtm

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • lzmhhh123

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 Mar 18, 2021
@jebter jebter added the cherry-pick-approved Cherry pick PR approved by release team. label Mar 18, 2021
@zhouqiang-cl
Copy link
Contributor

/label cherry-pick-approved

@ti-chi-bot
Copy link
Member

@zhouqiang-cl: The label(s) cherry-pick-approved cannot be applied. These labels are supported: CHANGELOG, challenge-program, compatibility-breaker, contribution, correctness, first-time-contributor, good-first-issue, hacktoberfest, high-performance, hptc, need-more-info, needs-cherry-pick-3.0, needs-cherry-pick-3.1, needs-cherry-pick-4.0, needs-cherry-pick-5.0-rc, needs-cherry-pick-5.0, proposal, release-note, require-LGT3, security, tools.

In response to this:

/label cherry-pick-approved

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

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 265313e

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 18, 2021
@zhouqiang-cl
Copy link
Contributor

/run-unit-tests

@ti-chi-bot ti-chi-bot merged commit e889a5c into pingcap:release-4.0 Mar 18, 2021
@zhouqiang-cl zhouqiang-cl modified the milestones: v4.0.11, v4.0.12 Mar 26, 2021
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. component/expression size/L Denotes a PR that changes 100-499 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/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants