Merge cockroachdb#130099

130099: go.mod: bump Pebble to 32cf8823809b r=RaduBerinde a=jbowens Changes: * [`32cf8823`](cockroachdb/pebble@32cf8823) sstable: separate [Index|Data]BlockIterator interfaces and constraints * [`137a1655`](cockroachdb/pebble@137a1655) testdata: use inf in tests * [`c2b6801c`](cockroachdb/pebble@c2b6801c) cache: remove entry.shard field * [`44ea3710`](cockroachdb/pebble@44ea3710) github: add MIPS builds to CI * [`ecdb921a`](cockroachdb/pebble@ecdb921a) cache: improve memory management comment * [`31f60405`](cockroachdb/pebble@31f60405) internal, vfs: support mips builds * [`2801a3ea`](cockroachdb/pebble@2801a3ea) colblk: add KeyCount, UnsafeBoundaryKeys to KeyspanBlockWriter * [`bb1c2c45`](cockroachdb/pebble@bb1c2c45) colblk: add IndexBlockWriter.UnsafeSeparator * [`5a00241f`](cockroachdb/pebble@5a00241f) colblk: condense column header debug formatting * [`d6b21ae1`](cockroachdb/pebble@d6b21ae1) colblk: misc index block tweaks * [`5294f89b`](cockroachdb/pebble@5294f89b) sstable: avoid repetition in sstable parsing error messages Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
sumeerbhola · Sep 4, 2024 · 4e28f28 · 4e28f28
2 parents b8dc903 + ccf7714
commit 4e28f28
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1798,10 +1798,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "165cf99502da132fa932c3238ea64f2c85e17d82f40ce71f6b09cd96244ef82c",
-        strip_prefix = "github.com/cockroachdb/[email protected]20240828192559-983d98b17ece",
+        sha256 = "c74ef1cfeb721234f1cc8ee9e90506a975341b79c5b23ddf2cc6eddcbe1e5087",
+        strip_prefix = "github.com/cockroachdb/[email protected]20240904144802-32cf8823809b",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240828192559-983d98b17ece.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240904144802-32cf8823809b.zip",
         ],
     )
     go_repository(

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -343,7 +343,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240828192559-983d98b17ece.zip": "165cf99502da132fa932c3238ea64f2c85e17d82f40ce71f6b09cd96244ef82c",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240904144802-32cf8823809b.zip": "c74ef1cfeb721234f1cc8ee9e90506a975341b79c5b23ddf2cc6eddcbe1e5087",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",

diff --git a/go.mod b/go.mod
@@ -130,7 +130,7 @@ require (
 	github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
 	github.com/cockroachdb/gostdlib v1.19.0
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b
-	github.com/cockroachdb/pebble v0.0.0-20240828192559-983d98b17ece
+	github.com/cockroachdb/pebble v0.0.0-20240904144802-32cf8823809b
 	github.com/cockroachdb/redact v1.1.5
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

diff --git a/go.sum b/go.sum
@@ -540,8 +540,8 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe
 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
 github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
 github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
-github.com/cockroachdb/pebble v0.0.0-20240828192559-983d98b17ece h1:LBipTImz0pD3BWc8z0Dx/955xFft9QHRWavzEG7NONw=
-github.com/cockroachdb/pebble v0.0.0-20240828192559-983d98b17ece/go.mod h1:SU2rHRPC7x12KOAFdytOIffRn+8R5x7BAwdr22rWSPQ=
+github.com/cockroachdb/pebble v0.0.0-20240904144802-32cf8823809b h1:ZF9xYuVST8W758JvhvGiWN0NLQVLq5pqHhd/unF8Bds=
+github.com/cockroachdb/pebble v0.0.0-20240904144802-32cf8823809b/go.mod h1:SU2rHRPC7x12KOAFdytOIffRn+8R5x7BAwdr22rWSPQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
 github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=