Merge #127314

127314: go.mod: bump Pebble to cbd534e661cc r=RaduBerinde a=RaduBerinde Changes: * [`cbd534e6`](cockroachdb/pebble@cbd534e6) objstorage: fix race in vfsSync * [`17a2c982`](cockroachdb/pebble@17a2c982) objstorage: improve ParallelSync test to expose race in vfsSync * [`5fee68ad`](cockroachdb/pebble@5fee68ad) vfs: require no open files in MemFS.ResetToSyncedState * [`b6c49f44`](cockroachdb/pebble@b6c49f44) db: support range keys in external files * [`01fc3d28`](cockroachdb/pebble@01fc3d28) keyspan: add LevelIter tests with loose range key spans * [`e824725f`](cockroachdb/pebble@e824725f) keyspan: modernize the LevelIter test * [`9a4ea4df`](cockroachdb/pebble@9a4ea4df) colblk: only align uint deltas * [`ac13f408`](cockroachdb/pebble@ac13f408) sstable: trace/expensive log when sstable footer read is slow * [`2d97bb15`](cockroachdb/pebble@2d97bb15) colblk: add RawBytes, RawBytesBuilder * [`e762e056`](cockroachdb/pebble@e762e056) colblk: fix bug in uint column debug formatting Release note: none. Epic: none. Co-authored-by: Radu Berinde <[email protected]>
cockroachdb · Jul 17, 2024 · 9a78f27 · 9a78f27
2 parents 677a7ed + 56b2426
commit 9a78f27
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/DEPS.bzl b/DEPS.bzl
@@ -1708,10 +1708,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "af50581a07c9a6a28385bba0aa482bc7b9f4e2a9a62e245518171c8051e899a3",
-        strip_prefix = "github.com/cockroachdb/[email protected]20240710184623-e727ab747b2f",
+        sha256 = "85d00a20793111e6b10b1bb794bbc0ebeda2a303746c293ffc73860239a15cd7",
+        strip_prefix = "github.com/cockroachdb/[email protected]20240717034117-cbd534e661cc",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240710184623-e727ab747b2f.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240717034117-cbd534e661cc.zip",
         ],
     )
     go_repository(

diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl
@@ -333,7 +333,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-20240710184623-e727ab747b2f.zip": "af50581a07c9a6a28385bba0aa482bc7b9f4e2a9a62e245518171c8051e899a3",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240717034117-cbd534e661cc.zip": "85d00a20793111e6b10b1bb794bbc0ebeda2a303746c293ffc73860239a15cd7",
     "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
@@ -126,7 +126,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-20240710184623-e727ab747b2f
+	github.com/cockroachdb/pebble v0.0.0-20240717034117-cbd534e661cc
 	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
@@ -519,8 +519,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-20240710184623-e727ab747b2f h1:aAGt3o9ByZJXLz1RYSVZNarRVZ418ZOryYF3HgKx0Q0=
-github.com/cockroachdb/pebble v0.0.0-20240710184623-e727ab747b2f/go.mod h1:6JguuJ0y0eK70b9ElngP0M8VVoFsCeEQIOpl7Cjgb+U=
+github.com/cockroachdb/pebble v0.0.0-20240717034117-cbd534e661cc h1:K1Ue3OKcRxlG8gsfwXJHOf8LTgMS7jDI1cPY14yd2xw=
+github.com/cockroachdb/pebble v0.0.0-20240717034117-cbd534e661cc/go.mod h1:6JguuJ0y0eK70b9ElngP0M8VVoFsCeEQIOpl7Cjgb+U=
 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=