Skip to content

Commit 5cda21f

Browse files
craig[bot]RaduBerinde
andcommitted
Merge #154984
154984: go.mod: bump Pebble to 79e6b4a13387 r=RaduBerinde a=RaduBerinde Changes: * [`79e6b4a1`](cockroachdb/pebble@79e6b4a1) db: add DBCompressionFast * [`37958098`](cockroachdb/pebble@37958098) db: don't store table fromat in compaction * [`1cb683a6`](cockroachdb/pebble@1cb683a6) db: make iterator tracking configurable * [`c34a2827`](cockroachdb/pebble@c34a2827) db: track and report long-standing iterators * [`a41a81bd`](cockroachdb/pebble@a41a81bd) inflight: add data structure to detect long-running operations * [`5858b72b`](cockroachdb/pebble@5858b72b) github: run tests against custom cockroach Go * [`ff0eb692`](cockroachdb/pebble@ff0eb692) db: test to demonstrate excise and EFOS race bug * [`ae3bfad7`](cockroachdb/pebble@ae3bfad7) wal: deflake TestManagerFailover * [`32dc26d7`](cockroachdb/pebble@32dc26d7) db: clean up some nil Options paths * [`3214797c`](cockroachdb/pebble@3214797c) wal: clean up all segment files * [`a0c64af9`](cockroachdb/pebble@a0c64af9) block: minor improvements to compression profiles * [`59645694`](cockroachdb/pebble@59645694) objstorageprovider: propagate errIsNotExist fn in remoteReadable Release note: none. Epic: none. Co-authored-by: Radu Berinde <[email protected]>
2 parents 04a6652 + 0fa2f73 commit 5cda21f

File tree

5 files changed

+22
-8
lines changed

5 files changed

+22
-8
lines changed

