From 7e6690df8e8d5474b1872edbd279bb1b3c510ee5 Mon Sep 17 00:00:00 2001 From: Yilin Chen Date: Thu, 29 Jul 2021 11:06:17 +0800 Subject: [PATCH] *: update client-go to solve #26359 (#26650) --- go.mod | 2 +- go.sum | 5 ++--- store/copr/coprocessor.go | 5 +++-- telemetry/telemetry_test.go | 4 ---- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 2736597c2145f..a78d8e12b9dd4 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/soheilhy/cmux v0.1.4 github.com/stretchr/testify v1.7.0 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 - github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210723073051-3d747cd203ba + github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210727085630-7329876df391 github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d github.com/twmb/murmur3 v1.1.3 github.com/uber-go/atomic v1.4.0 diff --git a/go.sum b/go.sum index e39deeae4c432..a811bc9bad27b 100644 --- a/go.sum +++ b/go.sum @@ -435,7 +435,6 @@ github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989/go.mod h1:O17Xtb github.com/pingcap/kvproto v0.0.0-20191211054548-3c6b38ea5107/go.mod h1:WWLmULLO7l8IOcQG+t+ItJ3fEcrL5FxF0Wu+HrMy26w= github.com/pingcap/kvproto v0.0.0-20200411081810-b85805c9476c/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/kvproto v0.0.0-20210219064844-c1844a4775d6/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= -github.com/pingcap/kvproto v0.0.0-20210712050333-b66fdbd6bfd5/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/kvproto v0.0.0-20210722091755-91a52cd9e8db h1:PSW6P83KZi5WopPBiecU286PWMSl2rvxCBZT94iBX+I= github.com/pingcap/kvproto v0.0.0-20210722091755-91a52cd9e8db/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= @@ -560,8 +559,8 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfK github.com/tidwall/gjson v1.3.5/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= -github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210723073051-3d747cd203ba h1:D0jF5O3J1g8Uu2EjKgLcS+8PeXAa+U7SN6Tu7K3jSxk= -github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210723073051-3d747cd203ba/go.mod h1:+bOiuuZZUqIq19EqyhTWQFaB0PeXLOh/il1vnVZx3Tk= +github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210727085630-7329876df391 h1:zBWBs1JYxhhvuE9ttwUHWkdcC+c4lb6U/N1iXm3EfEw= +github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210727085630-7329876df391/go.mod h1:LP8O6zZXAWKU781u1nt/v9nC0hxPipPxOxSoZT9Goqg= github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d h1:K0XnvsnT6ofLDuM8Rt3PuFQO4p8bNraeHYstspD316g= github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d/go.mod h1:Jw9KG11C/23Rr7DW4XWQ7H5xOgGZo6DFL1OKAF4+Igw= github.com/tklauser/go-sysconf v0.3.4 h1:HT8SVixZd3IzLdfs/xlpq0jeSfTX57g1v6wB1EuzV7M= diff --git a/store/copr/coprocessor.go b/store/copr/coprocessor.go index 0ed0756740420..d731176f8ef9f 100644 --- a/store/copr/coprocessor.go +++ b/store/copr/coprocessor.go @@ -46,6 +46,7 @@ import ( "github.com/tikv/client-go/v2/tikv" "github.com/tikv/client-go/v2/tikvrpc" "github.com/tikv/client-go/v2/txnkv/txnlock" + "github.com/tikv/client-go/v2/txnkv/txnsnapshot" "github.com/tikv/client-go/v2/util" "go.uber.org/zap" ) @@ -276,7 +277,7 @@ type copIteratorWorker struct { respChan chan<- *copResponse finishCh <-chan struct{} vars *tikv.Variables - kvclient *tikv.ClientHelper + kvclient *txnsnapshot.ClientHelper memTracker *memory.Tracker @@ -405,7 +406,7 @@ func (it *copIterator) open(ctx context.Context, enabledRateLimitAction bool) { respChan: it.respChan, finishCh: it.finishCh, vars: it.vars, - kvclient: tikv.NewClientHelper(it.store.store, &it.resolvedLocks, false), + kvclient: txnsnapshot.NewClientHelper(it.store.store, &it.resolvedLocks, false), memTracker: it.memTracker, replicaReadSeed: it.replicaReadSeed, actionOnExceed: it.actionOnExceed, diff --git a/telemetry/telemetry_test.go b/telemetry/telemetry_test.go index 8c69795e9be55..7e70ae41c7505 100644 --- a/telemetry/telemetry_test.go +++ b/telemetry/telemetry_test.go @@ -57,8 +57,6 @@ func TestPreview(t *testing.T) { t.Skip("integration.NewClusterV3 will create file contains a colon which is not allowed on Windows") } - t.Parallel() - s := newSuite(t) defer s.close() @@ -104,8 +102,6 @@ func TestReport(t *testing.T) { t.Skip("integration.NewClusterV3 will create file contains a colon which is not allowed on Windows") } - t.Parallel() - s := newSuite(t) defer s.close()