Skip to content

Commit b6ae107

Browse files
craig[bot]jbowens
andcommitted
Merge #144554
144554: go.mod: bump Pebble to 60ee59ba6a17 r=RaduBerinde a=jbowens Changes: * [`60ee59ba`](cockroachdb/pebble@60ee59ba) db: deflake CompactionCorruption * [`21b12ba8`](cockroachdb/pebble@21b12ba8) tool: print encoding during manifest dump with verbose flag * [`16e16a93`](cockroachdb/pebble@16e16a93) binfmt: add HexDump * [`56cdd34e`](cockroachdb/pebble@56cdd34e) github: run nightly tests on 1.24 in addition to 1.23 * [`716613c2`](cockroachdb/pebble@716613c2) db: support blob values in the level checker * [`1fec0809`](cockroachdb/pebble@1fec0809) github: rework nightly workflows and run on crl-release-25.2 * [`87d5d1fd`](cockroachdb/pebble@87d5d1fd) db: rename TestManualCompaction, organize datadriven files * [`27aee9bd`](cockroachdb/pebble@27aee9bd) testdata: remove two unused datadriven test files * [`ddc5ebac`](cockroachdb/pebble@ddc5ebac) db: use stdlib slices package in level checker * [`23ae0dd6`](cockroachdb/pebble@23ae0dd6) metamorphic: fix key format when running a single config * [`6d1e29e0`](cockroachdb/pebble@6d1e29e0) metamorphic: reduce test size for 32-bit * [`6018d0e4`](cockroachdb/pebble@6018d0e4) github: add testrace back to PR checks * [`6f876f3d`](cockroachdb/pebble@6f876f3d) db: add support for blob files to versionSet * [`7149af59`](cockroachdb/pebble@7149af59) manifest: include *BlobFileMetadata for deleted blob files Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents 70b0bd8 + fc9254c commit b6ae107

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
@@ -1915,10 +1915,10 @@ def go_deps():
19151915
patches = [
19161916
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
19171917
],
1918-
sha256 = "b8b78da44b535acb000e9cdacc4a5d2b65a59874d989b2ebe15c574347970f2a",
1919-
strip_prefix = "github.com/cockroachdb/[email protected]20250412125957-bf1dcd085694",
1918+
sha256 = "6c9a5c102d1abbcc9056caee1406b08c79d8213e3036f56a87c221497dcb87b4",
1919+
strip_prefix = "github.com/cockroachdb/[email protected]20250415171133-60ee59ba6a17",
19201920
urls = [
1921-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250412125957-bf1dcd085694.zip",
1921+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250415171133-60ee59ba6a17.zip",
19221922
],
19231923
)
19241924
go_repository(

build/bazelutil/distdir_files.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ DISTDIR_FILES = {
365365
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
366366
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
367367
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
368-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250412125957-bf1dcd085694.zip": "b8b78da44b535acb000e9cdacc4a5d2b65a59874d989b2ebe15c574347970f2a",
368+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250415171133-60ee59ba6a17.zip": "6c9a5c102d1abbcc9056caee1406b08c79d8213e3036f56a87c221497dcb87b4",
369369
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
370370
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
371371
"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
@@ -138,7 +138,7 @@ require (
138138
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
139139
github.com/cockroachdb/gostdlib v1.19.0
140140
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
141-
github.com/cockroachdb/pebble v0.0.0-20250412125957-bf1dcd085694
141+
github.com/cockroachdb/pebble v0.0.0-20250415171133-60ee59ba6a17
142142
github.com/cockroachdb/redact v1.1.6
143143
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
144144
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
@@ -593,8 +593,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
593593
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
594594
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
595595
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
596-
github.com/cockroachdb/pebble v0.0.0-20250412125957-bf1dcd085694 h1:V9IJvnoQ9nBMGSayyGD9rcSrv5umENBf2Ttz0x1mYMM=
597-
github.com/cockroachdb/pebble v0.0.0-20250412125957-bf1dcd085694/go.mod h1:ONMS0WzY11hEvOyO3Cl6fyfaDduyiz42cYeQAcqHRNQ=
596+
github.com/cockroachdb/pebble v0.0.0-20250415171133-60ee59ba6a17 h1:FwRE2ZsIsULwN/Fl+0N9kjwhj97wt9xERzbr2BqRwNw=
597+
github.com/cockroachdb/pebble v0.0.0-20250415171133-60ee59ba6a17/go.mod h1:ONMS0WzY11hEvOyO3Cl6fyfaDduyiz42cYeQAcqHRNQ=
598598
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
599599
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
600600
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

0 commit comments

Comments
 (0)