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

Jump to bottom

*: fix some problems related to notNullFlag #27697

Merged
merged 13 commits into from Sep 9, 2021
Merged

*: fix some problems related to notNullFlag #27697

merged 13 commits into from Sep 9, 2021

Conversation

wjhuang2016
Copy link
Member

@wjhuang2016 wjhuang2016 commented Aug 31, 2021 •
edited

What problem does this PR solve?

Issue Number: close #19025, close #18488

Problem Summary:
This PR is based on #19029. It fixes some problems related to the notNullFlag.

What is changed and how it works?

Remove adding NotNullFlag in dumpFlag.
Add NotNullFlag for Null constant in DefaultTypeForValue.

Check List

Tests

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

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note 

fix some problems related to notNullFlag

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 31, 2021 •
edited

[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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 31, 2021
@ti-chi-bot ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 31, 2021
@wjhuang2016
merge
fa189ae 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 31, 2021
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Sep 6, 2021
XuHuaiyu
XuHuaiyu reviewed Sep 6, 2021
View reviewed changes
server/column.go
@@ -76,9 +76,6 @@ func dumpFlag(tp byte, flag uint16) uint16 {
case mysql.TypeEnum:
return flag | uint16(mysql.EnumFlag)
default:
if mysql.HasBinaryFlag(uint(flag)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why remove this?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because it's unreasonable.

expression/constant.go Outdated
@@ -71,6 +71,19 @@ type Constant struct {
collationInfo
}

// Clone implements Expression interface.
func (c *Constant) Clone() Expression {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why change this?

Copy link
Member Author

Choose a reason for hiding this comment

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

From #19029, I think it's the right way for Clone. We should clone the retType too. Though it's not necessary for this PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

If this modification is not necessary for this PR, I think we can remove it.

expression/simple_rewriter.go Outdated
@@ -58,7 +58,7 @@ func ParseSimpleExprCastWithTableInfo(ctx sessionctx.Context, exprStr string, ta
if err != nil {
return nil, err
}
e = BuildCastFunction(ctx, e, targetFt)
e = BuildCastFunction(ctx, e, targetFt.Clone())
Copy link
Contributor

Choose a reason for hiding this comment

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

Why change this?

Copy link
Member Author

Choose a reason for hiding this comment

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

From #19029, I think it's reasonable not to let column and scalarFunction share the same ft. Though it's not necessary for this PR.

@wjhuang2016
fix
b007614 
Signed-off-by: wjhuang2016 <huangwenjun1997@gmail.com>
@wjhuang2016
Merge branch 'master' of https://github.com/pingcap/tidb into fix_not…
05f624c 
…null_flag
XuHuaiyu
XuHuaiyu approved these changes Sep 8, 2021
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-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 Sep 8, 2021
@XuHuaiyu XuHuaiyu added the type/bug-fix This PR fixes a bug. label Sep 8, 2021
@wjhuang2016
Copy link
Member Author

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 05f624c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Sep 8, 2021
@ti-chi-bot
Copy link
Member

@wjhuang2016: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

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.

@ti-chi-bot ti-chi-bot merged commit 39a1b43 into pingcap:master Sep 9, 2021
@wjhuang2016 wjhuang2016 deleted the fix_notnull_flag branch November 17, 2022 11:21
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

@lzmhhh123 lzmhhh123 lzmhhh123 approved these changes

Assignees
No one assigned
Labels
release-note 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/bug-fix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

JSON type has an unexpected NOT_NULL flag. NOT_NULL Flag incorrectly set
4 participants
@wjhuang2016 @ti-chi-bot @XuHuaiyu @lzmhhh123