Skip to content

Commit 90272be

Browse files
authored
*: update client-go to latest tidb-5.4 (cherry-pick) (#40642)
1 parent 93e5e96 commit 90272be

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

executor/main_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"os"
2020
"testing"
2121

22+
"github.com/pingcap/failpoint"
2223
"github.com/pingcap/tidb/config"
2324
"github.com/pingcap/tidb/meta/autoid"
2425
"github.com/pingcap/tidb/testkit"
@@ -49,6 +50,8 @@ func TestMain(m *testing.M) {
4950
conf.Experimental.AllowsExpressionIndex = true
5051
})
5152
tikv.EnableFailpoints()
53+
failpoint.Enable("tikvclient/injectLiveness", `return("reachable")`)
54+
defer failpoint.Disable("tikvclient/injectLiveness")
5255
tmpDir := config.GetGlobalConfig().TempStoragePath
5356
_ = os.RemoveAll(tmpDir) // clean the uncleared temp file during the last run.
5457
_ = os.MkdirAll(tmpDir, 0755)

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ require (
7070
github.com/spf13/pflag v1.0.5
7171
github.com/stretchr/testify v1.7.0
7272
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
73-
github.com/tikv/client-go/v2 v2.0.0-rc.0.20220425054530-a62124d9fa75
73+
github.com/tikv/client-go/v2 v2.0.0-rc.0.20230116094918-b670f6c3eb65
7474
github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee
7575
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
7676
github.com/twmb/murmur3 v1.1.3

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,8 @@ github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfK
789789
github.com/tidwall/gjson v1.3.5/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
790790
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
791791
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
792-
github.com/tikv/client-go/v2 v2.0.0-rc.0.20220425054530-a62124d9fa75 h1:f8/xvvOtyHx9XkO8CqMHPWU95IwzJVg2MdfytBe6QNI=
793-
github.com/tikv/client-go/v2 v2.0.0-rc.0.20220425054530-a62124d9fa75/go.mod h1:wRuh+W35daKTiYBld0oBlT6PSkzEVr+pB/vChzJZk+8=
792+
github.com/tikv/client-go/v2 v2.0.0-rc.0.20230116094918-b670f6c3eb65 h1:MgvbVQAUGBRw+e7OsQpzZUZv5MtnykpHxVtBRRxx9Bs=
793+
github.com/tikv/client-go/v2 v2.0.0-rc.0.20230116094918-b670f6c3eb65/go.mod h1:wRuh+W35daKTiYBld0oBlT6PSkzEVr+pB/vChzJZk+8=
794794
github.com/tikv/pd v1.1.0-beta.0.20211029083450-e65f0c55b6ae/go.mod h1:varH0IE0jJ9E9WN2Ei/N6pajMlPkcXdDEf7f5mmsUVQ=
795795
github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee h1:rAAdvQ8Hh36syHr92g0VmZEpkH+40RGQBpFL2121xMs=
796796
github.com/tikv/pd v1.1.0-beta.0.20211118054146-02848d2660ee/go.mod h1:lRbwxBAhnTQR5vqbTzeI/Bj62bD2OvYYuFezo2vrmeI=

0 commit comments

Comments
 (0)