Skip to content

Commit 4f2073d

Browse files
bb7133bb7133
authored
*: bump some dependencies for release-6.5 hot patch (#57272)
1 parent cd073ea commit 4f2073d

File tree

301 files changed

+6012
-2422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+6012
-2422
lines changed

‎DEPS.bzl

Lines changed: 3696 additions & 1188 deletions
Large diffs are not rendered by default.

‎WORKSPACE

Lines changed: 105 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,70 @@
11
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
22

3+
# Required by toolchains_protoc.
4+
http_archive(
5+
name = "platforms",
6+
sha256 = "218efe8ee736d26a3572663b374a253c012b716d8af0c07e842e82f238a0a7ee",
7+
urls = [
8+
"https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
9+
"https://github.com/bazelbuild/platforms/releases/download/0.0.10/platforms-0.0.10.tar.gz",
10+
],
11+
)
12+
13+
http_archive(
14+
name = "bazel_features",
15+
sha256 = "ba1282c1aa1d1fffdcf994ab32131d7c7551a9bc960fbf05f42d55a1b930cbfb",
16+
strip_prefix = "bazel_features-1.15.0",
17+
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.15.0/bazel_features-v1.15.0.tar.gz",
18+
)
19+
20+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
21+
22+
bazel_features_deps()
23+
24+
http_archive(
25+
name = "bazel_skylib",
26+
sha256 = "66ffd9315665bfaafc96b52278f57c7e2dd09f5ede279ea6d39b2be471e7e3aa",
27+
urls = [
28+
"http://bazel-cache.pingcap.net:8080/gomod/rules/bazel-skylib-1.4.2.tar.gz",
29+
"http://ats.apps.svc/gomod/rules/bazel-skylib-1.4.2.tar.gz",
30+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
31+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.2/bazel-skylib-1.4.2.tar.gz",
32+
],
33+
)
34+
35+
load("@bazel_skylib//lib:versions.bzl", "versions")
36+
versions.check(minimum_bazel_version = "6.0.0")
37+
338
http_archive(
439
name = "io_bazel_rules_go",
5-
sha256 = "d6ab6b57e48c09523e93050f13698f708428cfd5e619252e369d377af6597707",
40+
sha256 = "f4a9314518ca6acfa16cc4ab43b0b8ce1e4ea64b81c38d8a3772883f153346b8",
641
urls = [
7-
"http://bazel-cache.pingcap.net:8080/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip",
8-
"http://ats.apps.svc/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip",
9-
"https://github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip",
10-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.43.0/rules_go-v0.43.0.zip",
42+
"http://bazel-cache.pingcap.net:8080/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
43+
"http://ats.apps.svc/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
44+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
45+
"https://github.com/bazelbuild/rules_go/releases/download/v0.50.1/rules_go-v0.50.1.zip",
1146
],
1247
)
1348

1449
http_archive(
1550
name = "bazel_gazelle",
16-
sha256 = "b7387f72efb59f876e4daae42f1d3912d0d45563eac7cb23d1de0b094ab588cf",
51+
sha256 = "8ad77552825b078a10ad960bec6ef77d2ff8ec70faef2fd038db713f410f5d87",
52+
urls = [
53+
"http://bazel-cache.pingcap.net:8080/bazelbuild/bazel-gazelle/releases/download/v0.38.0/bazel-gazelle-v0.38.0.tar.gz",
54+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.38.0/bazel-gazelle-v0.38.0.tar.gz",
55+
"http://ats.apps.svc/bazelbuild/bazel-gazelle/releases/download/v0.38.0/bazel-gazelle-v0.38.0.tar.gz",
56+
],
57+
)
58+
59+
http_archive(
60+
name = "rules_cc",
1761
urls = [
18-
"http://bazel-cache.pingcap.net:8080/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
19-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
20-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
21-
"http://ats.apps.svc/bazelbuild/bazel-gazelle/releases/download/v0.34.0/bazel-gazelle-v0.34.0.tar.gz",
62+
"http://bazel-cache.pingcap.net:8080/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz",
63+
"https://github.com/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz",
64+
"http://ats.apps.svc/bazelbuild/rules_cc/releases/download/0.0.6/rules_cc-0.0.6.tar.gz",
2265
],
66+
sha256 = "3d9e271e2876ba42e114c9b9bc51454e379cbf0ec9ef9d40e2ae4cec61a31b40",
67+
strip_prefix = "rules_cc-0.0.6",
2368
)
2469

2570
load("@io_bazel_rules_go//go:deps.bzl", "go_download_sdk", "go_register_toolchains", "go_rules_dependencies")
@@ -34,12 +79,13 @@ go_rules_dependencies()
3479
go_download_sdk(
3580
name = "go_sdk",
3681
urls = [
82+
"https://cache.hawkingrei.com/golang/{}",
3783
"http://ats.apps.svc/golang/{}",
3884
"http://bazel-cache.pingcap.net:8080/golang/{}",
3985
"https://mirrors.aliyun.com/golang/{}",
4086
"https://dl.google.com/go/{}",
4187
],
42-
version = "1.19.12",
88+
version = "1.23.3",
4389
)
4490

4591
go_register_toolchains(
@@ -54,8 +100,9 @@ http_archive(
54100
strip_prefix = "protobuf-3.15.5",
55101
# latest, as of 2021-03-08
56102
urls = [
57-
"https://github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz",
103+
"http://bazel-cache.pingcap.net:8080/gomod/rules/protobuf-3.15.5.tar.gz ",
58104
"https://mirror.bazel.build/github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz",
105+
"https://github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz",
59106
],
60107
)
61108

@@ -65,20 +112,58 @@ protobuf_deps()
65112

66113
http_archive(
67114
name = "remote_java_tools",
68-
sha256 = "5cd59ea6bf938a1efc1e11ea562d37b39c82f76781211b7cd941a2346ea8484d",
115+
sha256 = "f58a358ca694a41416a9b6a92b852935ad301d8882e5d22f4f11134f035317d5",
69116
urls = [
70-
"http://ats.apps.svc/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip",
71-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools-v11.9.zip",
72-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools-v11.9.zip",
117+
"http://bazel-cache.pingcap.net:8080/gomod/rules/java_tools-v12.6.zip",
118+
"http://ats.apps.svc/gomod/rules/java_tools-v12.6.zip",
119+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools-v12.6.zip",
120+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools-v12.6.zip",
73121
],
74122
)
75123

76124
http_archive(
77125
name = "remote_java_tools_linux",
78-
sha256 = "512582cac5b7ea7974a77b0da4581b21f546c9478f206eedf54687eeac035989",
126+
sha256 = "64294e91fe940c77e6d35818b4c3a1f07d78e33add01e330188d907032687066",
127+
urls = [
128+
"http://bazel-cache.pingcap.net:8080/gomod/rules/java_tools_linux-v12.6.zip",
129+
"http://ats.apps.svc/gomod/rules/java_tools_linux-v12.6.zip",
130+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.6/java_tools_linux-v12.6.zip",
131+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.6/java_tools_linux-v12.6.zip",
132+
],
133+
)
134+
135+
http_archive(
136+
name = "rules_proto",
137+
sha256 = "303e86e722a520f6f326a50b41cfc16b98fe6d1955ce46642a5b7a67c11c0f5d",
138+
strip_prefix = "rules_proto-6.0.0",
139+
urls = [
140+
"https://github.com/bazelbuild/rules_proto/releases/download/6.0.0/rules_proto-6.0.0.tar.gz",
141+
],
142+
)
143+
144+
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
145+
146+
rules_proto_dependencies()
147+
148+
load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
149+
150+
rules_proto_toolchains()
151+
152+
http_archive(
153+
name = "rules_java",
154+
sha256 = "f5a3e477e579231fca27bf202bb0e8fbe4fc6339d63b38ccb87c2760b533d1c3",
155+
strip_prefix = "rules_java-981f06c3d2bd10225e85209904090eb7b5fb26bd",
79156
urls = [
80-
"http://ats.apps.svc/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip",
81-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.9/java_tools_linux-v11.9.zip",
82-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.9/java_tools_linux-v11.9.zip",
157+
"http://bazel-cache.pingcap.net:8080/gomod/rules/rules_java/rules_java-981f06c3d2bd10225e85209904090eb7b5fb26bd.tar.gz",
158+
"http://ats.apps.svc/bazelbuild/gomod/rules/rules_java/rules_java-981f06c3d2bd10225e85209904090eb7b5fb26bd.tar.gz",
159+
"https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/981f06c3d2bd10225e85209904090eb7b5fb26bd.tar.gz",
160+
"https://github.com/bazelbuild/rules_java/archive/981f06c3d2bd10225e85209904090eb7b5fb26bd.tar.gz",
83161
],
84162
)
163+
164+
http_archive(
165+
name = "toolchains_protoc",
166+
sha256 = "117af61ee2f1b9b014dcac7c9146f374875551abb8a30e51d1b3c5946d25b142",
167+
strip_prefix = "toolchains_protoc-0.3.0",
168+
url = "https://github.com/aspect-build/toolchains_protoc/releases/download/v0.3.0/toolchains_protoc-v0.3.0.tar.gz",
169+
)

‎bindinfo/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
func TestMain(m *testing.M) {
2525
testsetup.SetupForCommonTest()
2626
opts := []goleak.Option{
27-
goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"),
27+
goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"),
2828
goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"),
2929
goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"),
3030
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),

‎br/pkg/backup/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
func TestMain(m *testing.M) {
2525
testsetup.SetupForCommonTest()
2626
opts := []goleak.Option{
27-
goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"),
27+
goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"),
2828
goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"),
2929
goleak.IgnoreTopFunction("github.com/klauspost/compress/zstd.(*blockDec).startDecoder"),
3030
goleak.IgnoreTopFunction("github.com/pingcap/goleveldb/leveldb.(*DB).mpoolDrain"),

‎br/pkg/checksum/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
func TestMain(m *testing.M) {
2525
opts := []goleak.Option{
26-
goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"),
26+
goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"),
2727
goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"),
2828
goleak.IgnoreTopFunction("github.com/klauspost/compress/zstd.(*blockDec).startDecoder"),
2929
goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"),

‎br/pkg/conn/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
func TestMain(m *testing.M) {
2525
opts := []goleak.Option{
26-
goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"),
26+
goleak.IgnoreTopFunction("github.com/golang/glog.(*fileSink).flushDaemon"),
2727
goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"),
2828
goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"),
2929
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),

‎br/pkg/lightning/backend/backend.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package backend
1616

1717
import (
18+
"cmp"
1819
"context"
1920
"fmt"
2021
"time"
@@ -303,11 +304,14 @@ func (be Backend) CheckDiskQuota(quota int64) (
303304
totalMemSize int64,
304305
) {
305306
sizes := be.abstract.EngineFileSizes()
306-
slices.SortFunc(sizes, func(i, j EngineFileSize) bool {
307+
slices.SortFunc(sizes, func(i, j EngineFileSize) int {
307308
if i.IsImporting != j.IsImporting {
308-
return i.IsImporting
309+
if i.IsImporting {
310+
return -1
311+
}
312+
return 1
309313
}
310-
return i.DiskSize+i.MemSize < j.DiskSize+j.MemSize
314+
return cmp.Compare(i.DiskSize+i.MemSize, j.DiskSize+j.MemSize)
311315
})
312316
for _, size := range sizes {
313317
totalDiskSize += size.DiskSize

‎br/pkg/lightning/backend/kv/sql2kv.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package kv
1818

1919
import (
20+
"cmp"
2021
"context"
2122
"fmt"
2223
"math"
@@ -186,8 +187,8 @@ func collectGeneratedColumns(se *session, meta *model.TableInfo, cols []*table.C
186187
}
187188

188189
// order the result by column offset so they match the evaluation order.
189-
slices.SortFunc(genCols, func(i, j genCol) bool {
190-
return cols[i.index].Offset < cols[j.index].Offset
190+
slices.SortFunc(genCols, func(i, j genCol) int {
191+
return cmp.Compare(cols[i.index].Offset, cols[j.index].Offset)
191192
})
192193
return genCols, nil
193194
}

‎br/pkg/lightning/backend/local/engine.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -752,8 +752,8 @@ func (e *Engine) batchIngestSSTs(metas []*sstMeta) error {
752752
if len(metas) == 0 {
753753
return nil
754754
}
755-
slices.SortFunc(metas, func(i, j *sstMeta) bool {
756-
return bytes.Compare(i.minKey, j.minKey) < 0
755+
slices.SortFunc(metas, func(i, j *sstMeta) int {
756+
return bytes.Compare(i.minKey, j.minKey)
757757
})
758758

759759
metaLevels := make([][]*sstMeta, 0)
@@ -914,8 +914,8 @@ func sortAndMergeRanges(ranges []Range) []Range {
914914
return ranges
915915
}
916916

917-
slices.SortFunc(ranges, func(i, j Range) bool {
918-
return bytes.Compare(i.start, j.start) < 0
917+
slices.SortFunc(ranges, func(i, j Range) int {
918+
return bytes.Compare(i.start, j.start)
919919
})
920920

921921
curEnd := ranges[0].end
@@ -1181,8 +1181,8 @@ func (w *Writer) flushKVs(ctx context.Context) error {
11811181
return errors.Trace(err)
11821182
}
11831183
if !w.isWriteBatchSorted {
1184-
slices.SortFunc(w.writeBatch[:w.batchCount], func(i, j common.KvPair) bool {
1185-
return bytes.Compare(i.Key, j.Key) < 0
1184+
slices.SortFunc(w.writeBatch[:w.batchCount], func(i, j common.KvPair) int {
1185+
return bytes.Compare(i.Key, j.Key)
11861186
})
11871187
w.isWriteBatchSorted = true
11881188
}

‎br/pkg/lightning/backend/local/localhelper.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ func (local *local) SplitAndScatterRegionByRanges(
203203
var err1 error
204204
region := sp.region
205205
keys := sp.keys
206-
slices.SortFunc(keys, func(i, j []byte) bool {
207-
return bytes.Compare(i, j) < 0
206+
slices.SortFunc(keys, func(i, j []byte) int {
207+
return bytes.Compare(i, j)
208208
})
209209
splitRegion := region
210210
startIdx := 0
@@ -247,8 +247,8 @@ func (local *local) SplitAndScatterRegionByRanges(
247247
log.FromContext(ctx).Info("batch split region", zap.Uint64("region_id", splitRegion.Region.Id),
248248
zap.Int("keys", endIdx-startIdx), zap.Binary("firstKey", keys[startIdx]),
249249
zap.Binary("end", keys[endIdx-1]))
250-
slices.SortFunc(newRegions, func(i, j *split.RegionInfo) bool {
251-
return bytes.Compare(i.Region.StartKey, j.Region.StartKey) < 0
250+
slices.SortFunc(newRegions, func(i, j *split.RegionInfo) int {
251+
return bytes.Compare(i.Region.StartKey, j.Region.StartKey)
252252
})
253253
syncLock.Lock()
254254
scatterRegions = append(scatterRegions, newRegions...)
@@ -293,8 +293,8 @@ func (local *local) SplitAndScatterRegionByRanges(
293293
if len(retryKeys) == 0 {
294294
break
295295
}
296-
slices.SortFunc(retryKeys, func(i, j []byte) bool {
297-
return bytes.Compare(i, j) < 0
296+
slices.SortFunc(retryKeys, func(i, j []byte) int {
297+
return bytes.Compare(i, j)
298298
})
299299
minKey = codec.EncodeBytes([]byte{}, retryKeys[0])
300300
maxKey = codec.EncodeBytes([]byte{}, nextKey(retryKeys[len(retryKeys)-1]))

0 commit comments

Comments
 (0)