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/codec: fix issue of decode plan error cause by without escape special char (#21937) #22022

Merged
merged 6 commits into from
Jan 25, 2021

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #21937 to release-4.0


Signed-off-by: crazycs520 crazycs520@gmail.com

What problem does this PR solve?

Before

test> explain select tidb_version();
+---------------+---------+------+---------------+-------------------------------------------------------------------+
| id            | estRows | task | access object | operator info                                                     |
+---------------+---------+------+---------------+-------------------------------------------------------------------+
| Projection_3  | 1.00    | root |               | Release Version: v4.0.0-beta.2-1832-g7fac2ba02                    |
|               |         |      |               | Edition: Community                                                |
|               |         |      |               | Git Commit Hash: 7fac2ba027aee70cad4f4a307240ef5b7e6a64f8         |
|               |         |      |               | Git Branch: master                                                |
|               |         |      |               | UTC Build Time: 2020-12-16 03:32:17                               |
|               |         |      |               | GoVersion: go1.14.4                                               |
|               |         |      |               | Race Enabled: false                                               |
|               |         |      |               | TiKV Min Version: v3.0.0-60965b006877ca7234adaced7890d7b029ed1306 |
|               |         |      |               | Check Table Before Drop: false->Column#1                          |
| └─TableDual_4 | 1.00    | root |               | rows:1                                                            |
+---------------+---------+------+---------------+-------------------------------------------------------------------+

This PR

test> explain select tidb_version();
+---------------+---------+------+---------------+------------------------------------------------+
| id            | estRows | task | access object | operator info                                  |
+---------------+---------+------+---------------+------------------------------------------------+
| Projection_3  | 1.00    | root |               | Release Version: v4.0.0-beta.2-1889-g2b5e3e355 |
|               |         |      |               | Edition: Communit(len:331)->Column#1           |
| └─TableDual_4 | 1.00    | root |               | rows:1                                         |
+---------------+---------+------+---------------+------------------------------------------------+

What is changed and how it works?

N/A

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM

Release note

  • Fix issue of decode plan error cause by without escape special char.

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

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

@crazycs520
Copy link
Contributor

@wjhuang2016 @XuHuaiyu PTAL

Copy link
Member

@wjhuang2016 wjhuang2016 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 25, 2020
@ti-srebot ti-srebot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Dec 25, 2020
@XuHuaiyu
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

Sorry @XuHuaiyu, you don't have permission to trigger auto merge event on this branch.

@zz-jason
Copy link
Member

/merge

@ti-srebot
Copy link
Contributor Author

Sorry @zz-jason, this branch's release version is in progress, please contact zhouqiang-cl,shuke987,jebter,you06 for more details.

@jebter jebter removed this from the 4.0.0 milestone Jan 7, 2021
@jebter jebter added this to the v4.0.10 milestone Jan 7, 2021
@qw4990
Copy link
Contributor

qw4990 commented Jan 14, 2021

/run-all-tests

@jebter jebter modified the milestones: v4.0.10, v4.0.11 Jan 18, 2021
@zz-jason
Copy link
Member

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 25, 2021
@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 21323
  • 21329
  • 21404
  • 21443
  • 21473
  • 21477
  • 21582
  • 21593
  • 21602
  • 21604
  • 21610
  • 21623
  • 21635
  • 21958
  • 22116
  • 22148
  • 22353
  • 21488
  • 21546
  • 21573
  • 21608
  • 21665
  • 21673
  • 21718
  • 21785
  • 21810
  • 21813
  • 21971
  • 21916
  • 21969

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot merged commit 8264f6b into pingcap:release-4.0 Jan 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression sig/planner SIG: Planner sig/sql-infra SIG: SQL Infra 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