Skip to content

Commit 070ddee

Browse files
committed
txnkv: fix SetCommitWaitUntilTSOTimeout does not work in causal consistency (tikv#1847)
fix tikv#1846 Signed-off-by: Chao Wang <cclcwangchao@hotmail.com>
1 parent a7b7bb4 commit 070ddee

File tree

14 files changed

+235
-211
lines changed

14 files changed

+235
-211
lines changed

integration_tests/go.mod

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,29 @@ module integration_tests
33
go 1.25.5
44

55
require (
6+
github.com/google/uuid v1.6.0
67
github.com/ninedraft/israce v0.0.3
7-
github.com/pingcap/errors v0.11.5-0.20241219054535-6b8c588c3122
8+
github.com/pingcap/errors v0.11.5-0.20250523034308-74f78ae071ee
89
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86
910
github.com/pingcap/kvproto v0.0.0-20260119070026-e7016d9dbe90
1011
github.com/pingcap/tidb v1.1.0-beta.0.20250106104940-3ac9806e2a76
1112
github.com/pkg/errors v0.9.1
13+
github.com/prometheus/client_golang v1.23.0
14+
github.com/prometheus/client_model v0.6.2
1215
github.com/stretchr/testify v1.10.0
1316
github.com/tidwall/gjson v1.14.1
14-
github.com/tikv/client-go/v2 v2.0.8-0.20241121061241-006dfb024c26
17+
github.com/tikv/client-go/v2 v2.0.8-0.20260112052152-1d3c5ec76bf8
1518
github.com/tikv/pd/client v0.0.0-20251219084741-029eb6e7d5d0
1619
go.uber.org/goleak v1.3.0
1720
)
1821

1922
require (
2023
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
21-
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
24+
github.com/BurntSushi/toml v1.5.0 // indirect
2225
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
26+
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
2327
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2428
github.com/beorn7/perks v1.0.1 // indirect
25-
github.com/bits-and-blooms/bitset v1.14.3 // indirect
2629
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2730
github.com/cloudfoundry/gosigar v1.3.6 // indirect
2831
github.com/coocood/bbloom v0.0.0-20190830030839-58deb6228d64 // indirect
@@ -44,12 +47,11 @@ require (
4447
github.com/golang/protobuf v1.5.4 // indirect
4548
github.com/golang/snappy v0.0.4 // indirect
4649
github.com/google/btree v1.1.2 // indirect
47-
github.com/google/uuid v1.6.0 // indirect
4850
github.com/gorilla/mux v1.8.1 // indirect
4951
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
5052
github.com/influxdata/tdigest v0.0.1 // indirect
5153
github.com/json-iterator/go v1.1.12 // indirect
52-
github.com/klauspost/compress v1.17.9 // indirect
54+
github.com/klauspost/compress v1.18.0 // indirect
5355
github.com/klauspost/cpuid v1.3.1 // indirect
5456
github.com/lufia/plan9stats v0.0.0-20230326075908-cb1d2100619a // indirect
5557
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -60,54 +62,52 @@ require (
6062
github.com/ngaut/sync2 v0.0.0-20141008032647-7a24ed77b2ef // indirect
6163
github.com/opentracing/basictracer-go v1.1.0 // indirect
6264
github.com/opentracing/opentracing-go v1.2.0 // indirect
63-
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
65+
github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe // indirect
6466
github.com/pingcap/badger v1.5.1-0.20241015064302-38533b6cbf8d // indirect
6567
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 // indirect
66-
github.com/pingcap/log v1.1.1-0.20240314023424-862ccc32f18d // indirect
68+
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9 // indirect
6769
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5 // indirect
6870
github.com/pingcap/tidb/pkg/parser v0.0.0-20250106104940-3ac9806e2a76 // indirect
69-
github.com/pingcap/tipb v0.0.0-20241105053214-f91fdb81a69e // indirect
71+
github.com/pingcap/tipb v0.0.0-20251125085256-097db0b2c02a // indirect
7072
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7173
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
72-
github.com/prometheus/client_golang v1.20.5 // indirect
73-
github.com/prometheus/client_model v0.6.1 // indirect
74-
github.com/prometheus/common v0.57.0 // indirect
75-
github.com/prometheus/procfs v0.15.1 // indirect
74+
github.com/prometheus/common v0.65.0 // indirect
75+
github.com/prometheus/procfs v0.19.2 // indirect
7676
github.com/qri-io/jsonpointer v0.1.1 // indirect
7777
github.com/qri-io/jsonschema v0.2.1 // indirect
7878
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
79-
github.com/sasha-s/go-deadlock v0.3.5 // indirect
79+
github.com/sasha-s/go-deadlock v0.3.6 // indirect
8080
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
81-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
82-
github.com/spf13/pflag v1.0.5 // indirect
81+
github.com/shoenig/go-m1cpu v0.1.7 // indirect
82+
github.com/spf13/afero v1.11.0 // indirect
8383
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
8484
github.com/tidwall/match v1.1.1 // indirect
8585
github.com/tidwall/pretty v1.2.0 // indirect
86-
github.com/tklauser/go-sysconf v0.3.12 // indirect
87-
github.com/tklauser/numcpus v0.6.1 // indirect
86+
github.com/tklauser/go-sysconf v0.3.15 // indirect
87+
github.com/tklauser/numcpus v0.10.0 // indirect
8888
github.com/twmb/murmur3 v1.1.6 // indirect
8989
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
9090
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
9191
github.com/yusufpapurcu/wmi v1.2.4 // indirect
92-
go.etcd.io/etcd/api/v3 v3.5.12 // indirect
93-
go.etcd.io/etcd/client/pkg/v3 v3.5.12 // indirect
94-
go.etcd.io/etcd/client/v3 v3.5.12 // indirect
92+
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
93+
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
94+
go.etcd.io/etcd/client/v3 v3.5.15 // indirect
9595
go.uber.org/atomic v1.11.0 // indirect
9696
go.uber.org/multierr v1.11.0 // indirect
9797
go.uber.org/zap v1.27.0 // indirect
98-
golang.org/x/crypto v0.36.0 // indirect
98+
golang.org/x/crypto v0.44.0 // indirect
9999
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
100-
golang.org/x/net v0.38.0 // indirect
101-
golang.org/x/sync v0.12.0 // indirect
102-
golang.org/x/sys v0.31.0 // indirect
103-
golang.org/x/text v0.23.0 // indirect
104-
golang.org/x/time v0.7.0 // indirect
105-
golang.org/x/tools v0.27.0 // indirect
100+
golang.org/x/net v0.47.0 // indirect
101+
golang.org/x/sync v0.18.0 // indirect
102+
golang.org/x/sys v0.38.0 // indirect
103+
golang.org/x/text v0.31.0 // indirect
104+
golang.org/x/time v0.14.0 // indirect
105+
golang.org/x/tools v0.39.0 // indirect
106106
gonum.org/v1/gonum v0.8.2 // indirect
107-
google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
108-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
107+
google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect
108+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250425173222-7b384671a197 // indirect
109109
google.golang.org/grpc v1.63.2 // indirect
110-
google.golang.org/protobuf v1.34.2 // indirect
110+
google.golang.org/protobuf v1.36.10 // indirect
111111
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
112112
gopkg.in/yaml.v2 v2.4.0 // indirect
113113
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -120,6 +120,6 @@ replace (
120120
)
121121

122122
replace (
123-
github.com/pingcap/tidb => github.com/you06/tidb v1.1.0-beta.0.20250107072714-ec9aedaf5eb3
124-
github.com/pingcap/tidb/pkg/parser => github.com/you06/tidb/pkg/parser v0.0.0-20250107072714-ec9aedaf5eb3
123+
github.com/pingcap/tidb => github.com/lcwangchao/tidb v1.1.0-beta.0.20260126055322-e31e3f51a340
124+
github.com/pingcap/tidb/pkg/parser => github.com/lcwangchao/tidb/pkg/parser v0.0.0-20260126055322-e31e3f51a340
125125
)

0 commit comments

Comments
 (0)