Skip to content

Commit 372748c

Browse files
committed
db: don't reuse options in TestMarkedForCompaction
1 parent 5115ff4 commit 372748c

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

compaction_test.go

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2776,9 +2776,6 @@ func TestCompactionInvalidBounds(t *testing.T) {
27762776
func TestMarkedForCompaction(t *testing.T) {
27772777
defer leaktest.AfterTest(t)()
27782778

2779-
var mem vfs.FS = vfs.NewMem()
2780-
var d *DB
2781-
27822779
var buf bytes.Buffer
27832780
eventListener := EventListener{
27842781
CompactionEnd: func(info CompactionInfo) {
@@ -2792,19 +2789,24 @@ func TestMarkedForCompaction(t *testing.T) {
27922789
if testing.Verbose() {
27932790
eventListener = TeeEventListener(eventListener, MakeLoggingEventListener(base.DefaultLogger))
27942791
}
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
28052806
}
2806-
opts.WithFSDefaults()
28072807

2808+
var opts *Options
2809+
var d *DB
28082810
datadriven.RunTest(t, "testdata/marked_for_compaction", func(t *testing.T, td *datadriven.TestData) string {
28092811
buf.Reset()
28102812
switch td.Cmd {
@@ -2834,6 +2836,7 @@ func TestMarkedForCompaction(t *testing.T) {
28342836
return err.Error()
28352837
}
28362838
}
2839+
opts = mkOpts()
28372840
var err error
28382841
if d, err = runDBDefineCmd(td, opts); err != nil {
28392842
return err.Error()

0 commit comments

Comments
 (0)