workloadcccl: fix two regressions in fixtures make/load

pkg/ccl/workloadccl/allccl/all_test.go

@@ -26,6 +26,7 @@ const (
 	directIngestion  = true
 	oneFilePerNode   = 1
 	noInjectStats    = false
+	noSkipPostLoad   = false
 	skipCSVRoundtrip = ``
 )
 
@@ -84,7 +85,8 @@ func TestAllRegisteredImportFixture(t *testing.T) {
 			sqlutils.MakeSQLRunner(db).Exec(t, `CREATE DATABASE d`)
 
 			if _, err := workloadccl.ImportFixture(
-				ctx, db, gen, `d`, directIngestion, oneFilePerNode, noInjectStats, skipCSVRoundtrip,
+				ctx, db, gen, `d`, directIngestion, oneFilePerNode, noInjectStats, noSkipPostLoad,
+				skipCSVRoundtrip,
 			); err != nil {
 				t.Fatal(err)
 			}

pkg/ccl/workloadccl/bench_test.go

@@ -33,9 +33,9 @@ func benchmarkImportFixture(b *testing.B, gen workload.Generator) {
 
 		b.StartTimer()
 		const filesPerNode = 1
+		const directIngest, noInjectStats, skipPostLoad, csvServer = true, false, true, ``
 		importBytes, err := ImportFixture(
-			ctx, db, gen, `d`, true /* directIngestion */, filesPerNode, false, /* injectStats */
-			``, /* csvServer */
+			ctx, db, gen, `d`, directIngest, filesPerNode, noInjectStats, skipPostLoad, csvServer,
 		)
 		require.NoError(b, err)
 		bytes += importBytes

pkg/ccl/workloadccl/cliccl/fixtures.go

@@ -333,9 +333,10 @@ func fixturesImport(gen workload.Generator, urls []string, dbName string) error
 	directIngestion := *fixturesImportDirectIngestionTable
 	filesPerNode := *fixturesImportFilesPerNode
 	injectStats := *fixturesImportInjectStats
+	noSkipPostLoad := false
 	csvServer := *fixturesMakeImportCSVServerURL
 	bytes, err := workloadccl.ImportFixture(
-		ctx, sqlDB, gen, dbName, directIngestion, filesPerNode, injectStats, csvServer,
+		ctx, sqlDB, gen, dbName, directIngestion, filesPerNode, injectStats, noSkipPostLoad, csvServer,
 	)
 	if err != nil {
 		return errors.Wrap(err, `importing fixture`)

pkg/ccl/workloadccl/fixture.go

@@ -258,8 +258,10 @@ func MakeFixture(
 	if _, err := sqlDB.Exec(`CREATE DATABASE IF NOT EXISTS ` + dbName); err != nil {
 		return Fixture{}, err
 	}
-	const direct, stats, csvServer = false, false, ""
-	if _, err := ImportFixture(ctx, sqlDB, gen, dbName, direct, filesPerNode, stats, csvServer); err != nil {
+	const direct, stats, skipPostLoad, csvServer = false, false, true, ""
+	if _, err := ImportFixture(
+		ctx, sqlDB, gen, dbName, direct, filesPerNode, stats, skipPostLoad, csvServer,
+	); err != nil {
 		return Fixture{}, err
 	}
 	g := ctxgroup.WithContext(ctx)
@@ -293,6 +295,7 @@ func ImportFixture(
 	directIngestion bool,
 	filesPerNode int,
 	injectStats bool,
+	skipPostLoad bool,
 	csvServer string,
 ) (int64, error) {
 	for _, t := range gen.Tables() {
@@ -339,8 +342,10 @@ func ImportFixture(
 	if err := g.Wait(); err != nil {
 		return 0, err
 	}
-	if err := runPostLoadSteps(ctx, sqlDB, gen); err != nil {
-		return 0, err
+	if !skipPostLoad {
+		if err := runPostLoadSteps(ctx, sqlDB, gen); err != nil {
+			return 0, err
+		}
 	}
 	return atomic.LoadInt64(&bytesAtomic), nil
 }
@@ -449,13 +454,12 @@ func RestoreFixture(
 ) (int64, error) {
 	var bytesAtomic int64
 	g := ctxgroup.WithContext(ctx)
+	genName := fixture.Generator.Meta().Name
 	for _, table := range fixture.Tables {
 		table := table
 		g.GoCtx(func(ctx context.Context) error {
-			// The IMPORT ... CSV DATA command generates a backup with the table in
-			// database `csv`.
 			start := timeutil.Now()
-			importStmt := fmt.Sprintf(`RESTORE csv.%s FROM $1 WITH into_db=$2`, table.TableName)
+			importStmt := fmt.Sprintf(`RESTORE %s.%s FROM $1 WITH into_db=$2`, genName, table.TableName)
 			var rows, index, tableBytes int64
 			var discard interface{}
 			if err := sqlDB.QueryRow(importStmt, table.BackupURI, database).Scan(

pkg/ccl/workloadccl/fixture_test.go

@@ -183,10 +183,11 @@ func TestImportFixture(t *testing.T) {
 	}
 
 	const filesPerNode = 1
+	const noSkipPostLoad = false
 	sqlDB.Exec(t, `CREATE DATABASE distsort`)
 	_, err := ImportFixture(
 		ctx, db, gen, `distsort`, false /* directIngestion */, filesPerNode, true, /* injectStats */
-		``, /* csvServer */
+		noSkipPostLoad, ``, /* csvServer */
 	)
 	require.NoError(t, err)
 	sqlDB.CheckQueryResults(t,
@@ -203,7 +204,7 @@ func TestImportFixture(t *testing.T) {
 	sqlDB.Exec(t, `CREATE DATABASE direct`)
 	_, err = ImportFixture(
 		ctx, db, gen, `direct`, true /* directIngestion */, filesPerNode, false, /* injectStats */
-		``, /* csvServer */
+		noSkipPostLoad, ``, /* csvServer */
 	)
 	require.NoError(t, err)
 	sqlDB.CheckQueryResults(t,
@@ -240,9 +241,10 @@ func TestImportFixtureCSVServer(t *testing.T) {
 	}
 
 	const filesPerNode = 1
+	const noDirectIngest, noInjectStats, noSkipPostLoad = false, false, true
 	sqlDB.Exec(t, `CREATE DATABASE d`)
 	_, err := ImportFixture(
-		ctx, db, gen, `d`, false /* directIngestion */, filesPerNode, false /* injectStats */, ts.URL,
+		ctx, db, gen, `d`, noDirectIngest, filesPerNode, noInjectStats, noSkipPostLoad, ts.URL,
 	)
 	require.NoError(t, err)
 	sqlDB.CheckQueryResults(t,