Skip to content

Commit a44397a

Browse files
jbowensjbowens
committed
go.mod: bump Pebble to 9be04468f598
Changes: * [`9be04468`](cockroachdb/pebble@9be04468) db: add more logs to TestCompactionCorruption * [`e52a9b1d`](cockroachdb/pebble@e52a9b1d) wal: hint sequential reads when reading WAL files * [`43d95d5d`](cockroachdb/pebble@43d95d5d) internal/testutils: move Logger * [`71cce7bd`](cockroachdb/pebble@71cce7bd) db: take ScanInternal options through an options struct * [`ab9ffc9d`](cockroachdb/pebble@ab9ffc9d) block,cache: trace and stats for wait duration (for concurrent reads) * [`1f091ae1`](cockroachdb/pebble@1f091ae1) blockkind: remove the Index Kind * [`0c927430`](cockroachdb/pebble@0c927430) block: don't obtain decompressor twice * [`f4ef14f2`](cockroachdb/pebble@f4ef14f2) tool: show compression stats in sstable properties * [`222c46bb`](cockroachdb/pebble@222c46bb) db: propagate *PhysicalBlobFile to reportCorruption * [`bbd7e034`](cockroachdb/pebble@bbd7e034) base: add DiskFile interface * [`cbfea02d`](cockroachdb/pebble@cbfea02d) base: move BlobReferenceID, BlobFileMapping * [`436c169a`](cockroachdb/pebble@436c169a) db: remove EnableColumnarBlocks option * [`453a7219`](cockroachdb/pebble@453a7219) arenaskl,batchskl: add test ensuring node contains no pointer types Release note: none. Epic: none.
1 parent 464489b commit a44397a

File tree

6 files changed

+31
-14
lines changed

6 files changed

+31
-14
lines changed

