Skip to content

Commit bf1dcd0

Browse files
committed
db: enable columnar blocks by default
By default enable columnar blocks. In the future, the option to configure use of columnar blocks will be removed altogether, and columnar blocks will always be used.
1 parent 8e86378 commit bf1dcd0

File tree

6 files changed

+14
-8
lines changed

6 files changed

+14
-8
lines changed

format_major_version.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,9 @@ func (d *DB) TableFormat() sstable.TableFormat {
380380
if d.opts.Experimental.EnableValueBlocks == nil || !d.opts.Experimental.EnableValueBlocks() {
381381
f = sstable.TableFormatPebblev2
382382
}
383-
case sstable.TableFormatPebblev5, sstable.TableFormatPebblev6:
384-
if d.opts.Experimental.EnableColumnarBlocks == nil || !d.opts.Experimental.EnableColumnarBlocks() {
383+
default:
384+
if f.BlockColumnar() && (d.opts.Experimental.EnableColumnarBlocks == nil ||
385+
!d.opts.Experimental.EnableColumnarBlocks()) {
385386
f = sstable.TableFormatPebblev4
386387
}
387388
}

options.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,6 +1304,9 @@ func (o *Options) EnsureDefaults() {
13041304
if o.Experimental.DeletionSizeRatioThreshold == 0 {
13051305
o.Experimental.DeletionSizeRatioThreshold = sstable.DefaultDeletionSizeRatioThreshold
13061306
}
1307+
if o.Experimental.EnableColumnarBlocks == nil {
1308+
o.Experimental.EnableColumnarBlocks = func() bool { return true }
1309+
}
13071310
if o.Experimental.TombstoneDenseCompactionThreshold == 0 {
13081311
o.Experimental.TombstoneDenseCompactionThreshold = 0.10
13091312
}

options_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ func TestDefaultOptionsString(t *testing.T) {
8686
compaction_debt_concurrency=1073741824
8787
comparer=leveldb.BytewiseComparator
8888
disable_wal=false
89+
enable_columnar_blocks=true
8990
flush_delay_delete_range=0s
9091
flush_delay_range_key=0s
9192
flush_split_bytes=4194304

range_del_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,12 @@ L3:
382382
}
383383

384384
// TODO(jackson): Create a datadriven test and exercise it on
385-
// TableFormatPebblev6 and later format major versions. This test is tightly
385+
// TableFormatPebblev5 and later format major versions. This test is tightly
386386
// coupled to the current estimated sizes and won't produce the necessary
387387
// input LSM structure on later format major versions.
388388
versions := []FormatMajorVersion{
389389
FormatMinSupported,
390-
FormatWALSyncChunks,
390+
FormatFlushableIngestExcises,
391391
}
392392
for _, version := range versions {
393393
t.Run(fmt.Sprintf("version-%s", version), func(t *testing.T) {

replay/testdata/replay

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ tree
1111
614 000007.sst
1212
0 LOCK
1313
133 MANIFEST-000001
14-
1494 OPTIONS-000003
14+
1524 OPTIONS-000003
1515
0 marker.format-version.000001.013
1616
0 marker.manifest.000001.MANIFEST-000001
1717
simple/
@@ -21,7 +21,7 @@ tree
2121
25 000004.log
2222
586 000005.sst
2323
85 MANIFEST-000001
24-
1494 OPTIONS-000003
24+
1524 OPTIONS-000003
2525
0 marker.format-version.000001.013
2626
0 marker.manifest.000001.MANIFEST-000001
2727

@@ -38,6 +38,7 @@ cat build/OPTIONS-000003
3838
compaction_debt_concurrency=1073741824
3939
comparer=pebble.internal.testkeys
4040
disable_wal=false
41+
enable_columnar_blocks=true
4142
flush_delay_delete_range=0s
4243
flush_delay_range_key=0s
4344
flush_split_bytes=4194304

replay/testdata/replay_paced

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ tree
1414
0 LOCK
1515
133 MANIFEST-000001
1616
205 MANIFEST-000010
17-
1494 OPTIONS-000003
17+
1524 OPTIONS-000003
1818
0 marker.format-version.000001.013
1919
0 marker.manifest.000002.MANIFEST-000010
2020
high_read_amp/
@@ -26,7 +26,7 @@ tree
2626
39 000008.log
2727
560 000009.sst
2828
157 MANIFEST-000010
29-
1494 OPTIONS-000003
29+
1524 OPTIONS-000003
3030
0 marker.format-version.000001.013
3131
0 marker.manifest.000001.MANIFEST-000010
3232

0 commit comments

Comments
 (0)