Skip to content

Commit 5304fcd

Browse files
craig[bot]jbowens
andcommitted
Merge #147240
147240: go.mod: bump Pebble to abf8da2b6b97 r=annrpom a=jbowens Changes: * [`abf8da2b`](cockroachdb/pebble@abf8da2b) sstable: save UserProperties from `Properties` on sstable reader * [`0b203883`](cockroachdb/pebble@0b203883) sstable: remove `DeniedUserProperties` as a reader opt * [`559007d0`](cockroachdb/pebble@559007d0) db: disable TestCompactionCorruption under race * [`20e2d8ae`](cockroachdb/pebble@20e2d8ae) replay: support blob files * [`5fdf813f`](cockroachdb/pebble@5fdf813f) tools: load properties on demand * [`1382f307`](cockroachdb/pebble@1382f307) sstable: introduce ReadPropertiesBlock on reader * [`f0d9a21a`](cockroachdb/pebble@f0d9a21a) sstable: don't close Readable on NewReader error * [`798bbadc`](cockroachdb/pebble@798bbadc) db: close blob file readable if unable to open blob reader * [`2fd9454b`](cockroachdb/pebble@2fd9454b) db: remove iteratorRangeKeyState.init * [`28b61eed`](cockroachdb/pebble@28b61eed) db: fix access of an invalid LazyValue * [`cbdcf2f5`](cockroachdb/pebble@cbdcf2f5) github: fix bug in post-issue Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents 1bd8624 + 0569bda commit 5304fcd

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

DEPS.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,10 +1895,10 @@ def go_deps():
18951895
patches = [
18961896
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18971897
],
1898-
sha256 = "f16c617a8f3b671628e731969a6e7ea04b347e773c81c7e146b10d8a1994383f",
1899-
strip_prefix = "github.com/cockroachdb/[email protected]20250520163720-63d3c08127ff",
1898+
sha256 = "9c1327a1341d78784b000262f7497627d97d0f8e5e669c87a10165044deb6cd9",
1899+
strip_prefix = "github.com/cockroachdb/[email protected]20250523050552-abf8da2b6b97",
19001900
urls = [
1901-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250520163720-63d3c08127ff.zip",
1901+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250523050552-abf8da2b6b97.zip",
19021902
],
19031903
)
19041904
go_repository(

build/bazelutil/distdir_files.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ DISTDIR_FILES = {
367367
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
368368
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
369369
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
370-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250520163720-63d3c08127ff.zip": "f16c617a8f3b671628e731969a6e7ea04b347e773c81c7e146b10d8a1994383f",
370+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250523050552-abf8da2b6b97.zip": "9c1327a1341d78784b000262f7497627d97d0f8e5e669c87a10165044deb6cd9",
371371
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
372372
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
373373
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ require (
140140
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
141141
github.com/cockroachdb/gostdlib v1.19.0
142142
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
143-
github.com/cockroachdb/pebble v0.0.0-20250520163720-63d3c08127ff
143+
github.com/cockroachdb/pebble v0.0.0-20250523050552-abf8da2b6b97
144144
github.com/cockroachdb/redact v1.1.6
145145
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
146146
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
599599
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
600600
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
601601
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
602-
github.com/cockroachdb/pebble v0.0.0-20250520163720-63d3c08127ff h1:JwM3DacxX0RBRGRflJq8d/4v1cSnKYX3cYXxwzgHfCM=
603-
github.com/cockroachdb/pebble v0.0.0-20250520163720-63d3c08127ff/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
602+
github.com/cockroachdb/pebble v0.0.0-20250523050552-abf8da2b6b97 h1:e66S+lhckXbKAV8xoPWGLo7s4341nyEijQYTW10YXmk=
603+
github.com/cockroachdb/pebble v0.0.0-20250523050552-abf8da2b6b97/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
604604
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
605605
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
606606
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

0 commit comments

Comments
 (0)