Merge #143239

143239: go.mod: bump Pebble to 9aedeff126ce r=RaduBerinde a=jbowens

Changes:

 * [`9aedeff1`](cockroachdb/pebble@9aedeff1) internal/manifest: use slices.SortFunc
 * [`afc46e90`](cockroachdb/pebble@afc46e90) db: don't report compaction cancelled errors
 * [`269db0a0`](cockroachdb/pebble@269db0a0) sstable: add Compressor and Decompressor interfaces
 * [`eb883579`](cockroachdb/pebble@eb883579) manifest: add separate makeLevelSlice
 * [`a9b4a1df`](cockroachdb/pebble@a9b4a1df) manifest: check Insert error in makeBTree
 * [`dbc1c128`](cockroachdb/pebble@dbc1c128) colblk: add a PrefixBytes test case using 'inter-' words
 * [`8af50eef`](cockroachdb/pebble@8af50eef) internal/strparse: new package
 * [`f8261e8d`](cockroachdb/pebble@f8261e8d) use sstable.Span which is not internal
 * [`0aca500a`](cockroachdb/pebble@0aca500a) devtools: add a forbidden imports linter
 * [`38f0d482`](cockroachdb/pebble@38f0d482) sstable: update testutil readall to return an error
 * [`6921ec59`](cockroachdb/pebble@6921ec59) db: introduce CompactionScheduler and integrate with DB
 * [`793f8132`](cockroachdb/pebble@793f8132) *: use unsafe.Add throughout
 * [`a80a801b`](cockroachdb/pebble@a80a801b) sstable: clean up and document maximum handle lengths
 * [`4e2b8b2c`](cockroachdb/pebble@4e2b8b2c) sstable: add AddWithBlobHandle
 * [`422c2125`](cockroachdb/pebble@422c2125) sstable: rename AddWithForceObsolete to Add
 * [`c16f88c8`](cockroachdb/pebble@c16f88c8) sstable: add checksum to footer
 * [`7a210e2f`](cockroachdb/pebble@7a210e2f) github: pare down the tests running on each PR
 * [`62fc1714`](cockroachdb/pebble@62fc1714) github: add nightly test matrix
 * [`818edafc`](cockroachdb/pebble@818edafc) github: consolidate instrumented nightly runs
 * [`1ee9410c`](cockroachdb/pebble@1ee9410c) github: add issue posting to stress nightly
 * [`a48d4fcc`](cockroachdb/pebble@a48d4fcc) Makefile, .github: add test target for s390x
 * [`4f879199`](cockroachdb/pebble@4f879199) db: implement blob.ReaderProvider on fileCacheHandle
 * [`9dfc42a0`](cockroachdb/pebble@9dfc42a0) blob: apply defaults to FileWriterOptions
 * [`51b1e1bc`](cockroachdb/pebble@51b1e1bc) internal/compact: preserve blob references in Iter

Release note: none.
Epic: none.

Co-authored-by: Jackson Owens <[email protected]>

Author: craig[bot]

DEPS.bzl

@@ -1895,10 +1895,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "d67cf062084cd85b058aa08196ee002e7d1705f6e908fa64567b0dc785782e13",
-        strip_prefix = "github.com/cockroachdb/[email protected]20250312180301-b3f3a50f5021",
+        sha256 = "7c9b3d757f6a65e68fa1e5a2450fd568c9975e06f84f552048cb3a4396fc93e0",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250320203539-9aedeff126ce",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250312180301-b3f3a50f5021.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250320203539-9aedeff126ce.zip",
         ],
     )
     go_repository(

build/bazelutil/distdir_files.bzl

@@ -361,7 +361,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-20250312180301-b3f3a50f5021.zip": "d67cf062084cd85b058aa08196ee002e7d1705f6e908fa64567b0dc785782e13",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250320203539-9aedeff126ce.zip": "7c9b3d757f6a65e68fa1e5a2450fd568c9975e06f84f552048cb3a4396fc93e0",
     "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

@@ -136,7 +136,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-20250312180301-b3f3a50f5021
+	github.com/cockroachdb/pebble v0.0.0-20250320203539-9aedeff126ce
 	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

@@ -587,8 +587,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-20250312180301-b3f3a50f5021 h1:QSTJvjh0j9TwwEthp7hzB1XWfziPQnc/mqRa7D19U0Y=
-github.com/cockroachdb/pebble v0.0.0-20250312180301-b3f3a50f5021/go.mod h1:08jsvr5vUySLPaDXKxg/jhKDWxzg9Hu27nhhi1z30os=
+github.com/cockroachdb/pebble v0.0.0-20250320203539-9aedeff126ce h1:DKHaVQVHNIRSaqXhZ6C1vSgDks9brsbWt/OzrvYw0iA=
+github.com/cockroachdb/pebble v0.0.0-20250320203539-9aedeff126ce/go.mod h1:08jsvr5vUySLPaDXKxg/jhKDWxzg9Hu27nhhi1z30os=
 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/storage/bench_test.go

@@ -2493,7 +2493,7 @@ func BenchmarkMVCCScannerWithIntentsAndVersions(b *testing.B) {
 		opts := DefaultPebbleOptions().MakeWriterOptions(0, format)
 		writer := sstable.NewWriter(objstorageprovider.NewFileWritable(sstFile), opts)
 		for _, kv := range kvPairs {
-			require.NoError(b, writer.Raw().AddWithForceObsolete(
+			require.NoError(b, writer.Raw().Add(
 				pebble.MakeInternalKey(kv.key, 0 /* seqNum */, kv.kind), kv.value, false /* forceObsolete */))
 		}
 		require.NoError(b, writer.Close())

pkg/storage/sst_writer.go

@@ -355,7 +355,7 @@ func (fw *SSTWriter) PutInternalPointKey(key *pebble.InternalKey, value []byte)
 		return errors.New("cannot decode engine key")
 	}
 	fw.DataSize += int64(len(ek.Key)) + int64(len(value))
-	return fw.fw.Raw().AddWithForceObsolete(*key, value, false /* forceObsolete */)
+	return fw.fw.Raw().Add(*key, value, false /* forceObsolete */)
 }
 
 // clearRange clears all point keys in the given range by dropping a Pebble