Skip to content

Conversation

xhebox
Copy link
Contributor

@xhebox xhebox commented Jan 13, 2025

What problem does this PR solve?

Issue Number: close #58870

Problem Summary:

When it is text-prepare, SQL will be parsed twice. The first time, it is already transformed to utf8 due to charset_client. Thus when it comes to executor, only the other two parameters need to set.

But if it is coming from prepare protocol, SQL have not been parsed before. We also need to set charset_client to transform it to utf8.

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.

Fix broken prepare protocol when charset_client is not UTF8

@ti-chi-bot ti-chi-bot bot added 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. labels Jan 13, 2025
Copy link

tiprow bot commented Jan 13, 2025

Hi @xhebox. 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.

@xhebox xhebox requested review from tangenta and 0xPoe January 13, 2025 03:43
Signed-off-by: xhe <[email protected]>
Copy link

codecov bot commented Jan 13, 2025

Codecov Report

Attention: Patch coverage is 91.66667% with 1 line in your changes missing coverage. Please review.

Project coverage is 75.0302%. Comparing base (b74eb0f) to head (3f52758).
Report is 116 commits behind head on master.

Additional details and impacted files
@@               Coverage Diff                @@
##             master     #58872        +/-   ##
================================================
+ Coverage   73.1443%   75.0302%   +1.8858%     
================================================
  Files          1677       1723        +46     
  Lines        463918     473942     +10024     
