ddl: migrate part of ddl package code from Execute/ExecRestricted to safe API (2) (#22729) by ti-srebot · Pull Request #22937 · pingcap/tidb

ti-srebot · 2021-02-25T07:13:57Z

cherry-pick #22729 to release-3.0
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/22937

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

git push git@github.com:ti-srebot/tidb.git pr/22937:release-3.0-dedaabb800c4

Signed-off-by: AilinKid 314806019@qq.com

What problem does this PR solve?

Issue Number: part close #pingcap/tidb-test#1152

What is changed and how it works?

What's Changed:
Migrate part of code in ddl package from using Execute/ExecRestricted to safe API

Attention:
1: Since partitionDef.Expr string may contain the identifier, we won't pass it as a parameter but write it to SQL string directly.
2: Since the condition string in partitionDef.less-than field contains the quotation ", so trimming need be done before it passed as a string parameter.

Related changes

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

Check List

Tests

No code

Release note

ddl: migrate part of ddl package code from Execute/ExecRestricted to safe API (2)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot · 2021-02-25T07:14:00Z

/run-all-tests

ti-srebot · 2021-02-25T07:14:09Z

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

Signed-off-by: ailinkid <314806019@qq.com>

AilinKid · 2021-03-03T10:22:35Z

/merge

ti-chi-bot · 2021-03-03T10:22:36Z

@AilinKid: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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 ti-community-infra/tichi repository.

ti-chi-bot · 2021-03-03T10:22:38Z

@AilinKid: /merge in this pull request requires 2 /lgtm.

Details

In response to this:

/merge

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.

xhebox · 2021-03-03T10:34:06Z

/lgtm

ti-chi-bot · 2021-03-03T10:34:09Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

tangenta
xhebox

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.

Details

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

xhebox · 2021-03-03T10:34:14Z

/merge

ti-chi-bot · 2021-03-03T10:34:15Z

@xhebox: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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 ti-community-infra/tichi repository.

ti-chi-bot · 2021-03-03T10:34:17Z

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

Details

Commit hash: 50d059e4540880838899f025623442e446b1933a

AilinKid · 2021-03-04T02:33:54Z

/merge

ti-chi-bot · 2021-03-04T02:33:55Z

@AilinKid: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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 ti-community-infra/tichi repository.

Signed-off-by: ailinkid <314806019@qq.com>

ti-chi-bot · 2021-03-04T02:38:14Z

Merge canceled because a new commit is pushed.

ti-chi-bot · 2021-03-04T02:38:19Z

@ti-srebot: 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

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 ti-community-infra/tichi repository.

AilinKid · 2021-03-04T03:15:32Z

/run-unit-test

cherry pick pingcap#22729 to release-3.0

a78ca85

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Feb 25, 2021

ddl: migrate part of ddl package code from Execute/ExecRestricted to safe API (2) #22729

Merged

ti-srebot added sig/sql-infra SIG: SQL Infra type/3.0-cherry-pick labels Feb 25, 2021

ti-srebot requested review from morgo, tiancaiamao, xhebox and zimulala February 25, 2021 07:14

ti-chi-bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Feb 25, 2021

ti-srebot added this to the v3.0.21 milestone Feb 25, 2021

ti-srebot assigned AilinKid Feb 25, 2021

AilinKid added 2 commits March 3, 2021 15:36

Merge branch 'release-3.0' into release-3.0-dedaabb800c4

60884b9

resolve conflicts

b6169f8

Signed-off-by: ailinkid <314806019@qq.com>

ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 3, 2021

tangenta approved these changes Mar 3, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 3, 2021

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 Mar 3, 2021

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 3, 2021

.

9644ab2

Signed-off-by: ailinkid <314806019@qq.com>

AilinKid force-pushed the release-3.0-dedaabb800c4 branch from 50d059e to 9644ab2 Compare March 4, 2021 02:38

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Mar 4, 2021

Merge branch 'release-3.0' into release-3.0-dedaabb800c4

d7ef621

AilinKid merged commit 894a052 into pingcap:release-3.0 Mar 4, 2021

Conversation

ti-srebot commented Feb 25, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What problem does this PR solve?

What is changed and how it works?

Related changes

Check List

Release note

Uh oh!

ti-srebot commented Feb 25, 2021

Uh oh!

ti-srebot commented Feb 25, 2021

Uh oh!

AilinKid commented Mar 3, 2021

Uh oh!

ti-chi-bot commented Mar 3, 2021

Uh oh!

ti-chi-bot commented Mar 3, 2021

Uh oh!

xhebox commented Mar 3, 2021

Uh oh!

ti-chi-bot commented Mar 3, 2021

Uh oh!

xhebox commented Mar 3, 2021

Uh oh!

ti-chi-bot commented Mar 3, 2021

Uh oh!

ti-chi-bot commented Mar 3, 2021

Uh oh!

AilinKid commented Mar 4, 2021

Uh oh!

ti-chi-bot commented Mar 4, 2021

Uh oh!

ti-chi-bot commented Mar 4, 2021

Uh oh!

ti-chi-bot commented Mar 4, 2021

Uh oh!

AilinKid commented Mar 4, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ti-srebot commented Feb 25, 2021 •

edited

Loading