Merge #137740 #137784

137740: go.mod: bump Pebble to d5339521b84f r=RaduBerinde a=RaduBerinde Changes: * [`d5339521`](cockroachdb/pebble@d5339521) valblk: fix Writer.Size() performance * [`7a465cba`](cockroachdb/pebble@7a465cba) sstable: improve writer benchmark * [`170cd0d4`](cockroachdb/pebble@170cd0d4) cache: fix bug in TestReadShard Release note: none. Epic: none. 137784: release: released CockroachDB version 25.1.0-alpha.1. Next version: 25.1.0-alpha.2 r=celiala a=cockroach-teamcity Release note: None Epic: None Release justification: non-production (release infra) change. Co-authored-by: Radu Berinde <[email protected]> Co-authored-by: Justin Beaver <[email protected]>
cockroachdb · Dec 19, 2024 · b181396 · b181396
3 parents a833dc2 + 364d3d7 + 78f8db1
commit b181396
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 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 = "aaaf950e1cca1dd6e254b9a01a7267a9d4d509f0aacb8dd09134d50557c1a6b8",
-        strip_prefix = "github.com/cockroachdb/[email protected]20241217154139-42bb0f47f1c5",
+        sha256 = "25073429469d7b0dfc4e5eba83e37684d2fd4231c37b870db8e087fa51071b95",
+        strip_prefix = "github.com/cockroachdb/[email protected]20241219030037-d5339521b84f",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241217154139-42bb0f47f1c5.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241219030037-d5339521b84f.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-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
     "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-20241217154139-42bb0f47f1c5.zip": "aaaf950e1cca1dd6e254b9a01a7267a9d4d509f0aacb8dd09134d50557c1a6b8",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20241219030037-d5339521b84f.zip": "25073429469d7b0dfc4e5eba83e37684d2fd4231c37b870db8e087fa51071b95",
     "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-20241215232642-bb51bb14a506
-	github.com/cockroachdb/pebble v0.0.0-20241217154139-42bb0f47f1c5
+	github.com/cockroachdb/pebble v0.0.0-20241219030037-d5339521b84f
 	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-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
 github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
 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-20241217154139-42bb0f47f1c5 h1:Q0yPfmBNeWIdDiYNQ+XoeceRHJsUbA6+asfzd4NWMs8=
-github.com/cockroachdb/pebble v0.0.0-20241217154139-42bb0f47f1c5/go.mod h1:ewJSTQ30qIuX6FeYX+2M37Ghn6r0r2I+g0jDIcTdUXM=
+github.com/cockroachdb/pebble v0.0.0-20241219030037-d5339521b84f h1:eA+nR1b9uf/WBVIw+1GWTg1dtJFoKJkbQIHSau5LNck=
+github.com/cockroachdb/pebble v0.0.0-20241219030037-d5339521b84f/go.mod h1:ewJSTQ30qIuX6FeYX+2M37Ghn6r0r2I+g0jDIcTdUXM=
 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=

diff --git a/pkg/build/version.txt b/pkg/build/version.txt
@@ -1 +1 @@
-v25.1.0-alpha.1
+v25.1.0-alpha.2