@@ -1319,33 +1319,32 @@ func TestCompactionPickerCompensatedSize(t *testing.T) {
1319
1319
}
1320
1320
1321
1321
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
1335
1324
defer func () {
1336
1325
if d != nil {
1337
1326
require .NoError (t , d .Close ())
1338
1327
}
1339
1328
}()
1340
1329
1341
- var problemSpans * problemspans.ByLevel
1342
-
1343
1330
datadriven .RunTest (t , "testdata/compaction_picker_pick_file" , func (t * testing.T , td * datadriven.TestData ) string {
1344
1331
switch td .Cmd {
1345
1332
case "define" :
1346
1333
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
+ }
1348
1346
1347
+ var err error
1349
1348
d , err = runDBDefineCmd (td , opts )
1350
1349
if err != nil {
1351
1350
return err .Error ()
@@ -1378,7 +1377,7 @@ func TestCompactionPickerPickFile(t *testing.T) {
1378
1377
1379
1378
case "problem-spans" :
1380
1379
problemSpans = & problemspans.ByLevel {}
1381
- problemSpans .Init (manifest .NumLevels , opts .Comparer .Compare )
1380
+ problemSpans .Init (manifest .NumLevels , d . opts .Comparer .Compare )
1382
1381
for _ , line := range crstrings .Lines (td .Input ) {
1383
1382
var level int
1384
1383
var span1 , span2 string
@@ -1418,7 +1417,7 @@ func TestCompactionPickerPickFile(t *testing.T) {
1418
1417
}
1419
1418
p := d .mu .versions .picker .(* compactionPickerByScore )
1420
1419
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 )
1422
1421
}()
1423
1422
if ! ok {
1424
1423
return "(none)"
0 commit comments