db: remove unused runIngestCmd argument

RaduBerinde · RaduBerinde · commit cc9d5be903a4 · 2025-09-10T13:41:04.000-07:00
In some tests (`TestCompaction`), the passed argument is incorrect
anyway (because `runDBDefineCmd` overwrites the FS we think we're
using).
diff --git a/compaction_picker_test.go b/compaction_picker_test.go
@@ -1544,7 +1544,7 @@ func TestCompactionPickerScores(t *testing.T) {
 			if err := runBuildCmd(td, d, d.opts.FS); err != nil {
 				return err.Error()
 			}
-			if err := runIngestCmd(td, d, d.opts.FS); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			d.mu.Lock()
diff --git a/compaction_test.go b/compaction_test.go
@@ -1094,7 +1094,7 @@ func runCompactionTest(
 			return runGetCmd(t, td, d)
 
 		case "ingest":
-			if err := runIngestCmd(td, d, mem); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			d.mu.Lock()
@@ -1848,7 +1848,7 @@ func TestCompactionDeleteOnlyHints(t *testing.T) {
 				if err = runBuildCmd(td, d, d.opts.FS); err != nil {
 					return err.Error()
 				}
-				if err = runIngestCmd(td, d, d.opts.FS); err != nil {
+				if err = runIngestCmd(td, d); err != nil {
 					return err.Error()
 				}
 				return "OK"
diff --git a/data_test.go b/data_test.go
@@ -1553,7 +1553,7 @@ func runIngestAndExciseCmd(td *datadriven.TestData, d *DB) error {
 	return nil
 }
 
-func runIngestCmd(td *datadriven.TestData, d *DB, fs vfs.FS) error {
+func runIngestCmd(td *datadriven.TestData, d *DB) error {
 	paths := make([]string, 0, len(td.CmdArgs))
 	for _, arg := range td.CmdArgs {
 		if arg.Key == "no-wait" {
diff --git a/disk_usage_test.go b/disk_usage_test.go
@@ -88,7 +88,7 @@ func TestEstimateDiskUsageDataDriven(t *testing.T) {
 			return ""
 
 		case "ingest":
-			if err := runIngestCmd(td, d, fs); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			return ""
diff --git a/excise_test.go b/excise_test.go
@@ -160,7 +160,7 @@ func TestExcise(t *testing.T) {
 			if !noWait {
 				clearFlushed()
 			}
-			if err := runIngestCmd(td, d, mem); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			if noWait {
@@ -519,7 +519,7 @@ func TestConcurrentExcise(t *testing.T) {
 			return ""
 
 		case "ingest":
-			if err := runIngestCmd(td, d, d.opts.FS); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			// Wait for a possible flush.
diff --git a/ingest_test.go b/ingest_test.go
@@ -579,7 +579,7 @@ func TestOverlappingIngestedSSTs(t *testing.T) {
 			return ""
 
 		case "ingest":
-			if err := runIngestCmd(td, d, mem); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			if !blockFlush {
@@ -789,7 +789,7 @@ func testIngestSharedImpl(
 			return ""
 
 		case "ingest":
-			if err := runIngestCmd(td, d, d.opts.FS); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			// Wait for a possible flush.
@@ -1245,7 +1245,7 @@ func TestIngestExternal(t *testing.T) {
 
 		case "ingest":
 			flushed = false
-			if err := runIngestCmd(td, d, mem); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			// Wait for a possible flush.
@@ -1752,7 +1752,7 @@ func TestIngest(t *testing.T) {
 
 		case "ingest":
 			flushed = false
-			if err := runIngestCmd(td, d, mem); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			// Wait for a possible flush.
diff --git a/iterator_histories_test.go b/iterator_histories_test.go
@@ -226,15 +226,15 @@ func TestIterHistories(t *testing.T) {
 				}
 				return ""
 			case "ingest-existing":
-				if err := runIngestCmd(td, d, d.opts.FS); err != nil {
+				if err := runIngestCmd(td, d); err != nil {
 					return err.Error()
 				}
 				return ""
 			case "ingest":
 				if err := runBuildCmd(td, d, d.opts.FS); err != nil {
 					return err.Error()
 				}
-				if err := runIngestCmd(td, d, d.opts.FS); err != nil {
+				if err := runIngestCmd(td, d); err != nil {
 					return err.Error()
 				}
 				return ""
diff --git a/iterator_test.go b/iterator_test.go
@@ -573,7 +573,7 @@ func TestIteratorNextPrev(t *testing.T) {
 			return ""
 
 		case "ingest":
-			if err := runIngestCmd(td, d, mem); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			return runLSMCmd(td, d)
@@ -633,7 +633,7 @@ func TestIteratorStats(t *testing.T) {
 			return ""
 
 		case "ingest":
-			if err := runIngestCmd(td, d, mem); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			return runLSMCmd(td, d)
diff --git a/metrics_test.go b/metrics_test.go
@@ -362,7 +362,7 @@ func TestMetrics(t *testing.T) {
 			return s
 
 		case "ingest":
-			if err := runIngestCmd(td, d, d.opts.FS); err != nil {
+			if err := runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			return ""
diff --git a/table_stats_test.go b/table_stats_test.go
@@ -115,7 +115,7 @@ func TestTableStats(t *testing.T) {
 			if err = runBuildCmd(td, d, d.opts.FS); err != nil {
 				return err.Error()
 			}
-			if err = runIngestCmd(td, d, d.opts.FS); err != nil {
+			if err = runIngestCmd(td, d); err != nil {
 				return err.Error()
 			}
 			d.mu.Lock()

Original file line number	Diff line number	Diff line change
`@@ -1544,7 +1544,7 @@ func TestCompactionPickerScores(t *testing.T) {`
`1544`	`1544`	`if err := runBuildCmd(td, d, d.opts.FS); err != nil {`
`1545`	`1545`	`return err.Error()`
`1546`	`1546`	`}`
`1547`		`- if err := runIngestCmd(td, d, d.opts.FS); err != nil {`
	`1547`	`+ if err := runIngestCmd(td, d); err != nil {`
`1548`	`1548`	`return err.Error()`
`1549`	`1549`	`}`
`1550`	`1550`	`d.mu.Lock()`
Original file line number	Diff line number	Diff line change
`@@ -1094,7 +1094,7 @@ func runCompactionTest(`
`1094`	`1094`	`return runGetCmd(t, td, d)`
`1095`	`1095`
`1096`	`1096`	`case "ingest":`
`1097`		`- if err := runIngestCmd(td, d, mem); err != nil {`
	`1097`	`+ if err := runIngestCmd(td, d); err != nil {`
`1098`	`1098`	`return err.Error()`
`1099`	`1099`	`}`
`1100`	`1100`	`d.mu.Lock()`
`@@ -1848,7 +1848,7 @@ func TestCompactionDeleteOnlyHints(t *testing.T) {`
`1848`	`1848`	`if err = runBuildCmd(td, d, d.opts.FS); err != nil {`
`1849`	`1849`	`return err.Error()`
`1850`	`1850`	`}`
`1851`		`- if err = runIngestCmd(td, d, d.opts.FS); err != nil {`
	`1851`	`+ if err = runIngestCmd(td, d); err != nil {`
`1852`	`1852`	`return err.Error()`
`1853`	`1853`	`}`
`1854`	`1854`	`return "OK"`
Original file line number	Diff line number	Diff line change
`@@ -1553,7 +1553,7 @@ func runIngestAndExciseCmd(td datadriven.TestData, d DB) error {`
`1553`	`1553`	`return nil`
`1554`	`1554`	`}`
`1555`	`1555`
`1556`		`-func runIngestCmd(td datadriven.TestData, d DB, fs vfs.FS) error {`
	`1556`	`+func runIngestCmd(td datadriven.TestData, d DB) error {`
`1557`	`1557`	`paths := make([]string, 0, len(td.CmdArgs))`
`1558`	`1558`	`for _, arg := range td.CmdArgs {`
`1559`	`1559`	`if arg.Key == "no-wait" {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func TestEstimateDiskUsageDataDriven(t *testing.T) {`
`88`	`88`	`return ""`
`89`	`89`
`90`	`90`	`case "ingest":`
`91`		`- if err := runIngestCmd(td, d, fs); err != nil {`
	`91`	`+ if err := runIngestCmd(td, d); err != nil {`
`92`	`92`	`return err.Error()`
`93`	`93`	`}`
`94`	`94`	`return ""`
Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ func TestExcise(t *testing.T) {`
`160`	`160`	`if !noWait {`
`161`	`161`	`clearFlushed()`
`162`	`162`	`}`
`163`		`- if err := runIngestCmd(td, d, mem); err != nil {`
	`163`	`+ if err := runIngestCmd(td, d); err != nil {`
`164`	`164`	`return err.Error()`
`165`	`165`	`}`
`166`	`166`	`if noWait {`
`@@ -519,7 +519,7 @@ func TestConcurrentExcise(t *testing.T) {`
`519`	`519`	`return ""`
`520`	`520`
`521`	`521`	`case "ingest":`
`522`		`- if err := runIngestCmd(td, d, d.opts.FS); err != nil {`
	`522`	`+ if err := runIngestCmd(td, d); err != nil {`
`523`	`523`	`return err.Error()`
`524`	`524`	`}`
`525`	`525`	`// Wait for a possible flush.`
Original file line number	Diff line number	Diff line change
`@@ -226,15 +226,15 @@ func TestIterHistories(t *testing.T) {`
`226`	`226`	`}`
`227`	`227`	`return ""`
`228`	`228`	`case "ingest-existing":`
`229`		`- if err := runIngestCmd(td, d, d.opts.FS); err != nil {`
	`229`	`+ if err := runIngestCmd(td, d); err != nil {`
`230`	`230`	`return err.Error()`
`231`	`231`	`}`
`232`	`232`	`return ""`
`233`	`233`	`case "ingest":`
`234`	`234`	`if err := runBuildCmd(td, d, d.opts.FS); err != nil {`
`235`	`235`	`return err.Error()`
`236`	`236`	`}`
`237`		`- if err := runIngestCmd(td, d, d.opts.FS); err != nil {`
	`237`	`+ if err := runIngestCmd(td, d); err != nil {`
`238`	`238`	`return err.Error()`
`239`	`239`	`}`
`240`	`240`	`return ""`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ func TestMetrics(t *testing.T) {`
`362`	`362`	`return s`
`363`	`363`
`364`	`364`	`case "ingest":`
`365`		`- if err := runIngestCmd(td, d, d.opts.FS); err != nil {`
	`365`	`+ if err := runIngestCmd(td, d); err != nil {`
`366`	`366`	`return err.Error()`
`367`	`367`	`}`
`368`	`368`	`return ""`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ func TestTableStats(t *testing.T) {`
`115`	`115`	`if err = runBuildCmd(td, d, d.opts.FS); err != nil {`
`116`	`116`	`return err.Error()`
`117`	`117`	`}`
`118`		`- if err = runIngestCmd(td, d, d.opts.FS); err != nil {`
	`118`	`+ if err = runIngestCmd(td, d); err != nil {`
`119`	`119`	`return err.Error()`
`120`	`120`	`}`
`121`	`121`	`d.mu.Lock()`