From 06e73a56cc1cf7d779bb45ff96b7fe1c9e32dbda Mon Sep 17 00:00:00 2001 From: Zejun Li Date: Wed, 24 Jun 2020 13:04:47 +0800 Subject: [PATCH] *: compatible with Go 1.14's checkptr (#18189) --- executor/aggregate.go | 2 +- executor/shuffle.go | 2 +- go.mod | 7 ++++--- go.sum | 9 +++++++++ statistics/cmsketch.go | 2 +- statistics/cmsketch_test.go | 2 +- statistics/fmsketch.go | 2 +- statistics/histogram.go | 2 +- statistics/sample.go | 2 +- store/tikv/latch/latch.go | 2 +- table/tables/tables.go | 2 +- 11 files changed, 22 insertions(+), 12 deletions(-) diff --git a/executor/aggregate.go b/executor/aggregate.go index 45f067e1d668d..c1ea94d4329ae 100644 --- a/executor/aggregate.go +++ b/executor/aggregate.go @@ -35,7 +35,7 @@ import ( "github.com/pingcap/tidb/util/logutil" "github.com/pingcap/tidb/util/memory" "github.com/pingcap/tidb/util/set" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" "go.uber.org/zap" ) diff --git a/executor/shuffle.go b/executor/shuffle.go index c8f93bafb4bf7..a3429ae403320 100644 --- a/executor/shuffle.go +++ b/executor/shuffle.go @@ -24,7 +24,7 @@ import ( "github.com/pingcap/tidb/util/chunk" "github.com/pingcap/tidb/util/execdetails" "github.com/pingcap/tidb/util/logutil" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" "go.uber.org/zap" ) diff --git a/go.mod b/go.mod index 414cb29606629..93500b43a7034 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/klauspost/cpuid v1.2.1 github.com/ngaut/pools v0.0.0-20180318154953-b7bc8c42aac7 github.com/ngaut/sync2 v0.0.0-20141008032647-7a24ed77b2ef - github.com/ngaut/unistore v0.0.0-20200604061006-d8e9dc0ad154 + github.com/ngaut/unistore v0.0.0-20200623120739-1937e0fefe3c github.com/opentracing/basictracer-go v1.0.0 github.com/opentracing/opentracing-go v1.1.0 github.com/pingcap/badger v1.5.1-0.20200604041313-19c397305fcc @@ -31,7 +31,7 @@ require ( github.com/pingcap/failpoint v0.0.0-20200603062251-b230c36c413c github.com/pingcap/fn v0.0.0-20191016082858-07623b84a47d github.com/pingcap/goleveldb v0.0.0-20191226122134-f82aafb29989 - github.com/pingcap/kvproto v0.0.0-20200518112156-d4aeb467de29 + github.com/pingcap/kvproto v0.0.0-20200608081027-d02a6f65e956 github.com/pingcap/log v0.0.0-20200511115504-543df19646ad github.com/pingcap/parser v0.0.0-20200609110328-c65941b9fbb3 github.com/pingcap/pd/v4 v4.0.0-rc.2.0.20200520083007-2c251bd8f181 @@ -44,10 +44,11 @@ require ( github.com/shirou/gopsutil v2.19.10+incompatible github.com/sirupsen/logrus v1.6.0 github.com/soheilhy/cmux v0.1.4 - github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2 + github.com/twmb/murmur3 v1.1.3 github.com/uber-go/atomic v1.3.2 github.com/uber/jaeger-client-go v2.22.1+incompatible + go.etcd.io/bbolt v1.3.5 // indirect go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 go.uber.org/atomic v1.6.0 go.uber.org/automaxprocs v1.2.0 diff --git a/go.sum b/go.sum index 8c194c32dab73..7e51a13aa267a 100644 --- a/go.sum +++ b/go.sum @@ -383,6 +383,8 @@ github.com/ngaut/unistore v0.0.0-20200604043635-5004cdad650f h1:ws3QybMmoXuS3S8t github.com/ngaut/unistore v0.0.0-20200604043635-5004cdad650f/go.mod h1:5Vec+R2BwOyugVQ8Id8uDmlIYbqodCvykM50IpaAjk4= github.com/ngaut/unistore v0.0.0-20200604061006-d8e9dc0ad154 h1:yuiHbYQTMgvroGV9Uu5dOUDvt4dv944BN6gx0ZAM1oo= github.com/ngaut/unistore v0.0.0-20200604061006-d8e9dc0ad154/go.mod h1:YGQzxn9cVy0q2puXVt1X8l5OohRHv2djR/ziz1k14XQ= +github.com/ngaut/unistore v0.0.0-20200623120739-1937e0fefe3c h1:NugMLpqwFLBrYN1ny4JjCHxSNcHtG3GJkVu5i+T5/G8= +github.com/ngaut/unistore v0.0.0-20200623120739-1937e0fefe3c/go.mod h1:Hxlp5VAoPOHwcXLUw/E+P3XjJX1EP38NWjXPpc4nuOE= github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= @@ -450,6 +452,8 @@ github.com/pingcap/kvproto v0.0.0-20200428135407-0f5ffe459677 h1:90pbLYmkk7bXLgy github.com/pingcap/kvproto v0.0.0-20200428135407-0f5ffe459677/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/kvproto v0.0.0-20200518112156-d4aeb467de29 h1:NpW1OuYrIl+IQrSsVbtyHpHpazmSCHy+ysrOixY0xY4= github.com/pingcap/kvproto v0.0.0-20200518112156-d4aeb467de29/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= +github.com/pingcap/kvproto v0.0.0-20200608081027-d02a6f65e956 h1:G4ekqFoMUusFnlPglbhifaZKcuJjDgkpdgaDywLL11E= +github.com/pingcap/kvproto v0.0.0-20200608081027-d02a6f65e956/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20200117041106-d28c14d3b1cd/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20200511115504-543df19646ad h1:SveG82rmu/GFxYanffxsSF503SiQV+2JLnWEiGiF+Tc= @@ -594,6 +598,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/twmb/murmur3 v1.1.3 h1:D83U0XYKcHRYwYIpBKf3Pks91Z0Byda/9SJ8B6EMRcA= +github.com/twmb/murmur3 v1.1.3/go.mod h1:Qq/R7NUyOfr65zD+6Q5IHKsJLwP7exErjN6lyyq3OSQ= github.com/uber-go/atomic v1.3.2 h1:Azu9lPBWRNKzYXSIwRfgRuDuS0YKsK4NFhiQv98gkxo= github.com/uber-go/atomic v1.3.2/go.mod h1:/Ct5t2lcmbJ4OSe/waGBoaVvVqtO0bmtfVNex1PFV8g= github.com/uber/jaeger-client-go v2.15.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= @@ -625,6 +631,8 @@ github.com/zhangjinpeng1987/raft v0.0.0-20190624145930-deeb32d6553d/go.mod h1:1K go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738 h1:lWF4f9Nypl1ZqSb4gLeh/DGvBYVaUYHuiB93teOmwgc= go.etcd.io/etcd v0.5.0-alpha.5.0.20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= @@ -770,6 +778,7 @@ golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/statistics/cmsketch.go b/statistics/cmsketch.go index b731d38f93b55..abbefb5976309 100644 --- a/statistics/cmsketch.go +++ b/statistics/cmsketch.go @@ -28,7 +28,7 @@ import ( "github.com/pingcap/tidb/util/chunk" "github.com/pingcap/tidb/util/hack" "github.com/pingcap/tipb/go-tipb" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" ) // topNThreshold is the minimum ratio of the number of topn elements in CMSketch, 10 means 1 / 10 = 10%. diff --git a/statistics/cmsketch_test.go b/statistics/cmsketch_test.go index b90f91873dd16..21f95c2c4c157 100644 --- a/statistics/cmsketch_test.go +++ b/statistics/cmsketch_test.go @@ -26,7 +26,7 @@ import ( "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/chunk" "github.com/pingcap/tidb/util/codec" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" ) func (c *CMSketch) insert(val *types.Datum) error { diff --git a/statistics/fmsketch.go b/statistics/fmsketch.go index a8f9b83fb0b38..235f942bf8415 100644 --- a/statistics/fmsketch.go +++ b/statistics/fmsketch.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/tidb/types" "github.com/pingcap/tidb/util/codec" "github.com/pingcap/tipb/go-tipb" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" ) // FMSketch is used to count the number of distinct elements in a set. diff --git a/statistics/histogram.go b/statistics/histogram.go index 5c08383d80a62..2794d38603f3b 100644 --- a/statistics/histogram.go +++ b/statistics/histogram.go @@ -34,7 +34,7 @@ import ( "github.com/pingcap/tidb/util/logutil" "github.com/pingcap/tidb/util/ranger" "github.com/pingcap/tipb/go-tipb" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" "go.uber.org/zap" ) diff --git a/statistics/sample.go b/statistics/sample.go index 5e94227606fd4..6ed58a3817c47 100644 --- a/statistics/sample.go +++ b/statistics/sample.go @@ -29,7 +29,7 @@ import ( "github.com/pingcap/tidb/util/fastrand" "github.com/pingcap/tidb/util/sqlexec" "github.com/pingcap/tipb/go-tipb" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" ) // SampleItem is an item of sampled column value. diff --git a/store/tikv/latch/latch.go b/store/tikv/latch/latch.go index 23f2b01c02da2..8f6456fcace62 100644 --- a/store/tikv/latch/latch.go +++ b/store/tikv/latch/latch.go @@ -22,7 +22,7 @@ import ( "github.com/cznic/mathutil" "github.com/pingcap/tidb/util/logutil" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" "go.uber.org/zap" ) diff --git a/table/tables/tables.go b/table/tables/tables.go index ae8685e0f621b..12ff486ac2aff 100644 --- a/table/tables/tables.go +++ b/table/tables/tables.go @@ -43,7 +43,7 @@ import ( "github.com/pingcap/tidb/util/logutil" "github.com/pingcap/tidb/util/stringutil" "github.com/pingcap/tipb/go-binlog" - "github.com/spaolacci/murmur3" + "github.com/twmb/murmur3" "go.uber.org/zap" )