@@ -2776,9 +2776,6 @@ func TestCompactionInvalidBounds(t *testing.T) {
2776
2776
func TestMarkedForCompaction (t * testing.T ) {
2777
2777
defer leaktest .AfterTest (t )()
2778
2778
2779
- var mem vfs.FS = vfs .NewMem ()
2780
- var d * DB
2781
-
2782
2779
var buf bytes.Buffer
2783
2780
eventListener := EventListener {
2784
2781
CompactionEnd : func (info CompactionInfo ) {
@@ -2792,19 +2789,24 @@ func TestMarkedForCompaction(t *testing.T) {
2792
2789
if testing .Verbose () {
2793
2790
eventListener = TeeEventListener (eventListener , MakeLoggingEventListener (base .DefaultLogger ))
2794
2791
}
2795
- opts := & Options {
2796
- FS : mem ,
2797
- DebugCheck : DebugCheckLevels ,
2798
- DisableAutomaticCompactions : true ,
2799
- FormatMajorVersion : internalFormatNewest ,
2800
- EventListener : & eventListener ,
2801
- Logger : testutils.Logger {T : t },
2802
- }
2803
- opts .Experimental .CompactionScheduler = func () CompactionScheduler {
2804
- return NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest ()
2792
+ mkOpts := func () * Options {
2793
+ opts := & Options {
2794
+ FS : vfs .NewMem (),
2795
+ DebugCheck : DebugCheckLevels ,
2796
+ DisableAutomaticCompactions : true ,
2797
+ FormatMajorVersion : internalFormatNewest ,
2798
+ EventListener : & eventListener ,
2799
+ Logger : testutils.Logger {T : t },
2800
+ }
2801
+ opts .Experimental .CompactionScheduler = func () CompactionScheduler {
2802
+ return NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest ()
2803
+ }
2804
+ opts .WithFSDefaults ()
2805
+ return opts
2805
2806
}
2806
- opts .WithFSDefaults ()
2807
2807
2808
+ var opts * Options
2809
+ var d * DB
2808
2810
datadriven .RunTest (t , "testdata/marked_for_compaction" , func (t * testing.T , td * datadriven.TestData ) string {
2809
2811
buf .Reset ()
2810
2812
switch td .Cmd {
@@ -2834,6 +2836,7 @@ func TestMarkedForCompaction(t *testing.T) {
2834
2836
return err .Error ()
2835
2837
}
2836
2838
}
2839
+ opts = mkOpts ()
2837
2840
var err error
2838
2841
if d , err = runDBDefineCmd (td , opts ); err != nil {
2839
2842
return err .Error ()
0 commit comments