ddl: migrate part of ddl package code from Execute/ExecRestricted to safe API (1)#22670
Merged
ti-srebot merged 17 commits intopingcap:masterfrom Feb 5, 2021
Merged
ddl: migrate part of ddl package code from Execute/ExecRestricted to safe API (1)#22670ti-srebot merged 17 commits intopingcap:masterfrom
ti-srebot merged 17 commits intopingcap:masterfrom
Conversation
Signed-off-by: AilinKid <314806019@qq.com>
xhebox
reviewed
Feb 2, 2021
ddl/util/util.go
Outdated
| recordDoneDeletedRangeSQL = `INSERT IGNORE INTO mysql.gc_delete_range_done SELECT * FROM mysql.gc_delete_range WHERE job_id = %? AND element_id = %?` | ||
| completeDeleteRangeSQL = `DELETE FROM mysql.gc_delete_range WHERE job_id = %? AND element_id = %?` | ||
| completeDeleteMultiRangesSQL = `DELETE FROM mysql.gc_delete_range WHERE job_id = %? AND element_id in (%?)` | ||
| updateDeleteRangeSQL = `UPDATE mysql.gc_delete_range SET start_key = "%?" WHERE job_id = %? AND element_id = %? AND start_key = "%?"` |
Contributor
There was a problem hiding this comment.
Delete the quotes around %?.
ddl/column.go
Outdated
| sql := fmt.Sprintf("select 1 from `%s`.`%s` where %s limit 1;", schema.L, table.L, colsStr) | ||
| rows, _, err := ctx.(sqlexec.RestrictedSQLExecutor).ExecRestrictedSQL(sql) | ||
| sql := "select 1 from %n.%n where " + colsStr + " limit 1;" | ||
| stmt, err := ctx.(sqlexec.RestrictedSQLExecutor).ParseWithParams(context.Background(), sql, paramsList...) |
Contributor
There was a problem hiding this comment.
It is not considered safe to use concat and ParseWithParams at the same time. Though this case is safe.
fmt.Sprintf(fmt.Sprintf("%s", "%s")) will report an error.
You may want to check this PR.
Contributor
Author
There was a problem hiding this comment.
good~
the PR link is not right
Contributor
There was a problem hiding this comment.
I suggest that you can use fmt.Fprintf.
Signed-off-by: AilinKid <314806019@qq.com>
Signed-off-by: AilinKid <314806019@qq.com>
Signed-off-by: AilinKid <314806019@qq.com>
xhebox
reviewed
Feb 3, 2021
ddl/util/util.go
Outdated
| completeDeleteMultiRangesSQL := completeDeleteMultiRangesSQLPrefix + idList + completeDeleteMultiRangesSQLSuffix | ||
| _, err := ctx.(sqlexec.SQLExecutor).ExecuteInternal(context.TODO(), completeDeleteMultiRangesSQL, paramIDs...) | ||
| var buf strings.Builder | ||
| _, err := fmt.Fprintf(&buf, completeDeleteMultiRangesSQL, idList) |
Contributor
There was a problem hiding this comment.
Just let you know, we have fmt.Fprintf in our errcheck_ignore lists. And I agreed with that. fmt.Fprintf can not throw error on valid input, unless OOM. So you do not need to check that error.
BTW, You could use Fprintf to concat idList & nameList too.
tiancaiamao
reviewed
Feb 4, 2021
Contributor
Author
|
/run-all-tests |
Contributor
Author
|
/run-integration-copr-test |
Contributor
Author
|
ptal @tiancaiamao |
Contributor
|
LGTM |
ti-srebot
approved these changes
Feb 5, 2021
Contributor
Author
|
/merge |
Contributor
|
/run-all-tests |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Feb 25, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Contributor
|
cherry pick to release-5.0-rc in PR #22928 |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Feb 25, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Contributor
|
cherry pick to release-4.0 in PR #22929 |
ti-srebot
pushed a commit
to ti-srebot/tidb
that referenced
this pull request
Feb 25, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Contributor
|
cherry pick to release-3.0 in PR #22930 |
ti-chi-bot
pushed a commit
that referenced
this pull request
Feb 25, 2021
AilinKid
added a commit
to AilinKid/tidb
that referenced
this pull request
Mar 3, 2021
…safe API (1) (pingcap#22670) Signed-off-by: AilinKid <314806019@qq.com>
ti-chi-bot
pushed a commit
that referenced
this pull request
Mar 3, 2021
ti-chi-bot
pushed a commit
that referenced
this pull request
Mar 5, 2021
ti-chi-bot
pushed a commit
that referenced
this pull request
Mar 10, 2021
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
Related changes
pingcap/docs/pingcap/docs-cn:Check List
Tests
Release note