Skip to content

Commit 8fd09cd

Browse files
authoredFeb 2, 2023
config support both path and names (#683)
Signed-off-by: HuSharp <jinhao.hu@pingcap.com>
1 parent 35416c4 commit 8fd09cd

File tree

15 files changed

+41
-40
lines changed

15 files changed

+41
-40
lines changed
 

‎.github/workflows/test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v2
1717
with:
18-
go-version: 1.18
18+
go-version: 1.19
1919

2020
- name: Test
2121
run: go test ./...
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Go
2929
uses: actions/setup-go@v2
3030
with:
31-
go-version: 1.18
31+
go-version: 1.19
3232

3333
- name: Test with race
3434
run: go test -race ./...
@@ -42,7 +42,7 @@ jobs:
4242
- name: Set up Go
4343
uses: actions/setup-go@v2
4444
with:
45-
go-version: 1.18
45+
go-version: 1.19
4646

4747
- name: Lint
4848
uses: golangci/golangci-lint-action@v2.5.2

‎examples/gcworker/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module gcworker
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

‎examples/rawkv/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module rawkv
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

‎examples/txnkv/1pc_txn/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module 1pc_txn
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

‎examples/txnkv/async_commit/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module async_commit
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

‎examples/txnkv/delete_range/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module delete_range
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

‎examples/txnkv/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module txnkv
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

‎examples/txnkv/pessimistic_txn/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module pessimistic_txn
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

‎examples/txnkv/unsafedestoryrange/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module unsafedestoryrange
22

3-
go 1.18
3+
go 1.19
44

55
require github.com/tikv/client-go/v2 v2.0.0
66

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/tikv/client-go/v2
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548
@@ -14,16 +14,16 @@ require (
1414
github.com/pingcap/errors v0.11.5-0.20211224045212-9687c2b0f87c
1515
github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00
1616
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989
17-
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934
17+
github.com/pingcap/kvproto v0.0.0-20230201112839-2b853bed8125
1818
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3
1919
github.com/pkg/errors v0.9.1
2020
github.com/prometheus/client_golang v1.11.0
2121
github.com/prometheus/client_model v0.2.0
2222
github.com/stathat/consistent v1.0.0
2323
github.com/stretchr/testify v1.8.1
2424
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a
25-
github.com/tikv/pd v1.1.0-beta.0.20230119114149-402c2bfee2f3
26-
github.com/tikv/pd/client v0.0.0-20230118040950-082fc6a9bc2e
25+
github.com/tikv/pd v1.1.0-beta.0.20230202094356-18df271ce57f
26+
github.com/tikv/pd/client v0.0.0-20230202094356-18df271ce57f
2727
github.com/twmb/murmur3 v1.1.3
2828
go.etcd.io/etcd/api/v3 v3.5.2
2929
go.etcd.io/etcd/client/v3 v3.5.2

‎go.sum

+6-7
Original file line numberDiff line numberDiff line change
@@ -601,9 +601,8 @@ github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00 h1:C3N3itkduZXDZ
601601
github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00/go.mod h1:4qGtCB0QK0wBzKtFEGDhxXnSnbQApw1gc9siScUl8ew=
602602
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
603603
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
604-
github.com/pingcap/kvproto v0.0.0-20230117104311-1bc802baaad6/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
605-
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934 h1:LB+BrfyO5fsz5pwN3V4HvTrpZTAmsjB4VkCEBLbjYUw=
606-
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
604+
github.com/pingcap/kvproto v0.0.0-20230201112839-2b853bed8125 h1:ZiCJcEzmmF5xNgt8GIXekd3WQXI/22kzYQnrHi3Fc/4=
605+
github.com/pingcap/kvproto v0.0.0-20230201112839-2b853bed8125/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
607606
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8IDP+SZrdhV1Kibl9KrHxJ9eciw=
608607
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
609608
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -658,10 +657,10 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
658657
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
659658
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
660659
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
661-
github.com/tikv/pd v1.1.0-beta.0.20230119114149-402c2bfee2f3 h1:cj3bhdIBJcLL2304EDEmd3eX+r73+hbGSYRFn/APiDU=
662-
github.com/tikv/pd v1.1.0-beta.0.20230119114149-402c2bfee2f3/go.mod h1:IFQZ85uu1438yp7Tb0xCgvw/BdSPReB9zcJsxXbyTP4=
663-
github.com/tikv/pd/client v0.0.0-20230118040950-082fc6a9bc2e h1:MD/PZa8Hcv7dg3cFY0tO+g+OPMhTW3O3tXetE80SjbY=
664-
github.com/tikv/pd/client v0.0.0-20230118040950-082fc6a9bc2e/go.mod h1:yRGXx64wsS1dGsjtyeBm6Iy6DItkYkbcQ9+Hj9OED4U=
660+
github.com/tikv/pd v1.1.0-beta.0.20230202094356-18df271ce57f h1:iY/RztOIZ2nTbINUiLGsSv3SUGoEiub1GN0SKVKHJYg=
661+
github.com/tikv/pd v1.1.0-beta.0.20230202094356-18df271ce57f/go.mod h1:jb9oq6rN4U0U3FZdvqWlpi9rZzFJxiOlvZ3aj5BTpg8=
662+
github.com/tikv/pd/client v0.0.0-20230202094356-18df271ce57f h1:xHPPej9Z8IrYdyLED4byOGtGm/7yhxyRUf4m93CpDyg=
663+
github.com/tikv/pd/client v0.0.0-20230202094356-18df271ce57f/go.mod h1:0fdKmj9cafPLsHAeVAcgB50Uj018WGfMC1tgvzWXXQQ=
665664
github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA=
666665
github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
667666
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

‎integration_tests/go.mod

+7-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module integration_tests
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/ninedraft/israce v0.0.3
77
github.com/pingcap/errors v0.11.5-0.20221009092201-b66cddb77c32
88
github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3
9-
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934
9+
github.com/pingcap/kvproto v0.0.0-20230201112839-2b853bed8125
1010
github.com/pingcap/tidb v0.0.0-20230120062950-38a7c6220ea6
1111
github.com/pkg/errors v0.9.1
1212
github.com/stretchr/testify v1.8.1
1313
github.com/tidwall/gjson v1.14.1
1414
github.com/tikv/client-go/v2 v2.0.5-0.20230120021435-f89383775234
15-
github.com/tikv/pd/client v0.0.0-20230119115149-5c518d079b93
15+
github.com/tikv/pd/client v0.0.0-20230202094356-18df271ce57f
1616
go.uber.org/goleak v1.2.0
1717
)
1818

@@ -72,7 +72,7 @@ require (
7272
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a // indirect
7373
github.com/tidwall/match v1.1.1 // indirect
7474
github.com/tidwall/pretty v1.2.0 // indirect
75-
github.com/tikv/pd v1.1.0-beta.0.20230119114149-402c2bfee2f3 // indirect
75+
github.com/tikv/pd v1.1.0-beta.0.20230202094356-18df271ce57f // indirect
7676
github.com/twmb/murmur3 v1.1.3 // indirect
7777
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
7878
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
@@ -89,7 +89,7 @@ require (
8989
golang.org/x/sys v0.4.0 // indirect
9090
golang.org/x/text v0.6.0 // indirect
9191
golang.org/x/time v0.3.0 // indirect
92-
golang.org/x/tools v0.2.0 // indirect
92+
golang.org/x/tools v0.5.0 // indirect
9393
google.golang.org/genproto v0.0.0-20221202195650-67e5cbc046fd // indirect
9494
google.golang.org/grpc v1.51.0 // indirect
9595
google.golang.org/protobuf v1.28.1 // indirect
@@ -98,3 +98,5 @@ require (
9898
)
9999

100100
replace github.com/tikv/client-go/v2 => ../
101+
102+
replace github.com/pingcap/tidb => github.com/HuSharp/tidb v0.0.0-20230201105642-2ff0bda68903

‎integration_tests/go.sum

+11-10
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,8 @@ github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EF
392392
github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w=
393393
github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
394394
github.com/HdrHistogram/hdrhistogram-go v1.1.2 h1:5IcZpTvzydCQeHzK4Ef/D5rrSqwxob0t8PQPMybUNFM=
395+
github.com/HuSharp/tidb v0.0.0-20230201105642-2ff0bda68903 h1:8Mg/diY1+lOVBF8qDsbFwvYrq8mg4PTVhktejI6H5nE=
396+
github.com/HuSharp/tidb v0.0.0-20230201105642-2ff0bda68903/go.mod h1:Wh2kr4+vtRttC2DMM5670CCCoOKiHprSLsopH7Jpbng=
395397
github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
396398
github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM=
397399
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -791,15 +793,13 @@ github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3/go.mod h1:4qGtCB
791793
github.com/pingcap/fn v0.0.0-20200306044125-d5540d389059 h1:Pe2LbxRmbTfAoKJ65bZLmhahmvHm7n9DUxGRQT00208=
792794
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
793795
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
794-
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934 h1:LB+BrfyO5fsz5pwN3V4HvTrpZTAmsjB4VkCEBLbjYUw=
795-
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
796+
github.com/pingcap/kvproto v0.0.0-20230201112839-2b853bed8125 h1:ZiCJcEzmmF5xNgt8GIXekd3WQXI/22kzYQnrHi3Fc/4=
797+
github.com/pingcap/kvproto v0.0.0-20230201112839-2b853bed8125/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
796798
github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
797799
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
798800
github.com/pingcap/log v1.1.1-0.20221116035753-734d527bc87c h1:crhkw6DD+07Bg1wYhW5Piw+kYNKZqFQqfC2puUf6gMI=
799801
github.com/pingcap/log v1.1.1-0.20221116035753-734d527bc87c/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
800802
github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4 h1:HYbcxtnkN3s5tqrZ/z3eJS4j3Db8wMphEm1q10lY/TM=
801-
github.com/pingcap/tidb v0.0.0-20230120062950-38a7c6220ea6 h1:UrysnVknfSA15v/h7nShX1xsZ+RmFkHLNVXTtJbkNoQ=
802-
github.com/pingcap/tidb v0.0.0-20230120062950-38a7c6220ea6/go.mod h1:gmWCo8AR9PRtJAPa+fZ0ub8r9i9ZXtrA/HXayhhDCYM=
803803
github.com/pingcap/tidb/parser v0.0.0-20230109054422-b477b1c94620 h1:cEP+A7ylw8sGGOCHe8F8gto+vlkGQaYt09DHgHd2xmg=
804804
github.com/pingcap/tidb/parser v0.0.0-20230109054422-b477b1c94620/go.mod h1:wjvp+T3/T9XYt0nKqGX3Kc1AKuyUcfno6LTc6b2A6ew=
805805
github.com/pingcap/tipb v0.0.0-20230119054146-c6b7a5a1623b h1:j5sw2YZY7QfgIFZEoUcn1P5cYflms1PCVVS96i+IQiI=
@@ -874,6 +874,7 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
874874
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
875875
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
876876
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
877+
github.com/spkg/bom v1.0.0 h1:S939THe0ukL5WcTGiGqkgtaW5JW+O6ITaIlpJXTYY64=
877878
github.com/stathat/consistent v1.0.0 h1:ZFJ1QTRn8npNBKW065raSZ8xfOqhpb8vLOkfp4CcL/U=
878879
github.com/stathat/consistent v1.0.0/go.mod h1:uajTPbgSygZBJ+V+0mY7meZ8i0XAcZs7AQ6V121XSxw=
879880
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -900,10 +901,10 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
900901
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
901902
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
902903
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
903-
github.com/tikv/pd v1.1.0-beta.0.20230119114149-402c2bfee2f3 h1:cj3bhdIBJcLL2304EDEmd3eX+r73+hbGSYRFn/APiDU=
904-
github.com/tikv/pd v1.1.0-beta.0.20230119114149-402c2bfee2f3/go.mod h1:IFQZ85uu1438yp7Tb0xCgvw/BdSPReB9zcJsxXbyTP4=
905-
github.com/tikv/pd/client v0.0.0-20230119115149-5c518d079b93 h1:KK5bx0KLcpYUCnuQ06THPYT6QdAMfvwAtRQ0saVGD7k=
906-
github.com/tikv/pd/client v0.0.0-20230119115149-5c518d079b93/go.mod h1:NrbwVp9afaCmJjJEwFNtEQWfCChAW1ndnwjteHHS+d0=
904+
github.com/tikv/pd v1.1.0-beta.0.20230202094356-18df271ce57f h1:iY/RztOIZ2nTbINUiLGsSv3SUGoEiub1GN0SKVKHJYg=
905+
github.com/tikv/pd v1.1.0-beta.0.20230202094356-18df271ce57f/go.mod h1:jb9oq6rN4U0U3FZdvqWlpi9rZzFJxiOlvZ3aj5BTpg8=
906+
github.com/tikv/pd/client v0.0.0-20230202094356-18df271ce57f h1:xHPPej9Z8IrYdyLED4byOGtGm/7yhxyRUf4m93CpDyg=
907+
github.com/tikv/pd/client v0.0.0-20230202094356-18df271ce57f/go.mod h1:0fdKmj9cafPLsHAeVAcgB50Uj018WGfMC1tgvzWXXQQ=
907908
github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
908909
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
909910
github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
@@ -1318,8 +1319,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
13181319
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
13191320
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
13201321
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
1321-
golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
1322-
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
1322+
golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
1323+
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
13231324
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13241325
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
13251326
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎integration_tests/split_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ type mockPDClient struct {
142142
stop bool
143143
}
144144

145-
func (c *mockPDClient) LoadGlobalConfig(ctx context.Context, configPath string) ([]pd.GlobalConfigItem, int64, error) {
145+
func (c *mockPDClient) LoadGlobalConfig(ctx context.Context, names []string, configPath string) ([]pd.GlobalConfigItem, int64, error) {
146146
return nil, 0, nil
147147
}
148148

@@ -337,4 +337,3 @@ func (c *mockPDClient) GetExternalTimestamp(ctx context.Context) (uint64, error)
337337
func (c *mockPDClient) SetExternalTimestamp(ctx context.Context, tso uint64) error {
338338
panic("unimplemented")
339339
}
340-

‎internal/mockstore/mocktikv/pd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func NewPDClient(cluster *Cluster) pd.Client {
7979
}
8080
}
8181

82-
func (c *pdClient) LoadGlobalConfig(ctx context.Context, configPath string) ([]pd.GlobalConfigItem, int64, error) {
82+
func (c *pdClient) LoadGlobalConfig(ctx context.Context, names []string, configPath string) ([]pd.GlobalConfigItem, int64, error) {
8383
return nil, 0, nil
8484
}
8585

0 commit comments

Comments
 (0)