Skip to content

Commit 44f6c3d

Browse files
craig[bot]jbowens
craig[bot]
and
jbowens
committed
Merge #147727
147727: go.mod: bump Pebble to a1bc6420d3c6 r=jbowens a=jbowens Changes: * [`a1bc6420`](cockroachdb/pebble@a1bc6420) sstable: remove filter name check when copying filter * [`2874a421`](cockroachdb/pebble@2874a421) db: clean up level options * [`d6b8e14b`](cockroachdb/pebble@d6b8e14b) db: initialize baseLevel in compaction tests * [`b25d04cf`](cockroachdb/pebble@b25d04cf) base: add NoFilterPolicy * [`507d3bd3`](cockroachdb/pebble@507d3bd3) sstable: add `RawKeySize` and `RawValueSize` to TableStats * [`4b3a0ff4`](cockroachdb/pebble@4b3a0ff4) internal/manifest: move TableMetadata to a separate file * [`bef9490d`](cockroachdb/pebble@bef9490d) block: remove CompressAndChecksum variant without compressor * [`207e6cdf`](cockroachdb/pebble@207e6cdf) block: remove Buffer * [`a4f8e7e1`](cockroachdb/pebble@a4f8e7e1) block: rename BufHandle to TempBuffer, use single pool * [`842c8efb`](cockroachdb/pebble@842c8efb) internal/manifest: remove base.Compare from B-Tree * [`cb313697`](cockroachdb/pebble@cb313697) internal/manifest: genericize btree * [`80997864`](cockroachdb/pebble@80997864) invariants: add buffer mangler, use for blob.ValueFetcher * [`dc93da63`](cockroachdb/pebble@dc93da63) compressionanalyzer: sample per byte instead of per block * [`60a9df1d`](cockroachdb/pebble@60a9df1d) tool: ensure properly coupled blob references for scan * [`efa16203`](cockroachdb/pebble@efa16203) chore: rename named ssts * [`98ed96c1`](cockroachdb/pebble@98ed96c1) *: add BlobFileID * [`d26c655e`](cockroachdb/pebble@d26c655e) db: remove version,versionEdit,versionList aliases * [`09df0854`](cockroachdb/pebble@09df0854) db: remove newTableEntry alias * [`9ede2849`](cockroachdb/pebble@9ede2849) db: remove bulkVersionEdit alias * [`e373433f`](cockroachdb/pebble@e373433f) db: remove tableMetadata alias Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents 86f71fa + 15adeb2 commit 44f6c3d

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1885,10 +1885,10 @@ def go_deps():
18851885
patches = [
18861886
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18871887
],
1888-
sha256 = "d71e30b2fb081abe5dc5af6b95aab18871897d507b3399a7afd859766ee63b76",
1889-
strip_prefix = "github.com/cockroachdb/[email protected]20250530172448-9360e681647e",
1888+
sha256 = "4d8efa8c0a303a240ef6ca42d72ad892a006a5cdb9897cda723cfd64a5959b77",
1889+
strip_prefix = "github.com/cockroachdb/[email protected]20250603182808-a1bc6420d3c6",
18901890
urls = [
1891-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250530172448-9360e681647e.zip",
1891+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250603182808-a1bc6420d3c6.zip",
18921892
],
18931893
)
18941894
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ DISTDIR_FILES = {
366366
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
367367
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
368368
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
369-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250530172448-9360e681647e.zip": "d71e30b2fb081abe5dc5af6b95aab18871897d507b3399a7afd859766ee63b76",
369+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250603182808-a1bc6420d3c6.zip": "4d8efa8c0a303a240ef6ca42d72ad892a006a5cdb9897cda723cfd64a5959b77",
370370
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
371371
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
372372
"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
@@ -139,7 +139,7 @@ require (
139139
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
140140
github.com/cockroachdb/gostdlib v1.19.0
141141
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
142-
github.com/cockroachdb/pebble v0.0.0-20250530172448-9360e681647e
142+
github.com/cockroachdb/pebble v0.0.0-20250603182808-a1bc6420d3c6
143143
github.com/cockroachdb/redact v1.1.6
144144
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
145145
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
@@ -597,8 +597,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
597597
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
598598
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
599599
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
600-
github.com/cockroachdb/pebble v0.0.0-20250530172448-9360e681647e h1:41se5AmGBRIsDHH5h14HZ/owUytNWbxrLzbIRfikkf4=
601-
github.com/cockroachdb/pebble v0.0.0-20250530172448-9360e681647e/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
600+
github.com/cockroachdb/pebble v0.0.0-20250603182808-a1bc6420d3c6 h1:wb1UXjaUwwF7HatmYxzfXJVGzJCMMDUz0lBtIrm2XqE=
601+
github.com/cockroachdb/pebble v0.0.0-20250603182808-a1bc6420d3c6/go.mod h1:cnPe7/4+ZaEoSSlr4P3QT2CBbd6fdnP+JQ6On5PEpoE=
602602
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
603603
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
604604
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

‎pkg/storage/pebble.go‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ func DefaultPebbleOptions() *pebble.Options {
424424
L0CompactionThreshold: 2,
425425
L0StopWritesThreshold: 1000,
426426
LBaseMaxBytes: 64 << 20, // 64 MB
427-
Levels: make([]pebble.LevelOptions, 7),
428427
MemTableSize: 64 << 20, // 64 MB
429428
MemTableStopWritesThreshold: 4,
430429
Merger: MVCCMerger,
@@ -463,16 +462,21 @@ func DefaultPebbleOptions() *pebble.Options {
463462

464463
opts.Experimental.UserKeyCategories = userKeyCategories
465464

466-
for i := 0; i < len(opts.Levels); i++ {
465+
opts.Levels[0] = pebble.LevelOptions{
466+
BlockSize: 32 << 10, // 32 KB
467+
IndexBlockSize: 256 << 10, // 256 KB
468+
FilterPolicy: bloom.FilterPolicy(10),
469+
FilterType: pebble.TableFilter,
470+
}
471+
opts.Levels[0].EnsureL0Defaults()
472+
for i := 1; i < len(opts.Levels); i++ {
467473
l := &opts.Levels[i]
468474
l.BlockSize = 32 << 10 // 32 KB
469475
l.IndexBlockSize = 256 << 10 // 256 KB
470476
l.FilterPolicy = bloom.FilterPolicy(10)
471477
l.FilterType = pebble.TableFilter
472-
if i > 0 {
473-
l.TargetFileSize = opts.Levels[i-1].TargetFileSize * 2
474-
}
475-
l.EnsureDefaults()
478+
l.TargetFileSize = opts.Levels[i-1].TargetFileSize * 2
479+
l.EnsureL1PlusDefaults(&opts.Levels[i-1])
476480
}
477481

478482
// These size classes are a subset of available size classes in jemalloc[1].

0 commit comments

Comments
 (0)