Skip to content

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #11926

What problem does this PR solve?

Issue Number: close #11927

TiDB PR: pingcap/tidb#58408

What is changed and how it works?

  • Upgrade TiDB & parser dependency.
  • Add a test for special comment.

Check List

Tests

  • Unit test
  • Manual test (add detailed scripts or steps below)

Questions

Will it cause performance regression or break compatibility?

No

Do you need to update user documentation, design documentation or monitoring documentation?

No

Release note

None

@ti-chi-bot ti-chi-bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/cherry-pick-for-release-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Nov 28, 2025
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 28, 2025

This cherry pick PR is for a release branch and has not yet been approved by triage owners.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick:

  1. It must be approved by the approvers firstly.
  2. AFTER it has been approved by approvers, please wait for the cherry-pick merging approval from triage owners.
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 kubernetes-sigs/prow repository.

@ti-chi-bot
Copy link
Member Author

@tangenta This PR has conflicts, I have hold it.
Please resolve them or ask others to resolve them, then comment /unhold to remove the hold label.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 28, 2025

@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide.

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
Copy link
Contributor

ti-chi-bot bot commented Nov 28, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign sdojjy for approval. For more information see the Code Review Process.
Please ensure that each of them provides their approval before proceeding.

The full list of commands accepted by this bot can be found 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

@gemini-code-assist
Copy link

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 primarily focuses on enhancing the DDL handling capabilities by enabling the system to correctly process and restore ADD INDEX statements that utilize the PRE_SPLIT_REGIONS option. This ensures data consistency and operational integrity when dealing with advanced index creation scenarios. Additionally, it includes a series of dependency updates to keep the project's Go modules current and aligned with upstream changes.

Highlights

  • Support for ADD INDEX with PRE_SPLIT_REGIONS: This pull request introduces support for correctly restoring ADD INDEX DDL statements that include the PRE_SPLIT_REGIONS option, ensuring that such DDLs are handled properly within the system.
  • Dependency Upgrades: Several Go module dependencies have been updated to newer versions, including TiDB, TiDB parser, go-sqlsmith, stretchr/testify, tikv/client-go/v2, prometheus/common, and various golang.org/x packages, to ensure compatibility and leverage the latest features/fixes.
  • New Test Case: A new test case has been added to ddl_sink_test.go to specifically verify the correct handling and restoration of ADD INDEX statements with the PRE_SPLIT_REGIONS clause.
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.

Copy link

@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 aims to add support for restoring ADD INDEX statements with the pre_split option by upgrading TiDB and parser dependencies and adding a new test case.

However, both go.mod and go.sum files contain merge conflict markers (<<<<<<<, =======, >>>>>>>). These must be resolved before the pull request can be merged. This is a critical issue that prevents the build from succeeding.

Comment on lines +3 to +9
<<<<<<< HEAD
go 1.23.6

toolchain go1.23.8
=======
go 1.23.4
>>>>>>> f79c7ce184 (ddl(ticdc): support restoring add index statements with pre-split option (#11926))

Choose a reason for hiding this comment

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

critical

This file contains merge conflict markers. Please resolve the conflicts and remove the markers (<<<<<<< HEAD, =======, >>>>>>>). The PR cannot be merged in its current state.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Nov 28, 2025

@ti-chi-bot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-dm-integration-test 62c9366 link true /test pull-dm-integration-test
pull-cdc-integration-storage-test 62c9366 link true /test pull-cdc-integration-storage-test
pull-cdc-integration-mysql-test 62c9366 link true /test pull-cdc-integration-mysql-test
pull-cdc-integration-pulsar-test 62c9366 link true /test pull-cdc-integration-pulsar-test
pull-cdc-integration-kafka-test 62c9366 link true /test pull-cdc-integration-kafka-test
pull-dm-compatibility-test 62c9366 link true /test pull-dm-compatibility-test
pull-verify 62c9366 link true /test pull-verify

Full PR test history. Your PR dashboard.

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 kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do-not-merge/cherry-pick-not-approved do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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