DEPS.bzl

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,10 +1834,10 @@ def go_deps():
18341834
patches = [
18351835
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18361836
],
1837-
sha256 = "ca8b29434d9447e2e943160fa26b234cb9296d7e919e58ca2dda023a95776920",
1838-
strip_prefix = "github.com/cockroachdb/[email protected]20251002220049-0ac45a74e10a",
1837+
sha256 = "0f62a20d58756e8485d14285654993a96b320759bcfa411f8ad46fb4da977fe4",
1838+
strip_prefix = "github.com/cockroachdb/[email protected]20251007185819-79e6b4a13387",
18391839
urls = [
1840-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251002220049-0ac45a74e10a.zip",
1840+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251007185819-79e6b4a13387.zip",
18411841
],
18421842
)
18431843
go_repository(
@@ -7553,6 +7553,16 @@ def go_deps():
75537553
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/urlesc/com_github_puerkitobio_urlesc-v0.0.0-20170810143723-de5bf2ad4578.zip",
75547554
],
75557555
)
7556+
go_repository(
7557+
name = "com_github_puzpuzpuz_xsync_v3",
7558+
build_file_proto_mode = "disable_global",
7559+
importpath = "github.com/puzpuzpuz/xsync/v3",
7560+
sha256 = "f7fcd1eeb1bc96bc497dc0bca05ed0d64d194fdb1a73460dd42cd2bc42ae00e6",
7561+
strip_prefix = "github.com/puzpuzpuz/xsync/[email protected]",
7562+
urls = [
7563+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/puzpuzpuz/xsync/v3/com_github_puzpuzpuz_xsync_v3-v3.5.1.zip",
7564+
],
7565+
)
75567566
go_repository(
75577567
name = "com_github_raduberinde_axisds",
75587568
build_file_proto_mode = "disable_global",

build/bazelutil/distdir_files.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ DISTDIR_FILES = {
356356
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
358358
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
359-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251002220049-0ac45a74e10a.zip": "ca8b29434d9447e2e943160fa26b234cb9296d7e919e58ca2dda023a95776920",
359+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251007185819-79e6b4a13387.zip": "0f62a20d58756e8485d14285654993a96b320759bcfa411f8ad46fb4da977fe4",
360360
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
361361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
362362
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",
@@ -895,6 +895,7 @@ DISTDIR_FILES = {
895895
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/prometheus/statsd_exporter/com_github_prometheus_statsd_exporter-v0.21.0.zip": "aa848ade6fb019df4f7992808a1d6aa48d6b8276017970af4aabc1bd337c2dc3",
896896
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/pseudomuto/protoc-gen-doc/com_github_pseudomuto_protoc_gen_doc-v1.3.2.zip": "ecf627d6f5b4e55d4844dda45612cbd152f0bc4dbe2ba182c7bc3ad1dc63ce5f",
897897
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/pseudomuto/protokit/com_github_pseudomuto_protokit-v0.2.0.zip": "16d5fe0f6ac5bebbf9f2f05fde72f28bbf05bb18baef045b9ae79c2585f4e127",
898+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/puzpuzpuz/xsync/v3/com_github_puzpuzpuz_xsync_v3-v3.5.1.zip": "f7fcd1eeb1bc96bc497dc0bca05ed0d64d194fdb1a73460dd42cd2bc42ae00e6",
898899
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/rcrowley/go-metrics/com_github_rcrowley_go_metrics-v0.0.0-20201227073835-cf1acfcdf475.zip": "e4dbd20c185cb05019fd7d4a361266bd5d182938f49fd9577df4d12c16dc81c3",
899900
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/remyoudompheng/bigfft/com_github_remyoudompheng_bigfft-v0.0.0-20230129092748-24d4a6f8daec.zip": "9be16c32c384d55d0f7bd7b03f1ff1e9a4e4b91b000f0aa87a567a01b9b82398",
900901
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/retailnext/hllpp/com_github_retailnext_hllpp-v1.0.1-0.20180308014038-101a6d2f8b52.zip": "7863938cb01dfe9d4495df3c6608bedceec2d1195da05612f3c1b0e27d37729d",

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ require (
142142
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
143143
github.com/cockroachdb/gostdlib v1.19.0
144144
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
145-
github.com/cockroachdb/pebble v0.0.0-20251002220049-0ac45a74e10a
145+
github.com/cockroachdb/pebble v0.0.0-20251007185819-79e6b4a13387
146146
github.com/cockroachdb/redact v1.1.6
147147
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
148148
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b
@@ -432,6 +432,7 @@ require (
432432
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
433433
github.com/prometheus/procfs v0.10.1 // indirect
434434
github.com/pseudomuto/protokit v0.2.0 // indirect
435+
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
435436
github.com/rivo/uniseg v0.2.0 // indirect
436437
github.com/rogpeppe/go-internal v1.12.0 // indirect
437438
github.com/rs/xid v1.3.0 // indirect

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
577577
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
578578
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
579579
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
580-
github.com/cockroachdb/pebble v0.0.0-20251002220049-0ac45a74e10a h1:K31Go2TsBQEhEUNRSRbv63Qiu6ImEawHedYASgIyZOU=
581-
github.com/cockroachdb/pebble v0.0.0-20251002220049-0ac45a74e10a/go.mod h1:H/DxkYtsYVJwPFLikOL9yzb/PV7oIkz44CUmn4KecKg=
580+
github.com/cockroachdb/pebble v0.0.0-20251007185819-79e6b4a13387 h1:J8HQwx04ADqCaD4V7Rhq9RZrp+inwl+k16Lc1c0o7GU=
581+
github.com/cockroachdb/pebble v0.0.0-20251007185819-79e6b4a13387/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8=
582582
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
583583
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
584584
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=
@@ -2053,6 +2053,8 @@ github.com/pseudomuto/protoc-gen-doc v1.3.2 h1:61vWZuxYa8D7Rn4h+2dgoTNqnluBmJya2
20532053
github.com/pseudomuto/protoc-gen-doc v1.3.2/go.mod h1:y5+P6n3iGrbKG+9O04V5ld71in3v/bX88wUwgt+U8EA=
20542054
github.com/pseudomuto/protokit v0.2.0 h1:hlnBDcy3YEDXH7kc9gV+NLaN0cDzhDvD1s7Y6FZ8RpM=
20552055
github.com/pseudomuto/protokit v0.2.0/go.mod h1:2PdH30hxVHsup8KpBTOXTBeMVhJZVio3Q8ViKSAXT0Q=
2056+
github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
2057+
github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
20562058
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
20572059
github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
20582060
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=

pkg/storage/bench_cloud_io_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func benchObjstorageCopy(b *testing.B, prefix string, suffixes []string) {
8686
b.Fatal(err)
8787
}
8888

89-
readable := objstorageprovider.NewRemoteReadable(r, fileSize)
89+
readable := objstorageprovider.NewRemoteReadable(r, fileSize, s.IsNotExistError)
9090
rh := readable.NewReadHandle(0 /* readBeforeSize */)
9191
if err := objstorage.Copy(ctx, rh, discard{}, 4<<20, uint64(size)); err != nil {
9292
b.Fatal(err)

0 commit comments

Comments
 (0)