Skip to content

deps: Bump tikv client 6125c3b#5439

Merged
ti-chi-bot[bot] merged 1 commit into
pingcap:masterfrom
pingyu:bump-tikv-client-6125c3b
Jun 22, 2026
Merged

deps: Bump tikv client 6125c3b#5439
ti-chi-bot[bot] merged 1 commit into
pingcap:masterfrom
pingyu:bump-tikv-client-6125c3b

Conversation

@pingyu

@pingyu pingyu commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

What problem does this PR solve?

Issue Number: close #5440

What is changed and how it works?

Bump tikv/client-go to 6125c3b to support resolving txn file locks.

Ref: tikv/client-go#2003

Check List

Tests

  • Integration tests with nextgen cluster

TiCDC logs:

[2026/06/18 05:01:27.112 +00:00] [INFO] [lock_resolver.go:1530] ["txn lock cleanup resolve-region rpc finished"] [action=commit] [txnStartTS=467077400967512072] [commitTS=467077401675301177] [regionID=9265] [keyCount=8]
[2026/06/18 05:01:27.114 +00:00] [DEBUG] [lock_resolver.go:95] ["resolve lock finishes"] [regionID=9265] [lockCount=8] [sampleLocks="[{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true},{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAgOAAAAAAAAADQOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADQ==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true},{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAwOAAAAAAAAABwOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAABw==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true},{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAABAOAAAAAAAAABAOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAABA==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true},{\"Key\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAABQOAAAAAAAAAGgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAGg==\",\"Primary\":\"dIAAAAAAAACCX2mAAAAAAAAAAgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAAAQOAAAAAAAAADgOAAAAAAAAAAQOAAAAAAAAAAwOAAAAAAAAADg==\",\"TxnID\":467077400967512072,\"TTL\":3999,\"TxnSize\":8,\"LockType\":0,\"UseAsyncCommit\":false,\"LockForUpdateTS\":0,\"MinCommitTS\":0,\"IsTxnFile\":true}]"] [maxVersion=467077401124798464] [duration=7.47611ms] []

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

Bump tikv/client-go to 6125c3b to support resolving txn file locks.

Summary by CodeRabbit

  • Chores
    • Updated dependency version for improved stability and compatibility.

Signed-off-by: Ping Yu <yuping@pingcap.com>
@ti-chi-bot ti-chi-bot Bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 18, 2026
@coderabbitai

coderabbitai Bot commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

The go.mod file updates the github.com/tikv/client-go/v2 dependency from pseudo-version v2.0.8-0.20260609070524-8df1c02428d9 to v2.0.8-0.20260618054307-6125c3b05c6c. No other files or dependencies are modified.

Changes

tikv/client-go/v2 Dependency Bump

Layer / File(s) Summary
tikv/client-go/v2 version bump
go.mod
Updates github.com/tikv/client-go/v2 pseudo-version to the commit dated 2026-06-18 (6125c3b05c6c), replacing the prior commit from 2026-06-09.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

Possibly related PRs

  • pingcap/ticdc#5205: Also bumps github.com/tikv/client-go/v2 to a newer pseudo-version in go.mod, making it a direct predecessor of this change.

Suggested labels

size/S

Suggested reviewers

  • wk989898
  • 3AceShowHand

Poem

A hop, a skip, a version bump so small,
The tikv client leaps to a new commit's call,
From June the ninth to eighteenth it goes,
A tiny diff, yet forward the codebase flows,
🐇 One line changed, and all is well! 🎉

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title directly references the dependency update with the specific commit hash (6125c3b), accurately summarizing the main change in the PR.
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.
Description check ✅ Passed The pull request description includes all required sections: issue reference, explanation of changes, test verification, and compatibility/documentation answers.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ 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 and usage tips.

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

Copy link
Copy Markdown

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 github.com/tikv/client-go/v2 dependency to a newer commit hash in go.mod and go.sum. There are no review comments, and I have no feedback to provide.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

@ti-chi-bot ti-chi-bot Bot added do-not-merge/needs-triage-completed release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. labels Jun 18, 2026
@ti-chi-bot ti-chi-bot Bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jun 18, 2026
@pingyu

pingyu commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

/cc @tenfyzhong

@ti-chi-bot
ti-chi-bot Bot requested a review from tenfyzhong June 22, 2026 00:46
@ti-chi-bot

ti-chi-bot Bot commented Jun 22, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tenfyzhong, wk989898

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:
  • OWNERS [tenfyzhong,wk989898]

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

ti-chi-bot Bot commented Jun 22, 2026

Copy link
Copy Markdown

[LGTM Timeline notifier]

Timeline:

  • 2026-06-18 08:49:51.44603788 +0000 UTC m=+1641092.516355270: ☑️ agreed by wk989898.
  • 2026-06-22 02:19:46.712837759 +0000 UTC m=+1963287.783155149: ☑️ agreed by tenfyzhong.

@tenfyzhong

Copy link
Copy Markdown
Collaborator

/check-issue-triage-complete

@tenfyzhong

Copy link
Copy Markdown
Collaborator

/test all

@pingyu

pingyu commented Jun 22, 2026

Copy link
Copy Markdown
Contributor Author

/test pull-cdc-mysql-integration-light

@ti-chi-bot
ti-chi-bot Bot merged commit ad05ef4 into pingcap:master Jun 22, 2026
19 checks passed
@pingyu

pingyu commented Jun 26, 2026

Copy link
Copy Markdown
Contributor Author

/cherry-pick release-nextgen-202603

@ti-chi-bot

Copy link
Copy Markdown
Member

@pingyu: new pull request created to branch release-nextgen-202603: #5507.

Details

In response to this:

/cherry-pick release-nextgen-202603

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.

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

Labels

approved lgtm release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Support resolving txn file locks

4 participants