@@ -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