Skip to content

Commit

Permalink
bump client-go and cse-region-client to release-7.5 (pingcap#782)
Browse files Browse the repository at this point in the history 
Co-authored-by: Ti Chi Robot <[email protected]>
Co-authored-by: cfzjywxk <[email protected]>
Co-authored-by: ShuNing <[email protected]>
fix pingcap#35418 (pingcap#47951) (pingcap#48101)
close pingcap#35418
close tikv/pd#7509
  • Loading branch information
@iosmanthus
iosmanthus authored Dec 25, 2023
1 parent 54b21d2 commit 767529e
Show file tree
Hide file tree
Showing 14 changed files with 604 additions and 561 deletions.
752 changes: 422 additions & 330 deletions DEPS.bzl
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion domain/infosync/resource_group_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@ func (m *mockResourceGroupManager) LoadResourceGroups(ctx context.Context) ([]*r
}

func (m *mockResourceGroupManager) Watch(ctx context.Context, key []byte, opts ...pd.OpOption) (chan []*meta_storagepb.Event, error) {
return m.eventCh, nil
return nil, nil
}
1 change: 1 addition & 0 deletions executor/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ go_test(
"@com_github_pingcap_fn//:fn",
"@com_github_pingcap_kvproto//pkg/diagnosticspb",
"@com_github_pingcap_kvproto//pkg/kvrpcpb",
"@com_github_pingcap_kvproto//pkg/meta_storagepb",
"@com_github_pingcap_kvproto//pkg/metapb",
"@com_github_pingcap_log//:log",
"@com_github_pingcap_sysutil//:sysutil",
Expand Down
21 changes: 14 additions & 7 deletions executor/calibrate_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
package executor_test

import (
"bytes"
"context"
"encoding/json"
"testing"

"github.com/pingcap/errors"
"github.com/pingcap/failpoint"
"github.com/pingcap/kvproto/pkg/meta_storagepb"
"github.com/pingcap/tidb/executor"
"github.com/pingcap/tidb/parser/mysql"
"github.com/pingcap/tidb/testkit"
Expand Down Expand Up @@ -574,13 +576,18 @@ type mockResourceGroupProvider struct {
cfg rmclient.Config
}

func (p *mockResourceGroupProvider) LoadGlobalConfig(ctx context.Context, names []string, configPath string) ([]pd.GlobalConfigItem, int64, error) {
if configPath != "resource_group/controller" {
return nil, 0, errors.New("unsupported configPath")
func (p *mockResourceGroupProvider) Get(ctx context.Context, key []byte, opts ...pd.OpOption) (*meta_storagepb.GetResponse, error) {
if !bytes.Equal(pd.ControllerConfigPathPrefixBytes, key) {
return nil, errors.New("unsupported configPath")
}
payload, _ := json.Marshal(&p.cfg)
item := pd.GlobalConfigItem{
PayLoad: payload,
}
return []pd.GlobalConfigItem{item}, 0, nil
return &meta_storagepb.GetResponse{
Count: 1,
Kvs: []*meta_storagepb.KeyValue{
{
Key: key,
Value: payload,
},
},
}, nil
}
4 changes: 2 additions & 2 deletions executor/chunk_size_control_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ func manipulateCluster(cluster testutils.Cluster, splitKeys [][]byte) []uint64 {
if len(splitKeys) == 0 {
return nil
}
region, _, _ := cluster.GetRegionByKey(splitKeys[0])
region, _, _, _ := cluster.GetRegionByKey(splitKeys[0])
for _, key := range splitKeys {
if r, _, _ := cluster.GetRegionByKey(key); r.Id != region.Id {
if r, _, _, _ := cluster.GetRegionByKey(key); r.Id != region.Id {
panic("all split keys should belong to the same region")
}
}
Expand Down
2 changes: 1 addition & 1 deletion executor/distsql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func TestCopClientSend(t *testing.T) {

// Split one region.
key := tablecodec.EncodeRowKeyWithHandle(tblID, kv.IntHandle(500))
region, _, _ := cluster.GetRegionByKey(key)
region, _, _, _ := cluster.GetRegionByKey(key)
peerID := cluster.AllocID()
cluster.Split(region.GetId(), cluster.AllocID(), key, []uint64{peerID}, peerID)

Expand Down
85 changes: 42 additions & 43 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/pingcap/tidb
go 1.21

require (
cloud.google.com/go/storage v1.28.1
cloud.google.com/go/storage v1.30.1
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.20.0
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.12.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.2.0
Expand All @@ -26,7 +26,7 @@ require (
github.com/cockroachdb/errors v1.8.1
github.com/cockroachdb/pebble v0.0.0-20210719141320-8c3bd06debb5
github.com/coocood/freecache v1.2.1
github.com/coreos/go-semver v0.3.0
github.com/coreos/go-semver v0.3.1
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548
github.com/daixiang0/gci v0.10.1
github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37
Expand All @@ -50,13 +50,13 @@ require (
github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21
github.com/google/btree v1.1.2
github.com/google/pprof v0.0.0-20211122183932-1daafda22083
github.com/google/uuid v1.3.0
github.com/google/uuid v1.3.1
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28
github.com/gorilla/mux v1.8.0
github.com/gostaticanalysis/forcetypeassert v0.1.0
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
github.com/iancoleman/strcase v0.2.0
github.com/iosmanthus/cse-region-client v0.0.0-20230629092740-1123684ac01f
github.com/iosmanthus/cse-region-client v0.0.0-20231222080054-384736f92a0a
github.com/jedib0t/go-pretty/v6 v6.2.2
github.com/jingyugao/rowserrcheck v1.1.1
github.com/joho/sqltocsv v0.0.0-20210428211105-a6d6801d59df
Expand Down Expand Up @@ -96,37 +96,37 @@ require (
github.com/tdakkota/asciicheck v0.2.0
github.com/tiancaiamao/appdash v0.0.0-20181126055449-889f96f722a2
github.com/tidbcloud/aws-shared-provider/pkg/tidbworker/client v0.0.0-20231218022440-1206057a6823
github.com/tikv/client-go/v2 v2.0.8-0.20231115075203-e1d4f848db12
github.com/tikv/pd/client v0.0.0-20230724080549-de985b8e0afc
github.com/tikv/client-go/v2 v2.0.8-0.20231222073858-605dbe8a5434
github.com/tikv/pd/client v0.0.0-20231219031951-25f48f0bdd27
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e
github.com/twmb/murmur3 v1.1.6
github.com/uber/jaeger-client-go v2.22.1+incompatible
github.com/vbauerster/mpb/v7 v7.5.3
github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f
github.com/xitongsys/parquet-go v1.6.3-0.20230806034711-b6d7d8771e28
github.com/xitongsys/parquet-go-source v0.0.0-20200817004010-026bad9b25d0
go.etcd.io/etcd/api/v3 v3.5.2
go.etcd.io/etcd/client/pkg/v3 v3.5.2
go.etcd.io/etcd/client/v3 v3.5.2
go.etcd.io/etcd/server/v3 v3.5.2
go.etcd.io/etcd/tests/v3 v3.5.2
go.etcd.io/etcd/api/v3 v3.5.10
go.etcd.io/etcd/client/pkg/v3 v3.5.10
go.etcd.io/etcd/client/v3 v3.5.10
go.etcd.io/etcd/server/v3 v3.5.10
go.etcd.io/etcd/tests/v3 v3.5.10
go.opencensus.io v0.24.0
go.uber.org/atomic v1.11.0
go.uber.org/automaxprocs v1.4.0
go.uber.org/goleak v1.2.1
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.24.0
go.uber.org/zap v1.26.0
golang.org/x/exp v0.0.0-20230711005742-c3f37128e5a4
golang.org/x/net v0.17.0
golang.org/x/oauth2 v0.7.0
golang.org/x/sync v0.2.0
golang.org/x/oauth2 v0.11.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.13.0
golang.org/x/term v0.13.0
golang.org/x/text v0.13.0
golang.org/x/time v0.3.0
golang.org/x/tools v0.9.1
google.golang.org/api v0.114.0
google.golang.org/grpc v1.54.0
google.golang.org/api v0.128.0
google.golang.org/grpc v1.59.0
gopkg.in/yaml.v2 v2.4.0
honnef.co/go/tools v0.4.3
k8s.io/api v0.27.2
Expand All @@ -137,9 +137,12 @@ require (
require (
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/apache/arrow/go/v12 v12.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
github.com/elliotchance/pie/v2 v2.1.0 // indirect
github.com/goccy/go-reflect v1.2.0 // indirect
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
github.com/google/flatbuffers v2.0.8+incompatible // indirect
github.com/google/s2a-go v0.1.4 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/klauspost/asmfmt v1.3.2 // indirect
Expand All @@ -151,16 +154,29 @@ require (
github.com/sony/gobreaker v0.5.0 // indirect
github.com/tikv/pd v0.0.0-20230420042919-0e0313adef1f // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
go.etcd.io/etcd/client/v2 v2.305.10 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/raft/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0 // indirect
go.opentelemetry.io/otel v1.0.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1 // indirect
go.opentelemetry.io/otel/sdk v1.0.1 // indirect
go.opentelemetry.io/otel/trace v1.0.1 // indirect
go.opentelemetry.io/proto/otlp v0.9.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
gorm.io/driver/mysql v1.5.1 // indirect
gorm.io/gorm v1.25.4 // indirect
)

require (
cloud.google.com/go v0.110.0 // indirect
cloud.google.com/go/compute v1.19.0 // indirect
cloud.google.com/go v0.110.8 // indirect
cloud.google.com/go/compute v1.23.1 // indirect
cloud.google.com/go/compute/metadata v0.2.3 // indirect
cloud.google.com/go/iam v0.13.0 // indirect
cloud.google.com/go/pubsub v1.30.0 // indirect
cloud.google.com/go/iam v1.1.3 // indirect
cloud.google.com/go/pubsub v1.33.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.1 // indirect
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
github.com/DataDog/zstd v1.4.5 // indirect
Expand All @@ -172,7 +188,6 @@ require (
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/apache/thrift v0.16.0 // indirect
github.com/benbjohnson/clock v1.3.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bmatcuk/doublestar/v2 v2.0.4 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
Expand All @@ -183,7 +198,7 @@ require (
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
github.com/coocood/bbloom v0.0.0-20190830030839-58deb6228d64 // indirect
github.com/coocood/rtutil v0.0.0-20190304133409-c84515f646f2 // indirect
github.com/coreos/go-systemd/v22 v22.3.2 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand All @@ -192,21 +207,19 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/fatih/structtag v1.2.0 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
github.com/go-kit/kit v0.9.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/goccy/go-json v0.9.11 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/licensecheck v0.3.1 // indirect
github.com/google/renameio/v2 v2.0.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/websocket v1.4.2 // indirect
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
Expand Down Expand Up @@ -278,27 +291,13 @@ require (
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
go.etcd.io/etcd/client/v2 v2.305.2 // indirect
go.etcd.io/etcd/pkg/v3 v3.5.2 // indirect
go.etcd.io/etcd/raft/v3 v3.5.2 // indirect
go.opentelemetry.io/contrib v0.20.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect
go.opentelemetry.io/otel v0.20.0 // indirect
go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect
go.opentelemetry.io/otel/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect
go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect
go.opentelemetry.io/otel/trace v0.20.0 // indirect
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 767529e

Please sign in to comment.