Skip to content

Commit f4c3cc6

Browse files
zhangjinpeng87zhangjinpeng87
authored
Merge pull request #674 from HuSharp/support_resource_group_watch
client: update pd client
2 parents 7409e69 + 158f72c commit f4c3cc6

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

‎go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ 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-20230118055818-adcf4c414bfd
17+
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934
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/client v0.0.0-20230118040950-082fc6a9bc2e
25+
github.com/tikv/pd/client v0.0.0-20230119094950-c5bf5be4a928
2626
github.com/twmb/murmur3 v1.1.3
2727
go.etcd.io/etcd/api/v3 v3.5.2
2828
go.etcd.io/etcd/client/v3 v3.5.2

‎go.sum

+4-5
Original file line numberDiff line numberDiff line change
@@ -602,9 +602,8 @@ github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00 h1:C3N3itkduZXDZ
602602
github.com/pingcap/failpoint v0.0.0-20210918120811-547c13e3eb00/go.mod h1:4qGtCB0QK0wBzKtFEGDhxXnSnbQApw1gc9siScUl8ew=
603603
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
604604
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
605-
github.com/pingcap/kvproto v0.0.0-20230117104311-1bc802baaad6/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
606-
github.com/pingcap/kvproto v0.0.0-20230118055818-adcf4c414bfd h1:msal6GpqTW95y9oz55do/SsLYivVRMfBoqieB+hzmR0=
607-
github.com/pingcap/kvproto v0.0.0-20230118055818-adcf4c414bfd/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=
608607
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3 h1:HR/ylkkLmGdSSDaD8IDP+SZrdhV1Kibl9KrHxJ9eciw=
609608
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
610609
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -659,8 +658,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
659658
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
660659
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a h1:J/YdBZ46WKpXsxsW93SG+q0F8KI+yFrcIDT4c/RNoc4=
661660
github.com/tiancaiamao/gp v0.0.0-20221230034425-4025bc8a4d4a/go.mod h1:h4xBhSNtOeEosLJ4P7JyKXX7Cabg7AVkWCK5gV2vOrM=
662-
github.com/tikv/pd/client v0.0.0-20230118040950-082fc6a9bc2e h1:MD/PZa8Hcv7dg3cFY0tO+g+OPMhTW3O3tXetE80SjbY=
663-
github.com/tikv/pd/client v0.0.0-20230118040950-082fc6a9bc2e/go.mod h1:yRGXx64wsS1dGsjtyeBm6Iy6DItkYkbcQ9+Hj9OED4U=
661+
github.com/tikv/pd/client v0.0.0-20230119094950-c5bf5be4a928 h1:EByqW1yLW+xmBxD5j4rXNg1MGC/cycUj6m4KnySFte8=
662+
github.com/tikv/pd/client v0.0.0-20230119094950-c5bf5be4a928/go.mod h1:NrbwVp9afaCmJjJEwFNtEQWfCChAW1ndnwjteHHS+d0=
664663
github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA=
665664
github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ=
666665
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

‎integration_tests/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ 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-20230118055818-adcf4c414bfd
9+
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934
1010
github.com/pingcap/tidb v1.1.0-beta.0.20230109054422-b477b1c94620
1111
github.com/pkg/errors v0.9.1
1212
github.com/stretchr/testify v1.8.1
1313
github.com/tidwall/gjson v1.14.1
14-
github.com/tikv/client-go/v2 v2.0.5-0.20230112062023-fe5b35c5f5dc
15-
github.com/tikv/pd/client v0.0.0-20230118040950-082fc6a9bc2e
14+
github.com/tikv/client-go/v2 v2.0.5-0.20230119021317-7409e690af6b
15+
github.com/tikv/pd/client v0.0.0-20230119094950-c5bf5be4a928
1616
go.uber.org/goleak v1.2.0
1717
)
1818

