Merge cockroachdb#136176

136176: go.mod: bump Pebble to f5057c948b65 r=sumeerbhola a=itsbilal Changes: * [`f5057c94`](cockroachdb/pebble@f5057c94) sstable: fix improper buffer reuse in copyDataBlocks * [`9efb5b8c`](cockroachdb/pebble@9efb5b8c) wal: reduce flake in TestConcurrentWritersWithManyRecords * [`3ec779d3`](cockroachdb/pebble@3ec779d3) db: verify ingest sst bounds are suffixless or adjacent * [`7ce2628f`](cockroachdb/pebble@7ce2628f) valblk: move reader, fetcher * [`bd628879`](cockroachdb/pebble@bd628879) sstable: move UserKeyPrefixBound into options.go * [`ae6fda5f`](cockroachdb/pebble@ae6fda5f) metamorphic: add a test option to make downloadOp no-op Fixes cockroachdb#131332. Release note: none. Epic: none. Co-authored-by: Bilal Akhtar <[email protected]>
mgartner · Nov 26, 2024 · a0925a4 · a0925a4
2 parents eadc0b6 + 5f1885d
commit a0925a4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1845,10 +1845,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "a5f79a50bc6487b78d5834c2758d9fa798cc84f1727312aa67948a5e0efcc713",
-        strip_prefix = "github.com/cockroachdb/[email protected]20241118152240-46f1bba1562b",
+        sha256 = "7139420e4eb4a61d1b1b01e921eb12480d9b5ae1045509178533d492d8dc49a6",
+        strip_prefix = "github.com/cockroachdb/[email protected]20241125211801-f5057c948b65",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241118152240-46f1bba1562b.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241125211801-f5057c948b65.zip",
         ],
     )
     go_repository(

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -354,7 +354,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-20241118152240-46f1bba1562b.zip": "a5f79a50bc6487b78d5834c2758d9fa798cc84f1727312aa67948a5e0efcc713",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241125211801-f5057c948b65.zip": "7139420e4eb4a61d1b1b01e921eb12480d9b5ae1045509178533d492d8dc49a6",
     "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
@@ -134,7 +134,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-20241118152240-46f1bba1562b
+	github.com/cockroachdb/pebble v0.0.0-20241125211801-f5057c948b65
 	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
@@ -545,8 +545,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-20241118152240-46f1bba1562b h1:PCbFmGuMbhS07zWUzl+cj8A99Q29KtzkpcDmcavxqHg=
-github.com/cockroachdb/pebble v0.0.0-20241118152240-46f1bba1562b/go.mod h1:wHj0OgGL0nFHFvlAnluKoJIF+bg5meM676MxW1G6GXg=
+github.com/cockroachdb/pebble v0.0.0-20241125211801-f5057c948b65 h1:2VudmJhWr1ImDN3pn718b2NvYwfJtSm20ArBVz4YGyg=
+github.com/cockroachdb/pebble v0.0.0-20241125211801-f5057c948b65/go.mod h1:wHj0OgGL0nFHFvlAnluKoJIF+bg5meM676MxW1G6GXg=
 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=