Skip to content

Commit 505e4d3

Browse files
committed
db: don't reuse options in TestCompactionPickerPickFile
1 parent 372748c commit 505e4d3

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

compaction_picker_test.go

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1319,33 +1319,32 @@ func TestCompactionPickerCompensatedSize(t *testing.T) {
13191319
}
13201320

13211321
func TestCompactionPickerPickFile(t *testing.T) {
1322-
fs := vfs.NewMem()
1323-
opts := &Options{
1324-
Comparer: testkeys.Comparer,
1325-
FormatMajorVersion: FormatNewest,
1326-
FS: fs,
1327-
Logger: testutils.Logger{T: t},
1328-
}
1329-
opts.Experimental.CompactionScheduler = func() CompactionScheduler {
1330-
return NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest()
1331-
}
1332-
1333-
d, err := Open("", opts)
1334-
require.NoError(t, err)
1322+
var problemSpans *problemspans.ByLevel
1323+
var d *DB
13351324
defer func() {
13361325
if d != nil {
13371326
require.NoError(t, d.Close())
13381327
}
13391328
}()
13401329

1341-
var problemSpans *problemspans.ByLevel
1342-
13431330
datadriven.RunTest(t, "testdata/compaction_picker_pick_file", func(t *testing.T, td *datadriven.TestData) string {
13441331
switch td.Cmd {
13451332
case "define":
13461333
problemSpans = nil
1347-
require.NoError(t, d.Close())
1334+
if d != nil {
1335+
require.NoError(t, d.Close())
1336+
}
1337+
1338+
opts := &Options{
1339+
Comparer: testkeys.Comparer,
1340+
FormatMajorVersion: FormatNewest,
1341+
Logger: testutils.Logger{T: t},
1342+
}
1343+
opts.Experimental.CompactionScheduler = func() CompactionScheduler {
1344+
return NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest()
1345+
}
13481346

1347+
var err error
13491348
d, err = runDBDefineCmd(td, opts)
13501349
if err != nil {
13511350
return err.Error()
@@ -1378,7 +1377,7 @@ func TestCompactionPickerPickFile(t *testing.T) {
13781377

13791378
case "problem-spans":
13801379
problemSpans = &problemspans.ByLevel{}
1381-
problemSpans.Init(manifest.NumLevels, opts.Comparer.Compare)
1380+
problemSpans.Init(manifest.NumLevels, d.opts.Comparer.Compare)
13821381
for _, line := range crstrings.Lines(td.Input) {
13831382
var level int
13841383
var span1, span2 string
@@ -1418,7 +1417,7 @@ func TestCompactionPickerPickFile(t *testing.T) {
14181417
}
14191418
p := d.mu.versions.picker.(*compactionPickerByScore)
14201419
lf, ok = pickCompactionSeedFile(p.vers, &p.latestVersionState.virtualBackings,
1421-
opts, level, level+1, env.earliestSnapshotSeqNum, problemSpans)
1420+
d.opts, level, level+1, env.earliestSnapshotSeqNum, problemSpans)
14221421
}()
14231422
if !ok {
14241423
return "(none)"

0 commit comments

Comments
 (0)