From 8e727e4341961dd415bf487bbd1899dd30c2c9b9 Mon Sep 17 00:00:00 2001 From: ekexium Date: Mon, 5 Dec 2022 15:37:40 +0800 Subject: [PATCH 1/2] replace client-go Signed-off-by: ekexium --- DEPS.bzl | 5 +++-- go.mod | 1 + go.sum | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 851f55e3ec5d6..5184f87825bb1 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -3519,8 +3519,9 @@ def go_deps(): name = "com_github_tikv_client_go_v2", build_file_proto_mode = "disable_global", importpath = "github.com/tikv/client-go/v2", - sum = "h1:vlgZedcfExiTzB3BB4nt5CpaghDfm9La/0Ofn7weIUA=", - version = "v2.0.3-0.20221129032117-857772dd0907", + replace = "github.com/ekexium/client-go/v2", + sum = "h1:Oi9DRdkSkrgiV0ANhf//SKaYb6nwWlyNqKRwsYoZQEA=", + version = "v2.0.0-alpha.0.20221205073341-cc1fb7fe08d5", ) go_repository( name = "com_github_tikv_pd_client", diff --git a/go.mod b/go.mod index 1ea8d11ca96d0..55c5573a58383 100644 --- a/go.mod +++ b/go.mod @@ -254,5 +254,6 @@ replace ( // fix potential security issue(CVE-2020-26160) introduced by indirect dependency. github.com/dgrijalva/jwt-go => github.com/form3tech-oss/jwt-go v3.2.6-0.20210809144907-32ab6a8243d7+incompatible github.com/pingcap/tidb/parser => ./parser + github.com/tikv/client-go/v2 => github.com/ekexium/client-go/v2 v2.0.0-alpha.0.20221205073341-cc1fb7fe08d5 go.opencensus.io => go.opencensus.io v0.23.1-0.20220331163232-052120675fac ) diff --git a/go.sum b/go.sum index c29ca5c0b3929..f01ca10504b2d 100644 --- a/go.sum +++ b/go.sum @@ -251,6 +251,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/ekexium/client-go/v2 v2.0.0-alpha.0.20221205073341-cc1fb7fe08d5 h1:Oi9DRdkSkrgiV0ANhf//SKaYb6nwWlyNqKRwsYoZQEA= +github.com/ekexium/client-go/v2 v2.0.0-alpha.0.20221205073341-cc1fb7fe08d5/go.mod h1:MDT4J9LzgS7Bj1DnEq6Gk/puy6mp8TgUC92zGEVVLLg= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/elastic/gosigar v0.9.0/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= @@ -930,8 +932,6 @@ github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpR github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJfDRtkanvQPiooDH8HvJ2FBh+iKT/OmiQQ= github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU= -github.com/tikv/client-go/v2 v2.0.3-0.20221129032117-857772dd0907 h1:vlgZedcfExiTzB3BB4nt5CpaghDfm9La/0Ofn7weIUA= -github.com/tikv/client-go/v2 v2.0.3-0.20221129032117-857772dd0907/go.mod h1:MDT4J9LzgS7Bj1DnEq6Gk/puy6mp8TgUC92zGEVVLLg= github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 h1:ckPpxKcl75mO2N6a4cJXiZH43hvcHPpqc9dh1TmH1nc= github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07/go.mod h1:CipBxPfxPUME+BImx9MUYXCnAVLS3VJUr3mnSJwh40A= github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 h1:kl4KhGNsJIbDHS9/4U9yQo1UcPQM0kOMJHn29EoH/Ro= From 446b7790b0dfb83a043e1fc2e401c19a8c4113a9 Mon Sep 17 00:00:00 2001 From: ekexium Date: Mon, 5 Dec 2022 16:45:09 +0800 Subject: [PATCH 2/2] update client-go Signed-off-by: ekexium --- DEPS.bzl | 5 ++--- go.mod | 3 +-- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/DEPS.bzl b/DEPS.bzl index 5184f87825bb1..b3912045be800 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -3519,9 +3519,8 @@ def go_deps(): name = "com_github_tikv_client_go_v2", build_file_proto_mode = "disable_global", importpath = "github.com/tikv/client-go/v2", - replace = "github.com/ekexium/client-go/v2", - sum = "h1:Oi9DRdkSkrgiV0ANhf//SKaYb6nwWlyNqKRwsYoZQEA=", - version = "v2.0.0-alpha.0.20221205073341-cc1fb7fe08d5", + sum = "h1:Nr2EhvqkOE9xFyU7LV9c9EbsgN3OzVALdbfobK7Fmn4=", + version = "v2.0.3-0.20221205084317-ad59ca833a78", ) go_repository( name = "com_github_tikv_pd_client", diff --git a/go.mod b/go.mod index 55c5573a58383..5a0c9cf62b95f 100644 --- a/go.mod +++ b/go.mod @@ -86,7 +86,7 @@ require ( github.com/stretchr/testify v1.8.0 github.com/tdakkota/asciicheck v0.1.1 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 - github.com/tikv/client-go/v2 v2.0.3-0.20221129032117-857772dd0907 + github.com/tikv/client-go/v2 v2.0.3-0.20221205084317-ad59ca833a78 github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 github.com/twmb/murmur3 v1.1.3 @@ -254,6 +254,5 @@ replace ( // fix potential security issue(CVE-2020-26160) introduced by indirect dependency. github.com/dgrijalva/jwt-go => github.com/form3tech-oss/jwt-go v3.2.6-0.20210809144907-32ab6a8243d7+incompatible github.com/pingcap/tidb/parser => ./parser - github.com/tikv/client-go/v2 => github.com/ekexium/client-go/v2 v2.0.0-alpha.0.20221205073341-cc1fb7fe08d5 go.opencensus.io => go.opencensus.io v0.23.1-0.20220331163232-052120675fac ) diff --git a/go.sum b/go.sum index f01ca10504b2d..56da880be470f 100644 --- a/go.sum +++ b/go.sum @@ -251,8 +251,6 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/ekexium/client-go/v2 v2.0.0-alpha.0.20221205073341-cc1fb7fe08d5 h1:Oi9DRdkSkrgiV0ANhf//SKaYb6nwWlyNqKRwsYoZQEA= -github.com/ekexium/client-go/v2 v2.0.0-alpha.0.20221205073341-cc1fb7fe08d5/go.mod h1:MDT4J9LzgS7Bj1DnEq6Gk/puy6mp8TgUC92zGEVVLLg= github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= github.com/elastic/gosigar v0.9.0/go.mod h1:cdorVVzy1fhmEqmtgqkoE3bYtCfSCkVyjTyCIo22xvs= github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= @@ -932,6 +930,8 @@ github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpR github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 h1:mbAskLJ0oJfDRtkanvQPiooDH8HvJ2FBh+iKT/OmiQQ= github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2/go.mod h1:2PfKggNGDuadAa0LElHrByyrz4JPZ9fFx6Gs7nx7ZZU= +github.com/tikv/client-go/v2 v2.0.3-0.20221205084317-ad59ca833a78 h1:Nr2EhvqkOE9xFyU7LV9c9EbsgN3OzVALdbfobK7Fmn4= +github.com/tikv/client-go/v2 v2.0.3-0.20221205084317-ad59ca833a78/go.mod h1:MDT4J9LzgS7Bj1DnEq6Gk/puy6mp8TgUC92zGEVVLLg= github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 h1:ckPpxKcl75mO2N6a4cJXiZH43hvcHPpqc9dh1TmH1nc= github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07/go.mod h1:CipBxPfxPUME+BImx9MUYXCnAVLS3VJUr3mnSJwh40A= github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 h1:kl4KhGNsJIbDHS9/4U9yQo1UcPQM0kOMJHn29EoH/Ro=