Skip to content

Commit 30e803b

Browse files
authored
implement the external timestamp client (#610)
Signed-off-by: YangKeao <yangkeao@chunibyo.icu>
1 parent 4760b32 commit 30e803b

File tree

12 files changed

+321
-60
lines changed

12 files changed

+321
-60
lines changed

.github/workflows/integration.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Set up Go
1818
uses: actions/setup-go@v2
1919
with:
20-
go-version: 1.18
20+
go-version: 1.19
2121

2222
- name: Test
2323
run: go test ./...
@@ -32,7 +32,7 @@ jobs:
3232
- name: Set up Go
3333
uses: actions/setup-go@v2
3434
with:
35-
go-version: 1.18
35+
go-version: 1.19
3636

3737
- name: Test
3838
run: go test ./... -race
@@ -47,7 +47,7 @@ jobs:
4747
- name: Set up Go
4848
uses: actions/setup-go@v2
4949
with:
50-
go-version: 1.18
50+
go-version: 1.19
5151

5252
- name: Fetch PD
5353
uses: shrink/actions-docker-extract@v1
@@ -89,7 +89,7 @@ jobs:
8989
- name: Set up Go
9090
uses: actions/setup-go@v2
9191
with:
92-
go-version: 1.18
92+
go-version: 1.19
9393

9494
- name: Fetch PD
9595
uses: shrink/actions-docker-extract@v1

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ require (
1313
github.com/opentracing/opentracing-go v1.2.0
1414
github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00
1515
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989
16-
github.com/pingcap/kvproto v0.0.0-20221014081430-26e28e6a281a
17-
github.com/pingcap/log v0.0.0-20211215031037-e024ba4eb0ee
16+
github.com/pingcap/kvproto v0.0.0-20221026112947-f8d61344b172
17+
github.com/pingcap/log v1.1.1-0.20221015072633-39906604fb81
1818
github.com/pkg/errors v0.9.1
1919
github.com/prometheus/client_golang v1.11.0
2020
github.com/prometheus/client_model v0.2.0
2121
github.com/stathat/consistent v1.0.0
2222
github.com/stretchr/testify v1.7.0
23-
github.com/tikv/pd/client v0.0.0-20220725055910-7187a7ab72db
23+
github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07
2424
github.com/twmb/murmur3 v1.1.3
2525
go.etcd.io/etcd/api/v3 v3.5.2
2626
go.etcd.io/etcd/client/v3 v3.5.2

go.sum

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,13 +154,10 @@ github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00 h1:C3N3itkduZXDZ
154154
github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00/go.mod h1:4qGtCB0QK0wBzKtFEGDhxXnSnbQApw1gc9siScUl8ew=
155155
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
156156
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
157-
github.com/pingcap/kvproto v0.0.0-20220510035547-0e2f26c0a46a/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI=
158-
github.com/pingcap/kvproto v0.0.0-20220929075948-06e08d5ed64c h1:ceg4xjEEXNgPsScTQ5dtidiltLF4h17Y/jUqfyLAy9E=
159-
github.com/pingcap/kvproto v0.0.0-20220929075948-06e08d5ed64c/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI=
160-
github.com/pingcap/kvproto v0.0.0-20221014081430-26e28e6a281a h1:McYxPhA8SHqfUtLfQHHN0fQl4dy93IkhlX4Pp2MKIFA=
161-
github.com/pingcap/kvproto v0.0.0-20221014081430-26e28e6a281a/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI=
162-
github.com/pingcap/log v0.0.0-20211215031037-e024ba4eb0ee h1:VO2t6IBpfvW34TdtD/G10VvnGqjLic1jzOuHjUb5VqM=
163-
github.com/pingcap/log v0.0.0-20211215031037-e024ba4eb0ee/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
157+
github.com/pingcap/kvproto v0.0.0-20221026112947-f8d61344b172 h1:FYgKV9znRQmzVrrJDZ0gUfMIvKLAMU1tu1UKJib8bEQ=
158+
github.com/pingcap/kvproto v0.0.0-20221026112947-f8d61344b172/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI=
159+
github.com/pingcap/log v1.1.1-0.20221015072633-39906604fb81 h1:URLoJ61DmmY++Sa/yyPEQHG2s/ZBeV1FbIswHEMrdoY=
160+
github.com/pingcap/log v1.1.1-0.20221015072633-39906604fb81/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
164161
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
165162
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
166163
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -203,8 +200,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
203200
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
204201
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
205202
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
206-
github.com/tikv/pd/client v0.0.0-20220725055910-7187a7ab72db h1:r1eMh9Rny3hfWuBuxOnbsCRrR4FhthiNxLQ5rAUtaww=
207-
github.com/tikv/pd/client v0.0.0-20220725055910-7187a7ab72db/go.mod h1:ew8kS0yIcEaSetuuywkTLIUBR+sz3J5XvAYRae11qwc=
203+
github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 h1:ckPpxKcl75mO2N6a4cJXiZH43hvcHPpqc9dh1TmH1nc=
204+
github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07/go.mod h1:CipBxPfxPUME+BImx9MUYXCnAVLS3VJUr3mnSJwh40A=
208205
github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA=
209206
github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
210207
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

integration_tests/go.mod

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,27 @@ go 1.18
44

55
require (
66
github.com/ninedraft/israce v0.0.3
7-
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
7+
github.com/pingcap/errors v0.11.5-0.20220729040631-518f63d66278
88
github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3
9-
github.com/pingcap/kvproto v0.0.0-20221014081430-26e28e6a281a
9+
github.com/pingcap/kvproto v0.0.0-20221026112947-f8d61344b172
1010
github.com/pingcap/tidb v1.1.0-beta.0.20220902042024-0482b2e83ed2
1111
github.com/pkg/errors v0.9.1
1212
github.com/stretchr/testify v1.8.0
1313
github.com/tidwall/gjson v1.14.1
14-
github.com/tikv/client-go/v2 v2.0.1-0.20220830073839-0130f767386c
15-
github.com/tikv/pd/client v0.0.0-20220725055910-7187a7ab72db
16-
go.uber.org/goleak v1.1.12
14+
github.com/tikv/client-go/v2 v2.0.1-0.20221012074856-6def8d7b90c4
15+
github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07
16+
go.uber.org/goleak v1.2.0
1717
)
1818

1919
require (
2020
github.com/BurntSushi/toml v1.2.0 // indirect
2121
github.com/benbjohnson/clock v1.3.0 // indirect
2222
github.com/beorn7/perks v1.0.1 // indirect
2323
github.com/cespare/xxhash/v2 v2.1.2 // indirect
24+
github.com/cockroachdb/errors v1.8.1 // indirect
25+
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
26+
github.com/cockroachdb/redact v1.0.8 // indirect
27+
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
2428
github.com/coocood/bbloom v0.0.0-20190830030839-58deb6228d64 // indirect
2529
github.com/coocood/freecache v1.2.1 // indirect
2630
github.com/coocood/rtutil v0.0.0-20190304133409-c84515f646f2 // indirect
@@ -39,6 +43,8 @@ require (
3943
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
4044
github.com/klauspost/compress v1.15.4 // indirect
4145
github.com/klauspost/cpuid v1.3.1 // indirect
46+
github.com/kr/pretty v0.3.0 // indirect
47+
github.com/kr/text v0.2.0 // indirect
4248
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
4349
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
4450
github.com/ncw/directio v1.0.5 // indirect
@@ -47,16 +53,17 @@ require (
4753
github.com/opentracing/opentracing-go v1.2.0 // indirect
4854
github.com/pingcap/badger v1.5.1-0.20220314162537-ab58fbf40580 // indirect
4955
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 // indirect
50-
github.com/pingcap/log v1.1.0 // indirect
56+
github.com/pingcap/log v1.1.1-0.20221015072633-39906604fb81 // indirect
5157
github.com/pingcap/tidb/parser v0.0.0-20220724090709-5484002f1963 // indirect
52-
github.com/pingcap/tipb v0.0.0-20220824081009-0714a57aff1d // indirect
58+
github.com/pingcap/tipb v0.0.0-20221020071514-cd933387bcb5 // indirect
5359
github.com/pmezard/go-difflib v1.0.0 // indirect
5460
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
55-
github.com/prometheus/client_golang v1.12.2 // indirect
61+
github.com/prometheus/client_golang v1.13.0 // indirect
5662
github.com/prometheus/client_model v0.2.0 // indirect
57-
github.com/prometheus/common v0.32.1 // indirect
58-
github.com/prometheus/procfs v0.7.3 // indirect
63+
github.com/prometheus/common v0.37.0 // indirect
64+
github.com/prometheus/procfs v0.8.0 // indirect
5965
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
66+
github.com/rogpeppe/go-internal v1.6.1 // indirect
6067
github.com/shirou/gopsutil/v3 v3.22.7 // indirect
6168
github.com/spf13/pflag v1.0.5 // indirect
6269
github.com/stathat/consistent v1.0.0 // indirect
@@ -69,21 +76,26 @@ require (
6976
go.etcd.io/etcd/api/v3 v3.5.2 // indirect
7077
go.etcd.io/etcd/client/pkg/v3 v3.5.2 // indirect
7178
go.etcd.io/etcd/client/v3 v3.5.2 // indirect
72-
go.uber.org/atomic v1.9.0 // indirect
79+
go.uber.org/atomic v1.10.0 // indirect
7380
go.uber.org/multierr v1.8.0 // indirect
7481
go.uber.org/zap v1.21.0 // indirect
7582
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
7683
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
7784
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
78-
golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64 // indirect
85+
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
7986
golang.org/x/text v0.3.7 // indirect
8087
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
8188
golang.org/x/tools v0.1.12 // indirect
8289
google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb // indirect
8390
google.golang.org/grpc v1.45.0 // indirect
84-
google.golang.org/protobuf v1.28.0 // indirect
91+
google.golang.org/protobuf v1.28.1 // indirect
8592
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
8693
gopkg.in/yaml.v3 v3.0.1 // indirect
8794
)
8895

8996
replace github.com/tikv/client-go/v2 => ../
97+
98+
replace (
99+
github.com/pingcap/tidb v1.1.0-beta.0.20220902042024-0482b2e83ed2 => github.com/YangKeao/tidb v1.1.0-beta.0.20221027084838-c574366d0e5a
100+
github.com/pingcap/tidb/parser v0.0.0-20220724090709-5484002f1963 => github.com/YangKeao/tidb/parser v0.0.0-20221027084838-c574366d0e5a
101+
)

0 commit comments

Comments
 (0)