Skip to content

deps: bump client-go for nextgen shared lock#5205

Merged
ti-chi-bot[bot] merged 1 commit into
pingcap:masterfrom
cfzjywxk:nextgen-master-client-go-master
Jun 9, 2026
Merged

deps: bump client-go for nextgen shared lock#5205
ti-chi-bot[bot] merged 1 commit into
pingcap:masterfrom
cfzjywxk:nextgen-master-client-go-master

Conversation

@cfzjywxk

@cfzjywxk cfzjywxk commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

What problem does this PR solve?

Issue Number: ref #5206

TiCDC master still depends on an older github.com/tikv/client-go/v2 revision that does not contain the API v2 lock-key re-encoding fix needed by the TiDB shared-lock feature.

Related TiDB issue: pingcap/tidb#66154
Client-go fix PR: tikv/client-go#1987

This PR follows the same dependency strategy as #5203 and consumes the minimal client-go branch for TiCDC:

What is changed and how it works?

  • Bump github.com/tikv/client-go/v2 to the minimal 78dc334 pseudo-version.
  • Bump github.com/pingcap/kvproto only as required by that client-go version.
  • Keep github.com/pingcap/tidb, github.com/tikv/pd/client, google.golang.org/grpc, and golang.org/x/* unchanged.

Check List

Tests

  • Unit test
  • Manual test

Local checks run:

  • go mod tidy
  • git diff --check
  • NEXT_GEN=1 make cdc
  • go test --tags=nextgen ./cmd/cdc
  • go test --tags=nextgen ./pkg/txnutil/gc/...
  • go test --tags=nextgen ./logservice/logpuller/...
  • go test --tags=nextgen ./logservice/txnutil/...
  • go test --tags=nextgen -timeout=2m ./pkg/upstream/...

Note: pkg/pdutil/TestGetSourceID times out locally in the same way on clean origin/master, so it is not introduced by this dependency bump.

Questions

Will it cause performance regression or break compatibility?

No expected compatibility impact. The dependency change is limited to client-go and its required kvproto version for shared-lock support.

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

No.

Release note

None.

Signed-off-by: cfzjywxk <cfzjywxk@gmail.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. first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. labels Jun 5, 2026
@coderabbitai

coderabbitai Bot commented Jun 5, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

📝 Walkthrough

Walkthrough

This PR updates two Go module dependencies to newer commits: github.com/pingcap/kvproto and github.com/tikv/client-go/v2. Both changes are pinned commit updates within go.mod.

Changes

Dependency Updates

Layer / File(s) Summary
kvproto and client-go dependency version bumps
go.mod
github.com/pingcap/kvproto and github.com/tikv/client-go/v2 are each updated to newer commit hashes.

Estimated Code Review Effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Poem

🐰 Two modules hop along the path,
kvproto and client dashed,
Commits flow newer, fresh and bright,
Dependencies aligned just right! ✨

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically summarizes the main change: bumping the client-go dependency to support nextgen shared lock functionality.
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 PR description comprehensively addresses all required template sections with clear problem statement, detailed changes, thorough testing documentation, and explicit answers to compatibility and documentation questions.

✏️ 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.

@ti-chi-bot ti-chi-bot Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 5, 2026

@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/pingcap/kvproto and github.com/tikv/client-go/v2 dependencies to newer versions in go.mod and go.sum. 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.

@cfzjywxk

cfzjywxk commented Jun 5, 2026

Copy link
Copy Markdown
Contributor Author

@tenfyzhong @3AceShowHand @wk989898
PTAL it is critical important for correctness on nextgen tidb build.

@ti-chi-bot ti-chi-bot Bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Jun 8, 2026
@wk989898

wk989898 commented Jun 8, 2026

Copy link
Copy Markdown
Collaborator

/test next-gen

@ti-chi-bot ti-chi-bot Bot added the lgtm label Jun 9, 2026
@ti-chi-bot

ti-chi-bot Bot commented Jun 9, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 3AceShowHand, 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 [3AceShowHand,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 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Jun 9, 2026
@ti-chi-bot

ti-chi-bot Bot commented Jun 9, 2026

Copy link
Copy Markdown

[LGTM Timeline notifier]

Timeline:

  • 2026-06-08 03:31:24.741887407 +0000 UTC m=+757985.812204797: ☑️ agreed by wk989898.
  • 2026-06-09 03:51:47.479686909 +0000 UTC m=+845608.550004309: ☑️ agreed by 3AceShowHand.

@wk989898

wk989898 commented Jun 9, 2026

Copy link
Copy Markdown
Collaborator

/retest

@ti-chi-bot ti-chi-bot Bot merged commit c37f85f into pingcap:master Jun 9, 2026
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. lgtm release-note-none Denotes a PR that doesn't merit a release note. 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