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: Fix the problem that PlanBuilder.buildWindowFunctions may change sub operator's schema. (#27176) #27203

Merged
merged 1 commit into from
Aug 13, 2021

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Aug 13, 2021

cherry-pick #27176 to release-5.2
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/27203

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

git push git@github.com:ti-srebot/tidb.git pr/27203:release-5.2-cd5499e99436

What problem does this PR solve?

Issue Number: close #27148

Problem Summary: buildWindowFunctions will use sub operator's schema as itself's, for example, here

		switch newArg.(type) {
		case *expression.Column, *expression.Constant:
			newArgList = append(newArgList, newArg)
			continue
		}

obtains the sub operator's schema, and then changed them here

		if col, ok := a.Args[i].(*expression.Column); ok {
			col.RetType = types.NewFieldType(col.RetType.Tp)
		}
		// originTp is used when the the `Tp` of column is TypeFloat32 while
		// the type of the aggregation function is TypeFloat64.
		originTp := a.Args[i].GetType().Tp
		*(a.Args[i].GetType()) = *(a.RetTp)
		a.Args[i].GetType().Tp = originTp

This may cause some unexpected behaviors, for example in mpp query, making the schema of exchangeReceiver and exchangeSender not equal and then throw errors as the issue said.

for example, it will build a plan like:

Proj <- Proj <- Window       <- Proj   <- Proj <- Agg  <- DataSource
47,1    47,1    47,1            47,1              47,1
        25,1    25,1            3,1              sum, arg=3,1, ret=25,1
                3,1
                sum
                retTp=47,1
                argTp=47,1

the (3,1), (25,1), (47,1) means output schema's attribute flen and decimal in typeDecimal, but the excepted is

Proj <- Proj <- Window       <- Proj   <- Proj <- Agg  <- DataSource
47,1    47,1    47,1            25,1              25,1
        25,1    25,1            3,1              sum, arg=3,1, ret=25,1
                3,1
                sum
                retTp=47,1
                argTp=25,1

What is changed and how it works?

Proposal: xxx

What's Changed: let it obtain a column's clone.

Are there any suggestions for fixing it better?

Check List

Tests

  • Integration test
  • Manual test (issue fixed.)

Release note

None

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 13, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • LittleFall
  • 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-srebot
Copy link
Contributor Author

/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-none Denotes a PR that doesn't merit a release note. 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 Aug 13, 2021
@ti-srebot ti-srebot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/5.2-cherry-pick type/bugfix This PR fixes a bug. labels Aug 13, 2021
@ti-srebot
Copy link
Contributor Author

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

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Aug 13, 2021
@LittleFall
Copy link
Contributor

/run-check_dev

@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 Aug 13, 2021
@LittleFall
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 047e1c5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Aug 13, 2021
@LittleFall
Copy link
Contributor

/rebuild

@LittleFall
Copy link
Contributor

/run-unit-test

@LittleFall LittleFall deleted the release-5.2-cd5499e99436 branch August 13, 2021 10:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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/bugfix This PR fixes a bug. type/5.2-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants