Merge #120503

120503: go.mod: bump Pebble to 3b8e70c54f07 r=RaduBerinde a=RaduBerinde Changes: * [`3b8e70c5`](cockroachdb/pebble@3b8e70c5) remove support for prefix replacement * [`e6d0a420`](cockroachdb/pebble@e6d0a420) sstable/writer: fix two-level indexes when using addIndexEntrySync * [`7947a03f`](cockroachdb/pebble@7947a03f) sstable: pull reader/writer filter check into helper * [`54edf939`](cockroachdb/pebble@54edf939) sstable/writer: only gen user props if not already set * [`4c52a201`](cockroachdb/pebble@4c52a201) objstorage: add Copy helper * [`e6c5e959`](cockroachdb/pebble@e6c5e959) internal/manifest: add size to debug string * [`760f3f51`](cockroachdb/pebble@760f3f51) tests: use testLogger * [`e42448ef`](cockroachdb/pebble@e42448ef) manifest: centralize virtual backing metadata * [`5ad7458f`](cockroachdb/pebble@5ad7458f) manifest: move Ref/Unref to FileBacking Release note: none. Epic: none. Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
cockroachdb · Mar 14, 2024 · bf60272 · bf60272
2 parents 24c998b + 19c1410
commit bf60272
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1693,10 +1693,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "70f8a79177d264676bfc34a54b554698fbd6740a5f0e88454328cc33ad38063d",
-        strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240313162818-83f89c67b993",
+        sha256 = "9445c745a7f8780e03b9fb9c7515ce01e360c947a98cc1800c5bbfa13c9de990",
+        strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240314165408-3b8e70c54f07",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240313162818-83f89c67b993.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240314165408-3b8e70c54f07.zip",
         ],
     )
     go_repository(

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -330,7 +330,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-20240313162818-83f89c67b993.zip": "70f8a79177d264676bfc34a54b554698fbd6740a5f0e88454328cc33ad38063d",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240314165408-3b8e70c54f07.zip": "9445c745a7f8780e03b9fb9c7515ce01e360c947a98cc1800c5bbfa13c9de990",
     "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
@@ -124,7 +124,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-20240313162818-83f89c67b993
+	github.com/cockroachdb/pebble v0.0.0-20240314165408-3b8e70c54f07
 	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
@@ -508,8 +508,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-20240313162818-83f89c67b993 h1:SDqpD9r9W2uzSTuZKTj+0+1K9CLNkeR/70PShpJEAPc=
-github.com/cockroachdb/pebble v0.0.0-20240313162818-83f89c67b993/go.mod h1:g0agBmtwky6biPBw0MO+GkiYRv9krOTZgpPw2rfha8c=
+github.com/cockroachdb/pebble v0.0.0-20240314165408-3b8e70c54f07 h1:ABjVDP285p4TEGwe1rzPlz73eJqF/4uebRUDREkWlzI=
+github.com/cockroachdb/pebble v0.0.0-20240314165408-3b8e70c54f07/go.mod h1:g0agBmtwky6biPBw0MO+GkiYRv9krOTZgpPw2rfha8c=
 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=