From 2ce464bf451a1cea469000c4bb4fdb708fb58712 Mon Sep 17 00:00:00 2001 From: Lei Zhao Date: Tue, 6 Jul 2021 14:39:28 +0800 Subject: [PATCH] *: upgrade client-go to fix pessimistic write-conflict (#25984) --- go.mod | 3 +-- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 8c2bce8265..2502c28eea 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/shirou/gopsutil v3.21.2+incompatible github.com/soheilhy/cmux v0.1.4 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 - github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210701075128-88f909bcdd3f + github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210706041121-6ca00989ddb4 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 @@ -76,7 +76,6 @@ require ( golang.org/x/tools v0.1.4 google.golang.org/grpc v1.27.1 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - honnef.co/go/tools v0.2.0 // indirect modernc.org/mathutil v1.2.2 // indirect sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0 sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 diff --git a/go.sum b/go.sum index 8cc16ae095..bb44c6cd99 100644 --- a/go.sum +++ b/go.sum @@ -558,8 +558,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.20210701075128-88f909bcdd3f h1:T3zFmJfdvmF+sVUvLsZKJZmCzfkbo0O0DjlbQdmd74A= -github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210701075128-88f909bcdd3f/go.mod h1:crzTwbliZf57xC5ZSzmQx4iMZCLCGhA364to+E2JAPU= +github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210706041121-6ca00989ddb4 h1:kokFPtkpQ2ZH910iuxfmKMk8M9zzCLskN8h1LELWN20= +github.com/tikv/client-go/v2 v2.0.0-alpha.0.20210706041121-6ca00989ddb4/go.mod h1:crzTwbliZf57xC5ZSzmQx4iMZCLCGhA364to+E2JAPU= 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=