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.

Sign up for GitHub

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

Jump to bottom

planner, type: fix AggFieldType error when encouter unsigned and sign type (#21062) #21236

Merged
merged 4 commits into from
Nov 26, 2020
Merged

planner, type: fix AggFieldType error when encouter unsigned and sign type (#21062) #21236

merged 4 commits into from
Nov 26, 2020

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #21062 to release-4.0

What problem does this PR solve?

Issue Number:
close #9869
close #17652

Problem Summary: not process UnsignedFlag in AggFieldType

What is changed and how it works?

What's Changed:

types/field_type.go

How it Works:

add UnsignedFlag check in mergeFlag
add integral promotion when encounter signed and unsigned

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM
  • Breaking backward compatibility

Release note

@rogeryk @ti-srebot
cherry pick pingcap#21062 to release-4.0
5da6e48 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot ti-srebot mentioned this pull request Nov 24, 2020
Merged
@ti-srebot ti-srebot added component/expression first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. type/4.0-cherry-pick type/bugfix This PR fixes a bug. labels Nov 24, 2020
@ti-srebot ti-srebot added this to the v4.0.9 milestone Nov 24, 2020
@ti-srebot
Copy link
Contributor Author

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

XuHuaiyu
XuHuaiyu reviewed Nov 24, 2020
View reviewed changes
Copy link
Contributor

@XuHuaiyu XuHuaiyu 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 Nov 24, 2020
ichn-hu
ichn-hu approved these changes Nov 24, 2020
View reviewed changes
Copy link
Contributor

@ichn-hu ichn-hu 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 status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 24, 2020
@XuHuaiyu
Copy link
Contributor

/merge

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

Your auto merge job has been accepted, waiting for:

  • 20850
  • 21270
  • 21171
  • 21086

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@XuHuaiyu
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 21270

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@ti-srebot merge failed.

@XuHuaiyu
Copy link
Contributor

/merge

@ti-srebot
Copy link
Contributor Author

Your auto merge job has been accepted, waiting for:

  • 21239
  • 21161

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@XuHuaiyu XuHuaiyu changed the title planner, type: fix AggFieldType error when encouter unsigned and sign type (#21062) planner, type: fix AggFieldType error when encouter unsigned and sign type (#21062) Nov 26, 2020
@XuHuaiyu XuHuaiyu merged commit 1e73c51 into pingcap:release-4.0 Nov 26, 2020
@XuHuaiyu XuHuaiyu deleted the release-4.0-4897ecdba20c branch November 26, 2020 05:34
@rebelice rebelice mentioned this pull request Nov 27, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@ichn-hu ichn-hu ichn-hu approved these changes

@lzmhhh123 lzmhhh123 Awaiting requested review from lzmhhh123

Assignees

@XuHuaiyu XuHuaiyu

Labels
component/expression first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. 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
Milestone
v4.0.9
Development

Successfully merging this pull request may close these issues.
4 participants
@ti-srebot @XuHuaiyu @ichn-hu @rogeryk