Merge #148772

148772: go.mod: bump Pebble to dfa7783a6145 r=jbowens a=jbowens

Changes:

 * [`dfa7783a`](cockroachdb/pebble@dfa7783a) db: add blob file rewrite compaction
 * [`f715521e`](cockroachdb/pebble@f715521e) manifest: maintain pointers to *TableMetadata for blob references
 * [`bb0e2d17`](cockroachdb/pebble@bb0e2d17) db: add logic for blob file rewriting
 * [`ff0e2a6d`](cockroachdb/pebble@ff0e2a6d) sstable/blob: add a new Fetcher
 * [`b0d4682a`](cockroachdb/pebble@b0d4682a) db: remove redundant blob files in datadriven output
 * [`f4e9b0c0`](cockroachdb/pebble@f4e9b0c0) compressionanalyzer: support adaptive compressors
 * [`aecd724a`](cockroachdb/pebble@aecd724a) compression: add an adaptive compressor
 * [`0c357d69`](cockroachdb/pebble@0c357d69) ewma: add a per-bye EWMA estimator
 * [`34c10177`](cockroachdb/pebble@34c10177) compression: return Setting from Compress
 * [`77b1bbf5`](cockroachdb/pebble@77b1bbf5) db: fix incorrect cleanup of initial WALs
 * [`900855b4`](cockroachdb/pebble@900855b4) db: add TestDoubleRestart
 * [`7db16cb1`](cockroachdb/pebble@7db16cb1) tool/testdata: regen val-sep db fixture

Release note: none.
Epic: none.

Fixes #148419

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

Author: craig[bot]

DEPS.bzl

@@ -1835,10 +1835,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "7acb7d113b943ca8cc37113f587a88985b86682dd366c3893d7ad62b1c47f902",
-        strip_prefix = "github.com/cockroachdb/[email protected]20250624023311-70aa8f70b9bc",
+        sha256 = "2c13f8f88ccf297054140c9edce06851fe68eb24fa50c9697325a6875194ff4e",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250624223644-dfa7783a6145",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250624023311-70aa8f70b9bc.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250624223644-dfa7783a6145.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-20250624023311-70aa8f70b9bc.zip": "7acb7d113b943ca8cc37113f587a88985b86682dd366c3893d7ad62b1c47f902",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250624223644-dfa7783a6145.zip": "2c13f8f88ccf297054140c9edce06851fe68eb24fa50c9697325a6875194ff4e",
     "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-20250624023311-70aa8f70b9bc
+	github.com/cockroachdb/pebble v0.0.0-20250624223644-dfa7783a6145
 	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-20250624023311-70aa8f70b9bc h1:ZgdQ4v5Uiz7U4jQ1jXKnRi9P0MFcDZ1EQOVZv5wzWro=
-github.com/cockroachdb/pebble v0.0.0-20250624023311-70aa8f70b9bc/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
+github.com/cockroachdb/pebble v0.0.0-20250624223644-dfa7783a6145 h1:WRXIR4UYWK3sHQeTD/NmEdd0IE8DFCO3Gwxl0Khn0X8=
+github.com/cockroachdb/pebble v0.0.0-20250624223644-dfa7783a6145/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
 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/pebble.go

@@ -848,6 +848,8 @@ func newPebble(ctx context.Context, cfg engineConfig) (p *Pebble, err error) {
 			Enabled:               true,
 			MinimumSize:           int(valueSeparationMinimumSize.Get(&cfg.settings.SV)),
 			MaxBlobReferenceDepth: int(valueSeparationMaxReferenceDepth.Get(&cfg.settings.SV)),
+			RewriteMinimumAge:     time.Minute,
+			TargetGarbageRatio:    1.0, // Disable blob file rewrites
 		}
 	}
 

pkg/storage/pebble_test.go

@@ -631,6 +631,10 @@ func (l *nonFatalLogger) Fatalf(format string, args ...interface{}) {
 	l.t.Logf(format, args...)
 }
 
+func (l *nonFatalLogger) Infof(format string, args ...interface{}) {
+	l.t.Logf(format, args...)
+}
+
 func TestPebbleValidateKey(t *testing.T) {
 	defer leaktest.AfterTest(t)()