From b4b3a48b52bf76149896ca74e3c7f980304e75ba Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 1 Jul 2025 12:08:41 +0800 Subject: [PATCH 1/4] update pd-cse client Signed-off-by: ystaticy --- examples/gcworker/go.mod | 37 ++++++++++++++---------- examples/rawkv/go.mod | 7 +++-- examples/txnkv/1pc_txn/go.mod | 7 +++-- examples/txnkv/async_commit/go.mod | 7 +++-- examples/txnkv/delete_range/go.mod | 7 +++-- examples/txnkv/go.mod | 7 +++-- examples/txnkv/pessimistic_txn/go.mod | 7 +++-- examples/txnkv/unsafedestoryrange/go.mod | 7 +++-- integration_tests/go.mod | 1 + 9 files changed, 57 insertions(+), 30 deletions(-) diff --git a/examples/gcworker/go.mod b/examples/gcworker/go.mod index b38bc4f529..61b9423fe0 100644 --- a/examples/gcworker/go.mod +++ b/examples/gcworker/go.mod @@ -1,12 +1,14 @@ module gcworker -go 1.21 +go 1.23 + +toolchain go1.23.10 require github.com/tikv/client-go/v2 v2.0.0 require ( github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudfoundry/gosigar v1.3.6 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect @@ -17,19 +19,20 @@ require ( github.com/google/btree v1.1.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c // indirect - github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect - github.com/pingcap/kvproto v0.0.0-20240613021635-bca367ddc3b9 // indirect + github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect + github.com/pingcap/kvproto v0.0.0-20250224053625-b6a98c6bf02d // indirect github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_golang v1.18.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.46.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect + github.com/prometheus/client_golang v1.20.5 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect - github.com/tikv/pd/client v0.0.0-20240509073708-a674e668f8a5 // indirect + github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a // indirect github.com/twmb/murmur3 v1.1.3 // indirect go.etcd.io/etcd/api/v3 v3.5.10 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect @@ -37,17 +40,19 @@ require ( go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect - golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect google.golang.org/grpc v1.62.1 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) -replace github.com/tikv/client-go/v2 => ../../ +replace ( + github.com/tikv/client-go/v2 => ../../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 +) diff --git a/examples/rawkv/go.mod b/examples/rawkv/go.mod index 74b5137351..01ba2bf1ce 100644 --- a/examples/rawkv/go.mod +++ b/examples/rawkv/go.mod @@ -29,7 +29,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect - github.com/tikv/pd/client v0.0.0-20240509073708-a674e668f8a5 // indirect + github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a // indirect github.com/twmb/murmur3 v1.1.3 // indirect go.etcd.io/etcd/api/v3 v3.5.10 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect @@ -50,4 +50,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) -replace github.com/tikv/client-go/v2 => ../../ +replace ( + github.com/tikv/client-go/v2 => ../../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 +) diff --git a/examples/txnkv/1pc_txn/go.mod b/examples/txnkv/1pc_txn/go.mod index b25c4a99f5..7de6e5bb21 100644 --- a/examples/txnkv/1pc_txn/go.mod +++ b/examples/txnkv/1pc_txn/go.mod @@ -29,7 +29,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect - github.com/tikv/pd/client v0.0.0-20240509073708-a674e668f8a5 // indirect + github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a // indirect github.com/twmb/murmur3 v1.1.3 // indirect go.etcd.io/etcd/api/v3 v3.5.10 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect @@ -50,4 +50,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) -replace github.com/tikv/client-go/v2 => ../../../ +replace ( + github.com/tikv/client-go/v2 => ../../../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 +) diff --git a/examples/txnkv/async_commit/go.mod b/examples/txnkv/async_commit/go.mod index dafaaf8660..b196855bd0 100644 --- a/examples/txnkv/async_commit/go.mod +++ b/examples/txnkv/async_commit/go.mod @@ -29,7 +29,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect - github.com/tikv/pd/client v0.0.0-20240509073708-a674e668f8a5 // indirect + github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a // indirect github.com/twmb/murmur3 v1.1.3 // indirect go.etcd.io/etcd/api/v3 v3.5.10 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect @@ -50,4 +50,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) -replace github.com/tikv/client-go/v2 => ../../../ +replace ( + github.com/tikv/client-go/v2 => ../../../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 +) diff --git a/examples/txnkv/delete_range/go.mod b/examples/txnkv/delete_range/go.mod index 0a97d0060d..0ea26ee838 100644 --- a/examples/txnkv/delete_range/go.mod +++ b/examples/txnkv/delete_range/go.mod @@ -29,7 +29,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect - github.com/tikv/pd/client v0.0.0-20240509073708-a674e668f8a5 // indirect + github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a // indirect github.com/twmb/murmur3 v1.1.3 // indirect go.etcd.io/etcd/api/v3 v3.5.10 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect @@ -50,4 +50,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) -replace github.com/tikv/client-go/v2 => ../../../ +replace ( + github.com/tikv/client-go/v2 => ../../../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 +) diff --git a/examples/txnkv/go.mod b/examples/txnkv/go.mod index 827389c8a8..761a55077f 100644 --- a/examples/txnkv/go.mod +++ b/examples/txnkv/go.mod @@ -29,7 +29,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect - github.com/tikv/pd/client v0.0.0-20240509073708-a674e668f8a5 // indirect + github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a // indirect github.com/twmb/murmur3 v1.1.3 // indirect go.etcd.io/etcd/api/v3 v3.5.10 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect @@ -50,4 +50,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) -replace github.com/tikv/client-go/v2 => ../../ +replace ( + github.com/tikv/client-go/v2 => ../../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 +) diff --git a/examples/txnkv/pessimistic_txn/go.mod b/examples/txnkv/pessimistic_txn/go.mod index e39309558b..d4dce1877e 100644 --- a/examples/txnkv/pessimistic_txn/go.mod +++ b/examples/txnkv/pessimistic_txn/go.mod @@ -29,7 +29,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect - github.com/tikv/pd/client v0.0.0-20240509073708-a674e668f8a5 // indirect + github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a // indirect github.com/twmb/murmur3 v1.1.3 // indirect go.etcd.io/etcd/api/v3 v3.5.10 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect @@ -50,4 +50,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) -replace github.com/tikv/client-go/v2 => ../../../ +replace ( + github.com/tikv/client-go/v2 => ../../../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 +) diff --git a/examples/txnkv/unsafedestoryrange/go.mod b/examples/txnkv/unsafedestoryrange/go.mod index b558931a56..dc252438b1 100644 --- a/examples/txnkv/unsafedestoryrange/go.mod +++ b/examples/txnkv/unsafedestoryrange/go.mod @@ -29,7 +29,7 @@ require ( github.com/prometheus/procfs v0.12.0 // indirect github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect - github.com/tikv/pd/client v0.0.0-20240509073708-a674e668f8a5 // indirect + github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a // indirect github.com/twmb/murmur3 v1.1.3 // indirect go.etcd.io/etcd/api/v3 v3.5.10 // indirect go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect @@ -50,4 +50,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect ) -replace github.com/tikv/client-go/v2 => ../../../ +replace ( + github.com/tikv/client-go/v2 => ../../../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 +) diff --git a/integration_tests/go.mod b/integration_tests/go.mod index 633cdf2208..1db0ad6fa9 100644 --- a/integration_tests/go.mod +++ b/integration_tests/go.mod @@ -122,5 +122,6 @@ replace ( github.com/go-ldap/ldap/v3 => github.com/YangKeao/ldap/v3 v3.4.5-0.20230421065457-369a3bab1117 github.com/pingcap/tidb => github.com/oh-my-tidb/tidb v1.1.0-beta.0.20250617060139-449ec9142c87 github.com/pingcap/tidb/pkg/parser => github.com/oh-my-tidb/tidb/pkg/parser v0.0.0-20250617060139-449ec9142c87 + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 github.com/tikv/client-go/v2 => ../ ) From 0882797e335e0b0c0be93c50495b1651ba388835 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 1 Jul 2025 12:10:14 +0800 Subject: [PATCH 2/4] update pd-cse client Signed-off-by: ystaticy --- go.mod | 2 ++ go.sum | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b8191e05ba..2ffba2d5e4 100644 --- a/go.mod +++ b/go.mod @@ -62,3 +62,5 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) + +replace github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 diff --git a/go.sum b/go.sum index 853daf94e1..da07bdc7b6 100644 --- a/go.sum +++ b/go.sum @@ -115,8 +115,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4= github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM= -github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a h1:ofNIZzksw1Emd3vLbuP78fGjHagBi4gxlKDvI+6cNB4= -github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a/go.mod h1:6fHHp8ecZIIkGyjxKn/oZFqX5dzrRkcHjFJPlBpigzQ= +github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 h1:iQofMlCv0Ktxx7nFTQEUny2Eqnsh+hukHg1QBq6uEwg= +github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0/go.mod h1:6fHHp8ecZIIkGyjxKn/oZFqX5dzrRkcHjFJPlBpigzQ= github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA= github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From e29b47307b32f9acbce137176e5174f3922e3c98 Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 1 Jul 2025 12:31:19 +0800 Subject: [PATCH 3/4] go mod tidy -compat=1.21 Signed-off-by: ystaticy --- integration_tests/go.mod | 2 +- integration_tests/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration_tests/go.mod b/integration_tests/go.mod index 1db0ad6fa9..1843275145 100644 --- a/integration_tests/go.mod +++ b/integration_tests/go.mod @@ -122,6 +122,6 @@ replace ( github.com/go-ldap/ldap/v3 => github.com/YangKeao/ldap/v3 v3.4.5-0.20230421065457-369a3bab1117 github.com/pingcap/tidb => github.com/oh-my-tidb/tidb v1.1.0-beta.0.20250617060139-449ec9142c87 github.com/pingcap/tidb/pkg/parser => github.com/oh-my-tidb/tidb/pkg/parser v0.0.0-20250617060139-449ec9142c87 - github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 github.com/tikv/client-go/v2 => ../ + github.com/tikv/pd/client => github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 ) diff --git a/integration_tests/go.sum b/integration_tests/go.sum index 46ee6f37e7..20c4bfb333 100644 --- a/integration_tests/go.sum +++ b/integration_tests/go.sum @@ -512,14 +512,14 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJf github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU= github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4= github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM= +github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0 h1:iQofMlCv0Ktxx7nFTQEUny2Eqnsh+hukHg1QBq6uEwg= +github.com/tidbcloud/pd-cse/client v0.0.0-20250701024007-b22e096997e0/go.mod h1:6fHHp8ecZIIkGyjxKn/oZFqX5dzrRkcHjFJPlBpigzQ= github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo= github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a h1:ofNIZzksw1Emd3vLbuP78fGjHagBi4gxlKDvI+6cNB4= -github.com/tikv/pd/client v0.0.0-20250319102635-e5687bff864a/go.mod h1:6fHHp8ecZIIkGyjxKn/oZFqX5dzrRkcHjFJPlBpigzQ= github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= From 637398626ffcd88f7a2760361c39a3ae10e9713c Mon Sep 17 00:00:00 2001 From: ystaticy Date: Tue, 1 Jul 2025 14:55:50 +0800 Subject: [PATCH 4/4] support private pd-cse Signed-off-by: ystaticy --- .github/workflows/integration.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index df96f4934d..14e0738697 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -10,15 +10,28 @@ jobs: integration-local: runs-on: ubuntu-latest + env: + GOPRIVATE: "github.com/tidbcloud" + steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + token: ${{ secrets.GIT_ACTION_BOT }} # set the GitHub token - name: Set up Go uses: actions/setup-go@v4 with: go-version: 1.21.0 + - name: Configure git for private modules + env: + TOKEN: ${{ secrets.GIT_ACTION_BOT }} # set the GitHub token + run: | + git config --global url."https://${TOKEN}@github.com/".insteadOf "https://github.com/" + # check config + git config --global --get url."https://${TOKEN}@github.com/".insteadOf + - name: Test run: go test ./... working-directory: integration_tests