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

ddl: move partition sql string rewrite out of buildTablePartitionInfo #56120

Merged
merged 1 commit into from
Sep 18, 2024

Conversation

lcwangchao
Copy link
Collaborator

What problem does this PR solve?

Issue Number: close #56119

Problem Summary:

When executing a partition DDL, the query string maybe rewritten in buildTablePartitionInfo:

tidb/pkg/ddl/partition.go

Lines 610 to 620 in 7ce6ec3

query, ok := ctx.Value(sessionctx.QueryString).(string)
if ok {
sqlMode := ctx.GetSessionVars().SQLMode
var buf bytes.Buffer
AppendPartitionDefs(tbInfo.Partition, &buf, sqlMode)
syntacticSugar := s.Interval.OriginalText()
syntacticStart := s.Interval.OriginTextPosition()
newQuery := query[:syntacticStart] + "(" + buf.String() + ")" + query[syntacticStart+len(syntacticSugar):]
ctx.SetValue(sessionctx.QueryString, newQuery)
}

However, it's better not to do the rewrite work in buildTablePartitionInfo which is a function that can be used more widely than DDL.

What changed and how does it work?

Introduce a method rewritePartitionQueryString and call it outside meta build functions

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.

None

@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 18, 2024
Copy link

tiprow bot commented Sep 18, 2024

Hi @lcwangchao. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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-sigs/prow repository.

@lcwangchao lcwangchao changed the title ddl: remove sql str rewrite out of buildTablePartitionInfo ddl: move partition sql string rewrite out of buildTablePartitionInfo Sep 18, 2024
Copy link
Contributor

@mjonss mjonss 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 the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Sep 18, 2024
Copy link

codecov bot commented Sep 18, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 72.9566%. Comparing base (7ce6ec3) to head (92bd402).
Report is 1 commits behind head on master.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #56120        +/-   ##
================================================
- Coverage   72.9574%   72.9566%   -0.0009%     
================================================
  Files          1611       1611                
  Lines        447499     447485        -14     
================================================
- Hits         326484     326470        -14     
  Misses       100921     100921                
  Partials      20094      20094                
Components Coverage Δ
dumpling 52.9567% <ø> (ø)
parser ∅ <ø> (∅)
br 45.7919% <ø> (ø)

Copy link

ti-chi-bot bot commented Sep 18, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mjonss, tangenta

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

The pull request process is described here

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 approved lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Sep 18, 2024
Copy link

ti-chi-bot bot commented Sep 18, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-09-18 09:39:40.011956891 +0000 UTC m=+1040449.752380830: ☑️ agreed by mjonss.
  • 2024-09-18 09:57:47.516427698 +0000 UTC m=+1041537.256851634: ☑️ agreed by tangenta.

@lcwangchao
Copy link
Collaborator Author

/retest

Copy link

tiprow bot commented Sep 18, 2024

@lcwangchao: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/retest

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-sigs/prow repository.

@ti-chi-bot ti-chi-bot bot merged commit fd6d5c1 into pingcap:master Sep 18, 2024
25 checks passed
@lcwangchao lcwangchao deleted the parsqlrewrite branch September 18, 2024 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

remove sql str rewrite out of buildTablePartitionInfo
3 participants