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

types: fix a bug in casting str2str when union #37242

Merged
merged 18 commits into from
Aug 24, 2022
Merged

types: fix a bug in casting str2str when union #37242

merged 18 commits into from
Aug 24, 2022

Conversation

CbcWestwolf
Copy link
Member

@CbcWestwolf CbcWestwolf commented Aug 19, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #31678

Problem Summary:

When building the plan of union, the flen of the projection target FieldType is mis-computed.

What is changed and how it works?

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

Please refer to Release Notes Language Style Guide to write a quality release note.

Fix a wrong casting in building union plan

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 19, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • bb7133
  • xiongjiwei

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-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-4.0 needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 19, 2022
@CbcWestwolf
Copy link
Member Author

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 19, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Aug 19, 2022 •
edited by sre-bot
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/c342812957edf3ab3020a67221ac83425b5f2f84

@bb7133
Copy link
Member

bb7133 commented Aug 20, 2022

As you might noticed that the mysql-test case has been failed because of this PR(which is exactly the case from #31678), so please update the mysql-test case accordingly.

@CbcWestwolf
Copy link
Member Author

please update the mysql-test case accordingly

Sure! :-)

@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 22, 2022
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 23, 2022
@CbcWestwolf
Copy link
Member Author

/run-mysql-test tidb-test=pr/1931

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-4.0
dfa2fec 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 24, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #37355

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-5.0
7c67df1 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 24, 2022
Closed
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-5.1
048f366 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #37356

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-5.2
2df1b40 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 24, 2022
Closed
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.2 in PR #37358

@ti-srebot ti-srebot mentioned this pull request Aug 24, 2022
Closed
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-5.3
c32ff40 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-5.3 in PR #37359

@sre-bot
Copy link
Contributor

sre-bot commented Aug 24, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [2] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/common-test 🟥 failed 1, success 10, total 11 18 min New failing
idc-jenkins-ci-tidb/integration-common-test 🟥 failed 2, success 15, total 17 17 min New failing
idc-jenkins-ci/integration-cdc-test 🟢 all 36 tests passed 32 min Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 9 min 1 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 7 min 38 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 40 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 6 min 14 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 5 min 54 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 2 min 57 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-5.4
e56009e 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Aug 24, 2022
Open
12 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.4 in PR #37360

@ti-srebot ti-srebot mentioned this pull request Aug 24, 2022
Closed
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-6.0
2c3f083 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.0 in PR #37361

@ti-srebot ti-srebot mentioned this pull request Aug 24, 2022
Merged
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-6.1
edaa51c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.1 in PR #37363

@ti-srebot ti-srebot mentioned this pull request Aug 24, 2022
Closed
12 tasks
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Aug 24, 2022
@CbcWestwolf @ti-srebot
cherry pick pingcap#37242 to release-6.2
79a40c4 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-6.2 in PR #37364

morgo added a commit to morgo/tidb that referenced this pull request Aug 27, 2022
@morgo
Merge remote-tracking branch 'upstream/master' into improve-sysvar-co…
028958e 
…verage

* upstream/master: (109 commits)
  *: rename TemporaryTableAttachedInfoSchema (pingcap#37408)
  *: enable noloopclosure (pingcap#37153)
  executor: add JSON opaque value condition to everywhere (pingcap#37390)
  *: refine mock session manager (pingcap#37400)
  lightning: check counter value to make code more robust (pingcap#37380)
  *: use go 1.19 (pingcap#36223)
  br: restore tiflash replica count after PiTR (pingcap#37181)
  testkit,executor: add MustQueryWitnContext API and fix unstable test TestCoprocessorPriority (pingcap#37382)
  executor: add conversion to opaque value for json_objectagg and json_arrayagg (pingcap#37337)
  expression: quote json path if necessarily (pingcap#37375)
  *: support ACCOUNT (UN)LOCK when creating/altering user (pingcap#37052)
  log-backup: support the ddl(exchange partition) when PiTR  (pingcap#37050)
  *: change `integration.BeforeTest` to `integration.BeforeTestExternal` to avoid skip tests (pingcap#37341)
  executor: fix unstable TestGlobalMemoryTrackerOnCleanUp (pingcap#37372)
  util/ranger: avoid building ranges twice in detachCNFCondAndBuildRangeForIndex (pingcap#37177)
  statistics: track used stats status during query (pingcap#37101)
  *: fix data race in `TestTiFlashGroupIndexWhenStartup` (pingcap#37371)
  lightning: fix dpanic log when init session vars (pingcap#37301)
  executor: let plan replayer record table tiflash replica (pingcap#37336)
  types: fix a bug in casting str2str when `union` (pingcap#37242)
  ...
ti-chi-bot pushed a commit that referenced this pull request Sep 26, 2022
@ti-srebot
types: fix a bug in casting str2str when union (#37242) (#37363)
aebff36 
close #31678
@time-and-fate time-and-fate mentioned this pull request Jan 9, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xiongjiwei xiongjiwei xiongjiwei approved these changes

@bb7133 bb7133 bb7133 approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 Type: Need cherry pick to release-5.3 needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. 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. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Truncation of UTF8mb4 values when the UNION statement for binary and non-binary charsets
6 participants
@CbcWestwolf @ti-chi-bot @bb7133 @xiongjiwei @ti-srebot @sre-bot