Skip to content

upgrade: replace the wrong command SELECT TIDB_CURRENT_TSO() with BEGIN; SELECT TIDB_CURRENT_TSO(); ROLLBACK; (#22203)#22206

Merged
ti-chi-bot[bot] merged 1 commit intopingcap:release-8.5from
ti-chi-bot:cherry-pick-22203-to-release-8.5
Dec 18, 2025
Merged

upgrade: replace the wrong command SELECT TIDB_CURRENT_TSO() with BEGIN; SELECT TIDB_CURRENT_TSO(); ROLLBACK; (#22203)#22206
ti-chi-bot[bot] merged 1 commit intopingcap:release-8.5from
ti-chi-bot:cherry-pick-22203-to-release-8.5

Conversation

@ti-chi-bot
Copy link
Copy Markdown
Member

This is an automated cherry-pick of #22203

First-time contributors' checklist

What is changed, added or deleted? (Required)

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v9.0 (TiDB 9.0 versions)
  • v8.5 (TiDB 8.5 versions)
  • v8.1 (TiDB 8.1 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request focuses on enhancing the accuracy of the TiDB upgrade migration guide by correcting a critical SQL command. The change ensures that users retrieve the current Timestamp Oracle (TSO) using the proper transactional context, which is vital for maintaining data consistency and successful replication during cluster upgrades. This update improves the reliability of the documentation and helps prevent potential issues arising from incorrect TSO retrieval.

Highlights

  • Command Correction: Replaced the incorrect SELECT tidb_current_ts() command with BEGIN; SELECT TIDB_CURRENT_TSO(); ROLLBACK; in the TiDB upgrade migration guide.
  • Transactional TSO Retrieval: Ensured that the Timestamp Oracle (TSO) is retrieved within a transactional block (BEGIN; ...; ROLLBACK;) for accuracy and consistency during upgrade procedures.
  • Documentation Accuracy: Updated two instances in the tidb-upgrade-migration-guide.md file to provide correct instructions for obtaining the current TSO.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 18, 2025
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the command for retrieving the current TSO in the upgrade migration guide. It correctly replaces SELECT tidb_current_ts() with BEGIN; SELECT TIDB_CURRENT_TSO(); ROLLBACK; to ensure a fresh timestamp is retrieved within a new transaction. Note that there is a small discrepancy between the PR title, which mentions SELECT TIDB_CURRENT_TSO() as the old command, and the actual change from SELECT tidb_current_ts(). My review focuses on improving the readability of the new SQL command in the documentation. I've suggested splitting the single-line command into multiple lines to enhance clarity, which is in line with the documentation style guide.

@hfxsd
Copy link
Copy Markdown
Collaborator

hfxsd commented Dec 18, 2025

/approve

@ti-chi-bot ti-chi-bot bot added the approved label Dec 18, 2025
@hfxsd
Copy link
Copy Markdown
Collaborator

hfxsd commented Dec 18, 2025

/retest

@hfxsd
Copy link
Copy Markdown
Collaborator

hfxsd commented Dec 18, 2025

/approve

@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot bot commented Dec 18, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hfxsd

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 merged commit 631c0d5 into pingcap:release-8.5 Dec 18, 2025
11 of 12 checks passed
@ti-chi-bot ti-chi-bot bot deleted the cherry-pick-22203-to-release-8.5 branch December 18, 2025 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants