Skip to content

Commit 2023035

Browse files
craig[bot]jbowens
andcommitted
Merge #147547
147547: go.mod: bump Pebble to 9360e681647e r=RaduBerinde a=jbowens Changes: * [`9360e681`](cockroachdb/pebble@9360e681) db: clean up table stats collection * [`e48d39fa`](cockroachdb/pebble@e48d39fa) db: fix rare panic when closing internal scan iterator * [`173056b7`](cockroachdb/pebble@173056b7) pebble: use ReadPropertiesBlock when accessing reader props * [`86b60d82`](cockroachdb/pebble@86b60d82) pebble: close file cache before closing the objstorage provider * [`38797cfe`](cockroachdb/pebble@38797cfe) base: don't cache fetched LazyValue values * [`d1cb4120`](cockroachdb/pebble@d1cb4120) tool: ensure properly coupled blob references for find * [`13f571a2`](cockroachdb/pebble@13f571a2) tool: add more data to db val sep directory * [`71b1568c`](cockroachdb/pebble@71b1568c) db: fix copy compaction logic for tables with blobs * [`6456bcb5`](cockroachdb/pebble@6456bcb5) db: set up the blob value fetcher for internal scans * [`c59f8950`](cockroachdb/pebble@c59f8950) db: improve file cache panic * [`733a8473`](cockroachdb/pebble@733a8473) Makefile: start stress-crossversion with 24.1 * [`6edb6d4d`](cockroachdb/pebble@6edb6d4d) tool: print normal value in blob mode print * [`9c19c94c`](cockroachdb/pebble@9c19c94c) sstable/blob: add original FileNum to footer * [`79227e73`](cockroachdb/pebble@79227e73) sstable/blob: add ValueID indirection * [`db49f0a1`](cockroachdb/pebble@db49f0a1) sstable/blob: fix BenchmarkValueFetcherRetrieve cached variants * [`d40ff516`](cockroachdb/pebble@d40ff516) db: skip TestCompactionCorruption on slow builds * [`0836204b`](cockroachdb/pebble@0836204b) github: fix typo in post-issue action * [`5dd69082`](cockroachdb/pebble@5dd69082) metamorphic: fix shared and external directories * [`ed75cc3e`](cockroachdb/pebble@ed75cc3e) metamorphic: sometimes turn off value separation in randomizeOptions * [`a58df8f3`](cockroachdb/pebble@a58df8f3) metamorphic: tweak secondary cache settings * [`a65564f0`](cockroachdb/pebble@a65564f0) metamorphic: check for false values when parsing options * [`8041fd14`](cockroachdb/pebble@8041fd14) sstable: use ReadPropertiesBlock when accessing reader props * [`0dffe893`](cockroachdb/pebble@0dffe893) sstable: add AttributePointKeys * [`cad94e25`](cockroachdb/pebble@cad94e25) sstable: address TODO to use IsZero Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents e1f7a57 + 65bcd63 commit 2023035

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 = "b6af4af1463c58e1058577c48aacb50262d23f97b98b42225db3dbba6a841b4a",
1899-
strip_prefix = "github.com/cockroachdb/[email protected]20250527172825-a38c80fb488e",
1898+
sha256 = "d71e30b2fb081abe5dc5af6b95aab18871897d507b3399a7afd859766ee63b76",
1899+
strip_prefix = "github.com/cockroachdb/[email protected]20250530172448-9360e681647e",
19001900
urls = [
1901-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250527172825-a38c80fb488e.zip",
1901+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250530172448-9360e681647e.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-20250527172825-a38c80fb488e.zip": "b6af4af1463c58e1058577c48aacb50262d23f97b98b42225db3dbba6a841b4a",
370+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250530172448-9360e681647e.zip": "d71e30b2fb081abe5dc5af6b95aab18871897d507b3399a7afd859766ee63b76",
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-20250527172825-a38c80fb488e
143+
github.com/cockroachdb/pebble v0.0.0-20250530172448-9360e681647e
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-20250527172825-a38c80fb488e h1:8KdVMQeaT0BxPO/vzN/FCT2fqkkiyNlaq7hE8C8oQkM=
603-
github.com/cockroachdb/pebble v0.0.0-20250527172825-a38c80fb488e/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
602+
github.com/cockroachdb/pebble v0.0.0-20250530172448-9360e681647e h1:41se5AmGBRIsDHH5h14HZ/owUytNWbxrLzbIRfikkf4=
603+
github.com/cockroachdb/pebble v0.0.0-20250530172448-9360e681647e/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)