Skip to content

Commit e7ec6cd

Browse files
craig[bot]jbowens
andcommitted
Merge #155885
155885: go.mod: bump Pebble to ffc306f908df r=RaduBerinde a=jbowens Changes: * [`ffc306f9`](cockroachdb/pebble@ffc306f9) valsep: wrap new blob files in valsep output metadata in NewBlobFileInfo slice * [`398e43a3`](cockroachdb/pebble@398e43a3) valsep: move ValueSeparation interface to new valsep pkg * [`dd61365d`](cockroachdb/pebble@dd61365d) vfs: add Unwrap to loggingFS * [`e56c4c91`](cockroachdb/pebble@e56c4c91) db: delete pacer rewrite * [`c2e588ae`](cockroachdb/pebble@c2e588ae) db: refactor directory locking * [`77c0947c`](cockroachdb/pebble@77c0947c) db: refactor prepareAndOpenDirs * [`c5f83932`](cockroachdb/pebble@c5f83932) internal/base: add DirLockSet * [`b64943a7`](cockroachdb/pebble@b64943a7) db: ignore closed EFOS in check * [`ca08fb0a`](cockroachdb/pebble@ca08fb0a) db: remove unused newFileMetrics Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents 54a9a86 + 91e3d82 commit e7ec6cd

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

DEPS.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1834,10 +1834,10 @@ def go_deps():
18341834
patches = [
18351835
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18361836
],
1837-
sha256 = "00dccc178113bf65c540a779f00b13a3bf65b6b4876b22a3afb65cc1d1431e84",
1838-
strip_prefix = "github.com/cockroachdb/[email protected]20251020212309-d10d78a21f4f",
1837+
sha256 = "6950b51099dbd8abb646135741e4b68b34feaef1f6b653eec1458e35c46ff15e",
1838+
strip_prefix = "github.com/cockroachdb/[email protected]20251022203800-ffc306f908df",
18391839
urls = [
1840-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251020212309-d10d78a21f4f.zip",
1840+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251022203800-ffc306f908df.zip",
18411841
],
18421842
)
18431843
go_repository(

build/bazelutil/distdir_files.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ DISTDIR_FILES = {
356356
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
357357
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
358358
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
359-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251020212309-d10d78a21f4f.zip": "00dccc178113bf65c540a779f00b13a3bf65b6b4876b22a3afb65cc1d1431e84",
359+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20251022203800-ffc306f908df.zip": "6950b51099dbd8abb646135741e4b68b34feaef1f6b653eec1458e35c46ff15e",
360360
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
361361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
362362
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ require (
142142
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
143143
github.com/cockroachdb/gostdlib v1.19.0
144144
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
145-
github.com/cockroachdb/pebble v0.0.0-20251020212309-d10d78a21f4f
145+
github.com/cockroachdb/pebble v0.0.0-20251022203800-ffc306f908df
146146
github.com/cockroachdb/redact v1.1.6
147147
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
148148
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
577577
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
578578
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
579579
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
580-
github.com/cockroachdb/pebble v0.0.0-20251020212309-d10d78a21f4f h1:KldvpaS98v/pvRAzNmUkZKUSrnw/imqmZbVAclGLwgU=
581-
github.com/cockroachdb/pebble v0.0.0-20251020212309-d10d78a21f4f/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8=
580+
github.com/cockroachdb/pebble v0.0.0-20251022203800-ffc306f908df h1:PjT+Knqz8an/PiglpXnMxK6APo8d2ktwfXBR16B4dDU=
581+
github.com/cockroachdb/pebble v0.0.0-20251022203800-ffc306f908df/go.mod h1:GflN9NRwberlF+gFRJd6r6jrUYdWR/QD+gtgtH0LRK8=
582582
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
583583
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
584584
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd h1:KFOt5I9nEKZgCnOSmy8r4Oykh8BYQO8bFOTgHDS8YZA=

pkg/storage/pebble.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -967,8 +967,8 @@ func newPebble(ctx context.Context, cfg engineConfig) (p *Pebble, err error) {
967967
return int(concurrentDownloadCompactions.Get(&cfg.settings.SV))
968968
}
969969
}
970-
cfg.opts.TargetByteDeletionRate = func() int {
971-
return int(baselineDeletionRate.Get(&cfg.settings.SV))
970+
cfg.opts.DeletionPacing.BaselineRate = func() uint64 {
971+
return uint64(baselineDeletionRate.Get(&cfg.settings.SV))
972972
}
973973
cfg.opts.Experimental.TombstoneDenseCompactionThreshold = func() float64 {
974974
return 0.01 * float64(tombstoneDenseCompactionThreshold.Get(&cfg.settings.SV))

0 commit comments

Comments
 (0)