@@ -98,4 +98,4 @@ require (
9898

9999
replace github.com/tikv/client-go/v2 => ../
100100

101-
replace github.com/pingcap/tidb => github.com/HuSharp/tidb v0.0.0-20230118064626-888c2ba2e80f
101+
replace github.com/pingcap/tidb => github.com/HuSharp/tidb v1.1.0-beta.0.20230119075755-59624ef0dc70

‎integration_tests/go.sum

+6-7
Original file line numberDiff line numberDiff line change
@@ -392,8 +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-20230118064626-888c2ba2e80f h1:ZwQLuS0NFcQAw7WIXbkxTDaxcwBwugIvTo3aJIo9oO4=
396-
github.com/HuSharp/tidb v0.0.0-20230118064626-888c2ba2e80f/go.mod h1:vMAzwt85Trpt9WV4nP2PjiI6LTDYjgTmHBM0Bn07ddQ=
395+
github.com/HuSharp/tidb v1.1.0-beta.0.20230119075755-59624ef0dc70 h1:5u1xxgSlTUYyyn7439oKW6CNkp9KQIJ6V5r01KtVW+s=
396+
github.com/HuSharp/tidb v1.1.0-beta.0.20230119075755-59624ef0dc70/go.mod h1:tc5KA/4tBaDGzP2ohSI0Ksp0M4PrOoGeJ1NfMb9yq4c=
397397
github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
398398
github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM=
399399
github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
@@ -793,9 +793,8 @@ github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3/go.mod h1:4qGtCB
793793
github.com/pingcap/fn v0.0.0-20200306044125-d5540d389059 h1:Pe2LbxRmbTfAoKJ65bZLmhahmvHm7n9DUxGRQT00208=
794794
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 h1:surzm05a8C9dN8dIUmo4Be2+pMRb6f55i+UIYrluu2E=
795795
github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17XtbryoCJhkKGbT62+L2OlrniwqiGLSqrmdHCMzZw=
796-
github.com/pingcap/kvproto v0.0.0-20230117104311-1bc802baaad6/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
797-
github.com/pingcap/kvproto v0.0.0-20230118055818-adcf4c414bfd h1:msal6GpqTW95y9oz55do/SsLYivVRMfBoqieB+hzmR0=
798-
github.com/pingcap/kvproto v0.0.0-20230118055818-adcf4c414bfd/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
796+
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934 h1:LB+BrfyO5fsz5pwN3V4HvTrpZTAmsjB4VkCEBLbjYUw=
797+
github.com/pingcap/kvproto v0.0.0-20230119031034-25f1909b7934/go.mod h1:+on3Lfk/fb1lXkud3XvskJumhSIEEgN2TTbMObUlrxE=
799798
github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
800799
github.com/pingcap/log v1.1.1-0.20221110025148-ca232912c9f3/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4=
801800
github.com/pingcap/log v1.1.1-0.20221116035753-734d527bc87c h1:crhkw6DD+07Bg1wYhW5Piw+kYNKZqFQqfC2puUf6gMI=
@@ -901,8 +900,8 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
901900
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
902901
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
903902
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
904-
github.com/tikv/pd/client v0.0.0-20230118040950-082fc6a9bc2e h1:MD/PZa8Hcv7dg3cFY0tO+g+OPMhTW3O3tXetE80SjbY=
905-
github.com/tikv/pd/client v0.0.0-20230118040950-082fc6a9bc2e/go.mod h1:yRGXx64wsS1dGsjtyeBm6Iy6DItkYkbcQ9+Hj9OED4U=
903+
github.com/tikv/pd/client v0.0.0-20230119094950-c5bf5be4a928 h1:EByqW1yLW+xmBxD5j4rXNg1MGC/cycUj6m4KnySFte8=
904+
github.com/tikv/pd/client v0.0.0-20230119094950-c5bf5be4a928/go.mod h1:NrbwVp9afaCmJjJEwFNtEQWfCChAW1ndnwjteHHS+d0=
906905
github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
907906
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
908907
github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=

‎integration_tests/split_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,10 @@ func (c *mockPDClient) DeleteResourceGroup(ctx context.Context, resourceGroupNam
322322
return "", nil
323323
}
324324

325+
func (c *mockPDClient) WatchResourceGroup(ctx context.Context, revision int64) (chan []*rmpb.ResourceGroup, error) {
326+
return nil, nil
327+
}
328+
325329
func (c *mockPDClient) AcquireTokenBuckets(ctx context.Context, request *rmpb.TokenBucketsRequest) ([]*rmpb.TokenBucketResponse, error) {
326330
return nil, nil
327331
}

‎internal/mockstore/mocktikv/pd.go

+4
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,10 @@ func (c *pdClient) DeleteResourceGroup(ctx context.Context, resourceGroupName st
318318
return "", nil
319319
}
320320

321+
func (c *pdClient) WatchResourceGroup(ctx context.Context, revision int64) (chan []*rmpb.ResourceGroup, error) {
322+
return nil, nil
323+
}
324+
321325
func (c *pdClient) AcquireTokenBuckets(ctx context.Context, request *rmpb.TokenBucketsRequest) ([]*rmpb.TokenBucketResponse, error) {
322326
return nil, nil
323327
}

0 commit comments

Comments
 (0)