Merge pull request #149707 from annrpom/anniepompa/pebble-release-25.3-cd488b24ace9

release-25.3: go.mod: bump Pebble to cd488b24ace9

Author: annrpom

DEPS.bzl

@@ -1835,10 +1835,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "ce30f31f40d33b638036d21a1e68adb75cc0e01f04828a12d3136820c15dd542",
-        strip_prefix = "github.com/cockroachdb/[email protected]20250701172741-e3d11e721fa3",
+        sha256 = "ed0673d081f3d7fc4fa93cb7ea74a74631c702f609c88669b3a01a573ca0764b",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250708204140-cd488b24ace9",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250701172741-e3d11e721fa3.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250708204140-cd488b24ace9.zip",
         ],
     )
     go_repository(

build/bazelutil/distdir_files.bzl

@@ -357,7 +357,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-20250701172741-e3d11e721fa3.zip": "ce30f31f40d33b638036d21a1e68adb75cc0e01f04828a12d3136820c15dd542",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250708204140-cd488b24ace9.zip": "ed0673d081f3d7fc4fa93cb7ea74a74631c702f609c88669b3a01a573ca0764b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
     "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",

go.mod

@@ -139,7 +139,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-20250701172741-e3d11e721fa3
+	github.com/cockroachdb/pebble v0.0.0-20250708204140-cd488b24ace9
 	github.com/cockroachdb/redact v1.1.6
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

go.sum

@@ -580,8 +580,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-20250701172741-e3d11e721fa3 h1:NTy5nIHvJvHdbceT/hdg3sMECwC8NfFDC82ZMaoofig=
-github.com/cockroachdb/pebble v0.0.0-20250701172741-e3d11e721fa3/go.mod h1:+E2g3dO+px5IVuHgq5o+O5iy7fRK2eJLdckgrbtWzeE=
+github.com/cockroachdb/pebble v0.0.0-20250708204140-cd488b24ace9 h1:jwSVgSDK6WLIXBCqB/hhVQ7AQP1oiYV8mRdMjCRK7Cw=
+github.com/cockroachdb/pebble v0.0.0-20250708204140-cd488b24ace9/go.mod h1:+E2g3dO+px5IVuHgq5o+O5iy7fRK2eJLdckgrbtWzeE=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
 github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

pkg/cli/interactive_tests/test_encryption.tcl

@@ -53,7 +53,7 @@ end_test
 
 start_test "Run pebble debug tool."
 send "$argv debug pebble db lsm $storedir\r"
-eexpect "level | tables  size val-bl vtables | score  ff  cff |   in  | tables  size | tables  size | tables  size |  read |   r   w\r"
+eexpect "level | tables  size val-bl vtables | score  ff  cff |   in  | tables  size | tables  size | tables  size |  read |   r   w  | refsz  valblk\r"
 end_test
 
 start_test "Restart with plaintext."
@@ -107,7 +107,7 @@ end_test
 
 start_test "Run pebble debug tool with AES-256."
 send "$argv debug pebble db lsm $storedir --enterprise-encryption=path=$storedir,key=$keydir/aes-256.key,old-key=$keydir/aes-256.key\r"
-eexpect "level | tables  size val-bl vtables | score  ff  cff |   in  | tables  size | tables  size | tables  size |  read |   r   w\r"
+eexpect "level | tables  size val-bl vtables | score  ff  cff |   in  | tables  size | tables  size | tables  size |  read |   r   w  | refsz  valblk\r"
 # Try running without the encryption flag.
 send "$argv debug pebble db lsm $storedir\r"
 eexpect "If this is an encrypted store, make sure the correct encryption key is set."