Skip to content

parser, planner: fix embedded setOprStmt will be seen as SetOprSelectList item and lost its orderBy and Limit (#49421)#49503

Closed
ti-chi-bot wants to merge 6 commits intopingcap:release-7.1from
ti-chi-bot:cherry-pick-49421-to-release-7.1
Closed

parser, planner: fix embedded setOprStmt will be seen as SetOprSelectList item and lost its orderBy and Limit (#49421)#49503
ti-chi-bot wants to merge 6 commits intopingcap:release-7.1from
ti-chi-bot:cherry-pick-49421-to-release-7.1

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Dec 15, 2023

This is an automated cherry-pick of #49421

What problem does this PR solve?

Issue Number: close #49377

Problem Summary:

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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.

parser, planner: fix embedded setOprStmt will be seen as SetOprSelectList item and lost its orderBy and Limit

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Dec 15, 2023
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 15, 2023
Merged
13 tasks
@ti-chi-bot ti-chi-bot bot added 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 Dec 15, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 15, 2023
bb7133
bb7133 approved these changes Dec 15, 2023
View reviewed changes
Copy link
Member

@bb7133 bb7133 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 bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 15, 2023
@AilinKid AilinKid force-pushed the cherry-pick-49421-to-release-7.1 branch from ccabb45 to dd2e6f4 Compare December 16, 2023 04:42
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 16, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AilinKid, bb7133

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 16, 2023
@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 16, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-15 23:48:56.953410276 +0000 UTC m=+659227.990637202: ☑️ agreed by bb7133.
  • 2023-12-16 04:43:12.654931266 +0000 UTC m=+676883.692158192: ☑️ agreed by AilinKid.

@AilinKid
Copy link
Contributor

AilinKid commented Dec 16, 2023

/retest unit-test

@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 16, 2023

@AilinKid: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test build
  • /test check-dev
  • /test check-dev2
  • /test mysql-test
  • /test unit-test

The following commands are available to trigger optional jobs:

  • /test pull-br-integration-test

Use /test all to run the following jobs that were automatically triggered:

  • pingcap/tidb/release-7.1/ghpr_build
  • pingcap/tidb/release-7.1/ghpr_check
  • pingcap/tidb/release-7.1/ghpr_check2
  • pingcap/tidb/release-7.1/ghpr_mysql_test
  • pingcap/tidb/release-7.1/ghpr_unit_test
Details

In response to this:

/retest unit-test

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.

@tiprow
Copy link

tiprow bot commented Dec 16, 2023

@AilinKid: No presubmit jobs available for pingcap/tidb@release-7.1

Details

In response to this:

/retest unit-test

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.

@AilinKid
Copy link
Contributor

AilinKid commented Dec 16, 2023

/test unit-test

@tiprow
Copy link

tiprow bot commented Dec 16, 2023

@AilinKid: No presubmit jobs available for pingcap/tidb@release-7.1

Details

In response to this:

/test unit-test

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.

@AilinKid
Copy link
Contributor

AilinKid commented Dec 16, 2023

/test unit-test

@tiprow
Copy link

tiprow bot commented Dec 16, 2023

@AilinKid: No presubmit jobs available for pingcap/tidb@release-7.1

Details

In response to this:

/test unit-test

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.

@AilinKid
Copy link
Contributor

AilinKid commented Dec 18, 2023

/test unit-test

@tiprow
Copy link

tiprow bot commented Dec 18, 2023

@AilinKid: No presubmit jobs available for pingcap/tidb@release-7.1

Details

In response to this:

/test unit-test

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.

@bb7133
Copy link
Member

bb7133 commented Dec 18, 2023

/retest

@AilinKid
Copy link
Contributor

AilinKid commented Dec 18, 2023 •
edited
Loading

seems this pr has nothing with test TestCheckActRowsWithUnistore failure, strange

@AilinKid
Copy link
Contributor

AilinKid commented Dec 18, 2023

/test unit-test

@tiprow
Copy link

tiprow bot commented Dec 18, 2023

@AilinKid: No presubmit jobs available for pingcap/tidb@release-7.1

Details

In response to this:

/test unit-test

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.

@AilinKid
Copy link
Contributor

AilinKid commented Dec 18, 2023

/test unit-test

@tiprow
Copy link

tiprow bot commented Dec 18, 2023

@AilinKid: No presubmit jobs available for pingcap/tidb@release-7.1

Details

In response to this:

/test unit-test

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-chi-bot ti-chi-bot removed the cherry-pick-approved Cherry pick PR approved by release team. label Dec 18, 2023
@AilinKid AilinKid force-pushed the cherry-pick-49421-to-release-7.1 branch from 0d7527b to 05918dd Compare December 18, 2023 07:46
@AilinKid
Copy link
Contributor

AilinKid commented Dec 19, 2023

/test unit-test

@tiprow
Copy link

tiprow bot commented Dec 19, 2023

@AilinKid: No presubmit jobs available for pingcap/tidb@release-7.1

Details

In response to this:

/test unit-test

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.

@AilinKid
This is an automated cherry-pick of pingcap#49421
9e7785a 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@AilinKid
.
cadeec7 
Signed-off-by: AilinKid <314806019@qq.com>
@AilinKid
.
1ed1caa 
Signed-off-by: AilinKid <314806019@qq.com>
@AilinKid
add general log
7545b34 
Signed-off-by: AilinKid <314806019@qq.com>
@AilinKid AilinKid force-pushed the cherry-pick-49421-to-release-7.1 branch from 05918dd to 7545b34 Compare December 19, 2023 07:17
@AilinKid
add assert
201fb62 
Signed-off-by: AilinKid <314806019@qq.com>
@AilinKid
test restore
635bb84 
Signed-off-by: AilinKid <314806019@qq.com>
@ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 19, 2023

@ti-chi-bot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
idc-jenkins-ci-tidb/unit-test 635bb84 link true /test unit-test

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@AilinKid
Copy link
Contributor

AilinKid commented Dec 20, 2023

#49592 the manual cherry-pick can work

@AilinKid AilinKid closed this Dec 22, 2023
@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 22, 2023
@ti-chi-bot ti-chi-bot deleted the cherry-pick-49421-to-release-7.1 branch April 15, 2025 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bb7133 bb7133 bb7133 approved these changes

@AilinKid AilinKid AilinKid approved these changes

Assignees

@AilinKid AilinKid

Labels

approved cherry-pick-approved Cherry pick PR approved by release team. lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ti-chi-bot @AilinKid @bb7133