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

expression: Fix the wrong behavior of const.String() (#17495) #17673

Merged
merged 2 commits into from
Jun 5, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Jun 4, 2020

cherry-pick #17495 to release-4.0


What problem does this PR solve?

Issue Number: close #17287

Problem Summary:

  1. After we execute the statement, it will decode the plan to string. And the behavior of const.String() is wrong.
  2. When the const.DeferredExpr != nil, we need to use the passed function parameter chunk.row for Eval, instead of using an empty chunk.Row.

What is changed and how it works?

Use the const.DeferredExpr.String() rather than to eval the const.
Use the function parameter chunk.row for Eval instead of an empty chunk.Row().

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Release note

  • fix the wrong behavior of const.String()

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 4, 2020

/run-all-tests

@qw4990
Copy link
Contributor

qw4990 commented Jun 4, 2020

/run-integration-copr-test

Copy link
Contributor

@danmay319 danmay319 left a comment

Choose a reason for hiding this comment

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

LGTM

@Reminiscent
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 5, 2020

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

@SunRunAway
Copy link
Contributor

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 5, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 5, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 5, 2020

@sre-bot merge failed.

@danmay319
Copy link
Contributor

/run-unit-tests

@SunRunAway SunRunAway merged commit c04c6a5 into pingcap:release-4.0 Jun 5, 2020
@bb7133 bb7133 modified the milestones: v4.0.1, v4.0.2 Jun 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/expression status/can-merge Indicates a PR has been approved by a committer. 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.

6 participants