‎DEPS.bzl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,10 +1850,10 @@ def go_deps():
18501850
patches = [
18511851
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18521852
],
1853-
sha256 = "e47b5d6c32ebd359e64d4332866e2935861a82cff227ccfe184741384955b199",
1854-
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20250806123517-258531bdf87e",
1853+
sha256 = "668f4a5ade4ee097a7f6f504672e202032329b11f1d0191361d75223922b1986",
1854+
strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20250812190039-9be04468f598",
18551855
urls = [
1856-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250806123517-258531bdf87e.zip",
1856+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250812190039-9be04468f598.zip",
18571857
],
18581858
)
18591859
go_repository(

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ DISTDIR_FILES = {
359359
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
360360
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
361361
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
362-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250806123517-258531bdf87e.zip": "e47b5d6c32ebd359e64d4332866e2935861a82cff227ccfe184741384955b199",
362+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250812190039-9be04468f598.zip": "668f4a5ade4ee097a7f6f504672e202032329b11f1d0191361d75223922b1986",
363363
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
364364
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
365365
"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
@@ -136,7 +136,7 @@ require (
136136
github.com/cockroachdb/errors v1.12.0
137137
github.com/cockroachdb/gostdlib v1.19.0
138138
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
139-
github.com/cockroachdb/pebble v0.0.0-20250806123517-258531bdf87e
139+
github.com/cockroachdb/pebble v0.0.0-20250812190039-9be04468f598
140140
github.com/cockroachdb/redact v1.1.6
141141
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
142142
github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
583583
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
584584
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
585585
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
586-
github.com/cockroachdb/pebble v0.0.0-20250806123517-258531bdf87e h1:MqHNboOEEG68bOzAvh+crJX7j9CmkvyTiGWtTphR0Eg=
587-
github.com/cockroachdb/pebble v0.0.0-20250806123517-258531bdf87e/go.mod h1:86lLSKhilQEdaYPIVAG2mIlDGhxlKX1CUkr4Z09nCzA=
586+
github.com/cockroachdb/pebble v0.0.0-20250812190039-9be04468f598 h1:38IyfrdbyCapHZZS2A6uCBROisJ3Cy0IirleW955AD0=
587+
github.com/cockroachdb/pebble v0.0.0-20250812190039-9be04468f598/go.mod h1:86lLSKhilQEdaYPIVAG2mIlDGhxlKX1CUkr4Z09nCzA=
588588
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
589589
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
590590
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

‎pkg/storage/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ go_library(
104104
"@com_github_cockroachdb_pebble//rangekey",
105105
"@com_github_cockroachdb_pebble//replay",
106106
"@com_github_cockroachdb_pebble//sstable",
107-
"@com_github_cockroachdb_pebble//sstable/block",
108107
"@com_github_cockroachdb_pebble//vfs",
109108
"@com_github_cockroachdb_pebble//wal",
110109
"@com_github_cockroachdb_redact//:redact",

‎pkg/storage/pebble.go‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ import (
5555
"github.com/cockroachdb/pebble/rangekey"
5656
"github.com/cockroachdb/pebble/replay"
5757
"github.com/cockroachdb/pebble/sstable"
58-
"github.com/cockroachdb/pebble/sstable/block"
5958
"github.com/cockroachdb/pebble/vfs"
6059
"github.com/cockroachdb/redact"
6160
"github.com/dustin/go-humanize"
@@ -934,7 +933,6 @@ func newPebble(ctx context.Context, cfg engineConfig) (p *Pebble, err error) {
934933
cfg.opts.Experimental.IngestSplit = func() bool {
935934
return IngestSplitEnabled.Get(&cfg.settings.SV)
936935
}
937-
cfg.opts.Experimental.EnableColumnarBlocks = func() bool { return true }
938936
cfg.opts.Experimental.EnableDeleteOnlyCompactionExcises = func() bool {
939937
return deleteCompactionsCanExcise.Get(&cfg.settings.SV)
940938
}
@@ -1499,8 +1497,18 @@ func (p *Pebble) ScanInternal(
14991497
rawLower := EngineKey{Key: lower}.Encode()
15001498
rawUpper := EngineKey{Key: upper}.Encode()
15011499
// TODO(sumeer): set category.
1502-
return p.db.ScanInternal(ctx, block.CategoryUnknown, rawLower, rawUpper, visitPointKey,
1503-
visitRangeDel, visitRangeKey, visitSharedFile, visitExternalFile)
1500+
return p.db.ScanInternal(ctx, pebble.ScanInternalOptions{
1501+
IterOptions: pebble.IterOptions{
1502+
LowerBound: rawLower,
1503+
UpperBound: rawUpper,
1504+
KeyTypes: pebble.IterKeyTypePointsAndRanges,
1505+
},
1506+
VisitPointKey: visitPointKey,
1507+
VisitRangeDel: visitRangeDel,
1508+
VisitRangeKey: visitRangeKey,
1509+
VisitSharedFile: visitSharedFile,
1510+
VisitExternalFile: visitExternalFile,
1511+
})
15041512
}
15051513

15061514
// ConsistentIterators implements the Engine interface.
@@ -3001,8 +3009,18 @@ func (p *pebbleSnapshot) ScanInternal(
30013009
rawLower := EngineKey{Key: lower}.Encode()
30023010
rawUpper := EngineKey{Key: upper}.Encode()
30033011
// TODO(sumeer): set category.
3004-
return p.efos.ScanInternal(ctx, block.CategoryUnknown, rawLower, rawUpper, visitPointKey,
3005-
visitRangeDel, visitRangeKey, visitSharedFile, visitExternalFile)
3012+
return p.efos.ScanInternal(ctx, pebble.ScanInternalOptions{
3013+
IterOptions: pebble.IterOptions{
3014+
LowerBound: rawLower,
3015+
UpperBound: rawUpper,
3016+
KeyTypes: pebble.IterKeyTypePointsAndRanges,
3017+
},
3018+
VisitPointKey: visitPointKey,
3019+
VisitRangeDel: visitRangeDel,
3020+
VisitRangeKey: visitRangeKey,
3021+
VisitSharedFile: visitSharedFile,
3022+
VisitExternalFile: visitExternalFile,
3023+
})
30063024
}
30073025

30083026
// ExceedMaxSizeError is the error returned when an export request

0 commit comments

Comments
 (0)