================================================
+ Hits         339330     355600     +16270     
+ Misses       103722      96130      -7592     
- Partials      20866      22212      +1346     
Flag Coverage Δ
integration 48.8461% <66.6666%> (?)
unit 72.5213% <91.6666%> (+0.1709%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 52.6910% <ø> (ø)
parser ∅ <ø> (∅)
br 61.7358% <ø> (+15.9938%) ⬆️

Signed-off-by: xhe <[email protected]>
@ti-chi-bot ti-chi-bot bot added needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. labels Jan 13, 2025
@hawkingrei
Copy link
Member

/test all

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jan 14, 2025
@xhebox
Copy link
Contributor Author

xhebox commented Jan 14, 2025

/retest

Copy link

tiprow bot commented Jan 14, 2025

@xhebox: 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 added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jan 14, 2025
Copy link

ti-chi-bot bot commented Jan 14, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-01-14 02:39:28.855207054 +0000 UTC m=+839712.144038758: ☑️ agreed by tangenta.
  • 2025-01-14 05:13:04.375013489 +0000 UTC m=+9055.830059637: ☑️ agreed by Defined2014.

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

Copy link

ti-chi-bot bot commented Jan 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bb7133, Defined2014, 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:
  • OWNERS [Defined2014,bb7133,tangenta]

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 merged commit 6fac459 into pingcap:master Jan 14, 2025
24 checks passed
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 14, 2025
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #58906.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.1: #58907.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 14, 2025
@bb7133 bb7133 added the needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 branch. label Jan 15, 2025
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-8.5: #58931.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 15, 2025
ti-chi-bot bot pushed a commit that referenced this pull request Jan 15, 2025
ti-chi-bot bot pushed a commit that referenced this pull request Jan 15, 2025
ti-chi-bot bot pushed a commit that referenced this pull request Jan 15, 2025
@ti-chi-bot ti-chi-bot bot added the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Jan 21, 2025
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-6.5: #59060.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Jan 21, 2025
@ti-chi-bot ti-chi-bot bot added the needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. label Feb 6, 2025
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #59263.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Feb 6, 2025
ti-chi-bot bot pushed a commit that referenced this pull request Feb 6, 2025
ti-chi-bot bot pushed a commit that referenced this pull request Feb 6, 2025
zeminzhou pushed a commit to zeminzhou/tidb that referenced this pull request May 6, 2025
crazycs520 pushed a commit to crazycs520/tidb that referenced this pull request Jun 4, 2025
…_pr=95

* executor: fix a bug that global temporary table send cop request (pingcap#588…
* statistics: fix the panic when to async load stats with dropped index …
* executor: fix prepared protocol charset (pingcap#58872) (pingcap#58931)
* *: Update client-go and verify all read ts (pingcap#58909)
* integration test: fix test case "br_pitr" (pingcap#58876)
* session: add indexes for `mysql.analyze_jobs` (pingcap#58134) (pingcap#58355)
* ddl: fix args count for modify column (pingcap#58855) (pingcap#58858)
* planner: correct plan when scan tidb related cluster table with KeepOr…
* planner: Fix vector not truncated after CBO (pingcap#58809) (pingcap#58844)
* ddl: Fix vector index for high dimensional vectors (pingcap#58717) (pingcap#58835)
* ddl: Fix issue with concurrent update getting reverted by BackfillData…
* statistics: stats cache set default quota as 20%  (pingcap#58013) (pingcap#58817)
* executor: change the evaluation order of columns in `Update` and `Inse…
* statistics: add recover to protect background task (pingcap#58739) (pingcap#58767)
* ttl: fix the infinite waiting for delRateLimiter when `tidb_ttl_delete…
* ttl: reduce some warnings logs when locking TTL tasks (pingcap#58306) (pingcap#58783)
* ttl: retry the rows when del rate limiter returns error in delWorker (…
* ttl: reschedule task to other instances when shrinking worker (pingcap#57703) (pingcap#58778)
* ttl: fix the issue that one task losing heartbeat will block other tas…
* ttl: fix the issue that the task is not cancelled after transfering ow…
* ddl: fix job state overridden when concurrent updates don't overlap in…
* ttl: set the job history status to `cancelled` if it's removed in GC a…
* ttl: fix the timezone issue and panic in the caller of `getSession` (#…
* ddl: fix version syncer doesn't print who hasn't synced on partial syn…
* ttl: fix the issue that `DROP TABLE` / `ALTER TABLE` will keep job run…
* br/stream: allow pitr to create oversized indices (pingcap#58433) (pingcap#58527)
* ttl: set a result for timeout scan task during shrinking scan worker (…
* executor: fix time zone issue when querying slow log (pingcap#58455) (pingcap#58577)
* table: fix the issue that the default value for `BIT` column is wrong …
* statistics: temporarily skip handling errors for DDL events (pingcap#58609) (pingcap#58634)
* sessionctx: fix null max value to leading wrong warning (pingcap#57898) (pingcap#57935)
* planner: convert cartesian semi join with other nulleq condition to cr…
* planner: fix idxMergePartPlans forget to deal with RootTaskConds (pingcap#585…
* domain: change some stats log level as WARN (pingcap#58316) (pingcap#58555)
* planner: quickly get total count from index/column (pingcap#58365) (pingcap#58431)
* planner, expr: eval readonly user var during plan phase (pingcap#54462) (pingcap#58540)
* metrics: add col/idx name(s) for BackfillProgressGauge and BackfillTot…
* br: refactor test to use wait checkpoint method (pingcap#57612) (pingcap#58498)
* executor: reuse chunk in hash join v2 during restoring (pingcap#56936) (pingcap#58018)
* executor: fix goroutine leak when exceed quota in hash agg (pingcap#58078) (pingcap#58462)
* copr: fix the issue that busy threshold may redirect batch copr to fol…
* statistics: skip non-exicted table when to init stats (pingcap#58381) (pingcap#58394)
* planner: fix incorrectly using the schema for plan cache (pingcap#57964) (pingcap#58090)
* *: use DDL subscriber updating stats meta (pingcap#57872) (pingcap#58387)
* planner, runtime_filter: Remove redundant logs whose meaning can be di…
* statistics: remove dead code (pingcap#58412) (pingcap#58442)
* planner: Use/force to apply prefer range scan (pingcap#56928) (pingcap#58444)
* statistics: gc the statistics correctly after drop the database (pingcap#5730…
* ddl: Fixed partition interval from DayMinute to just Minute. (pingcap#57738) (pingcap#58019)
* executor: Enlarge the timeout for fetching TiFlash system tables (pingcap#579
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. needs-cherry-pick-release-8.5 Should cherry pick this PR to release-8.5 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Prepare protocol is broken on non-utf8 charset since #28925
6 participants