Skip to content

integration_tests: remove temporary TiDB replaces#2021

Merged
ti-chi-bot[bot] merged 1 commit into
tikv:masterfrom
YuhaoZhang00:chore/remove-temporary-tidb-replace
Jul 16, 2026
Merged

integration_tests: remove temporary TiDB replaces#2021
ti-chi-bot[bot] merged 1 commit into
tikv:masterfrom
YuhaoZhang00:chore/remove-temporary-tidb-replace

Conversation

@YuhaoZhang00

@YuhaoZhang00 YuhaoZhang00 commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

What changed

Why

#1947 temporarily used an adapted TiDB fork because TiDB master had not yet adopted the current PD client mock interfaces. The required TiDB adaptations have since merged in pingcap/tidb#67941, so the integration module no longer needs the fork overrides.

Validation

  • go mod verify
  • env GOCACHE=/tmp/client-go-remove-tidb-replace-gocache go test ./... -run "^$" -count=0
  • git diff --check upstream/master...HEAD

Related: #1947, pingcap/tidb#67941

Summary by CodeRabbit

  • Bug Fixes
    • Updated integration components to newer versions for improved compatibility and reliability.
    • Refined LDAP integration support.
    • Removed outdated integration-specific overrides and aligned parser components with the updated database integration.

TiDB master now contains the PD client mock interface adaptations required by the integration module. Point TiDB and its parser module back to the official master pseudo-version and remove the temporary fork replaces.

Signed-off-by: Yuhao Zhang <yhzhang00@outlook.com>
@ti-chi-bot ti-chi-bot Bot added the dco-signoff: yes Indicates the PR's author has signed the dco. label Jul 15, 2026
@ti-chi-bot

ti-chi-bot Bot commented Jul 15, 2026

Copy link
Copy Markdown

Hi @YuhaoZhang00. Thanks for your PR.

I'm waiting for a tikv member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 ti-chi-bot Bot added contribution This PR is from a community contributor. needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 15, 2026
@coderabbitai

coderabbitai Bot commented Jul 15, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 2c23a615-ac3f-43a4-a9c7-73df0015e726

📥 Commits

Reviewing files that changed from the base of the PR and between 01bd8f9 and 8d87f8f.

⛔ Files ignored due to path filters (1)
  • integration_tests/go.sum is excluded by !**/*.sum
📒 Files selected for processing (1)
  • integration_tests/go.mod

📝 Walkthrough

Walkthrough

integration_tests/go.mod updates TiDB, parser, and client-go dependency versions, adds an LDAP fork replacement, and removes temporary TiDB fork replacements.

Changes

Integration test dependency updates

Layer / File(s) Summary
Module dependency and replacement updates
integration_tests/go.mod
TiDB, parser, and client-go dependencies are updated; the LDAP replacement is added; prior TiDB replacement directives are removed.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

  • tikv/client-go#1921: Updates the same integration test dependency versions and removes TiDB fork replacements.
  • tikv/client-go#1984: Updates matching TiDB and client-go dependencies and adjusts replacement directives.

Suggested reviewers: connor1996, ekexium

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly matches the main change: removing temporary TiDB replace directives from integration_tests.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@ti-chi-bot ti-chi-bot Bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jul 15, 2026
@ti-chi-bot ti-chi-bot Bot added the lgtm label Jul 16, 2026
@ti-chi-bot

ti-chi-bot Bot commented Jul 16, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cfzjywxk, JmPotato

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 added approved and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 16, 2026
@ti-chi-bot

ti-chi-bot Bot commented Jul 16, 2026

Copy link
Copy Markdown

[LGTM Timeline notifier]

Timeline:

  • 2026-07-15 08:46:34.544124655 +0000 UTC m=+789780.580219721: ☑️ agreed by JmPotato.
  • 2026-07-16 02:32:22.250073235 +0000 UTC m=+853728.286168291: ☑️ agreed by cfzjywxk.

@ti-chi-bot ti-chi-bot Bot merged commit 3d4b3ea into tikv:master Jul 16, 2026
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved contribution This PR is from a community contributor. dco-signoff: yes Indicates the PR's author has signed the dco. lgtm needs-ok-to-test Indicates a PR created by contributors and need ORG member send '/ok-to-test' to start testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants