Skip to content

expression: use cloned RetType at evaluateExprWithNull when it may be changed. (#35759)#35780

Closed
ti-srebot wants to merge 1 commit intopingcap:release-5.4from
ti-srebot:release-5.4-1f40fc72a586
Closed

expression: use cloned RetType at evaluateExprWithNull when it may be changed. (#35759)#35780
ti-srebot wants to merge 1 commit intopingcap:release-5.4from
ti-srebot:release-5.4-1f40fc72a586

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 28, 2022 •
edited
Loading

cherry-pick #35759 to release-5.4
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/35780

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

git push git@github.com:ti-srebot/tidb.git pr/35780:release-5.4-1f40fc72a586

What problem does this PR solve?

Issue Number: close #25813

Problem Summary:

evaluateExprWithNull will pass the expression's RetType to NewFunctionInternal, which may change it unexpectedly.

What is changed and how it works?

pass its clone instead of itself.

Check List

Tests

  • Unit test
  • Integration test

Release note

Fixed a bug that may cause comparisons between json and string report.

@LittleFall @ti-srebot
cherry pick pingcap#35759 to release-5.4
9fe875a 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 28, 2022

[REVIEW NOTIFICATION]

This pull request has not been approved.

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-chi-bot
Copy link
Member

ti-chi-bot commented Jun 28, 2022

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

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 kubernetes/test-infra repository.

@ti-srebot
Copy link
Contributor Author

ti-srebot commented Jun 28, 2022

/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 Jun 28, 2022
@ti-srebot ti-srebot mentioned this pull request Jun 28, 2022
Merged
2 tasks
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.4-cherry-pick labels Jun 28, 2022
@ti-srebot ti-srebot added this to the v5.4.1 milestone Jun 28, 2022
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Jun 28, 2022

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hawkingrei hawkingrei Awaiting requested review from hawkingrei

@XuHuaiyu XuHuaiyu Awaiting requested review from XuHuaiyu

@Yisaer Yisaer Awaiting requested review from Yisaer

Assignees

@LittleFall LittleFall

Labels

do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.4-cherry-pick

Projects

None yet

Milestone

v5.4.1

Development

Successfully merging this pull request may close these issues.

4 participants

@ti-srebot @ti-chi-bot @zanmato1984 @LittleFall