Merge cockroachdb#123919

123919: go.mod: bump Pebble to a43bb5d5a335 r=RaduBerinde a=jbowens Changes: * [`a43bb5d5`](cockroachdb/pebble@a43bb5d5) db: adjust Iterator.NextPrefix to error if in error state * [`8633593c`](cockroachdb/pebble@8633593c) metamorphic: use 12 as the minimum target file size * [`2b26224a`](cockroachdb/pebble@2b26224a) metamorphic: make a reduce parameter configurable * [`4301b8f5`](cockroachdb/pebble@4301b8f5) compaction: clean up runCompaction * [`2a4cdcc8`](cockroachdb/pebble@2a4cdcc8) compact: move grandparent and L0 limits code * [`6a357e67`](cockroachdb/pebble@6a357e67) compaction: remove redundant cleanup code * [`57caca15`](cockroachdb/pebble@57caca15) compaction: tolerate empty keys * [`98cadc9f`](cockroachdb/pebble@98cadc9f) db: fix ingested flushable range deletion iterator * [`bfd3ee24`](cockroachdb/pebble@bfd3ee24) db: fix iterator error propagation, NextPrefix violation * [`f03e7efe`](cockroachdb/pebble@f03e7efe) compact: some Iter cleanup * [`c58ac885`](cockroachdb/pebble@c58ac885) internal/keyspan: prohibit NextPrefix at span boundary * [`fdba3c90`](cockroachdb/pebble@fdba3c90) db: fix level checker use of stale iterator value * [`0bc137ad`](cockroachdb/pebble@0bc137ad) compact: rework span handling * [`ab6cd136`](cockroachdb/pebble@ab6cd136) compact: add facility to split and encode spans * [`bc2d51c6`](cockroachdb/pebble@bc2d51c6) sstable: add ReadAll test util * [`12108115`](cockroachdb/pebble@12108115) compact: pull out code for compacting spans * [`94cfeb2b`](cockroachdb/pebble@94cfeb2b) db: document memTable.writerRefs subtlety * [`16c5635c`](cockroachdb/pebble@16c5635c) compact: relax splitter frontier requirement Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
nameisbhaskar · May 10, 2024 · 16d4175 · 16d4175
2 parents d301389 + 5820b31
commit 16d4175
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1673,10 +1673,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "7cb0d10f219983da85a319d5413cb1c9d9bd5d6e7fdd004cec509de91ce6b26c",
-        strip_prefix = "github.com/cockroachdb/[email protected]20240503142225-f729ccd44cbb",
+        sha256 = "0531d94a35fcbbfafc63d09afb9e7983a189a32294909e3dd4ac2d3d1f8d16b1",
+        strip_prefix = "github.com/cockroachdb/[email protected]20240509215128-a43bb5d5a335",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240503142225-f729ccd44cbb.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240509215128-a43bb5d5a335.zip",
         ],
     )
     go_repository(

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -329,7 +329,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-20240503142225-f729ccd44cbb.zip": "7cb0d10f219983da85a319d5413cb1c9d9bd5d6e7fdd004cec509de91ce6b26c",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240509215128-a43bb5d5a335.zip": "0531d94a35fcbbfafc63d09afb9e7983a189a32294909e3dd4ac2d3d1f8d16b1",
     "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-20240503142225-f729ccd44cbb
+	github.com/cockroachdb/pebble v0.0.0-20240509215128-a43bb5d5a335
 	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
@@ -507,8 +507,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-20240503142225-f729ccd44cbb h1:T6uptsqq9gp2QZVZ0bBHsJCPHU12BO5Oi/OHLNftlMA=
-github.com/cockroachdb/pebble v0.0.0-20240503142225-f729ccd44cbb/go.mod h1:gm/vT3lwZUKyB3iTDgWIZfC0hu0gLr+VcXr/tZeTdEU=
+github.com/cockroachdb/pebble v0.0.0-20240509215128-a43bb5d5a335 h1:jdEqMcywxW92hhVrh84Is0wkPUFAXHa/vJ9Me9ubDLQ=
+github.com/cockroachdb/pebble v0.0.0-20240509215128-a43bb5d5a335/go.mod h1:gm/vT3lwZUKyB3iTDgWIZfC0hu0gLr+VcXr/tZeTdEU=
 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=