diff --git a/pkg/ccl/backupccl/backup_test.go b/pkg/ccl/backupccl/backup_test.go index eebc51960750..21038602ec2d 100644 --- a/pkg/ccl/backupccl/backup_test.go +++ b/pkg/ccl/backupccl/backup_test.go @@ -10876,3 +10876,110 @@ func TestExportResponseDataSizeZeroCPUPagination(t *testing.T) { sqlDB.Exec(t, `BACKUP TABLE foo INTO 'nodelocal://1/foo'`) require.Equal(t, 2, numRequests) } + +func TestBackupRestoreForeignKeys(t *testing.T) { + defer leaktest.AfterTest(t)() + defer log.Scope(t).Close(t) + + params := base.TestServerArgs{} + const numAccounts = 1000 + _, sqlDB, _, cleanup := backupRestoreTestSetupWithParams(t, singleNode, numAccounts, + InitManualReplication, base.TestClusterArgs{ServerArgs: params}) + defer cleanup() + + sqlDB.Exec(t, `CREATE DATABASE test`) + sqlDB.Exec(t, `SET database = test`) + sqlDB.Exec(t, ` +CREATE TABLE circular (k INT8 PRIMARY KEY, selfid INT8 UNIQUE); +ALTER TABLE circular ADD CONSTRAINT self_fk FOREIGN KEY (selfid) REFERENCES circular (selfid); +CREATE TABLE parent (k INT8 PRIMARY KEY, j INT8 UNIQUE); +CREATE TABLE child (k INT8 PRIMARY KEY, parent_i INT8 REFERENCES parent, parent_j INT8 REFERENCES parent (j)); +CREATE TABLE child_pk (k INT8 PRIMARY KEY REFERENCES parent); +`) + + sqlDB.Exec(t, `BACKUP INTO $1 WITH revision_history`, localFoo) + + sqlDB.Exec(t, `CREATE TABLE rev_times (id INT PRIMARY KEY, logical_time DECIMAL);`) + sqlDB.Exec(t, `INSERT INTO rev_times VALUES (1, cluster_logical_timestamp());`) + + sqlDB.Exec(t, ` + CREATE USER newuser; + GRANT ALL ON circular TO newuser; + GRANT ALL ON parent TO newuser; +`) + + sqlDB.Exec(t, `BACKUP INTO LATEST IN $1 WITH revision_history`, localFoo) + sqlDB.Exec(t, `INSERT INTO rev_times VALUES (2, cluster_logical_timestamp())`) + + sqlDB.Exec(t, `GRANT ALL ON child TO newuser;`) + + sqlDB.Exec(t, `BACKUP INTO LATEST IN $1 WITH revision_history`, localFoo) + sqlDB.Exec(t, `INSERT INTO rev_times VALUES (3, cluster_logical_timestamp())`) + + sqlDB.Exec(t, `GRANT ALL ON child_pk TO newuser`) + + sqlDB.Exec(t, `BACKUP INTO LATEST IN $1 WITH revision_history`, localFoo) + + // Test that `SHOW BACKUP` displays the foreign keys correctly. + type testCase struct { + table string + expectedForeignKeyPattern string + } + for _, tc := range []testCase{ + { + "circular", + "CONSTRAINT self_fk FOREIGN KEY \\(selfid\\) REFERENCES public\\.circular\\(selfid\\) NOT VALID", + }, + { + "child", + "CONSTRAINT \\w+ FOREIGN KEY \\(\\w+\\) REFERENCES public\\.parent\\(\\w+\\)", + }, + { + "child_pk", + "CONSTRAINT \\w+ FOREIGN KEY \\(\\w+\\) REFERENCES public\\.parent\\(\\w+\\)", + }, + } { + results := sqlDB.QueryStr(t, ` + SELECT + create_statement + FROM + [SHOW BACKUP SCHEMAS FROM LATEST IN $1] + WHERE + object_type = 'table' AND object_name = $2 + `, localFoo, tc.table) + require.NotEmpty(t, results) + require.Regexp(t, regexp.MustCompile(tc.expectedForeignKeyPattern), results[0][0]) + } + sqlDB.Exec(t, `DROP DATABASE test`) + + // Test restoring different objects from the backup. + sqlDB.Exec(t, `CREATE DATABASE ts`) + sqlDB.Exec(t, `RESTORE test.rev_times FROM LATEST IN $1 WITH into_db = 'ts'`, localFoo) + for _, ts := range sqlDB.QueryStr(t, `SELECT logical_time FROM ts.rev_times`) { + sqlDB.Exec(t, fmt.Sprintf(`RESTORE DATABASE test FROM LATEST IN $1 AS OF SYSTEM TIME %s`, ts[0]), localFoo) + // Just rendering the constraints loads and validates schema. + sqlDB.Exec(t, `SELECT * FROM pg_catalog.pg_constraint`) + sqlDB.Exec(t, `DROP DATABASE test`) + + // Restore a couple tables, including parent but not child_pk. + sqlDB.Exec(t, `CREATE DATABASE test`) + sqlDB.Exec(t, fmt.Sprintf(`RESTORE test.circular FROM LATEST IN $1 AS OF SYSTEM TIME %s`, ts[0]), localFoo) + require.Equal(t, [][]string{ + {"test.public.circular", "CREATE TABLE public.circular (\n\tk INT8 NOT NULL,\n\tselfid INT8 NULL,\n\tCONSTRAINT circular_pkey PRIMARY KEY (k ASC),\n\tCONSTRAINT self_fk FOREIGN KEY (selfid) REFERENCES public.circular(selfid) NOT VALID,\n\tUNIQUE INDEX circular_selfid_key (selfid ASC)\n)"}, + }, sqlDB.QueryStr(t, `SHOW CREATE TABLE test.circular`)) + sqlDB.Exec(t, fmt.Sprintf(`RESTORE test.parent, test.child FROM LATEST IN $1 AS OF SYSTEM TIME %s `, ts[0]), localFoo) + sqlDB.Exec(t, `SELECT * FROM pg_catalog.pg_constraint`) + sqlDB.Exec(t, `DROP DATABASE test`) + + // Now do each table on its own with skip_missing_foreign_keys. + sqlDB.Exec(t, `CREATE DATABASE test`) + for _, name := range []string{"child_pk", "child", "circular", "parent"} { + if name == "child" || name == "child_pk" { + sqlDB.ExpectErr(t, "cannot restore table.*without referenced table", fmt.Sprintf(`RESTORE test.%s FROM LATEST IN $1 AS OF SYSTEM TIME %s`, name, ts[0]), localFoo) + } + sqlDB.Exec(t, fmt.Sprintf(`RESTORE test.%s FROM LATEST IN $1 AS OF SYSTEM TIME %s WITH skip_missing_foreign_keys`, name, ts[0]), localFoo) + } + sqlDB.Exec(t, `SELECT * FROM pg_catalog.pg_constraint`) + sqlDB.Exec(t, `DROP DATABASE test`) + } +} diff --git a/pkg/ccl/backupccl/restore_mid_schema_change_test.go b/pkg/ccl/backupccl/restore_mid_schema_change_test.go index 58ee70a7050a..c18fda7bf327 100644 --- a/pkg/ccl/backupccl/restore_mid_schema_change_test.go +++ b/pkg/ccl/backupccl/restore_mid_schema_change_test.go @@ -31,11 +31,6 @@ import ( "github.com/stretchr/testify/require" ) -var ( - clusterRestoreVersion = version.MustParse("v20.1.0") - noNonMVCCAddSSTable = version.MustParse("v22.1.0") -) - // TestRestoreMidSchemaChanges attempts to RESTORE several BACKUPs that are // already constructed and store in // ccl/backupccl/testdata/restore_mid_schema_change. These backups were taken on @@ -68,12 +63,12 @@ func TestRestoreMidSchemaChange(t *testing.T) { testdataBase = datapathutils.TestDataPath(t, "restore_mid_schema_change") exportDirs = testdataBase + "/exports" ) - for _, isSchemaOnly := range []bool{true, false} { + testutils.RunTrueAndFalse(t, "schema-only", func(t *testing.T, isSchemaOnly bool) { name := "regular-" if isSchemaOnly { name = "schema-only-" } - for _, isClusterRestore := range []bool{true, false} { + testutils.RunTrueAndFalse(t, "cluster-restore", func(t *testing.T, isClusterRestore bool) { name = name + "table" if isClusterRestore { name = name + "cluster" @@ -89,10 +84,6 @@ func TestRestoreMidSchemaChange(t *testing.T) { clusterVersion, err := parseMajorVersion(clusterVersionDir.Name()) require.NoError(t, err) - if !clusterVersion.AtLeast(clusterRestoreVersion) && isClusterRestore { - continue - } - t.Run(clusterVersionDir.Name(), func(t *testing.T) { require.True(t, clusterVersionDir.IsDir()) fullClusterVersionDir, err := filepath.Abs( @@ -115,8 +106,8 @@ func TestRestoreMidSchemaChange(t *testing.T) { }) } }) - } - } + }) + }) } // parseMajorVersion parses our major-versioned directory names as if they were @@ -139,15 +130,10 @@ func expectedSCJobCount(scName string, ver *version.Version) int { case "midmultitable": expNumSCJobs = 2 // this test perform a schema change for each table case "midprimarykeyswap": - if ver.AtLeast(noNonMVCCAddSSTable) { - // PK change and PK cleanup - expNumSCJobs = 2 - } else { - // This will fail so we expect no cleanup job. - expNumSCJobs = 1 - } + // PK change and PK cleanup + expNumSCJobs = 2 case "midprimarykeyswapcleanup": - expNumSCJobs = 1 + expNumSCJobs = 2 default: // Most test cases only have 1 schema change under test. expNumSCJobs = 1 @@ -257,14 +243,14 @@ func restoreMidSchemaChange( require.NoError(t, err) sqlDB.Exec(t, "USE defaultdb") - restoreQuery := "RESTORE defaultdb.* FROM $1" + restoreQuery := "RESTORE defaultdb.* FROM LATEST IN $1" if isClusterRestore { - restoreQuery = "RESTORE FROM $1" + restoreQuery = "RESTORE FROM LATEST IN $1" } if isSchemaOnly { restoreQuery = restoreQuery + "with schema_only" } - log.Infof(context.Background(), "%+v", sqlDB.QueryStr(t, "SHOW BACKUP $1", localFoo)) + log.Infof(context.Background(), "%+v", sqlDB.QueryStr(t, "SHOW BACKUP LATEST IN $1", localFoo)) sqlDB.Exec(t, restoreQuery, localFoo) // Wait for all jobs to terminate. Some may fail since we don't restore // adding spans. diff --git a/pkg/ccl/backupccl/restore_old_sequences_test.go b/pkg/ccl/backupccl/restore_old_sequences_test.go index 8c7ff9de0864..fe3619b7aaab 100644 --- a/pkg/ccl/backupccl/restore_old_sequences_test.go +++ b/pkg/ccl/backupccl/restore_old_sequences_test.go @@ -14,6 +14,8 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/clusterversion" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils/datapathutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -30,7 +32,7 @@ import ( // // VERSION=... // roachprod create local -// roachprod wipe localÅ +// roachprod wipe local // roachprod stage local release ${VERSION} // roachprod start local // roachprod sql local:1 -- -e "$(cat pkg/ccl/backupccl/testdata/restore_old_sequences/create.sql)" @@ -66,6 +68,8 @@ func TestRestoreOldSequences(t *testing.T) { func restoreOldSequencesTest(exportDir string, isSchemaOnly bool) func(t *testing.T) { return func(t *testing.T) { params := base.TestServerArgs{} + params.Settings = cluster.MakeTestingClusterSettingsWithVersions(clusterversion.TestingBinaryVersion, + clusterversion.TestingBinaryMinSupportedVersion, false /* initializeVersion */) const numAccounts = 1000 _, sqlDB, dir, cleanup := backupRestoreTestSetupWithParams(t, singleNode, numAccounts, InitManualReplication, base.TestClusterArgs{ServerArgs: params}) @@ -75,7 +79,7 @@ func restoreOldSequencesTest(exportDir string, isSchemaOnly bool) func(t *testin sqlDB.Exec(t, `CREATE DATABASE test`) var unused string var importedRows int - restoreQuery := `RESTORE test.* FROM $1` + restoreQuery := `RESTORE test.* FROM LATEST IN $1` if isSchemaOnly { restoreQuery = restoreQuery + " with schema_only" } diff --git a/pkg/ccl/backupccl/restore_old_versions_test.go b/pkg/ccl/backupccl/restore_old_versions_test.go index 62710c119fd4..406de2c936a1 100644 --- a/pkg/ccl/backupccl/restore_old_versions_test.go +++ b/pkg/ccl/backupccl/restore_old_versions_test.go @@ -13,16 +13,10 @@ import ( "fmt" "os" "path/filepath" - "strings" "testing" - "time" "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/jobs" - "github.com/cockroachdb/cockroach/pkg/jobs/jobspb" - "github.com/cockroachdb/cockroach/pkg/keys" - "github.com/cockroachdb/cockroach/pkg/roachpb" - "github.com/cockroachdb/cockroach/pkg/server" "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/sql/catalog" "github.com/cockroachdb/cockroach/pkg/sql/catalog/catalogkeys" @@ -33,12 +27,10 @@ import ( "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/datapathutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" - "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" - "github.com/cockroachdb/errors" "github.com/stretchr/testify/require" ) @@ -66,239 +58,22 @@ func TestRestoreOldVersions(t *testing.T) { defer log.Scope(t).Close(t) testdataBase := datapathutils.TestDataPath(t, "restore_old_versions") var ( - exportDirsWithoutInterleave = testdataBase + "/exports-without-interleaved" - exportDirs = testdataBase + "/exports" - fkRevDirs = testdataBase + "/fk-rev-history" - clusterDirs = testdataBase + "/cluster" - exceptionalDirs = testdataBase + "/exceptional" - privilegeDirs = testdataBase + "/privileges" - multiRegionDirs = testdataBase + "/multi-region" - publicSchemaDirs = testdataBase + "/public-schema-remap" - systemUsersDirs = testdataBase + "/system-users-restore" - systemRoleMembersDirs = testdataBase + "/system-role-members-restore" + clusterDirs = testdataBase + "/cluster" + systemRoleMembersDirs = testdataBase + "/system-role-members-restore" ) - t.Run("table-restore", func(t *testing.T) { - dirs, err := os.ReadDir(exportDirsWithoutInterleave) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(exportDirsWithoutInterleave, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), restoreOldVersionTest(exportDir)) - } - }) - - t.Run("table-restore-with-interleave", func(t *testing.T) { - dirs, err := os.ReadDir(exportDirsWithoutInterleave) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(exportDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), restoreOldVersionTestWithInterleave(exportDir)) - } - }) - - t.Run("fk-rev-restore", func(t *testing.T) { - dirs, err := os.ReadDir(fkRevDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(fkRevDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), restoreOldVersionFKRevTest(exportDir)) - } - }) - t.Run("cluster-restore", func(t *testing.T) { dirs, err := os.ReadDir(clusterDirs) require.NoError(t, err) for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(clusterDirs, dir.Name())) - require.NoError(t, err) - - // TODO(adityamaru): Figure out how to generate a 20.1.7 fixture using the - // updated `create_cluster.sql` file. - if strings.Contains(dir.Name(), "v20.1.7") { - t.Run(dir.Name(), deprecatedRestoreOldVersionClusterTest(exportDir)) + // Skip over the `create.sql` file. + if !dir.IsDir() { continue } - t.Run(dir.Name(), restoreOldVersionClusterTest(exportDir)) - } - }) - - t.Run("multi-region-restore", func(t *testing.T) { - skip.UnderRace(t, "very slow as it starts multiple servers") - dirs, err := os.ReadDir(multiRegionDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(multiRegionDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), runOldVersionMultiRegionTest(exportDir)) - } - }) - - // exceptional backups are backups that were possible to generate on old - // versions, but are now disallowed, but we should check that we fail - // gracefully with them. - t.Run("exceptional-backups", func(t *testing.T) { - t.Run("duplicate-db-desc", func(t *testing.T) { - backupUnderTest := "doubleDB" - /* - This backup was generated with the following SQL on (v21.1.6): - - CREATE DATABASE db1; - DROP DATABASE db1; - CREATE DATABASE db1; - BACKUP TO 'nodelocal://1/doubleDB' WITH revision_history; - */ - dir, err := os.Stat(filepath.Join(exceptionalDirs, backupUnderTest)) - require.NoError(t, err) - require.True(t, dir.IsDir()) - - // We could create tables which reference types in another database on - // 20.2 release candidates. - exportDir, err := filepath.Abs(filepath.Join(exceptionalDirs, dir.Name())) - require.NoError(t, err) - - externalDir, dirCleanup := testutils.TempDir(t) - ctx := context.Background() - tc := testcluster.StartTestCluster(t, singleNode, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{ - // Disabling the default test tenant due to test cases - // failures. More investigation is required. Tracked with - // #76378. - DisableDefaultTestTenant: true, - ExternalIODir: externalDir, - }, - }) - sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0]) - defer func() { - tc.Stopper().Stop(ctx) - dirCleanup() - }() - err = os.Symlink(exportDir, filepath.Join(externalDir, "foo")) - require.NoError(t, err) - - sqlDB.Exec(t, `RESTORE FROM $1`, localFoo) - sqlDB.Exec(t, `DROP DATABASE db1;`) - sqlDB.Exec(t, `RESTORE DATABASE db1 FROM $1`, localFoo) - sqlDB.CheckQueryResults(t, - `SELECT count(*) FROM [SHOW DATABASES] WHERE database_name = 'db1'`, - [][]string{{"1"}}, - ) - }) - - t.Run("x-db-type-reference", func(t *testing.T) { - backupUnderTest := "xDbRef" - /* - This backup was generated with the following SQL: - - CREATE TYPE t AS ENUM ('foo'); - CREATE TABLE tbl (a t); - CREATE DATABASE otherdb; - ALTER TABLE tbl RENAME TO otherdb.tbl; - BACKUP DATABASE otherdb TO 'nodelocal://1/xDbRef'; - - This was permitted on some release candidates of v20.2. (#55709) - */ - dir, err := os.Stat(filepath.Join(exceptionalDirs, backupUnderTest)) - require.NoError(t, err) - require.True(t, dir.IsDir()) - - // We could create tables which reference types in another database on - // 20.2 release candidates. - exportDir, err := filepath.Abs(filepath.Join(exceptionalDirs, dir.Name())) - require.NoError(t, err) - - externalDir, dirCleanup := testutils.TempDir(t) - ctx := context.Background() - tc := testcluster.StartTestCluster(t, singleNode, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{ - ExternalIODir: externalDir, - }, - }) - sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0]) - defer func() { - tc.Stopper().Stop(ctx) - dirCleanup() - }() - err = os.Symlink(exportDir, filepath.Join(externalDir, "foo")) - require.NoError(t, err) - - // Expect this restore to fail. - sqlDB.ExpectErr(t, `type "t" has unknown ParentID 50`, `RESTORE DATABASE otherdb FROM $1`, localFoo) - - // Expect that we don't crash and that we emit NULL for data that we - // cannot resolve (e.g. missing database descriptor, create_statement). - sqlDB.CheckQueryResults(t, ` -SELECT - database_name, parent_schema_name, object_name, object_type, create_statement -FROM [SHOW BACKUP SCHEMAS '`+localFoo+`' WITH privileges] -ORDER BY object_type, object_name`, [][]string{ - {"NULL", "NULL", "otherdb", "database", "NULL"}, - {"otherdb", "public", "tbl", "table", "NULL"}, - {"NULL", "public", "_t", "type", "NULL"}, - {"NULL", "public", "t", "type", "NULL"}, - }) - }) - }) - - t.Run("zoneconfig_privilege_restore", func(t *testing.T) { - dirs, err := os.ReadDir(privilegeDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(privilegeDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), restoreV201ZoneconfigPrivilegeTest(exportDir)) - } - }) - - t.Run("public_schema_remap", func(t *testing.T) { - dirs, err := os.ReadDir(publicSchemaDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(publicSchemaDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), restorePublicSchemaRemap(exportDir)) - } - }) - - t.Run("missing_public_schema_namespace_entry_cleanup_on_fail", func(t *testing.T) { - dirs, err := os.ReadDir(publicSchemaDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(publicSchemaDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), restoreSyntheticPublicSchemaNamespaceEntryCleanupOnFail(exportDir)) - } - }) - - t.Run("system-users-restore", func(t *testing.T) { - dirs, err := os.ReadDir(systemUsersDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(systemUsersDirs, dir.Name())) + exportDir, err := filepath.Abs(filepath.Join(clusterDirs, dir.Name())) require.NoError(t, err) - t.Run(dir.Name(), restoreSystemUsersWithoutIDs(exportDir)) - } - }) - t.Run("full-cluster-restore-users-without-ids", func(t *testing.T) { - dirs, err := os.ReadDir(systemUsersDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(systemUsersDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), fullClusterRestoreUsersWithoutIDs(exportDir)) + t.Run(dir.Name(), restoreOldVersionClusterTest(exportDir)) } }) @@ -314,268 +89,6 @@ ORDER BY object_type, object_name`, [][]string{ }) } -func restoreOldVersionTestWithInterleave(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - params := base.TestServerArgs{} - const numAccounts = 1000 - _, sqlDB, dir, cleanup := backupRestoreTestSetupWithParams(t, singleNode, numAccounts, - InitManualReplication, base.TestClusterArgs{ServerArgs: params}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(dir, "foo")) - require.NoError(t, err) - sqlDB.Exec(t, `CREATE DATABASE test`) - // Restore should now fail. - sqlDB.ExpectErr(t, - "pq: restoring interleaved tables is no longer allowed. table t3 was found to be interleaved", - `RESTORE test.* FROM $1`, localFoo) - } -} - -func runOldVersionMultiRegionTest(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - const numNodes = 9 - dir, dirCleanupFn := testutils.TempDir(t) - defer dirCleanupFn() - ctx := context.Background() - - params := make(map[int]base.TestServerArgs, numNodes) - for i := 0; i < 9; i++ { - var region string - switch i / 3 { - case 0: - region = "europe-west2" - case 1: - region = "us-east1" - case 2: - region = "us-west1" - } - params[i] = base.TestServerArgs{ - // Test fails due to inability to use multi-region - // abstractions by default in tenants. Tracked with #76378. - DisableDefaultTestTenant: true, - Locality: roachpb.Locality{ - Tiers: []roachpb.Tier{ - {Key: "region", Value: region}, - }, - }, - ExternalIODir: dir, - } - } - - tc := testcluster.StartTestCluster(t, numNodes, base.TestClusterArgs{ - ServerArgsPerNode: params, - }) - defer tc.Stopper().Stop(ctx) - require.NoError(t, os.Symlink(exportDir, filepath.Join(dir, "external_backup_dir"))) - - sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0]) - - var unused string - var importedRows int - sqlDB.QueryRow(t, `RESTORE DATABASE multi_region_db FROM $1`, `nodelocal://0/external_backup_dir`).Scan( - &unused, &unused, &unused, &importedRows, &unused, &unused, - ) - const totalRows = 12 - if importedRows != totalRows { - t.Fatalf("expected %d rows, got %d", totalRows, importedRows) - } - sqlDB.Exec(t, `USE multi_region_db`) - sqlDB.CheckQueryResults(t, `select table_name, locality FROM [show tables] ORDER BY table_name;`, [][]string{ - {`tbl_global`, `GLOBAL`}, - {`tbl_primary_region`, `REGIONAL BY TABLE IN PRIMARY REGION`}, - {`tbl_regional_by_row`, `REGIONAL BY ROW`}, - {`tbl_regional_by_table`, `REGIONAL BY TABLE IN "us-east1"`}, - }) - sqlDB.CheckQueryResults(t, `SELECT region FROM [SHOW REGIONS FROM DATABASE] ORDER BY region`, [][]string{ - {`europe-west2`}, - {`us-east1`}, - {`us-west1`}, - }) - sqlDB.CheckQueryResults(t, `SELECT * FROM tbl_primary_region ORDER BY pk`, [][]string{ - {`1`, `a`}, - {`2`, `b`}, - {`3`, `c`}, - }) - sqlDB.CheckQueryResults(t, `SELECT * FROM tbl_global ORDER BY pk`, [][]string{ - {`4`, `d`}, - {`5`, `e`}, - {`6`, `f`}, - }) - sqlDB.CheckQueryResults(t, `SELECT * FROM tbl_regional_by_table ORDER BY pk`, [][]string{ - {`7`, `g`}, - {`8`, `h`}, - {`9`, `i`}, - }) - sqlDB.CheckQueryResults(t, `SELECT crdb_region, * FROM tbl_regional_by_row ORDER BY pk`, [][]string{ - {`europe-west2`, `10`, `j`}, - {`us-east1`, `11`, `k`}, - {`us-west1`, `12`, `l`}, - }) - } -} - -func restoreOldVersionTest(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - params := base.TestServerArgs{} - const numAccounts = 1000 - _, sqlDB, dir, cleanup := backupRestoreTestSetupWithParams(t, singleNode, numAccounts, - InitManualReplication, base.TestClusterArgs{ServerArgs: params}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(dir, "foo")) - require.NoError(t, err) - sqlDB.Exec(t, `CREATE DATABASE test`) - var unused string - var importedRows int - sqlDB.QueryRow(t, `RESTORE test.* FROM $1`, localFoo).Scan( - &unused, &unused, &unused, &importedRows, &unused, &unused, - ) - const totalRows = 12 - if importedRows != totalRows { - t.Fatalf("expected %d rows, got %d", totalRows, importedRows) - } - results := [][]string{ - {"1", "1", "1"}, - {"2", "2", "2"}, - {"3", "3", "3"}, - } - sqlDB.CheckQueryResults(t, `SELECT * FROM test.t1 ORDER BY k`, results) - sqlDB.CheckQueryResults(t, `SELECT * FROM test.t2 ORDER BY k`, results) - sqlDB.CheckQueryResults(t, `SELECT * FROM test.t4 ORDER BY k`, results) - - results = append(results, []string{"4", "5", "6"}) - sqlDB.Exec(t, `INSERT INTO test.t1 VALUES (4, 5 ,6)`) - sqlDB.CheckQueryResults(t, `SELECT * FROM test.t1 ORDER BY k`, results) - } -} - -// restoreV201ZoneconfigPrivilegeTest checks that privilege descriptors with -// ZONECONFIG from tables and databases are correctly restored. -// The ZONECONFIG bit was overwritten to be USAGE in 20.2 onwards. -// We only need to test restoring with full cluster backup / restore as -// it is the only form of restore that restores privileges. -func restoreV201ZoneconfigPrivilegeTest(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - const numAccounts = 1000 - _, _, tmpDir, cleanupFn := backupRestoreTestSetup(t, multiNode, numAccounts, InitManualReplication) - defer cleanupFn() - - _, sqlDB, cleanup := backupRestoreTestSetupEmpty(t, singleNode, tmpDir, - InitManualReplication, base.TestClusterArgs{}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(tmpDir, "foo")) - require.NoError(t, err) - sqlDB.Exec(t, `RESTORE FROM $1`, localFoo) - testDBGrants := [][]string{ - {"test", "admin", "ALL", "true"}, - {"test", "root", "ALL", "true"}, - {"test", "testuser", "ZONECONFIG", "false"}, - } - sqlDB.CheckQueryResults(t, `show grants on database test`, testDBGrants) - - testTableGrants := [][]string{ - {"test", "public", "test_table", "admin", "ALL", "true"}, - {"test", "public", "test_table", "root", "ALL", "true"}, - {"test", "public", "test_table", "testuser", "ZONECONFIG", "false"}, - } - sqlDB.CheckQueryResults(t, `show grants on test.test_table`, testTableGrants) - - testTable2Grants := [][]string{ - {"test", "public", "test_table2", "admin", "ALL", "true"}, - {"test", "public", "test_table2", "root", "ALL", "true"}, - {"test", "public", "test_table2", "testuser", "ALL", "false"}, - } - sqlDB.CheckQueryResults(t, `show grants on test.test_table2`, testTable2Grants) - } -} - -func restoreOldVersionFKRevTest(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - params := base.TestServerArgs{} - const numAccounts = 1000 - _, sqlDB, dir, cleanup := backupRestoreTestSetupWithParams(t, singleNode, numAccounts, - InitManualReplication, base.TestClusterArgs{ServerArgs: params}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(dir, "foo")) - require.NoError(t, err) - sqlDB.Exec(t, `CREATE DATABASE ts`) - sqlDB.Exec(t, `RESTORE test.rev_times FROM $1 WITH into_db = 'ts'`, localFoo) - for _, ts := range sqlDB.QueryStr(t, `SELECT logical_time FROM ts.rev_times`) { - - sqlDB.Exec(t, fmt.Sprintf(`RESTORE DATABASE test FROM $1 AS OF SYSTEM TIME %s`, ts[0]), localFoo) - // Just rendering the constraints loads and validates schema. - sqlDB.Exec(t, `SELECT * FROM pg_catalog.pg_constraint`) - sqlDB.Exec(t, `DROP DATABASE test`) - - // Restore a couple tables, including parent but not child_pk. - sqlDB.Exec(t, `CREATE DATABASE test`) - sqlDB.Exec(t, fmt.Sprintf(`RESTORE test.circular FROM $1 AS OF SYSTEM TIME %s`, ts[0]), localFoo) - sqlDB.Exec(t, fmt.Sprintf(`RESTORE test.parent, test.child FROM $1 AS OF SYSTEM TIME %s WITH skip_missing_foreign_keys`, ts[0]), localFoo) - sqlDB.Exec(t, `SELECT * FROM pg_catalog.pg_constraint`) - sqlDB.Exec(t, `DROP DATABASE test`) - - // Now do each table on its own with skip_missing_foreign_keys. - sqlDB.Exec(t, `CREATE DATABASE test`) - for _, name := range []string{"child_pk", "child", "circular", "parent"} { - sqlDB.Exec(t, fmt.Sprintf(`RESTORE test.%s FROM $1 AS OF SYSTEM TIME %s WITH skip_missing_foreign_keys`, name, ts[0]), localFoo) - } - sqlDB.Exec(t, `SELECT * FROM pg_catalog.pg_constraint`) - sqlDB.Exec(t, `DROP DATABASE test`) - - } - } -} - -func deprecatedRestoreOldVersionClusterTest(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - externalDir, dirCleanup := testutils.TempDir(t) - ctx := context.Background() - tc := testcluster.StartTestCluster(t, singleNode, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{ - // Disabling the test tenant due to test failures. More - // investigation is required. Tracked with #76378. - DisableDefaultTestTenant: true, - ExternalIODir: externalDir, - }, - }) - sqlDB := sqlutils.MakeSQLRunner(tc.Conns[0]) - defer func() { - tc.Stopper().Stop(ctx) - dirCleanup() - }() - err := os.Symlink(exportDir, filepath.Join(externalDir, "foo")) - require.NoError(t, err) - - // Ensure that the restore succeeds. - sqlDB.Exec(t, `RESTORE FROM $1`, localFoo) - - sqlDB.CheckQueryResults(t, "SHOW USERS", [][]string{ - {"admin", "", "{}"}, - {"craig", "", "{}"}, - {"root", "", "{admin}"}, - }) - sqlDB.CheckQueryResults(t, "SELECT comment FROM system.comments ORDER BY object_id", [][]string{ - {"database comment string"}, - {"table comment string"}, - }) - // In the backup, Public schemas for non-system databases have ID 29. - // These should all be updated to explicit public schemas. - sqlDB.CheckQueryResults(t, `SELECT - if((id = 29), 'system', 'non-system') AS is_system_schema, count(*) as c -FROM - system.namespace -WHERE - "parentSchemaID" = 0 AND name = 'public' -GROUP BY - is_system_schema -ORDER BY - c ASC`, [][]string{ - {"system", "1"}, - {"non-system", "3"}, - }) - sqlDB.CheckQueryResults(t, "SELECT * FROM data.bank", [][]string{{"1"}}) - } -} - func restoreOldVersionClusterTest(exportDir string) func(t *testing.T) { return func(t *testing.T) { externalDir, dirCleanup := testutils.TempDir(t) @@ -597,7 +110,7 @@ func restoreOldVersionClusterTest(exportDir string) func(t *testing.T) { require.NoError(t, err) // Ensure that the restore succeeds. - sqlDB.Exec(t, `RESTORE FROM $1`, localFoo) + sqlDB.Exec(t, `RESTORE FROM LATEST IN $1`, localFoo) sqlDB.CheckQueryResults(t, "SHOW DATABASES", [][]string{ {"data", "root", "NULL", "NULL", "{}", "NULL"}, @@ -675,217 +188,21 @@ ORDER BY } } -/* -func TestCreateIncBackupMissingIndexEntries(t *testing.T) { - defer leaktest.AfterTest(t)() - defer log.Scope(t).Close(t) - - defer jobs.TestingSetAdoptAndCancelIntervals(5*time.Millisecond, 5*time.Millisecond)() - - const numAccounts = 10 - const numBackups = 9 - windowSize := int(numAccounts / 3) - - blockBackfill := make(chan struct{}) - defer close(blockBackfill) - - backfillWaiting := make(chan struct{}) - defer close(backfillWaiting) - - ctx, tc, sqlDB, dir, cleanupFn := backupRestoreTestSetupWithParams( - t, singleNode, 0, InitManualReplication, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{Knobs: base.TestingKnobs{ - DistSQL: &execinfra.TestingKnobs{ - RunBeforeBackfillChunk: func(sp roachpb.Span) error { - select { - case backfillWaiting <- struct{}{}: - case <-time.After(time.Second * 5): - panic("timeout blocking in knob") - } - select { - case <-blockBackfill: - case <-time.After(time.Second * 5): - panic("timeout blocking in knob") - } - return nil - }, - }, - }}, - }, - ) - defer cleanupFn() - args := base.TestServerArgs{ExternalIODir: dir} - rng, _ := randutil.NewPseudoRand() - - sqlDB.Exec(t, `CREATE TABLE data.jsontest (id INT PRIMARY KEY, j JSONB)`) - sqlDB.Exec(t, `INSERT INTO data.jsontest VALUES (1, '{"a": "a", "b": "b"}'), (2, '{"c": "c", "d":"d"}')`) - - sqlDB.Exec(t, `CREATE TABLE data.geotest (id INT PRIMARY KEY, p geometry(point))`) - sqlDB.Exec(t, `INSERT INTO data.geotest VALUES (1, 'POINT(1.0 1.0)'), (2, 'POINT(2.0 2.0)')`) - - var backupDirs []string - var checksums []uint32 - { - for backupNum := 0; backupNum < numBackups; backupNum++ { - // In the following, windowSize is `w` and offset is `o`. The first - // mutation creates accounts with id [w,3w). Every mutation after - // that deletes everything less than o, leaves [o, o+w) unchanged, - // mutates [o+w,o+2w), and inserts [o+2w,o+3w). - offset := windowSize * backupNum - var buf bytes.Buffer - fmt.Fprintf(&buf, `DELETE FROM data.bank WHERE id < %d; `, offset) - buf.WriteString(`UPSERT INTO data.bank VALUES `) - for j := 0; j < windowSize*2; j++ { - if j != 0 { - buf.WriteRune(',') - } - id := offset + windowSize + j - payload := randutil.RandBytes(rng, backupRestoreRowPayloadSize) - fmt.Fprintf(&buf, `(%d, %d, '%s')`, id, backupNum, payload) - } - sqlDB.Exec(t, buf.String()) - createErr := make(chan error) - go func() { - defer close(createErr) - var stmt string - switch backupNum % 3 { - case 0: - stmt = fmt.Sprintf(`CREATE INDEX test_idx_%d ON data.bank (balance)`, backupNum+1) - case 1: - stmt = fmt.Sprintf(`CREATE INDEX test_idx_%d ON data.jsontest USING GIN(j)`, backupNum+1) - case 2: - stmt = fmt.Sprintf(`CREATE INDEX test_idx_%d ON data.geotest USING GIST(p)`, backupNum+1) - } - t.Log(stmt) - _, err := sqlDB.DB.ExecContext(ctx, stmt) - createErr <- err - }() - select { - case <-backfillWaiting: - case err := <-createErr: - t.Fatal(err) - } - checksums = append(checksums, checksumBankPayload(t, sqlDB)) - - backupDir := fmt.Sprintf("nodelocal://0/%d", backupNum) - var from string - if backupNum > 0 { - from = fmt.Sprintf(` INCREMENTAL FROM %s`, strings.Join(backupDirs, `,`)) - } - sqlDB.Exec(t, fmt.Sprintf(`BACKUP TO '%s' %s`, backupDir, from)) - blockBackfill <- struct{}{} - require.NoError(t, <-createErr) - - backupDirs = append(backupDirs, fmt.Sprintf(`'%s'`, backupDir)) - } - - // Test a regression in RESTORE where the batch end key was not - // being set correctly in Import: make an incremental backup such that - // the greatest key in the diff is less than the previous backups. - sqlDB.Exec(t, `INSERT INTO data.bank VALUES (0, -1, 'final')`) - checksums = append(checksums, checksumBankPayload(t, sqlDB)) - sqlDB.Exec(t, fmt.Sprintf(`BACKUP TO '%s' %s`, - "nodelocal://0/final", fmt.Sprintf(` INCREMENTAL FROM %s`, strings.Join(backupDirs, `,`)), - )) - backupDirs = append(backupDirs, `'nodelocal://0/final'`) - } - os.Rename(dir, path/to/testdata) -} -*/ - -// TestRestoreOldBackupMissingOfflineIndexes tests restoring a backup made by -// v20.2 prior to the introduction of excluding offline indexes in #62572 using -// the commented-out code above in TestCreateIncBackupMissingIndexEntries. Note: -// that code needs to be pasted into a branch checkout _prior_ to the inclusion -// of the mentioned PR. -func TestRestoreOldBackupMissingOfflineIndexes(t *testing.T) { - defer leaktest.AfterTest(t)() - skip.UnderRace(t, "times out under race cause it starts up two test servers") - ctx := context.Background() - - badBackups, err := filepath.Abs(datapathutils.TestDataPath(t, "restore_old_versions", "inc_missing_addsst", "v20.2.7")) - require.NoError(t, err) - // Disabling the default test tenant due to test cases failures. More - // investigation is required. Tracked with #76378. - args := base.TestServerArgs{ExternalIODir: badBackups, DisableDefaultTestTenant: true} - backupDirs := make([]string, 9) - for i := range backupDirs { - backupDirs[i] = fmt.Sprintf("'nodelocal://0/%d'", i) - } - - // Start a new cluster to restore into. - { - for i := len(backupDirs); i > 0; i-- { - restoreTC := testcluster.StartTestCluster(t, singleNode, base.TestClusterArgs{ServerArgs: args}) - defer restoreTC.Stopper().Stop(context.Background()) - sqlDBRestore := sqlutils.MakeSQLRunner(restoreTC.Conns[0]) - from := strings.Join(backupDirs[:i], `,`) - sqlDBRestore.Exec(t, fmt.Sprintf(`RESTORE FROM %s`, from)) - - for j := i; j > 1; j-- { - var res int64 - switch j % 3 { - case 2: - for i := 0; i < 50; i++ { - if err := sqlDBRestore.DB.QueryRowContext(ctx, - fmt.Sprintf(`SELECT count(*) FROM data.bank@test_idx_%d`, j-1), - ).Scan(&res); err != nil { - if !strings.Contains(err.Error(), `not found`) { - t.Fatal(err) - } - t.Logf("index %d doesn't exist yet on attempt %d", j-1, i) - time.Sleep(time.Millisecond * 50) - continue - } - break - } - var expected int64 - sqlDBRestore.QueryRow(t, `SELECT count(*) FROM data.bank@primary`).Scan(&expected) - if res != expected { - t.Fatalf("got %d, expected %d", res, expected) - } - // case 1 and 0 are both inverted, which we can't validate via SQL, so - // this is just checking that it eventually shows up, i.e. that the code - // to validate and create the schema change works. - case 0: - found := false - for i := 0; i < 50; i++ { - if err := sqlDBRestore.DB.QueryRowContext(ctx, - fmt.Sprintf(`SELECT count(*) FROM data.jsontest@test_idx_%d`, j-1), - ).Scan(&res); err != nil { - if strings.Contains(err.Error(), `is inverted`) { - found = true - break - } - if !strings.Contains(err.Error(), `not found`) { - t.Fatal(err) - } - t.Logf("index %d doesn't exist yet on attempt %d", j-1, i) - time.Sleep(time.Millisecond * 50) - } - } - if !found { - t.Fatal("expected index to come back") - } - } - } - } - } -} - func TestRestoreWithDroppedSchemaCorruption(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) ctx := context.Background() - backupDir := datapathutils.TestDataPath(t, "restore_with_dropped_schema", "exports", "v20.2.7") const ( - dbName = "foo" - fromDir = "nodelocal://0/" + dbName = "foo" + restoredDBName = "foorestored" + fromDir = "nodelocal://1/" ) + dir, dirCleanupFn := testutils.TempDir(t) + defer dirCleanupFn() args := base.TestServerArgs{ - ExternalIODir: backupDir, + ExternalIODir: dir, // Disabling the test tenant because this test case traps when run // from within a tenant. The problem occurs because we try to // reference a nil pointer below where we're expecting a database @@ -897,9 +214,18 @@ func TestRestoreWithDroppedSchemaCorruption(t *testing.T) { tdb := sqlutils.MakeSQLRunner(sqlDB) defer s.Stopper().Stop(ctx) - tdb.Exec(t, fmt.Sprintf("RESTORE DATABASE %s FROM '%s'", dbName, fromDir)) - query := fmt.Sprintf("SELECT database_name FROM [SHOW DATABASES] WHERE database_name = '%s'", dbName) - tdb.CheckQueryResults(t, query, [][]string{{dbName}}) + tdb.Exec(t, ` +CREATE DATABASE foo; +SET DATABASE = foo; +CREATE SCHEMA bar; +DROP SCHEMA bar; +`) + tdb.Exec(t, `BACKUP DATABASE foo INTO 'nodelocal://1/'`) + + tdb.Exec(t, fmt.Sprintf("RESTORE DATABASE %s FROM LATEST IN '%s' WITH new_db_name = '%s'", + dbName, fromDir, restoredDBName)) + query := fmt.Sprintf("SELECT database_name FROM [SHOW DATABASES] WHERE database_name = '%s'", restoredDBName) + tdb.CheckQueryResults(t, query, [][]string{{restoredDBName}}) // Read descriptor without validation. execCfg := s.ExecutorConfig().(sql.ExecutorConfig) @@ -926,251 +252,7 @@ func TestRestoreWithDroppedSchemaCorruption(t *testing.T) { })) return exists } - require.Falsef(t, hasSameNameSchema(dbName), "corrupted descriptor exists") -} - -// restorePublicSchemaRemap tests that if we're restoring a database from -// an older version where the database has a synthetic public schema, a real -// descriptor backed public schema is created and the tables in the schema -// are correctly mapped to the new public schema. -func restorePublicSchemaRemap(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - const numAccounts = 1000 - _, _, tmpDir, cleanupFn := backupRestoreTestSetup(t, multiNode, numAccounts, InitManualReplication) - defer cleanupFn() - - _, sqlDB, cleanup := backupRestoreTestSetupEmpty(t, singleNode, tmpDir, - InitManualReplication, base.TestClusterArgs{}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(tmpDir, "foo")) - require.NoError(t, err) - - sqlDB.Exec(t, fmt.Sprintf("RESTORE DATABASE d FROM '%s'", localFoo)) - - var restoredDBID, publicSchemaID int - row := sqlDB.QueryRow(t, `SELECT id FROM system.namespace WHERE name='d' AND "parentID"=0`) - row.Scan(&restoredDBID) - row = sqlDB.QueryRow(t, fmt.Sprintf(`SELECT id FROM system.namespace WHERE name='public' AND "parentID"=%d`, restoredDBID)) - row.Scan(&publicSchemaID) - - if publicSchemaID == keys.PublicSchemaID { - t.Fatalf("expected public schema id to not be %d", keys.PublicSchemaID) - } - - row = sqlDB.QueryRow(t, - fmt.Sprintf(`SELECT count(1) FROM system.namespace WHERE name='t' AND "parentID"=%d AND "parentSchemaID"=%d`, restoredDBID, publicSchemaID)) - require.NotNil(t, row) - - sqlDB.CheckQueryResults(t, `SELECT x FROM d.s.t`, [][]string{{"1"}, {"2"}}) - sqlDB.CheckQueryResults(t, `SELECT x FROM d.public.t`, [][]string{{"3"}, {"4"}}) - - // Test restoring a single table and ensuring that d.public.t which - // previously had a synthetic public schema gets correctly restored into the - // descriptor backed public schema of database test. - sqlDB.Exec(t, `CREATE DATABASE test`) - sqlDB.Exec(t, `RESTORE d.public.t FROM $1 WITH into_db = 'test'`, localFoo) - - row = sqlDB.QueryRow(t, `SELECT id FROM system.namespace WHERE name='test' AND "parentID"=0`) - var parentDBID int - row.Scan(&parentDBID) - - row = sqlDB.QueryRow(t, fmt.Sprintf(`SELECT id FROM system.namespace WHERE name='public' AND "parentID"=%d`, parentDBID)) - row.Scan(&publicSchemaID) - - if publicSchemaID == keys.PublicSchemaID || publicSchemaID == int(descpb.InvalidID) { - t.Errorf(fmt.Sprintf("expected public schema id to not be %d or %d, found %d", keys.PublicSchemaID, descpb.InvalidID, publicSchemaID)) - } - - sqlDB.CheckQueryResults(t, `SELECT x FROM test.public.t`, [][]string{{"3"}, {"4"}}) - } -} - -func restoreSyntheticPublicSchemaNamespaceEntryCleanupOnFail(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - const numAccounts = 1000 - _, _, tmpDir, cleanupFn := backupRestoreTestSetup(t, multiNode, numAccounts, InitManualReplication) - defer cleanupFn() - - tc, sqlDB, cleanup := backupRestoreTestSetupEmpty(t, singleNode, tmpDir, - InitManualReplication, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{ - Knobs: base.TestingKnobs{ - JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), - Server: &server.TestingKnobs{ - DisableAutomaticVersionUpgrade: make(chan struct{}), - }, - }, - }}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(tmpDir, "foo")) - require.NoError(t, err) - - for _, server := range tc.Servers { - registry := server.JobRegistry().(*jobs.Registry) - registry.TestingResumerCreationKnobs = map[jobspb.Type]func(raw jobs.Resumer) jobs.Resumer{ - jobspb.TypeRestore: func(raw jobs.Resumer) jobs.Resumer { - r := raw.(*restoreResumer) - r.testingKnobs.beforePublishingDescriptors = func() error { - return errors.New("boom") - } - return r - }, - } - } - - // Drop the default databases so only the system database remains. - sqlDB.Exec(t, "DROP DATABASE defaultdb") - sqlDB.Exec(t, "DROP DATABASE postgres") - - restoreQuery := fmt.Sprintf("RESTORE DATABASE d FROM '%s'", localFoo) - sqlDB.ExpectErr(t, "boom", restoreQuery) - - // We should have no non-system database with a public schema name space - // entry with id 29. - sqlDB.CheckQueryResults(t, `SELECT id FROM system.namespace WHERE name = 'public' AND id=29 AND "parentID"!=1`, [][]string{}) - } -} - -func fullClusterRestoreUsersWithoutIDs(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - const numAccounts = 1000 - _, _, tmpDir, cleanupFn := backupRestoreTestSetup(t, multiNode, numAccounts, InitManualReplication) - defer cleanupFn() - - _, sqlDB, cleanup := backupRestoreTestSetupEmpty(t, singleNode, tmpDir, - InitManualReplication, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{ - Knobs: base.TestingKnobs{ - JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), - }, - }}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(tmpDir, "foo")) - require.NoError(t, err) - - sqlDB.Exec(t, fmt.Sprintf("RESTORE FROM '%s'", localFoo)) - - sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id >= 100 FROM system.users`, [][]string{ - {"admin", "", "true", "false"}, - {"root", "", "false", "false"}, - {"testrole", "NULL", "true", "true"}, - {"testuser", "NULL", "false", "true"}, - {"testuser2", "NULL", "false", "true"}, - {"testuser3", "NULL", "false", "true"}, - {"testuser4", "NULL", "false", "true"}, - }) - - sqlDB.CheckQueryResults(t, `SELECT username, option, value FROM system.role_options`, [][]string{ - {"testrole", "NOLOGIN", "NULL"}, - {"testuser", "CREATEROLE", "NULL"}, - {"testuser", "VALID UNTIL", "2021-01-10 00:00:00+00:00"}, - {"testuser2", "CONTROLCHANGEFEED", "NULL"}, - {"testuser2", "CONTROLJOB", "NULL"}, - {"testuser2", "CREATEDB", "NULL"}, - {"testuser2", "CREATELOGIN", "NULL"}, - {"testuser2", "NOLOGIN", "NULL"}, - {"testuser2", "VIEWACTIVITY", "NULL"}, - {"testuser3", "CANCELQUERY", "NULL"}, - {"testuser3", "MODIFYCLUSTERSETTING", "NULL"}, - {"testuser3", "VIEWACTIVITYREDACTED", "NULL"}, - {"testuser3", "VIEWCLUSTERSETTING", "NULL"}, - {"testuser4", "NOSQLLOGIN", "NULL"}, - }) - - // Verify that the next user we create uses the next biggest ID. - sqlDB.Exec(t, "CREATE USER testuser5") - - sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole" FROM system.users`, [][]string{ - {"admin", "", "true"}, - {"root", "", "false"}, - {"testrole", "NULL", "true"}, - {"testuser", "NULL", "false"}, - {"testuser2", "NULL", "false"}, - {"testuser3", "NULL", "false"}, - {"testuser4", "NULL", "false"}, - {"testuser5", "NULL", "false"}, - }) - } -} - -func restoreSystemUsersWithoutIDs(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - const numAccounts = 1000 - _, _, tmpDir, cleanupFn := backupRestoreTestSetup(t, multiNode, numAccounts, InitManualReplication) - defer cleanupFn() - - _, sqlDB, cleanup := backupRestoreTestSetupEmpty(t, singleNode, tmpDir, - InitManualReplication, base.TestClusterArgs{ - ServerArgs: base.TestServerArgs{ - Knobs: base.TestingKnobs{ - JobsTestingKnobs: jobs.NewTestingKnobsWithShortIntervals(), - }, - }}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(tmpDir, "foo")) - require.NoError(t, err) - - sqlDB.Exec(t, fmt.Sprintf("RESTORE SYSTEM USERS FROM '%s'", localFoo)) - - sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users`, [][]string{ - {"admin", "", "true", "2"}, - {"root", "", "false", "1"}, - {"testrole", "NULL", "true", "100"}, - {"testuser", "NULL", "false", "101"}, - {"testuser2", "NULL", "false", "102"}, - {"testuser3", "NULL", "false", "103"}, - {"testuser4", "NULL", "false", "104"}, - }) - - // Verify that the next user we create uses the next biggest ID. - sqlDB.Exec(t, "CREATE USER testuser5") - - sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users`, [][]string{ - {"admin", "", "true", "2"}, - {"root", "", "false", "1"}, - {"testrole", "NULL", "true", "100"}, - {"testuser", "NULL", "false", "101"}, - {"testuser2", "NULL", "false", "102"}, - {"testuser3", "NULL", "false", "103"}, - {"testuser4", "NULL", "false", "104"}, - {"testuser5", "NULL", "false", "105"}, - }) - - // Drop some users and try restoring again. - sqlDB.Exec(t, "DROP ROLE testrole") - sqlDB.Exec(t, "DROP ROLE testuser2") - sqlDB.Exec(t, "DROP ROLE testuser3") - sqlDB.Exec(t, "DROP ROLE testuser4") - - sqlDB.Exec(t, fmt.Sprintf("RESTORE SYSTEM USERS FROM '%s'", localFoo)) - - // testrole, testuser2, testuser3, testuser4 should be reassigned higher ids. - sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users`, [][]string{ - {"admin", "", "true", "2"}, - {"root", "", "false", "1"}, - {"testrole", "NULL", "true", "106"}, - {"testuser", "NULL", "false", "101"}, - {"testuser2", "NULL", "false", "107"}, - {"testuser3", "NULL", "false", "108"}, - {"testuser4", "NULL", "false", "109"}, - {"testuser5", "NULL", "false", "105"}, - }) - - // Verify that the next user we create uses the next biggest ID. - sqlDB.Exec(t, "CREATE USER testuser6") - sqlDB.CheckQueryResults(t, `SELECT username, "hashedPassword", "isRole", user_id FROM system.users`, [][]string{ - {"admin", "", "true", "2"}, - {"root", "", "false", "1"}, - {"testrole", "NULL", "true", "106"}, - {"testuser", "NULL", "false", "101"}, - {"testuser2", "NULL", "false", "107"}, - {"testuser3", "NULL", "false", "108"}, - {"testuser4", "NULL", "false", "109"}, - {"testuser5", "NULL", "false", "105"}, - {"testuser6", "NULL", "false", "110"}, - }) - - } + require.Falsef(t, hasSameNameSchema(restoredDBName), "corrupted descriptor exists") } func fullClusterRestoreSystemRoleMembersWithoutIDs(exportDir string) func(t *testing.T) { diff --git a/pkg/ccl/backupccl/show_test.go b/pkg/ccl/backupccl/show_test.go index 53b26662fb1f..2fe96463088d 100644 --- a/pkg/ccl/backupccl/show_test.go +++ b/pkg/ccl/backupccl/show_test.go @@ -30,7 +30,6 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/catalog/desctestutils" "github.com/cockroachdb/cockroach/pkg/sql/rowenc" "github.com/cockroachdb/cockroach/pkg/testutils" - "github.com/cockroachdb/cockroach/pkg/testutils/datapathutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" @@ -715,67 +714,6 @@ func TestShowBackupPrivileges(t *testing.T) { require.NoError(t, err) } -func TestShowUpgradedForeignKeys(t *testing.T) { - defer leaktest.AfterTest(t)() - defer log.Scope(t).Close(t) - - var ( - testdataBase = datapathutils.TestDataPath(t, "restore_old_versions") - fkRevDirs = testdataBase + "/fk-rev-history" - ) - - dirs, err := os.ReadDir(fkRevDirs) - require.NoError(t, err) - for _, dir := range dirs { - require.True(t, dir.IsDir()) - exportDir, err := filepath.Abs(filepath.Join(fkRevDirs, dir.Name())) - require.NoError(t, err) - t.Run(dir.Name(), showUpgradedForeignKeysTest(exportDir)) - } -} - -func showUpgradedForeignKeysTest(exportDir string) func(t *testing.T) { - return func(t *testing.T) { - params := base.TestServerArgs{} - const numAccounts = 1000 - _, sqlDB, dir, cleanup := backupRestoreTestSetupWithParams(t, singleNode, numAccounts, - InitManualReplication, base.TestClusterArgs{ServerArgs: params}) - defer cleanup() - err := os.Symlink(exportDir, filepath.Join(dir, "foo")) - require.NoError(t, err) - - type testCase struct { - table string - expectedForeignKeyPattern string - } - for _, tc := range []testCase{ - { - "circular", - "CONSTRAINT self_fk FOREIGN KEY \\(selfid\\) REFERENCES public\\.circular\\(selfid\\) NOT VALID", - }, - { - "child", - "CONSTRAINT \\w+ FOREIGN KEY \\(\\w+\\) REFERENCES public\\.parent\\(\\w+\\)", - }, - { - "child_pk", - "CONSTRAINT \\w+ FOREIGN KEY \\(\\w+\\) REFERENCES public\\.parent\\(\\w+\\)", - }, - } { - results := sqlDB.QueryStr(t, ` - SELECT - create_statement - FROM - [SHOW BACKUP SCHEMAS $1] - WHERE - object_type = 'table' AND object_name = $2 - `, localFoo, tc.table) - require.NotEmpty(t, results) - require.Regexp(t, regexp.MustCompile(tc.expectedForeignKeyPattern), results[0][0]) - } - } -} - func TestShowBackupWithDebugIDs(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) diff --git a/pkg/ccl/backupccl/testdata/backup-restore/in-progress-import-missing b/pkg/ccl/backupccl/testdata/backup-restore/in-progress-import-missing deleted file mode 100644 index 94b3e1a747b3..000000000000 --- a/pkg/ccl/backupccl/testdata/backup-restore/in-progress-import-missing +++ /dev/null @@ -1,237 +0,0 @@ -# This test inspects and restores backups that were affected by the -# bug described in -# https://github.com/cockroachdb/cockroach/issues/88042 -# (see the fixtures in pkg/ccl/backupccl/testdata/restore_importing_tables). -# The test also ensures that RESTORE now fails with an expected error message. -# The exact timeline that induces the bug is the following: -# -# - t0: begin import jobs and pause it -# - t1: wildcard table or database backup with revision history -# - t2: cancel an import job, and continue a different one -# - t3: run an incremental backup with revision history -# - the testing knob will induce this incremental backup to skip the -# introduction of the imported tables -# - t4: restore the tables. -# - If we restore AOST after the imports completed/failed, the restore should fail as it now -# detects that the incremental backup at t3 forgot to re-introduce the span. -# - If we restore AOST before the import completed/failed, the restore should succeed, as the -# skipped span introduction is irrelevant. -# -# The test also ensures that similar backup/restore/import scenarios are safe from corruption: -# - the timeline above with table/database backups w/o revision history -# - revision history cluster backups -# - revision history table/database backups which includes an incremental backup between t1 and t2 - -new-cluster name=s1 allow-implicit-access disable-tenant ----- - -# Link 4 backup chains: -# 1. A corrupt database backup chain with revision history -link-backup cluster=s1 src-path=restore_importing_tables,database dest-path=database ----- - -# 2. A clean database backup chain with revision history which includes two -# backups that observe the offline descriptors. -link-backup cluster=s1 src-path=restore_importing_tables,database_double_inc dest-path=database_double_inc ----- - -# 3. A clean data database backup chain without revision history -link-backup cluster=s1 src-path=restore_importing_tables,database_no_hist dest-path=database_no_hist ----- - -# 4. A clean cluster backup chain with revision history -link-backup cluster=s1 src-path=restore_importing_tables,cluster dest-path=cluster ----- - -# Note that we're purposely skipping the reintroduction of foo, foofoo, goodfoo in the -# incremental to simulate the bug. - -query-sql -SELECT - database_name, object_name, object_type, rows, backup_type -FROM - [SHOW BACKUP LATEST IN 'nodelocal://0/database'] -WHERE - object_name = 'foo' or object_name = 'foofoo' or object_name = 'goodfoo' -ORDER BY - start_time, database_name; ----- -d foo table 0 incremental -d foofoo table 0 incremental -d goodfoo table 0 incremental - - -query-sql -SELECT - database_name, object_name, object_type, rows, backup_type -FROM - [SHOW BACKUP LATEST IN 'nodelocal://0/database_double_inc/'] -WHERE - object_name = 'foo' or object_name = 'foofoo' or object_name = 'goodfoo' -ORDER BY - start_time, database_name; ----- -d foo table 0 incremental -d foofoo table 1 incremental -d goodfoo table 3 incremental - -query-sql -SELECT - database_name, object_name, object_type, rows, backup_type -FROM - [SHOW BACKUP LATEST IN 'nodelocal://0/database_no_hist/'] -WHERE - object_name = 'foo' or object_name = 'foofoo' or object_name = 'goodfoo' -ORDER BY - start_time, database_name; ----- -d foo table 0 incremental -d foofoo table 1 incremental -d goodfoo table 3 incremental - - - -query-sql -SELECT - database_name, object_name, object_type, rows, backup_type -FROM - [SHOW BACKUP LATEST IN 'nodelocal://0/cluster/'] -WHERE - object_name = 'foo' or object_name = 'foofoo' or object_name = 'goodfoo' -ORDER BY - start_time, database_name; ----- -d foo table 3 full -d foofoo table 4 full -d goodfoo table 3 full -d foo table 0 incremental -d foofoo table 1 incremental -d goodfoo table 3 incremental - - -############ -# Restore validation -############ - -# check that RESTORE will fail if any corrupt table restore is attempted -exec-sql -RESTORE DATABASE d FROM LATEST IN 'nodelocal://0/database/'; ----- -pq: table "foo" cannot be safely restored from this backup. This backup is affected by issue #88042, which produced incorrect backups after an IMPORT. To continue the restore, you can either: 1) restore to a system time before the import completed, 2022-10-03 20:03:58.623676398 +0000 UTC; 2) restore with a newer backup chain (a full backup [+ incrementals]) taken after the current backup target; 3) or remove table foo from the restore targets. -HINT: See: https://www.cockroachlabs.com/docs/advisories/a88042 - - -exec-sql -RESTORE TABLE d.goodfoo FROM LATEST IN 'nodelocal://0/database/' with into_db = defaultdb; ----- -pq: table "goodfoo" cannot be safely restored from this backup. This backup is affected by issue #88042, which produced incorrect backups after an IMPORT. To continue the restore, you can either: 1) restore to a system time before the import completed, 2022-10-03 20:03:58.623676398 +0000 UTC; 2) restore with a newer backup chain (a full backup [+ incrementals]) taken after the current backup target; 3) or remove table goodfoo from the restore targets. -HINT: See: https://www.cockroachlabs.com/docs/advisories/a88042 - -exec-sql -RESTORE TABLE d.foofoo FROM LATEST IN 'nodelocal://0/database/' with into_db = defaultdb; ----- -pq: table "foofoo" cannot be safely restored from this backup. This backup is affected by issue #88042, which produced incorrect backups after an IMPORT. To continue the restore, you can either: 1) restore to a system time before the import completed, 2022-10-03 20:03:58.623676398 +0000 UTC; 2) restore with a newer backup chain (a full backup [+ incrementals]) taken after the current backup target; 3) or remove table foofoo from the restore targets. -HINT: See: https://www.cockroachlabs.com/docs/advisories/a88042 - - -# Ensure the restore succeeds if there are no corrupt tables in the target -exec-sql -RESTORE TABLE d.baz FROM LATEST IN 'nodelocal://0/database/' with into_db = defaultdb; ----- - - -# Check that the wildcard restore encounters the same errors - -###################### -# Check that you can restore AOST while the tables are offline -exec-sql -RESTORE DATABASE d FROM LATEST IN 'nodelocal://0/database/' AS OF SYSTEM TIME '2022-10-03 20:03:58.623676398'; ----- - - -query-sql -SELECT table_name FROM [SHOW TABLES FROM d]; ----- -baz - - -########################### -# Check the alternative scenarios -########################### - -exec-sql -DROP DATABASE d CASCADE; ----- - -# Check that a backup chain with the intermediate incremental backup restores properly -exec-sql -RESTORE DATABASE d FROM LATEST IN 'nodelocal://0/database_double_inc/'; ----- - -query-sql -SELECT count(*) FROM d.foo; ----- -0 - - -query-sql -SELECT count(*) FROM d.foofoo; ----- -1 - -query-sql -SELECT count(*) FROM d.goodfoo; ----- -3 - - -# Check that that backup chain with the intermediate incremental backup restores properly -exec-sql -DROP DATABASE d CASCADE; ----- - -exec-sql -RESTORE DATABASE d FROM LATEST IN 'nodelocal://0/database_no_hist/'; ----- - -query-sql -SELECT count(*) FROM d.foo; ----- -0 - - -query-sql -SELECT count(*) FROM d.foofoo; ----- -1 - -query-sql -SELECT count(*) FROM d.goodfoo; ----- -3 - - -# Check the cluster level restore -new-cluster name=s2 share-io-dir=s1 allow-implicit-access disable-tenant ----- - -exec-sql -RESTORE FROM LATEST IN 'nodelocal://0/cluster/'; ----- - -query-sql -SELECT count(*) FROM d.foo; ----- -0 - - -query-sql -SELECT count(*) FROM d.foofoo; ----- -1 - - -query-sql -SELECT count(*) FROM d.goodfoo; ----- -3 diff --git a/pkg/ccl/backupccl/testdata/backup-restore/regression-tests b/pkg/ccl/backupccl/testdata/backup-restore/regression-tests new file mode 100644 index 000000000000..fd1bfaf460a2 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/backup-restore/regression-tests @@ -0,0 +1,173 @@ +new-cluster name=s1 +---- + +subtest double-db + +exec-sql +CREATE DATABASE db1; +DROP DATABASE db1; +CREATE DATABASE db1; +---- + +exec-sql +BACKUP INTO 'nodelocal://1/doubleDB' WITH revision_history; +---- + +new-cluster name=s2 share-io-dir=s1 +---- + +exec-sql +RESTORE FROM LATEST IN 'nodelocal://1/doubleDB' +---- + +exec-sql +DROP DATABASE db1; +---- + +exec-sql +RESTORE DATABASE db1 FROM LATEST IN 'nodelocal://1/doubleDB'; +---- + +query-sql +SELECT count(*) FROM [SHOW DATABASES] WHERE database_name = 'db1' +---- +1 + +subtest end + +subtest privileges-zone-config + +exec-sql +CREATE DATABASE test; +SET database = test; +CREATE USER testuser; +CREATE TABLE test_table(); +CREATE TABLE test_table2(); +GRANT ZONECONFIG ON DATABASE test TO testuser; +GRANT ZONECONFIG ON test_table TO testuser; +GRANT ALL ON test_table2 TO testuser; +---- + +exec-sql +BACKUP INTO 'nodelocal://1/priv-zone-cfg' +---- + +new-cluster name=s3 share-io-dir=s2 +---- + +exec-sql +RESTORE FROM LATEST IN 'nodelocal://1/priv-zone-cfg'; +---- + +query-sql +show grants on database test; +---- +test admin ALL true +test public CONNECT false +test root ALL true +test testuser ZONECONFIG false + +query-sql +show grants on test.test_table +---- +test public test_table admin ALL true +test public test_table root ALL true +test public test_table testuser ZONECONFIG false + +query-sql +show grants on test.test_table2 +---- +test public test_table2 admin ALL true +test public test_table2 root ALL true +test public test_table2 testuser ALL false + +subtest end + +subtest create-without-interleave + +exec-sql +CREATE DATABASE newtest; +---- + +exec-sql +SET database = newtest; +---- + +exec-sql +CREATE TABLE t1 (k INT8 PRIMARY KEY, v1 INT8); +---- + +exec-sql +ALTER TABLE t1 ADD COLUMN v2 INT8; +---- + +exec-sql +CREATE INDEX t1_v2 ON t1 (v2); +---- + +exec-sql +CREATE TABLE t2 (k INT8 PRIMARY KEY, v1 INT8, v2 INT8); +---- + +exec-sql +CREATE TABLE t3 (k INT8 PRIMARY KEY); +---- + +exec-sql +CREATE TABLE t4 (k INT8 PRIMARY KEY, v1 INT8, v2 INT8, CONSTRAINT fk_t3 FOREIGN KEY (k) REFERENCES t3); +---- + +exec-sql +INSERT INTO t1 VALUES (1, 1, 1), (2, 2, 2), (3, 3, 3); +---- + +exec-sql +INSERT INTO t2 VALUES (1, 1, 1), (2, 2, 2), (3, 3, 3); +---- + +exec-sql +INSERT INTO t3 VALUES (1), (2), (3); +---- + +exec-sql +INSERT INTO t4 VALUES (1, 1, 1), (2, 2, 2), (3, 3, 3); +---- + +exec-sql +BACKUP INTO 'nodelocal://1/foo/create-without-interleave' +---- + +exec-sql +CREATE DATABASE "restore-test" +---- + +exec-sql +RESTORE newtest.* FROM LATEST IN 'nodelocal://1/foo/create-without-interleave' WITH into_db='restore-test' +---- + +exec-sql +USE "restore-test" +---- + +query-sql +SELECT * FROM "restore-test".t1 ORDER BY k +---- +1 1 1 +2 2 2 +3 3 3 + +query-sql +SELECT * FROM "restore-test".t2 ORDER BY k +---- +1 1 1 +2 2 2 +3 3 3 + +query-sql +SELECT * FROM "restore-test".t4 ORDER BY k +---- +1 1 1 +2 2 2 +3 3 3 + +subtest end diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/create.sql b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/create.sql index 5342a8b997b5..ba6957c0fd72 100644 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/create.sql +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/create.sql @@ -10,29 +10,29 @@ after it completed the backfill portion of the schema change. CREATE TABLE midaddcol as select * from generate_series(1,3) as a; ALTER TABLE midaddcol ADD COLUMN b DECIMAL NOT NULL DEFAULT (DECIMAL '1.3'); -BACKUP defaultdb.* TO 'nodelocal://1/midaddcol'; +BACKUP defaultdb.* INTO 'nodelocal://1/midaddcol'; DROP TABLE midaddcol; CREATE TABLE midaddconst as select * from generate_series(1,3) as a; ALTER TABLE midaddconst ADD CONSTRAINT my_const CHECK (a > 0); -BACKUP defaultdb.* TO 'nodelocal://1/midaddconst'; +BACKUP defaultdb.* INTO 'nodelocal://1/midaddconst'; DROP TABLE midaddconst; CREATE TABLE midaddindex as select * from generate_series(1,3) as a; CREATE INDEX my_idx ON midaddindex(a); -BACKUP defaultdb.* TO 'nodelocal://1/midaddindex'; +BACKUP defaultdb.* INTO 'nodelocal://1/midaddindex'; DROP TABLE midaddindex; CREATE TABLE middropcol as select * from generate_series(1,3) as a, generate_series(1,3) as b; ALTER TABLE middropcol DROP COLUMN b; -BACKUP defaultdb.* TO 'nodelocal://1/middropcol'; +BACKUP defaultdb.* INTO 'nodelocal://1/middropcol'; DROP TABLE middropcol; CREATE TABLE midmany as select * from generate_series(1,3) as a; ALTER TABLE midmany ADD COLUMN b DECIMAL NOT NULL DEFAULT (DECIMAL '1.3'); ALTER TABLE midmany ADD CONSTRAINT my_const CHECK (a > 0); CREATE INDEX my_idx ON midmany(a); -BACKUP defaultdb.* TO 'nodelocal://1/midmany'; +BACKUP defaultdb.* INTO 'nodelocal://1/midmany'; DROP TABLE midmany; CREATE TABLE midmultitxn as SELECT * from generate_series(1,3) as a; @@ -41,14 +41,14 @@ ALTER TABLE midmultitxn ADD COLUMN b DECIMAL NOT NULL DEFAULT (DECIMAL '1.3'); ALTER TABLE midmultitxn ADD CONSTRAINT my_const CHECK (a > 0); CREATE INDEX my_idx ON midmultitxn(a); COMMIT; -BACKUP defaultdb.* TO 'nodelocal://1/midmultitxn'; +BACKUP defaultdb.* INTO 'nodelocal://1/midmultitxn'; DROP TABLE midmultitxn; CREATE TABLE midmultitable1 AS SELECT * FROM generate_series(1, 3) AS a; CREATE TABLE midmultitable2 AS SELECT * FROM generate_series(1, 3) AS a; ALTER TABLE midmultitable1 ADD COLUMN b DECIMAL NOT NULL DEFAULT (DECIMAL '1.3'); ALTER TABLE midmultitable2 ADD CONSTRAINT my_const CHECK (a > 0); -BACKUP defaultdb.* TO 'nodelocal://1/midmultitable'; +BACKUP defaultdb.* INTO 'nodelocal://1/midmultitable'; DROP TABLE midmultitable1; DROP TABLE midmultitable2; @@ -57,12 +57,12 @@ CREATE TABLE midprimarykeyswap AS SELECT * FROM generate_series(1,3) AS a; -- This schema change is used to enable the primary key swap. The backup is not taken during this schema change. ALTER TABLE midprimarykeyswap ALTER COLUMN a SET NOT NULL; ALTER TABLE midprimarykeyswap ALTER PRIMARY KEY USING COLUMNS (a); -BACKUP defaultdb.* TO 'nodelocal://1/midprimarykeyswap'; +BACKUP defaultdb.* INTO 'nodelocal://1/midprimarykeyswap'; DROP TABLE midprimarykeyswap; CREATE TABLE midprimarykeyswapcleanup AS SELECT * FROM generate_series(1,3) AS a; -- This schema change is used to enable the primary key swap. The backup is not taken during this schema change. ALTER TABLE midprimarykeyswapcleanup ALTER COLUMN a SET NOT NULL; ALTER TABLE midprimarykeyswapcleanup ALTER PRIMARY KEY USING COLUMNS (a); -BACKUP defaultdb.* TO 'nodelocal://1/midprimarykeyswapcleanup'; +BACKUP defaultdb.* INTO 'nodelocal://1/midprimarykeyswapcleanup'; DROP TABLE midprimarykeyswapcleanup; diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddcol/550587561189703681.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddcol/550587561189703681.sst deleted file mode 100644 index 04a7528c3305..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddcol/550587561189703681.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddcol/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddcol/BACKUP deleted file mode 100644 index 233cb0a4ad7e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddcol/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddconst/550587672604639233.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddconst/550587672604639233.sst deleted file mode 100644 index f91e89dc4db1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddconst/550587672604639233.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddconst/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddconst/BACKUP deleted file mode 100644 index d6edaaedcba3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddconst/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/550587748795252737.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/550587748795252737.sst deleted file mode 100644 index d9c354380076..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/550587748795252737.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/550587748795351041.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/550587748795351041.sst deleted file mode 100644 index 2a5efe4692a6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/550587748795351041.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/BACKUP deleted file mode 100644 index b823339af3bb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midaddindex/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/middropcol/550587825541808129.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/middropcol/550587825541808129.sst deleted file mode 100644 index 42569b64656c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/middropcol/550587825541808129.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/middropcol/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/middropcol/BACKUP deleted file mode 100644 index 4eab608e2dee..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/middropcol/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmany/550587942347407361.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmany/550587942347407361.sst deleted file mode 100644 index 800272b1287f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmany/550587942347407361.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmany/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmany/BACKUP deleted file mode 100644 index ceaa36c074f3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmany/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/550588302039220225.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/550588302039220225.sst deleted file mode 100644 index 72b3ae77df33..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/550588302039220225.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/550588302039416833.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/550588302039416833.sst deleted file mode 100644 index f5e82217ce42..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/550588302039416833.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/BACKUP deleted file mode 100644 index 3128d4ad7345..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitable/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/550588153209683969.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/550588153209683969.sst deleted file mode 100644 index 7468387ae6ef..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/550588153209683969.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/550588153209782273.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/550588153209782273.sst deleted file mode 100644 index 368a64fe97ba..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/550588153209782273.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/BACKUP deleted file mode 100644 index 80557c565504..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/19.2/midmultitxn/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513838804993.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513838804993.sst deleted file mode 100644 index 4b446d920988..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513838804993.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513838837761.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513838837761.sst deleted file mode 100644 index aa6ec9d41831..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513838837761.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513839427585.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513839427585.sst deleted file mode 100644 index a6370663b74e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513839427585.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513875144705.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513875144705.sst deleted file mode 100644 index d96e46815b11..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513875144705.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513875603457.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513875603457.sst deleted file mode 100644 index b2179d9a60af..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513875603457.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513963454465.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513963454465.sst deleted file mode 100644 index f37642158000..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513963454465.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513986719745.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513986719745.sst deleted file mode 100644 index 7854c315f15d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393513986719745.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514076864513.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514076864513.sst deleted file mode 100644 index 855d2c72840b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514076864513.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514100064257.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514100064257.sst deleted file mode 100644 index 78ccddd0845b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514100064257.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514193551361.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514193551361.sst deleted file mode 100644 index 3d9a19967a59..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/600393514193551361.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/BACKUP deleted file mode 100644 index 73761d7a5a26..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddcol/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351410864129.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351410864129.sst deleted file mode 100644 index 385808888181..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351410864129.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351410896897.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351410896897.sst deleted file mode 100644 index 0bab55b39c6e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351410896897.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351411257345.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351411257345.sst deleted file mode 100644 index 2d80977d46b9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351411257345.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351480496129.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351480496129.sst deleted file mode 100644 index bc5442b27667..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351480496129.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351526830081.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351526830081.sst deleted file mode 100644 index ac780063f08a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351526830081.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351527714817.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351527714817.sst deleted file mode 100644 index fb93541332b4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351527714817.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351580176385.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351580176385.sst deleted file mode 100644 index f14a370a1996..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351580176385.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351643254785.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351643254785.sst deleted file mode 100644 index b88f4e07fc0d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351643254785.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351700238337.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351700238337.sst deleted file mode 100644 index cde7eb4f822b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351700238337.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351774556161.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351774556161.sst deleted file mode 100644 index 9a67eb4b4bb6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/600380351774556161.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/BACKUP deleted file mode 100644 index 9b9903e4b994..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddconst/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514338865153.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514338865153.sst deleted file mode 100644 index faababf2eeea..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514338865153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514338930689.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514338930689.sst deleted file mode 100644 index 9a683e76605a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514338930689.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514339094529.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514339094529.sst deleted file mode 100644 index 44d1d7cb7354..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514339094529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514376744961.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514376744961.sst deleted file mode 100644 index 87614758d631..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514376744961.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514487238657.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514487238657.sst deleted file mode 100644 index 465981b10e76..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514487238657.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514487369729.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514487369729.sst deleted file mode 100644 index d2e9ccd69192..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514487369729.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514542583809.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514542583809.sst deleted file mode 100644 index 42da33a8b298..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514542583809.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514564833281.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514564833281.sst deleted file mode 100644 index d762d479cbad..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514564833281.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514585247745.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514585247745.sst deleted file mode 100644 index 0f625a91a0ad..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514585247745.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514618933249.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514618933249.sst deleted file mode 100644 index 8bbd7337fa2a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514618933249.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514641149953.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514641149953.sst deleted file mode 100644 index 9820b294c1e0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/600380514641149953.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/BACKUP deleted file mode 100644 index f38e0224d1af..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midaddindex/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025585153.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025585153.sst deleted file mode 100644 index c0365043472f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025585153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025617921.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025617921.sst deleted file mode 100644 index 2e5b5248cf6b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025617921.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025650689.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025650689.sst deleted file mode 100644 index f49554e797e2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393025650689.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393068576769.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393068576769.sst deleted file mode 100644 index d7eac95f12f0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393068576769.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393134505985.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393134505985.sst deleted file mode 100644 index 48b035bca8c6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393134505985.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393136832513.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393136832513.sst deleted file mode 100644 index 1b96c53c27e1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393136832513.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393158361089.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393158361089.sst deleted file mode 100644 index 019d6d084383..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393158361089.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393198862337.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393198862337.sst deleted file mode 100644 index a24d8f7f08fd..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393198862337.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393199321089.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393199321089.sst deleted file mode 100644 index 320ef5054c90..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393199321089.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393220128769.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393220128769.sst deleted file mode 100644 index 976362840850..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/600240393220128769.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/BACKUP deleted file mode 100644 index 5d313c1bcbf8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/middropcol/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334573569.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334573569.sst deleted file mode 100644 index 1cd607afa0a5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334573569.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334606337.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334606337.sst deleted file mode 100644 index 38036774c1e2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334606337.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334639105.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334639105.sst deleted file mode 100644 index e78ae28ae6c5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976334639105.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976374222849.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976374222849.sst deleted file mode 100644 index 9cede3dd208b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976374222849.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976397160449.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976397160449.sst deleted file mode 100644 index 66202f9ebab7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976397160449.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976497070081.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976497070081.sst deleted file mode 100644 index 69520927ba54..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976497070081.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976607301633.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976607301633.sst deleted file mode 100644 index 64ddc43ed9a4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976607301633.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976607989761.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976607989761.sst deleted file mode 100644 index aff7269bb88e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976607989761.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976629780481.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976629780481.sst deleted file mode 100644 index c60b324e8fb8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976629780481.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976653045761.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976653045761.sst deleted file mode 100644 index a20945280195..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/600387976653045761.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/BACKUP deleted file mode 100644 index 7f5754a88330..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmany/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415118213121.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415118213121.sst deleted file mode 100644 index b064bf672bdc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415118213121.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415118278657.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415118278657.sst deleted file mode 100644 index 7d87ad8e896a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415118278657.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415119228929.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415119228929.sst deleted file mode 100644 index b90dfc495c51..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415119228929.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415155306497.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415155306497.sst deleted file mode 100644 index e6d9a6afb946..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415155306497.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415232049153.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415232049153.sst deleted file mode 100644 index af845677bb8d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415232049153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415274549249.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415274549249.sst deleted file mode 100644 index c9214183ff64..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415274549249.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415314100225.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415314100225.sst deleted file mode 100644 index 4697b50d0366..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415314100225.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415353847809.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415353847809.sst deleted file mode 100644 index e1bb3319d5a9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415353847809.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415427346433.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415427346433.sst deleted file mode 100644 index 3a0485b17bb1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415427346433.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415520473089.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415520473089.sst deleted file mode 100644 index b2e42423977c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415520473089.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415617531905.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415617531905.sst deleted file mode 100644 index 5a706612e742..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/600388415617531905.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/BACKUP deleted file mode 100644 index 7e4bdcc6ee15..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitable/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066677761.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066677761.sst deleted file mode 100644 index c2d75414bf1f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066677761.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066710529.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066710529.sst deleted file mode 100644 index c6cb7cf3bc60..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066710529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066743297.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066743297.sst deleted file mode 100644 index be146d75ba55..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162066743297.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162105016321.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162105016321.sst deleted file mode 100644 index 384c354d424e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162105016321.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162105573377.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162105573377.sst deleted file mode 100644 index a286cc5140d5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162105573377.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162126610433.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162126610433.sst deleted file mode 100644 index 7b1ca642c9fe..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162126610433.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162201518081.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162201518081.sst deleted file mode 100644 index 3f9aa5fba3e7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162201518081.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162292908033.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162292908033.sst deleted file mode 100644 index 1cffc148c09b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162292908033.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162317451265.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162317451265.sst deleted file mode 100644 index c65e80b19c8f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162317451265.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162340847617.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162340847617.sst deleted file mode 100644 index 914fd7812c9f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162340847617.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162378334209.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162378334209.sst deleted file mode 100644 index 0e416d7f7352..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/600388162378334209.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/BACKUP deleted file mode 100644 index 186d54d27783..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midmultitxn/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535496705.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535496705.sst deleted file mode 100644 index a6649f4da67f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535496705.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535529473.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535529473.sst deleted file mode 100644 index 5135e6ed7680..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535529473.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535562241.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535562241.sst deleted file mode 100644 index 5756dbbc779f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812535562241.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812578488321.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812578488321.sst deleted file mode 100644 index cf1f0b5286cc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812578488321.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812578684929.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812578684929.sst deleted file mode 100644 index f97bddf3bbc9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812578684929.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812610666497.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812610666497.sst deleted file mode 100644 index d5c2e01a1fd6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812610666497.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812652347393.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812652347393.sst deleted file mode 100644 index 60779c7bd1a8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812652347393.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812652969985.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812652969985.sst deleted file mode 100644 index 8b721be11a38..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812652969985.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812744163329.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812744163329.sst deleted file mode 100644 index 5d13d148550b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812744163329.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812768772097.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812768772097.sst deleted file mode 100644 index fee1620e1d7e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812768772097.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812769132545.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812769132545.sst deleted file mode 100644 index 72f14b56fd72..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/600388812769132545.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/BACKUP deleted file mode 100644 index 8b1a87fa5c1d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682883585.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682883585.sst deleted file mode 100644 index 0557482787ce..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682883585.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682916353.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682916353.sst deleted file mode 100644 index a7766b47d0a7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682916353.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682949121.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682949121.sst deleted file mode 100644 index fbc934317468..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791682949121.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791726104577.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791726104577.sst deleted file mode 100644 index 5c1e589fa768..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791726104577.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791751172097.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791751172097.sst deleted file mode 100644 index a2c5b0f95677..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791751172097.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791752286209.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791752286209.sst deleted file mode 100644 index 08665e7577c3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791752286209.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791789477889.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791789477889.sst deleted file mode 100644 index cb595eb35407..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791789477889.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791824998401.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791824998401.sst deleted file mode 100644 index d252d0133c24..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791824998401.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791860420609.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791860420609.sst deleted file mode 100644 index 6d1ad8ec9cd3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791860420609.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791932608513.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791932608513.sst deleted file mode 100644 index dad12182d4eb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791932608513.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791969669121.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791969669121.sst deleted file mode 100644 index 517f6566e0a8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/600470791969669121.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/BACKUP deleted file mode 100644 index 8efef2496834..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.1/midprimarykeyswap/midprimarykeyswap/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203570491393.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203570491393.sst deleted file mode 100644 index 992233dd70d5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203570491393.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203570753537.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203570753537.sst deleted file mode 100644 index cb97155608d0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203570753537.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203571965953.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203571965953.sst deleted file mode 100644 index 5262d2427b05..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203571965953.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203632783361.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203632783361.sst deleted file mode 100644 index cf889b1d9152..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203632783361.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203633831937.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203633831937.sst deleted file mode 100644 index 6ad536cf4374..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203633831937.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203634257921.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203634257921.sst deleted file mode 100644 index d7f8e9644a90..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203634257921.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203696615425.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203696615425.sst deleted file mode 100644 index 54747537bc55..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203696615425.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203696910337.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203696910337.sst deleted file mode 100644 index 5793aa82a4aa..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203696910337.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203697336321.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203697336321.sst deleted file mode 100644 index a1e5e6dd195a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203697336321.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203759726593.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203759726593.sst deleted file mode 100644 index e907d3c7ddf3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203759726593.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203760283649.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203760283649.sst deleted file mode 100644 index 0e9d7133ee9c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/601645203760283649.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index dc3ed5f92549..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -O \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP_MANIFEST deleted file mode 100644 index 5434f113963f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 41f37e47ae73..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -Uг \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450040321.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450040321.sst deleted file mode 100644 index ff94f5415815..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450040321.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450073089.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450073089.sst deleted file mode 100644 index 6516f88a1a12..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450073089.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450761217.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450761217.sst deleted file mode 100644 index 7175325d7518..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227450761217.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568594945.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568594945.sst deleted file mode 100644 index 6b74df512387..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568594945.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568758785.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568758785.sst deleted file mode 100644 index b39e927ee873..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568758785.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568791553.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568791553.sst deleted file mode 100644 index e01ba69c84b8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227568791553.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227643535361.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227643535361.sst deleted file mode 100644 index df4f0ab954f8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227643535361.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227643797505.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227643797505.sst deleted file mode 100644 index 59a1d326dacf..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227643797505.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227680366593.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227680366593.sst deleted file mode 100644 index c017302e41e3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227680366593.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227795611649.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227795611649.sst deleted file mode 100644 index c0ce5b16b7f8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227795611649.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227797315585.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227797315585.sst deleted file mode 100644 index ec45e109efda..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/601645227797315585.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index b71a1537856f..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ --r \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP_MANIFEST deleted file mode 100644 index a9d2c748f7ea..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 901cd38b4294..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -7 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251191701505.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251191701505.sst deleted file mode 100644 index d476eba3918e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251191701505.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251191865345.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251191865345.sst deleted file mode 100644 index dbdba6d4b271..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251191865345.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251193110529.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251193110529.sst deleted file mode 100644 index 57cc80e465bf..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251193110529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251287384065.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251287384065.sst deleted file mode 100644 index 7a037dd7dc2c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251287384065.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251309568001.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251309568001.sst deleted file mode 100644 index 38b515ba0ab8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251309568001.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251309600769.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251309600769.sst deleted file mode 100644 index 228a260a38cb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251309600769.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251495198721.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251495198721.sst deleted file mode 100644 index 4a19d2f1d378..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251495198721.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251727884289.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251727884289.sst deleted file mode 100644 index 87ff7d6e8307..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251727884289.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251728113665.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251728113665.sst deleted file mode 100644 index a170a533608b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251728113665.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251728310273.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251728310273.sst deleted file mode 100644 index d76273538096..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251728310273.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251777953793.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251777953793.sst deleted file mode 100644 index 81733d17984b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251777953793.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251799744513.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251799744513.sst deleted file mode 100644 index 179b261b24f5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/601645251799744513.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 5d39ce081939..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -v \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP_MANIFEST deleted file mode 100644 index a345823e6165..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 7508a0a5f277..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -%[ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275231518721.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275231518721.sst deleted file mode 100644 index 6fd8c4ca4ce6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275231518721.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275231617025.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275231617025.sst deleted file mode 100644 index 90ecff0c0481..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275231617025.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275233124353.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275233124353.sst deleted file mode 100644 index 800d92d7126e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275233124353.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295285249.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295285249.sst deleted file mode 100644 index fcddc2f5033b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295285249.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295645697.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295645697.sst deleted file mode 100644 index 415570721de0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295645697.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295940609.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295940609.sst deleted file mode 100644 index c231cf00d6af..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275295940609.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275359772673.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275359772673.sst deleted file mode 100644 index e6668a913bcd..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275359772673.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275360165889.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275360165889.sst deleted file mode 100644 index fdb33537a8bf..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275360165889.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275360296961.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275360296961.sst deleted file mode 100644 index 175fb808a76a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275360296961.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275423244289.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275423244289.sst deleted file mode 100644 index faf849b9caae..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275423244289.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275423932417.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275423932417.sst deleted file mode 100644 index 2f98d934eabb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/601645275423932417.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 1821c34e4dc0..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ũ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP_MANIFEST deleted file mode 100644 index 9001a66f19c1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 21d5d9feb587..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/middropcol/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298762022913.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298762022913.sst deleted file mode 100644 index 3945529565dd..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298762022913.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298764873729.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298764873729.sst deleted file mode 100644 index 46b18f9a72bc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298764873729.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298767265793.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298767265793.sst deleted file mode 100644 index 05538691ea2a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298767265793.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298818809857.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298818809857.sst deleted file mode 100644 index 827cb2886aa1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298818809857.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298819301377.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298819301377.sst deleted file mode 100644 index a7146c24d016..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298819301377.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298819989505.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298819989505.sst deleted file mode 100644 index 705b264f3632..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298819989505.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298904399873.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298904399873.sst deleted file mode 100644 index fb5aa1ee73be..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645298904399873.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146031105.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146031105.sst deleted file mode 100644 index 0ad11e7de381..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146031105.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146063873.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146063873.sst deleted file mode 100644 index db985e97ff55..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146063873.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146948609.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146948609.sst deleted file mode 100644 index b144abe93035..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299146948609.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299187023873.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299187023873.sst deleted file mode 100644 index 157faf969b80..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/601645299187023873.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 8818d5aebf08..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -=LM \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP_MANIFEST deleted file mode 100644 index d63d3dd7b29a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 8bb0db398898..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmany/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -xD \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347188834305.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347188834305.sst deleted file mode 100644 index 56d114413641..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347188834305.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347188932609.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347188932609.sst deleted file mode 100644 index 144b0b5083ba..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347188932609.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347189850113.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347189850113.sst deleted file mode 100644 index fbae27f73718..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347189850113.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256270849.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256270849.sst deleted file mode 100644 index 9dab6f786f32..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256270849.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256303617.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256303617.sst deleted file mode 100644 index 67acfa7a537b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256303617.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256336385.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256336385.sst deleted file mode 100644 index ee74876d6921..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347256336385.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347424141313.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347424141313.sst deleted file mode 100644 index f3700a6c0f45..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347424141313.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347445669889.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347445669889.sst deleted file mode 100644 index dd85a5a543d5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347445669889.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347445702657.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347445702657.sst deleted file mode 100644 index 20917d328e6a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347445702657.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347556917249.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347556917249.sst deleted file mode 100644 index 192cce2da9f5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347556917249.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347578544129.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347578544129.sst deleted file mode 100644 index 642fe1e8ba71..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347578544129.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347600236545.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347600236545.sst deleted file mode 100644 index cac053c49ca4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/601645347600236545.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 9f340893e7db..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -!m \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP_MANIFEST deleted file mode 100644 index 3fc1c85b79a5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index ed3a3a71877c..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitable/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -A \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695573505.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695573505.sst deleted file mode 100644 index 58de9710d124..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695573505.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695606273.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695606273.sst deleted file mode 100644 index d89272581691..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695606273.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695671809.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695671809.sst deleted file mode 100644 index 4a434d7964b3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322695671809.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322747707393.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322747707393.sst deleted file mode 100644 index 56cafd074154..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322747707393.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322747740161.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322747740161.sst deleted file mode 100644 index 1f2a7f9338c0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322747740161.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322748198913.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322748198913.sst deleted file mode 100644 index 4d891becc4db..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322748198913.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322790961153.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322790961153.sst deleted file mode 100644 index 3b2774113b5c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645322790961153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061460993.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061460993.sst deleted file mode 100644 index 3d45c1a0efed..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061460993.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061821441.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061821441.sst deleted file mode 100644 index e87cb3fa3cbe..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061821441.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061854209.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061854209.sst deleted file mode 100644 index b97321cdf3fe..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323061854209.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323145707521.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323145707521.sst deleted file mode 100644 index d616fa9ca073..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323145707521.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323147083777.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323147083777.sst deleted file mode 100644 index 15ecfd5d7acf..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/601645323147083777.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 37726428fce8..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -yN \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP_MANIFEST deleted file mode 100644 index d2c95b38759d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 3a978768f2ea..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midmultitxn/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -t6! \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162518017.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162518017.sst deleted file mode 100644 index b3bea57c528d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162518017.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162550785.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162550785.sst deleted file mode 100644 index 2ba35e8fffc5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162550785.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162583553.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162583553.sst deleted file mode 100644 index f1075eacc8a5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406162583553.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406218747905.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406218747905.sst deleted file mode 100644 index b1cd647afb61..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406218747905.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406219501569.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406219501569.sst deleted file mode 100644 index be418c7a02bc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406219501569.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406220222465.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406220222465.sst deleted file mode 100644 index 9e5f74ed4927..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406220222465.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406300274689.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406300274689.sst deleted file mode 100644 index 1c243c8bcb29..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406300274689.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520442881.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520442881.sst deleted file mode 100644 index 749bcad53ce1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520442881.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520475649.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520475649.sst deleted file mode 100644 index 0d482c5a7041..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520475649.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520508417.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520508417.sst deleted file mode 100644 index 7580cae30e26..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406520508417.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406561665025.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406561665025.sst deleted file mode 100644 index 985447fcbb9d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406561665025.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406580506625.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406580506625.sst deleted file mode 100644 index 3dead2803a18..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/601645406580506625.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 6aed7d66c46b..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ͻ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP_MANIFEST deleted file mode 100644 index 60596312b5f9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 701aeaa091ad..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswap/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ݩe \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985073153.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985073153.sst deleted file mode 100644 index 4cc78d69c04f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985073153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985105921.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985105921.sst deleted file mode 100644 index 7443408e5417..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985105921.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985302529.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985302529.sst deleted file mode 100644 index 895198ae203c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645497985302529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498032848897.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498032848897.sst deleted file mode 100644 index 3060f8ee1aa1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498032848897.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498052870145.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498052870145.sst deleted file mode 100644 index bf17a3e50e59..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498052870145.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498053033985.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498053033985.sst deleted file mode 100644 index a15aa208528b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498053033985.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498095271937.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498095271937.sst deleted file mode 100644 index 0781523dac39..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498095271937.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278805505.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278805505.sst deleted file mode 100644 index 3399c9b960e4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278805505.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278871041.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278871041.sst deleted file mode 100644 index a14d4c5bfe60..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278871041.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278969345.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278969345.sst deleted file mode 100644 index 140b8f8f7c23..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498278969345.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498394640385.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498394640385.sst deleted file mode 100644 index dfd92dced7a9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/601645498394640385.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index bbffd2670e15..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST deleted file mode 100644 index db2e1beee550..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index fa74cbb98372..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -},t \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP-LOCK-780220986219692033 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP-LOCK-846687217466802177 similarity index 100% rename from pkg/ccl/backupccl/testdata/restore_old_versions/cluster/v22.1.3/BACKUP-LOCK-780220986219692033 rename to pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP-LOCK-846687217466802177 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP-STATISTICS similarity index 100% rename from pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddcol/BACKUP-STATISTICS rename to pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP-STATISTICS diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP_MANIFEST new file mode 100644 index 000000000000..7777619c5ef1 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..a08d44427d2c --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +v \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/data/846687218047254529.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/data/846687218047254529.sst new file mode 100644 index 000000000000..93745a9eab10 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/data/846687218047254529.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdc9cbc8cbccdfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cac7cdcfc6cacccccbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdc9cbc8cbccdfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cac7cdcfc6cacccccbfffe new file mode 100644 index 000000000000..0098b9a70cc3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdc9cbc8cbccdfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cac7cdcfc6cacccccbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdc9cbc8cbccdfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cac7cdcfc6cacccccbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdc9cbc8cbccdfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cac7cdcfc6cacccccbfffe-CHECKSUM new file mode 100644 index 000000000000..22c20ddd7912 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdc9cbc8cbccdfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cac7cdcfc6cacccccbfffe-CHECKSUM @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdcfcfcbc9c7dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cacec8c7cec6c8cfc6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdcfcfcbc9c7dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cacec8c7cec6c8cfc6fffe new file mode 100644 index 000000000000..9d54f25f6e06 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdcfcfcbc9c7dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cacec8c7cec6c8cfc6fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdcfcfcbc9c7dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cacec8c7cec6c8cfc6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdcfcfcbc9c7dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cacec8c7cec6c8cfc6fffe-CHECKSUM new file mode 100644 index 000000000000..237e7e2ffef3 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/2023/03/10-143353.06/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1cdcfcfcbc9c7dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1cacec8c7cec6c8cfc6fffe-CHECKSUM @@ -0,0 +1 @@ +[+& \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1ccc9cfcfcfc6dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1c9c8c8ccc9cdcec9c8fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1ccc9cfcfcfc6dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1c9c8c8ccc9cdcec9c8fffe new file mode 100644 index 000000000000..679711109ad8 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddcol/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccccc5caccd1ccc9cfcfcfc6dfd4cfcfcfcfdfaaabbcdf92c2d4c9ced1c9c8c8ccc9cdcec9c8fffe @@ -0,0 +1 @@ +/2023/03/10-143353.06 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP-LOCK-786701266473517057 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP-LOCK-846687327161253889 similarity index 100% rename from pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP-LOCK-786701266473517057 rename to pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP-LOCK-846687327161253889 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP-STATISTICS new file mode 100644 index 000000000000..94ec866304b6 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP_MANIFEST new file mode 100644 index 000000000000..ed6d9f9944b7 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..e88ae576a486 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +` \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/data/846687327460229121.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/data/846687327460229121.sst new file mode 100644 index 000000000000..341dae4d7326 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/data/846687327460229121.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c9cbc8c8cdcddfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6c9cacdc6c6cfc7cbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c9cbc8c8cdcddfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6c9cacdc6c6cfc7cbfffe new file mode 100644 index 000000000000..85b1a8f70681 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c9cbc8c8cdcddfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6c9cacdc6c6cfc7cbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c9cbc8c8cdcddfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6c9cacdc6c6cfc7cbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c9cbc8c8cdcddfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6c9cacdc6c6cfc7cbfffe-CHECKSUM new file mode 100644 index 000000000000..94c64e116706 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c9cbc8c8cdcddfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6c9cacdc6c6cfc7cbfffe-CHECKSUM @@ -0,0 +1 @@ +"d \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1cac6c7c8cacedfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6cec9cccdc8cecdc9fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1cac6c7c8cacedfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6cec9cccdc8cecdc9fffe new file mode 100644 index 000000000000..fb1f845faf7d Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1cac6c7c8cacedfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6cec9cccdc8cecdc9fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1cac6c7c8cacedfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6cec9cccdc8cecdc9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1cac6c7c8cacedfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6cec9cccdc8cecdc9fffe-CHECKSUM new file mode 100644 index 000000000000..cb9c56d57591 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/2023/03/10-143426.53/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1cac6c7c8cacedfd4cfcfcfcfdfaaabbcdf92c2d4c6cbd1c6cec9cccdc8cecdc9fffe-CHECKSUM @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c8cfcbc9c7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6cad1cfcdcdcdcac8c6cac6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c8cfcbc9c7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6cad1cfcdcdcdcac8c6cac6fffe new file mode 100644 index 000000000000..bdbbce3f17da --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddconst/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cccbc5cdc9d1c8cfcbc9c7cedfd4cfcfcfcfdfaaabbcdf92c2d4c6cad1cfcdcdcdcac8c6cac6fffe @@ -0,0 +1 @@ +/2023/03/10-143426.53 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP-LOCK-846687969664696321 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP-LOCK-846687969664696321 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP-LOCK-846687969664696321 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP-STATISTICS new file mode 100644 index 000000000000..94ec866304b6 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP_MANIFEST new file mode 100644 index 000000000000..c94d514bebaa Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..42ddb6b22f6b --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +Z \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/data/846687970087370753.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/data/846687970087370753.sst new file mode 100644 index 000000000000..36513d378bc7 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/data/846687970087370753.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cac9c8c8dfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6c6c6cacccccfc7cbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cac9c8c8dfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6c6c6cacccccfc7cbfffe new file mode 100644 index 000000000000..0d7fde73d27a Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cac9c8c8dfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6c6c6cacccccfc7cbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cac9c8c8dfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6c6c6cacccccfc7cbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cac9c8c8dfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6c6c6cacccccfc7cbfffe-CHECKSUM new file mode 100644 index 000000000000..f7329f3f081e --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cac9c8c8dfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6c6c6cacccccfc7cbfffe-CHECKSUM @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cec9cac9cadfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6cac6cccdc6cfcbcdfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cec9cac9cadfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6cac6cccdc6cfcbcdfffe new file mode 100644 index 000000000000..c77c36323ad4 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cec9cac9cadfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6cac6cccdc6cfcbcdfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cec9cac9cadfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6cac6cccdc6cfcbcdfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cec9cac9cadfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6cac6cccdc6cfcbcdfffe-CHECKSUM new file mode 100644 index 000000000000..8fa1b83c310e --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/2023/03/10-143742.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c8cec9cac9cadfd4cfcfcfcfdfaaabbcdf92c2d4cdc6cfd1c6cac6cccdc6cfcbcdfffe-CHECKSUM @@ -0,0 +1 @@ +쯃 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c7cec7cbc7cbdfd4cfcfcfcfdfaaabbcdf92c2d4cdc6ced1cfc9cecdcbc9c9cdc9fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c7cec7cbc7cbdfd4cfcfcfcfdfaaabbcdf92c2d4cdc6ced1cfc9cecdcbc9c9cdc9fffe new file mode 100644 index 000000000000..2cc71a151be3 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midaddindex/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccc8c5cbcdd1c7cec7cbc7cbdfd4cfcfcfcfdfaaabbcdf92c2d4cdc6ced1cfc9cecdcbc9c9cdc9fffe @@ -0,0 +1 @@ +/2023/03/10-143742.61 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP-LOCK-846688260166778881 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP-LOCK-846688260166778881 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP-LOCK-846688260166778881 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP-STATISTICS new file mode 100644 index 000000000000..12c00f669a67 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP_MANIFEST new file mode 100644 index 000000000000..4d42b7531f91 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..364f28ec9641 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +\Y \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/data/846688260646895617.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/data/846688260646895617.sst new file mode 100644 index 000000000000..875bd5a67247 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/data/846688260646895617.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbcdc8cfc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9c9c7c8c9cccfc7cbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbcdc8cfc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9c9c7c8c9cccfc7cbfffe new file mode 100644 index 000000000000..3b57df1f40f9 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbcdc8cfc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9c9c7c8c9cccfc7cbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbcdc8cfc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9c9c7c8c9cccfc7cbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbcdc8cfc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9c9c7c8c9cccfc7cbfffe-CHECKSUM new file mode 100644 index 000000000000..0da85f12f9ca --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbcdc8cfc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9c9c7c8c9cccfc7cbfffe-CHECKSUM @@ -0,0 +1 @@ +p( \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1ccc7cdc7c9ccdfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9cdcbcacac8cacbcdfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1ccc7cdc7c9ccdfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9cdcbcacac8cacbcdfffe new file mode 100644 index 000000000000..6e95c5c55a25 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1ccc7cdc7c9ccdfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9cdcbcacac8cacbcdfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1ccc7cdc7c9ccdfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9cdcbcacac8cacbcdfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1ccc7cdc7c9ccdfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9cdcbcacac8cacbcdfffe-CHECKSUM new file mode 100644 index 000000000000..de02bf8e96b2 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/2023/03/10-143911.26/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1ccc7cdc7c9ccdfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c9cdcbcacac8cacbcdfffe-CHECKSUM @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbc7cbc9ccc9dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c8cdc9cccdc6ccc8c9fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbc7cbc9ccc9dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c8cdc9cccdc6ccc8c9fffe new file mode 100644 index 000000000000..9b5e12bbd5a0 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/middropcol/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5ccc6c5ceced1cbc7cbc9ccc9dfd4cfcfcfcfdfaaabbcdf92c2d4ccc8c6d1c8cdc9cccdc6ccc8c9fffe @@ -0,0 +1 @@ +/2023/03/10-143911.26 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP-LOCK-846688968412987393 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP-LOCK-846688968412987393 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP-LOCK-846688968412987393 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP-STATISTICS new file mode 100644 index 000000000000..94ec866304b6 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP_MANIFEST new file mode 100644 index 000000000000..0e53e5258fa8 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..d59dfc9ffb66 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +ד \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/data/846688968790769665.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/data/846688968790769665.sst new file mode 100644 index 000000000000..85dc8b60519f Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/data/846688968790769665.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cacccccccbcddfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8c8cdcbcccdccc8c9fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cacccccccbcddfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8c8cdcbcccdccc8c9fffe new file mode 100644 index 000000000000..6000678197ca Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cacccccccbcddfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8c8cdcbcccdccc8c9fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cacccccccbcddfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8c8cdcbcccdccc8c9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cacccccccbcddfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8c8cdcbcccdccc8c9fffe-CHECKSUM new file mode 100644 index 000000000000..d9b8f6557bc1 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cacccccccbcddfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8c8cdcbcccdccc8c9fffe-CHECKSUM @@ -0,0 +1 @@ +0k \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cbc7cbcbc6cedfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8cdcccac7cdcdcacefffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cbc7cbcbc6cedfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8cdcccac7cdcdcacefffe new file mode 100644 index 000000000000..60155f0fd196 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cbc7cbcbc6cedfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8cdcccac7cdcdcacefffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cbc7cbcbc6cedfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8cdcccac7cdcdcacefffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cbc7cbcbc6cedfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8cdcccac7cdcdcacefffe-CHECKSUM new file mode 100644 index 000000000000..ddfd4099e54e --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/2023/03/10-144247.40/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1cbc7cbcbc6cedfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c8cdcccac7cdcdcacefffe-CHECKSUM @@ -0,0 +1 @@ +5G \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1c9cccccec7cadfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c7c8cdcdc8ccc9c9c8fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1c9cccccec7cadfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c7c8cdcdc8ccc9c9c8fffe new file mode 100644 index 000000000000..65d5eee29271 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmany/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbcdc5cbc8d1c9cccccec7cadfd4cfcfcfcfdfaaabbcdf92c2d4cac6cad1c7c8cdcdc8ccc9c9c8fffe @@ -0,0 +1 @@ +/2023/03/10-144247.40 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP-LOCK-846689916297150465 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP-LOCK-846689916297150465 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP-LOCK-846689916297150465 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP-STATISTICS new file mode 100644 index 000000000000..94ec866304b6 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP_MANIFEST new file mode 100644 index 000000000000..383817730f81 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..3cc11527a5cf --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ += \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/data/846689916661170177.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/data/846689916661170177.sst new file mode 100644 index 000000000000..d629ee1e1164 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/data/846689916661170177.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7cfcbcbcdccdfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfcbcfcfcdc8c9cdc9fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7cfcbcbcdccdfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfcbcfcfcdc8c9cdc9fffe new file mode 100644 index 000000000000..1bb81a350868 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7cfcbcbcdccdfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfcbcfcfcdc8c9cdc9fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7cfcbcbcdccdfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfcbcfcfcdc8c9cdc9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7cfcbcbcdccdfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfcbcfcfcdc8c9cdc9fffe-CHECKSUM new file mode 100644 index 000000000000..d2778ce3df50 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7cfcbcbcdccdfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfcbcfcfcdc8c9cdc9fffe-CHECKSUM @@ -0,0 +1 @@ + F8 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c8cacbcfc7cddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cbd1c6c7c6c9c7c8cccccbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c8cacbcfc7cddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cbd1c6c7c6c9c7c8cccccbfffe new file mode 100644 index 000000000000..ad775416ee38 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c8cacbcfc7cddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cbd1c6c7c6c9c7c8cccccbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c8cacbcfc7cddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cbd1c6c7c6c9c7c8cccccbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c8cacbcfc7cddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cbd1c6c7c6c9c7c8cccccbfffe-CHECKSUM new file mode 100644 index 000000000000..81e1d20687fb --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/2023/03/10-144736.67/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c8cacbcfc7cddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cbd1c6c7c6c9c7c8cccccbfffe-CHECKSUM @@ -0,0 +1 @@ +U՗z \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7c9cfc8cccddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfc6c9cccccac8cfc6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7c9cfc8cccddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfc6c9cccccac8cfc6fffe new file mode 100644 index 000000000000..9e20e689d9ee --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitable/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc8c5ccc9d1c7c9cfc8cccddfd4cfcfcfcfdfaaabbcdf92c2d4c7c7cad1cfc6c9cccccac8cfc6fffe @@ -0,0 +1 @@ +/2023/03/10-144736.67 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP-LOCK-846689606789431297 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP-LOCK-846689606789431297 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP-LOCK-846689606789431297 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP-STATISTICS new file mode 100644 index 000000000000..2f15d865c417 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP_MANIFEST new file mode 100644 index 000000000000..258ff753ce85 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..777626069765 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +9AF \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/data/846689607222820865.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/data/846689607222820865.sst new file mode 100644 index 000000000000..3b3377dc10bd Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/data/846689607222820865.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1ccc8cacfcccbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9cecec8c8c9c7cccbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1ccc8cacfcccbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9cecec8c8c9c7cccbfffe new file mode 100644 index 000000000000..c2b2df9a4025 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1ccc8cacfcccbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9cecec8c8c9c7cccbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1ccc8cacfcccbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9cecec8c8c9c7cccbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1ccc8cacfcccbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9cecec8c8c9c7cccbfffe-CHECKSUM new file mode 100644 index 000000000000..0b7626a10e7a --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1ccc8cacfcccbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9cecec8c8c9c7cccbfffe-CHECKSUM @@ -0,0 +1 @@ +, \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cdc6cac6cdc8dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1cacccdc9c8cfcacbcdfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cdc6cac6cdc8dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1cacccdc9c8cfcacbcdfffe new file mode 100644 index 000000000000..5190d6ce2a40 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cdc6cac6cdc8dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1cacccdc9c8cfcacbcdfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cdc6cac6cdc8dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1cacccdc9c8cfcacbcdfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cdc6cac6cdc8dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1cacccdc9c8cfcacbcdfffe-CHECKSUM new file mode 100644 index 000000000000..688448aac3cc --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/2023/03/10-144602.22/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cdc6cac6cdc8dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1cacccdc9c8cfcacbcdfffe-CHECKSUM @@ -0,0 +1 @@ +Q \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cbcccecacecddfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9c9c7cdcaccc8cfc6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cbcccecacecddfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9c9c7cdcaccc8cfc6fffe new file mode 100644 index 000000000000..d5c021ee5e83 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midmultitxn/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc9c5cfcdd1cbcccecacecddfd4cfcfcfcfdfaaabbcdf92c2d4c8c6cfd1c9c9c7cdcaccc8cfc6fffe @@ -0,0 +1 @@ +/2023/03/10-144602.22 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP-LOCK-846690127630336001 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP-LOCK-846690127630336001 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP-LOCK-846690127630336001 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP-STATISTICS new file mode 100644 index 000000000000..94ec866304b6 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP_MANIFEST new file mode 100644 index 000000000000..f19d737d3047 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..bfc868e6cb0b --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +am \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/data/846690128318398465.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/data/846690128318398465.sst new file mode 100644 index 000000000000..6abf01d05ad1 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/data/846690128318398465.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1ccc6c6ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9cccbcecdcac7cccbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1ccc6c6ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9cccbcecdcac7cccbfffe new file mode 100644 index 000000000000..644198981622 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1ccc6c6ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9cccbcecdcac7cccbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1ccc6c6ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9cccbcecdcac7cccbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1ccc6c6ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9cccbcecdcac7cccbfffe-CHECKSUM new file mode 100644 index 000000000000..61d5c201a83f --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1ccc6c6ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9cccbcecdcac7cccbfffe-CHECKSUM @@ -0,0 +1 @@ +D \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cccfc9ccc7ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1cacbcecdcfc6c7c8c9fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cccfc9ccc7ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1cacbcecdcfc6c7c8c9fffe new file mode 100644 index 000000000000..9ff71571340c Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cccfc9ccc7ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1cacbcecdcfc6c7c8c9fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cccfc9ccc7ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1cacbcecdcfc6c7c8c9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cccfc9ccc7ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1cacbcecdcfc6c7c8c9fffe-CHECKSUM new file mode 100644 index 000000000000..a170863ae736 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/2023/03/10-144841.17/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cccfc9ccc7ccdfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1cacbcecdcfc6c7c8c9fffe-CHECKSUM @@ -0,0 +1 @@ +>x \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cbcac8c9c6c7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9c6cdcacdccc7cccbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cbcac8c9c6c7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9c6cdcacdccc7cccbfffe new file mode 100644 index 000000000000..73d20c82bac2 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswap/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cbc7c5cbced1cbcac8c9c6c7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cbc6d1c9c6cdcacdccc7cccbfffe @@ -0,0 +1 @@ +/2023/03/10-144841.17 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP-LOCK-846690439807762433 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP-LOCK-846690439807762433 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP-LOCK-846690439807762433 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP-STATISTICS new file mode 100644 index 000000000000..94ec866304b6 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP_MANIFEST new file mode 100644 index 000000000000..516ec67be568 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..bb092698fc6a --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +! \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/data/846690440099823617.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/data/846690440099823617.sst new file mode 100644 index 000000000000..a975b6c1482d Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/data/846690440099823617.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacbcbc6cfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8c8c7cac7cbc8cfc6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacbcbc6cfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8c8c7cac7cbc8cfc6fffe new file mode 100644 index 000000000000..7ded43f01063 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacbcbc6cfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8c8c7cac7cbc8cfc6fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacbcbc6cfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8c8c7cac7cbc8cfc6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacbcbc6cfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8c8c7cac7cbc8cfc6fffe-CHECKSUM new file mode 100644 index 000000000000..9d3e8266a40e --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacbcbc6cfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8c8c7cac7cbc8cfc6fffe-CHECKSUM @@ -0,0 +1 @@ +C \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacfc7cacbcddfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8cbcdcdcdcec6cac6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacfc7cacbcddfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8cbcdcdcdcec6cac6fffe new file mode 100644 index 000000000000..d5843e88a8fb Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacfc7cacbcddfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8cbcdcdcdcec6cac6fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacfc7cacbcddfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8cbcdcdcdcec6cac6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacfc7cacbcddfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8cbcdcdcdcec6cac6fffe-CHECKSUM new file mode 100644 index 000000000000..689e083b9996 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/2023/03/10-145016.44/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cacfc7cacbcddfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c8cbcdcdcdcec6cac6fffe-CHECKSUM @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cac6cccdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c7cdc9c7c6cbc6cec8fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cac6cccdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c7cdc9c7c6cbc6cec8fffe new file mode 100644 index 000000000000..2c908262ce6b --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/22.2/midprimarykeyswapcleanup/metadata/latest/LATEST-13cdcfcdccd2cfccd2cecfdfcecbc5cacfc5cec9d1cac6cccdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cecfcbcbd1c7cdc9c7c6cbc6cec8fffe @@ -0,0 +1 @@ +/2023/03/10-145016.44 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027901441.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027901441.sst deleted file mode 100644 index b15b4dbbadc8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027901441.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027934209.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027934209.sst deleted file mode 100644 index 3d39ffd655bb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027934209.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027966977.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027966977.sst deleted file mode 100644 index 871612f71711..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397027966977.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397065650177.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397065650177.sst deleted file mode 100644 index fa6a9203134a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397065650177.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397085999105.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397085999105.sst deleted file mode 100644 index 18c4d8b41735..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397085999105.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397086523393.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397086523393.sst deleted file mode 100644 index e348ce4bea24..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397086523393.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397162086401.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397162086401.sst deleted file mode 100644 index 9cc017345f41..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397162086401.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397163954177.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397163954177.sst deleted file mode 100644 index a236ee3990c2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397163954177.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397184598017.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397184598017.sst deleted file mode 100644 index 3414e5e91bf9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397184598017.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397223690241.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397223690241.sst deleted file mode 100644 index a6d68c45924c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/600424397223690241.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/BACKUP deleted file mode 100644 index 70ad2581a510..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddcol/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418287026177.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418287026177.sst deleted file mode 100644 index bb9f88ce4830..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418287026177.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418287943681.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418287943681.sst deleted file mode 100644 index 902f2e3112d4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418287943681.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418288697345.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418288697345.sst deleted file mode 100644 index aa9f7cd98f43..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418288697345.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418345287681.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418345287681.sst deleted file mode 100644 index 977912038055..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418345287681.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418348498945.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418348498945.sst deleted file mode 100644 index cc2f3b115d1c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418348498945.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418367799297.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418367799297.sst deleted file mode 100644 index 53404e8a18f7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418367799297.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418478555137.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418478555137.sst deleted file mode 100644 index 8ee552feb577..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418478555137.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418478653441.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418478653441.sst deleted file mode 100644 index 1503180420db..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418478653441.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418498740225.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418498740225.sst deleted file mode 100644 index f0394849e109..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418498740225.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418520956929.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418520956929.sst deleted file mode 100644 index d1da68f7473a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/600424418520956929.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/BACKUP deleted file mode 100644 index a594d618e427..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddconst/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600480257.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600480257.sst deleted file mode 100644 index e38ffdd00bf0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600480257.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600611329.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600611329.sst deleted file mode 100644 index fcdbd365168a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600611329.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600676865.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600676865.sst deleted file mode 100644 index 38c4ea4eafad..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439600676865.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439644618753.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439644618753.sst deleted file mode 100644 index 08d24b2e4fee..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439644618753.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439702781953.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439702781953.sst deleted file mode 100644 index f546a9e6ab3e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439702781953.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439726866433.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439726866433.sst deleted file mode 100644 index a13b3f56ac28..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439726866433.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439763828737.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439763828737.sst deleted file mode 100644 index ac5c8aceaa1a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439763828737.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439834542081.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439834542081.sst deleted file mode 100644 index 6c662f42e8f1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439834542081.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439855939585.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439855939585.sst deleted file mode 100644 index d2e9a3241807..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439855939585.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439877730305.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439877730305.sst deleted file mode 100644 index ccd42c22e529..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/600424439877730305.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/BACKUP deleted file mode 100644 index 803b49c36336..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midaddindex/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054640129.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054640129.sst deleted file mode 100644 index 2e93e6e23942..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054640129.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054705665.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054705665.sst deleted file mode 100644 index 04dcb2125dc2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054705665.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054836737.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054836737.sst deleted file mode 100644 index c203d2fbabc7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461054836737.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461101367297.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461101367297.sst deleted file mode 100644 index af7199989ecf..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461101367297.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461207830529.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461207830529.sst deleted file mode 100644 index fcdda51a377d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461207830529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461208027137.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461208027137.sst deleted file mode 100644 index 7f09d47739f8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461208027137.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461316390913.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461316390913.sst deleted file mode 100644 index ab0b50ff4bfe..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461316390913.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461340246017.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461340246017.sst deleted file mode 100644 index 23f5161aa82d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461340246017.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461361348609.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461361348609.sst deleted file mode 100644 index 1cea1a12f594..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461361348609.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461435764737.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461435764737.sst deleted file mode 100644 index 7b8dd12e5012..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/600424461435764737.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/BACKUP deleted file mode 100644 index 0cb7d2850569..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/middropcol/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411610113.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411610113.sst deleted file mode 100644 index 1caa5d7f2d52..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411610113.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411642881.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411642881.sst deleted file mode 100644 index 7c8d6d6303cd..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411642881.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411872257.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411872257.sst deleted file mode 100644 index 6a836a736ea5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482411872257.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482454175745.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482454175745.sst deleted file mode 100644 index c4de09bd93e7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482454175745.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482548940801.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482548940801.sst deleted file mode 100644 index f24acbeb7908..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482548940801.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482549202945.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482549202945.sst deleted file mode 100644 index 1914f795b466..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482549202945.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482592096257.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482592096257.sst deleted file mode 100644 index 1be93e0844ff..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482592096257.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482616377345.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482616377345.sst deleted file mode 100644 index 36d90e8912d7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482616377345.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482691284993.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482691284993.sst deleted file mode 100644 index fb1dc2b92cd5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482691284993.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482767732737.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482767732737.sst deleted file mode 100644 index 0ac693b1aa07..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/600424482767732737.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/BACKUP deleted file mode 100644 index 67675df3f5f5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmany/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525002801153.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525002801153.sst deleted file mode 100644 index 6cb3f2686398..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525002801153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525002899457.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525002899457.sst deleted file mode 100644 index 49cc6bf43c06..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525002899457.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525003259905.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525003259905.sst deleted file mode 100644 index bbb6eecd1201..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525003259905.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525040189441.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525040189441.sst deleted file mode 100644 index 28f422bcbde3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525040189441.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525127942145.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525127942145.sst deleted file mode 100644 index 3e1184fe071c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525127942145.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525128007681.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525128007681.sst deleted file mode 100644 index 3a814a9abc46..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525128007681.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525217857537.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525217857537.sst deleted file mode 100644 index b2451740a3d4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525217857537.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525241843713.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525241843713.sst deleted file mode 100644 index ee0f496fd4d7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525241843713.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525266518017.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525266518017.sst deleted file mode 100644 index b7c4b5db60c4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525266518017.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525343227905.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525343227905.sst deleted file mode 100644 index f53e9998fbcb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525343227905.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525367017473.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525367017473.sst deleted file mode 100644 index 269398e0efbe..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/600424525367017473.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/BACKUP deleted file mode 100644 index 8394049284bc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitable/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685185537.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685185537.sst deleted file mode 100644 index 4018d3cf2034..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685185537.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685218305.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685218305.sst deleted file mode 100644 index db8ed6478af2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685218305.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685414913.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685414913.sst deleted file mode 100644 index 7347322c03a2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503685414913.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799480321.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799480321.sst deleted file mode 100644 index ff28c09813ba..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799480321.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799513089.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799513089.sst deleted file mode 100644 index 80da5f18c06d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799513089.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799840769.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799840769.sst deleted file mode 100644 index 171227fa46d9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503799840769.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503846404097.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503846404097.sst deleted file mode 100644 index e48e3115d122..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503846404097.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503847256065.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503847256065.sst deleted file mode 100644 index a5a7ea36d41a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503847256065.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503869702145.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503869702145.sst deleted file mode 100644 index b911ea27a26d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503869702145.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503893229569.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503893229569.sst deleted file mode 100644 index c02ced1c716b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/600424503893229569.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/BACKUP deleted file mode 100644 index fb4c91c673fe..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midmultitxn/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582423085057.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582423085057.sst deleted file mode 100644 index 53cb511be233..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582423085057.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582423347201.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582423347201.sst deleted file mode 100644 index 0f34db84be88..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582423347201.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582424035329.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582424035329.sst deleted file mode 100644 index 99da87cf25a0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582424035329.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582458802177.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582458802177.sst deleted file mode 100644 index c36f5acb37da..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582458802177.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582458834945.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582458834945.sst deleted file mode 100644 index f6e832be0f77..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582458834945.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582507429889.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582507429889.sst deleted file mode 100644 index d427fbe3ab4f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582507429889.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582599999489.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582599999489.sst deleted file mode 100644 index 6119ff6d64a0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582599999489.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582600327169.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582600327169.sst deleted file mode 100644 index 8b8b5dcf2d4d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582600327169.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582621790209.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582621790209.sst deleted file mode 100644 index 8f7264ceee8f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582621790209.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582655344641.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582655344641.sst deleted file mode 100644 index 1d30de43880a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/600424582655344641.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/BACKUP deleted file mode 100644 index f7f1d4907ff0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswap/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129162753.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129162753.sst deleted file mode 100644 index 774f5bb44bd4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129162753.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129195521.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129195521.sst deleted file mode 100644 index 365e1c6cde84..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129195521.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129228289.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129228289.sst deleted file mode 100644 index c96e4a62c473..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989129228289.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989172711425.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989172711425.sst deleted file mode 100644 index 447b046ea2fc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989172711425.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989240639489.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989240639489.sst deleted file mode 100644 index e2730272df84..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989240639489.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989240705025.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989240705025.sst deleted file mode 100644 index 52012eaf0f63..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989240705025.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989263839233.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989263839233.sst deleted file mode 100644 index e1d39b394c50..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989263839233.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989370499073.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989370499073.sst deleted file mode 100644 index 29cc18169edc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989370499073.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989370761217.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989370761217.sst deleted file mode 100644 index b3ca5c1ce842..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989370761217.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989391142913.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989391142913.sst deleted file mode 100644 index b6d4733b087d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/600468989391142913.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/BACKUP b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/BACKUP deleted file mode 100644 index 309ab791a1ac..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.1/midprimarykeyswapcleanup/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513546241.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513546241.sst deleted file mode 100644 index 0b3419be3212..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513546241.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513579009.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513579009.sst deleted file mode 100644 index 7c0b12a26683..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513579009.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513611777.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513611777.sst deleted file mode 100644 index b1cdb32f13be..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580513611777.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580572790785.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580572790785.sst deleted file mode 100644 index b10c36b92a25..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580572790785.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580572889089.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580572889089.sst deleted file mode 100644 index be95de1cf78b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580572889089.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580574167041.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580574167041.sst deleted file mode 100644 index 9689cb81f1b1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580574167041.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580656578561.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580656578561.sst deleted file mode 100644 index e074c930572a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580656578561.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890607617.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890607617.sst deleted file mode 100644 index bd948f37a8bd..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890607617.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890640385.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890640385.sst deleted file mode 100644 index 3fe79a2b1a99..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890640385.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890673153.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890673153.sst deleted file mode 100644 index 565b7212300f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580890673153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580941168641.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580941168641.sst deleted file mode 100644 index 9b95e2892b0e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/601644580941168641.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 20561f294aa5..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ݑ\9 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP_MANIFEST deleted file mode 100644 index c816d8fa503b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index c485a9131b39..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddcol/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621553665.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621553665.sst deleted file mode 100644 index 31a7c0b786b0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621553665.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621586433.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621586433.sst deleted file mode 100644 index 8b407bcac4dd..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621586433.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621619201.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621619201.sst deleted file mode 100644 index 384dc4d55d2c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604621619201.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604667985921.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604667985921.sst deleted file mode 100644 index c0326d004fa6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604667985921.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604726771713.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604726771713.sst deleted file mode 100644 index 2740d84a7490..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604726771713.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604727787521.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604727787521.sst deleted file mode 100644 index b608750bba8d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604727787521.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604728967169.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604728967169.sst deleted file mode 100644 index 76ffd800e00d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604728967169.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814393345.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814393345.sst deleted file mode 100644 index 23657693d93a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814393345.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814426113.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814426113.sst deleted file mode 100644 index 0fdd76657d5c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814426113.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814524417.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814524417.sst deleted file mode 100644 index 42aa3ab170e6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604814524417.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604876292097.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604876292097.sst deleted file mode 100644 index 8e555020fb1a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/601644604876292097.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 6b64b14d54a6..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -dB%+ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP_MANIFEST deleted file mode 100644 index ddc3783e80b7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 2f65e8602f1e..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddconst/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -<x \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498055169.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498055169.sst deleted file mode 100644 index 823a1cc8470f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498055169.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498087937.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498087937.sst deleted file mode 100644 index 8930bb32fa6a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498087937.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498120705.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498120705.sst deleted file mode 100644 index 3608f15337d5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628498120705.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628545404929.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628545404929.sst deleted file mode 100644 index c6aa566311c4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628545404929.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628564934657.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628564934657.sst deleted file mode 100644 index d01b466acec9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628564934657.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628565229569.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628565229569.sst deleted file mode 100644 index 7a50c17aa2fc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628565229569.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628609302529.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628609302529.sst deleted file mode 100644 index a2efb92e7acc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628609302529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806172673.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806172673.sst deleted file mode 100644 index e0f3c905b416..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806172673.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806205441.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806205441.sst deleted file mode 100644 index 8d8297aab928..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806205441.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806238209.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806238209.sst deleted file mode 100644 index c48e0989f3ee..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628806238209.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628863156225.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628863156225.sst deleted file mode 100644 index e5858ff65897..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/601644628863156225.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 2931f4b4ed98..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -^jm \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP_MANIFEST deleted file mode 100644 index aacada0ac9c4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index a65a89d8527a..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midaddindex/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -p \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652138758145.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652138758145.sst deleted file mode 100644 index 0011cff9c04b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652138758145.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652138790913.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652138790913.sst deleted file mode 100644 index 00867f330f5a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652138790913.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652139741185.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652139741185.sst deleted file mode 100644 index 00948cd1efb9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652139741185.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652238995457.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652238995457.sst deleted file mode 100644 index f3b9874214b2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652238995457.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652351815681.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652351815681.sst deleted file mode 100644 index 42d421b508fb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652351815681.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652352077825.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652352077825.sst deleted file mode 100644 index c82944bdfa1a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652352077825.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652453330945.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652453330945.sst deleted file mode 100644 index 83703f7b3dd3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652453330945.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652517294081.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652517294081.sst deleted file mode 100644 index cd8d24a882bd..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652517294081.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652517326849.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652517326849.sst deleted file mode 100644 index 980aaf7fb9ad..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652517326849.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652539084801.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652539084801.sst deleted file mode 100644 index 2059f8899480..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652539084801.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652577193985.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652577193985.sst deleted file mode 100644 index 0f2d8df49d80..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/601644652577193985.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index a02814be12b9..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -^ D \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP_MANIFEST deleted file mode 100644 index f2cc8074cee2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 64be3c1fc45a..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/middropcol/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -( \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676906483713.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676906483713.sst deleted file mode 100644 index 1731240e2bbf..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676906483713.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676909596673.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676909596673.sst deleted file mode 100644 index 1156206260f9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676909596673.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676912316417.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676912316417.sst deleted file mode 100644 index a7cc90e42d2c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676912316417.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676962516993.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676962516993.sst deleted file mode 100644 index a4e43fcb6712..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676962516993.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676962844673.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676962844673.sst deleted file mode 100644 index 8f51d25cad6d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676962844673.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676963368961.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676963368961.sst deleted file mode 100644 index 6e6ac5fa5464..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644676963368961.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677048860673.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677048860673.sst deleted file mode 100644 index 50ec81dd34e4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677048860673.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112791041.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112791041.sst deleted file mode 100644 index 730b083b95f9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112791041.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112823809.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112823809.sst deleted file mode 100644 index 5a9b87936e6a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112823809.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112856577.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112856577.sst deleted file mode 100644 index 9a3f25b9911a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677112856577.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677175574529.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677175574529.sst deleted file mode 100644 index 7f86c386b82d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/601644677175574529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 22b2949b5fe8..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ejbc \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP_MANIFEST deleted file mode 100644 index b72542f01838..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index b38364411a40..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmany/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725353545729.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725353545729.sst deleted file mode 100644 index 4b4a1ac38916..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725353545729.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725353611265.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725353611265.sst deleted file mode 100644 index 35f784bdc663..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725353611265.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725355151361.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725355151361.sst deleted file mode 100644 index 318d1f610629..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725355151361.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725510569985.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725510569985.sst deleted file mode 100644 index 324f8ae3475b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725510569985.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725510995969.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725510995969.sst deleted file mode 100644 index d8ebdf98fa95..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725510995969.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725511127041.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725511127041.sst deleted file mode 100644 index 921b30cb3e6b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725511127041.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725594750977.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725594750977.sst deleted file mode 100644 index 12d5e953b880..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725594750977.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725731524609.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725731524609.sst deleted file mode 100644 index baffcea48cd4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725731524609.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725731655681.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725731655681.sst deleted file mode 100644 index dcd82a22cc83..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725731655681.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725756002305.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725756002305.sst deleted file mode 100644 index b637ed13269e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725756002305.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725788868609.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725788868609.sst deleted file mode 100644 index 879a8df48536..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725788868609.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725812854785.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725812854785.sst deleted file mode 100644 index cf01e4a5d2a6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/601644725812854785.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 06ccff82cb0a..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -! \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP_MANIFEST deleted file mode 100644 index 585f1b6544d4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index b9f277e0d000..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitable/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -  \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718792705.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718792705.sst deleted file mode 100644 index 7af03c933c89..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718792705.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718825473.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718825473.sst deleted file mode 100644 index 6a6bf7f738ba..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718825473.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718989313.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718989313.sst deleted file mode 100644 index c1c49e79da86..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700718989313.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700765126657.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700765126657.sst deleted file mode 100644 index 0d0299c34f3c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700765126657.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700822536193.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700822536193.sst deleted file mode 100644 index 6570b0e02aca..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700822536193.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700824010753.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700824010753.sst deleted file mode 100644 index 0a1729a48a1e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700824010753.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700907470849.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700907470849.sst deleted file mode 100644 index 987e7abbf505..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644700907470849.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701046243329.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701046243329.sst deleted file mode 100644 index 9a09604f9b1a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701046243329.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701046276097.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701046276097.sst deleted file mode 100644 index 5689ca82834c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701046276097.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701070229505.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701070229505.sst deleted file mode 100644 index c1cf6d35ca3b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701070229505.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701114400769.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701114400769.sst deleted file mode 100644 index fa3635f0a5fb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/601644701114400769.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 27b4ed2be609..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -@ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP_MANIFEST deleted file mode 100644 index ae55303e5d4c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index bdaec908dca9..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midmultitxn/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -# \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784655794177.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784655794177.sst deleted file mode 100644 index 8ab3c59075f0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784655794177.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784658939905.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784658939905.sst deleted file mode 100644 index c5cd2f53a162..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784658939905.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784661921793.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784661921793.sst deleted file mode 100644 index 93053bf059ef..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784661921793.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784708190209.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784708190209.sst deleted file mode 100644 index e49fef51dc41..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784708190209.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784728571905.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784728571905.sst deleted file mode 100644 index 0d06068a4781..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784728571905.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784788406273.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784788406273.sst deleted file mode 100644 index fe38c8679881..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784788406273.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784904634369.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784904634369.sst deleted file mode 100644 index 2a0830d9ec1c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644784904634369.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118281729.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118281729.sst deleted file mode 100644 index d568a61595b4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118281729.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118314497.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118314497.sst deleted file mode 100644 index 01bd66d6d207..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118314497.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118576641.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118576641.sst deleted file mode 100644 index c15bf58713a2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785118576641.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785181622273.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785181622273.sst deleted file mode 100644 index 092fbd3acf11..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/601644785181622273.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 57046f2f5c09..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -E \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP_MANIFEST deleted file mode 100644 index 99945ddac293..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 40ceddfcc28a..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswap/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -Q^ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793099777.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793099777.sst deleted file mode 100644 index 6ff6304eb44c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793099777.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793132545.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793132545.sst deleted file mode 100644 index e6f293a1bcda..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793132545.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793394689.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793394689.sst deleted file mode 100644 index 09c3227bfca7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877793394689.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877924859905.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877924859905.sst deleted file mode 100644 index 33d85a582205..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877924859905.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877945700353.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877945700353.sst deleted file mode 100644 index b77800622ec6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877945700353.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877945995265.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877945995265.sst deleted file mode 100644 index 1909a183e385..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644877945995265.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878007500801.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878007500801.sst deleted file mode 100644 index 03793aa56c08..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878007500801.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337376257.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337376257.sst deleted file mode 100644 index db2dd6588d5f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337376257.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337409025.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337409025.sst deleted file mode 100644 index cc9975e8d0cd..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337409025.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337474561.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337474561.sst deleted file mode 100644 index 2c52345351a7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878337474561.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878379253761.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878379253761.sst deleted file mode 100644 index 4a541e2ac50c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/601644878379253761.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index e9b259612548..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST deleted file mode 100644 index 3cfd2433e731..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index efef773a0657..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/20.2/midprimarykeyswapcleanup/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -D* \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP-LOCK-830063832431951873 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP-LOCK-830063832431951873 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP-LOCK-830063832431951873 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP-STATISTICS similarity index 100% rename from pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddconst/BACKUP-STATISTICS rename to pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP-STATISTICS diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP_MANIFEST new file mode 100644 index 000000000000..23c039f261ed Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..8d26e8f27e93 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +aX@ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/data/830063832866881537.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/data/830063832866881537.sst new file mode 100644 index 000000000000..d8ba0a740aec Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/data/830063832866881537.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9c7c7c6cadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacecfcfc6c7cdcacefffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9c7c7c6cadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacecfcfc6c7cdcacefffe new file mode 100644 index 000000000000..b2355364123d Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9c7c7c6cadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacecfcfc6c7cdcacefffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9c7c7c6cadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacecfcfc6c7cdcacefffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9c7c7c6cadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacecfcfc6c7cdcacefffe-CHECKSUM new file mode 100644 index 000000000000..c616692cf6f0 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9c7c7c6cadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacecfcfc6c7cdcacefffe-CHECKSUM @@ -0,0 +1 @@ +ꑙ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9cccdcadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cbcaccc9cbc8c9cdc9fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9cccdcadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cbcaccc9cbc8c9cdc9fffe new file mode 100644 index 000000000000..cdbb24c18068 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9cccdcadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cbcaccc9cbc8c9cdc9fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9cccdcadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cbcaccc9cbc8c9cdc9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9cccdcadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cbcaccc9cbc8c9cdc9fffe-CHECKSUM new file mode 100644 index 000000000000..f3fb649a6ca6 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/2023/01/10-212258.54/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c9cccdcadfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cbcaccc9cbc8c9cdc9fffe-CHECKSUM @@ -0,0 +1 @@ +r \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c8ccc9c8ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacac8c7c8c7cfc7cbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c8ccc9c8ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacac8c7c8c7cfc7cbfffe new file mode 100644 index 000000000000..3785c8201a44 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddcol/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdcdc5cac7d1c8ccc9c8ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdccd1cacac8c7c8c7cfc7cbfffe @@ -0,0 +1 @@ +/2023/01/10-212258.54 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP-LOCK-830064199164133377 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP-LOCK-830064199164133377 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP-LOCK-830064199164133377 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP-STATISTICS new file mode 100644 index 000000000000..228d236254a3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP_MANIFEST new file mode 100644 index 000000000000..b677c944fdd5 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..048dfb56f616 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +D=K \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/data/830064199500562433.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/data/830064199500562433.sst new file mode 100644 index 000000000000..613dd4092fe2 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/data/830064199500562433.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1cac8c6cec9c7dfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcfcfc6cac7c8cacefffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1cac8c6cec9c7dfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcfcfc6cac7c8cacefffe new file mode 100644 index 000000000000..252838478f59 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1cac8c6cec9c7dfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcfcfc6cac7c8cacefffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1cac8c6cec9c7dfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcfcfc6cac7c8cacefffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1cac8c6cec9c7dfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcfcfc6cac7c8cacefffe-CHECKSUM new file mode 100644 index 000000000000..e3cf36c11918 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1cac8c6cec9c7dfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcfcfc6cac7c8cacefffe-CHECKSUM differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1caccc6cfcfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1ccc9cfc8c6cacdcfc6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1caccc6cfcfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1ccc9cfc8c6cacdcfc6fffe new file mode 100644 index 000000000000..ecf6450fd2bc Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1caccc6cfcfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1ccc9cfc8c6cacdcfc6fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1caccc6cfcfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1ccc9cfc8c6cacdcfc6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1caccc6cfcfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1ccc9cfc8c6cacdcfc6fffe-CHECKSUM new file mode 100644 index 000000000000..5b8d48551e58 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/2023/01/10-212450.46/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1caccc6cfcfcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1ccc9cfc8c6cacdcfc6fffe-CHECKSUM @@ -0,0 +1 @@ +18| \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1c9cccdc9cdcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcacbcbcec9cdcacefffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1c9cccdc9cdcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcacbcbcec9cdcacefffe new file mode 100644 index 000000000000..1a839861a884 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddconst/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdcbc5cacfd1c9cccdc9cdcadfd4cfcfcfcfdfaaabbcdf92c2d4cecccad1cbcacbcbcec9cdcacefffe @@ -0,0 +1 @@ +/2023/01/10-212450.46 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP-LOCK-830064457125068801 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP-LOCK-830064457125068801 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP-LOCK-830064457125068801 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP-STATISTICS new file mode 100644 index 000000000000..228d236254a3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP_MANIFEST new file mode 100644 index 000000000000..902162baa243 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..369f3e848207 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +? \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/data/830064457462939649.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/data/830064457462939649.sst new file mode 100644 index 000000000000..3350d72b6774 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/data/830064457462939649.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cccfcdcec7cddfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cecdcbcbcdcacbcac6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cccfcdcec7cddfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cecdcbcbcdcacbcac6fffe new file mode 100644 index 000000000000..b8889822d1ed Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cccfcdcec7cddfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cecdcbcbcdcacbcac6fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cccfcdcec7cddfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cecdcbcbcdcacbcac6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cccfcdcec7cddfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cecdcbcbcdcacbcac6fffe-CHECKSUM new file mode 100644 index 000000000000..c9d1d4c2060d --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cccfcdcec7cddfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cecdcbcbcdcacbcac6fffe-CHECKSUM @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cdc9cdcfc9ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cfc7cbcccfcacacfcefffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cdc9cdcfc9ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cfc7cbcccfcacacfcefffe new file mode 100644 index 000000000000..de3092354b60 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cdc9cdcfc9ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cfc7cbcccfcacacfcefffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cdc9cdcfc9ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cfc7cbcccfcacacfcefffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cdc9cdcfc9ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cfc7cbcccfcacacfcefffe-CHECKSUM new file mode 100644 index 000000000000..0ae581d20906 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/2023/01/10-212609.18/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1cdc9cdcfc9ccdfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cfc7cbcccfcacacfcefffe-CHECKSUM @@ -0,0 +1 @@ +f6 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1ccc9cdcac7cedfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cec7cbc7cdcbcbcec7fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1ccc9cdcac7cedfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cec7cbc7cdcbcbcec7fffe new file mode 100644 index 000000000000..8b831c22c67e --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midaddindex/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc9c5cfc6d1ccc9cdcac7cedfd4cfcfcfcfdfaaabbcdf92c2d4cdcecbd1cec7cbc7cdcbcbcec7fffe @@ -0,0 +1 @@ +/2023/01/10-212609.18 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP-LOCK-830064756436008961 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP-LOCK-830064756436008961 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP-LOCK-830064756436008961 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP-STATISTICS new file mode 100644 index 000000000000..228d236254a3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP_MANIFEST new file mode 100644 index 000000000000..db193e1433bb Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..c3f4ec9cf7ee --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +]K \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/data/830064756771979265.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/data/830064756771979265.sst new file mode 100644 index 000000000000..c2319d2c37a0 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/data/830064756771979265.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cbc6cccdcddfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbc8cdcfc6cfcfc7cbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cbc6cccdcddfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbc8cdcfc6cfcfc7cbfffe new file mode 100644 index 000000000000..1814fa9355ef Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cbc6cccdcddfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbc8cdcfc6cfcfc7cbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cbc6cccdcddfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbc8cdcfc6cfcfc7cbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cbc6cccdcddfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbc8cdcfc6cfcfc7cbfffe-CHECKSUM new file mode 100644 index 000000000000..472eca68917f --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cbc6cccdcddfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbc8cdcfc6cfcfc7cbfffe-CHECKSUM @@ -0,0 +1 @@ +c0 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cfcdcfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbcdcbc7cbc8c7c8c9fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cfcdcfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbcdcbc7cbc8c7c8c9fffe new file mode 100644 index 000000000000..6aa38ca6d253 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cfcdcfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbcdcbc7cbc8c7c8c9fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cfcdcfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbcdcbc7cbc8c7c8c9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cfcdcfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbcdcbc7cbc8c7c8c9fffe-CHECKSUM new file mode 100644 index 000000000000..0420ba437312 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/2023/01/10-212740.52/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c9cfcdcfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cbcdcbc7cbc8c7c8c9fffe-CHECKSUM @@ -0,0 +1 @@ +04 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c8cfcdc8cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cacdcacacecdc9c9c7fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c8cfcdc8cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cacdcacacecdc9c9c7fffe new file mode 100644 index 000000000000..a4dfb12c2f97 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/middropcol/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc8c5cbcfd1c8cfcdc8cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4cccfcad1cacdcacacecdc9c9c7fffe @@ -0,0 +1 @@ +/2023/01/10-212740.52 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP-LOCK-830065185099743233 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP-LOCK-830065185099743233 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP-LOCK-830065185099743233 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP-STATISTICS new file mode 100644 index 000000000000..228d236254a3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP_MANIFEST new file mode 100644 index 000000000000..94b84b1ada77 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..51bc2f511ba2 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +ȸ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/data/830065185434861569.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/data/830065185434861569.sst new file mode 100644 index 000000000000..1f50d28c3c3c Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/data/830065185434861569.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbc9c8cdc9cddfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdc6cfc8c7cdcfcbccfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbc9c8cdc9cddfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdc6cfc8c7cdcfcbccfffe new file mode 100644 index 000000000000..b90564b3538f Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbc9c8cdc9cddfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdc6cfc8c7cdcfcbccfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbc9c8cdc9cddfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdc6cfc8c7cdcfcbccfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbc9c8cdc9cddfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdc6cfc8c7cdcfcbccfffe-CHECKSUM new file mode 100644 index 000000000000..40213c48ef49 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbc9c8cdc9cddfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdc6cfc8c7cdcfcbccfffe-CHECKSUM @@ -0,0 +1 @@ + . \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbcdc9c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdcacfcbcac9cacbccfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbcdc9c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdcacfcbcac9cacbccfffe new file mode 100644 index 000000000000..20dd33341f80 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbcdc9c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdcacfcbcac9cacbccfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbcdc9c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdcacfcbcac9cacbccfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbcdc9c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdcacfcbcac9cacbccfffe-CHECKSUM new file mode 100644 index 000000000000..3de4e8efdcb4 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/2023/01/10-212951.34/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cbcdc9c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cdcacfcbcac9cacbccfffe-CHECKSUM @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cacdcdcacfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cccbc9cfcdc7cdcacefffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cacdcdcacfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cccbc9cfcdc7cdcacefffe new file mode 100644 index 000000000000..2b9c30dd6865 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmany/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cdc6c5caced1cacdcdcacfc7dfd4cfcfcfcfdfaaabbcdf92c2d4cbccc9d1cccbc9cfcdc7cdcacefffe @@ -0,0 +1 @@ +/2023/01/10-212951.34 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP-LOCK-830066750978621441 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP-LOCK-830066750978621441 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP-LOCK-830066750978621441 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP-STATISTICS new file mode 100644 index 000000000000..228d236254a3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP_MANIFEST new file mode 100644 index 000000000000..f7bb2a6e8c1b Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..66f646725c9f --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +8 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/data/830066751331860481.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/data/830066751331860481.sst new file mode 100644 index 000000000000..4ba0fa731051 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/data/830066751331860481.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccccc9c9cdc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cec9ccc6cecac9c9c7fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccccc9c9cdc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cec9ccc6cecac9c9c7fffe new file mode 100644 index 000000000000..ca7ccbcd1fc6 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccccc9c9cdc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cec9ccc6cecac9c9c7fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccccc9c9cdc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cec9ccc6cecac9c9c7fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccccc9c9cdc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cec9ccc6cecac9c9c7fffe-CHECKSUM new file mode 100644 index 000000000000..6e9b8fc6a37e --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccccc9c9cdc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cec9ccc6cecac9c9c7fffe-CHECKSUM @@ -0,0 +1 @@ +>O \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1cdc6cbccccc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cecdcec9cdcdc6cac6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1cdc6cbccccc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cecdcec9cdcdc6cac6fffe new file mode 100644 index 000000000000..ad988bfb54bc Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1cdc6cbccccc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cecdcec9cdcdc6cac6fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1cdc6cbccccc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cecdcec9cdcdc6cac6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1cdc6cbccccc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cecdcec9cdcdc6cac6fffe-CHECKSUM new file mode 100644 index 000000000000..4f1abe65f95f --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/2023/01/10-213749.21/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1cdc6cbccccc7dfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cecdcec9cdcdc6cac6fffe-CHECKSUM @@ -0,0 +1 @@ +Jʪ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccc7c6c6c8cbdfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cdcec8cdc9cacbcec7fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccc7c6c6c8cbdfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cdcec8cdc9cacbcec7fffe new file mode 100644 index 000000000000..6ec49c9981d0 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitable/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5ccc8c5cbc6d1ccc7c6c6c8cbdfd4cfcfcfcfdfaaabbcdf92c2d4c6cecbd1cdcec8cdc9cacbcec7fffe @@ -0,0 +1 @@ +/2023/01/10-213749.21 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP-LOCK-830066364015673345 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP-LOCK-830066364015673345 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP-LOCK-830066364015673345 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP-STATISTICS new file mode 100644 index 000000000000..228d236254a3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP_MANIFEST new file mode 100644 index 000000000000..42f353bfa0ca Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..b573d8ffb938 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +i \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/data/830066364339585025.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/data/830066364339585025.sst new file mode 100644 index 000000000000..3e1ee416c96a Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/data/830066364339585025.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdcccbcecdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcac6c8cecdcacbccfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdcccbcecdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcac6c8cecdcacbccfffe new file mode 100644 index 000000000000..5432c8ebb9b5 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdcccbcecdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcac6c8cecdcacbccfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdcccbcecdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcac6c8cecdcacbccfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdcccbcecdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcac6c8cecdcacbccfffe-CHECKSUM new file mode 100644 index 000000000000..ac94981eac0e --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdcccbcecdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcac6c8cecdcacbccfffe-CHECKSUM @@ -0,0 +1 @@ +6 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cec6cbc7cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcdcfcbcccfcfcfcefffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cec6cbc7cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcdcfcbcccfcfcfcefffe new file mode 100644 index 000000000000..fc5e65f24389 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cec6cbc7cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcdcfcbcccfcfcfcefffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cec6cbc7cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcdcfcbcccfcfcfcefffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cec6cbc7cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcdcfcbcccfcfcfcefffe-CHECKSUM new file mode 100644 index 000000000000..96487e1d3c19 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/2023/01/10-213551.12/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cec6cbc7cbcbdfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cfcdcfcbcccfcfcfcefffe-CHECKSUM @@ -0,0 +1 @@ +Χ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdc6cfcccdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cececac6cecdc8cfc6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdc6cfcccdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cececac6cecdc8cfc6fffe new file mode 100644 index 000000000000..7f99876b3411 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midmultitxn/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cccac5caced1cdc6cfcccdc9dfd4cfcfcfcfdfaaabbcdf92c2d4c8c6c9d1cececac6cecdc8cfc6fffe @@ -0,0 +1 @@ +/2023/01/10-213551.12 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP-LOCK-830067283508133889 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP-LOCK-830067283508133889 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP-LOCK-830067283508133889 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP-STATISTICS new file mode 100644 index 000000000000..472561f4c981 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP_MANIFEST new file mode 100644 index 000000000000..4e87935be90f Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..3960081e8e60 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +26 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/data/830067283886014465.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/data/830067283886014465.sst new file mode 100644 index 000000000000..fc38570e6328 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/data/830067283886014465.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7cac7c6c7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9c7c7cdcacdcfc7cbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7cac7c6c7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9c7c7cdcacdcfc7cbfffe new file mode 100644 index 000000000000..8148751fcc3d Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7cac7c6c7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9c7c7cdcacdcfc7cbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7cac7c6c7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9c7c7cdcacdcfc7cbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7cac7c6c7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9c7c7cdcacdcfc7cbfffe-CHECKSUM new file mode 100644 index 000000000000..54c72374a217 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7cac7c6c7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9c7c7cdcacdcfc7cbfffe-CHECKSUM @@ -0,0 +1 @@ +17 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7ceccc7c7cedfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9cbcccecbccc8cfc6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7ceccc7c7cedfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9cbcccecbccc8cfc6fffe new file mode 100644 index 000000000000..e1ba8c7a0cee Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7ceccc7c7cedfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9cbcccecbccc8cfc6fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7ceccc7c7cedfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9cbcccecbccc8cfc6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7ceccc7c7cedfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9cbcccecbccc8cfc6fffe-CHECKSUM new file mode 100644 index 000000000000..3948dc3bb5c3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/2023/01/10-214031.72/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c7ceccc7c7cedfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c9cbcccecbccc8cfc6fffe-CHECKSUM differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c6cecfcacecddfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c8ccc6c8c8cacbcac6fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c6cecfcacecddfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c8ccc6c8c8cacbcac6fffe new file mode 100644 index 000000000000..e20283bc4e33 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswap/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cbcfc5ccced1c6cecfcacecddfd4cfcfcfcfdfaaabbcdf92c2d4cecfc8c9d1c8ccc6c8c8cacbcac6fffe @@ -0,0 +1 @@ +/2023/01/10-214031.72 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP-LOCK-830068282574766081 b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP-LOCK-830068282574766081 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP-LOCK-830068282574766081 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP-STATISTICS new file mode 100644 index 000000000000..dad7239eb5ce Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP_MANIFEST new file mode 100644 index 000000000000..c6e7e7509e72 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..ad55a1a806e3 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +ᒎ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/data/830068282921779201.sst b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/data/830068282921779201.sst new file mode 100644 index 000000000000..354e34b73a75 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/data/830068282921779201.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c8cbc7ccc8c8dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cac8c6cac9c9c8c6ccfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c8cbc7ccc8c8dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cac8c6cac9c9c8c6ccfffe new file mode 100644 index 000000000000..d537414f2567 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c8cbc7ccc8c8dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cac8c6cac9c9c8c6ccfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c8cbc7ccc8c8dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cac8c6cac9c9c8c6ccfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c8cbc7ccc8c8dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cac8c6cac9c9c8c6ccfffe-CHECKSUM new file mode 100644 index 000000000000..dc2b40dfd698 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c8cbc7ccc8c8dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cac8c6cac9c9c8c6ccfffe-CHECKSUM @@ -0,0 +1 @@ +᤮ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c9c6c9cdc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cacdc8cbcac7cac7cbfffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c9c6c9cdc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cacdc8cbcac7cac7cbfffe new file mode 100644 index 000000000000..6d787160dd9a Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c9c6c9cdc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cacdc8cbcac7cac7cbfffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c9c6c9cdc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cacdc8cbcac7cac7cbfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c9c6c9cdc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cacdc8cbcac7cac7cbfffe-CHECKSUM new file mode 100644 index 000000000000..487d6057ce07 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/2023/01/10-214536.61/progress/BACKUP-CHECKPOINT-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c9c6c9cdc9c6dfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1cacdc8cbcac7cac7cbfffe-CHECKSUM @@ -0,0 +1 @@ +I \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c7cfccc9c7cbdfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1c9cccbc7c8cbcec9c7fffe b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c7cfccc9c7cbdfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1c9cccbc7c8cbcec9c7fffe new file mode 100644 index 000000000000..628820fea32a --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/before/22.2/midprimarykeyswapcleanup/metadata/latest/LATEST-13cdcfcdccd2cfced2cecfdfcdcec5cbcac5ccc9d1c7cfccc9c7cbdfd4cfcfcfcfdfaaabbcdf92c2d4ceccc7ced1c9cccbc7c8cbcec9c7fffe @@ -0,0 +1 @@ +/2023/01/10-214536.61 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336309761.sst b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336309761.sst deleted file mode 100644 index 5e3578073a05..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336309761.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336342529.sst b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336342529.sst deleted file mode 100644 index a385a6533347..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336342529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336375297.sst b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336375297.sst deleted file mode 100644 index 18525645fe60..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045336375297.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045755576321.sst b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045755576321.sst deleted file mode 100644 index 5a6d79cdc0fe..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/642037045755576321.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/BACKUP_MANIFEST deleted file mode 100644 index 55473d7149d3..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v20.2.5/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP-LOCK-824792216002658305 b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP-LOCK-824792216002658305 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP-LOCK-824792216002658305 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP-STATISTICS similarity index 100% rename from pkg/ccl/backupccl/testdata/restore_mid_schema_change/exports/after/20.2/midaddindex/BACKUP-STATISTICS rename to pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP-STATISTICS diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP_MANIFEST new file mode 100644 index 000000000000..ad5723550f14 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..88e9cb12702f --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +&;F \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/data/824792217015189508.sst b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/data/824792217015189508.sst new file mode 100644 index 000000000000..34cef471eb0c Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/data/824792217015189508.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cdcecacdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c7c8cec9cacfcecdc9fffe b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cdcecacdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c7c8cec9cacfcecdc9fffe new file mode 100644 index 000000000000..92040c831f5f Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cdcecacdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c7c8cec9cacfcecdc9fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cdcecacdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c7c8cec9cacfcecdc9fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cdcecacdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c7c8cec9cacfcecdc9fffe-CHECKSUM new file mode 100644 index 000000000000..557f5c5cee11 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cdcecacdcec9dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c7c8cec9cacfcecdc9fffe-CHECKSUM @@ -0,0 +1 @@ +E \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cfc9cbccc7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c8cdcfc7cdcacfcfcefffe b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cfc9cbccc7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c8cdcfc7cdcacfcfcefffe new file mode 100644 index 000000000000..b216f325fc72 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cfc9cbccc7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c8cdcfc7cdcacfcfcefffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cfc9cbccc7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c8cdcfc7cdcacfcfcefffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cfc9cbccc7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c8cdcfc7cdcacfcfcefffe-CHECKSUM new file mode 100644 index 000000000000..b96bc459990a --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/2022/12/23-063008.87/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cfc9cbccc7c6dfd4cfcfcfcfdfaaabbcdf92c2d4cec6ccd1c8cdcfc7cdcacfcfcefffe-CHECKSUM @@ -0,0 +1 @@ +7 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/metadata/latest/LATEST-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cbcfc8cdcacbdfd4cfcfcfcfdfaaabbcdf92c2d4cec6cbd1cfc9ccc9c7cac6cac6fffe b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/metadata/latest/LATEST-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cbcfc8cdcacbdfd4cfcfcfcfdfaaabbcdf92c2d4cec6cbd1cfc9ccc9c7cac6cac6fffe new file mode 100644 index 000000000000..f7c9897370a7 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_sequences/exports/v22.2.0/metadata/latest/LATEST-13cdcfcdcdd2cecdd2cdccdfcfc9c5cccfc5cfc6d1cbcfc8cdcacbdfd4cfcfcfcfdfaaabbcdf92c2d4cec6cbd1cfc9ccc9c7cac6cac6fffe @@ -0,0 +1 @@ +/2022/12/23-063008.87 \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-LOCK-824468910992424961 b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-LOCK-824468910992424961 new file mode 100644 index 000000000000..19104f172a34 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-LOCK-824468910992424961 @@ -0,0 +1 @@ +lock \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-STATISTICS new file mode 100644 index 000000000000..635cd4a79bf3 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP-STATISTICS differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST new file mode 100644 index 000000000000..ae64d79bed7e Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST-CHECKSUM new file mode 100644 index 000000000000..969a281a3d32 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/BACKUP_MANIFEST-CHECKSUM @@ -0,0 +1 @@ +o \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/data/824468911158099969.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/data/824468911158099969.sst new file mode 100644 index 000000000000..a3518f0b8f2a Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/data/824468911158099969.sst differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe new file mode 100644 index 000000000000..f661934d7a92 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe-CHECKSUM new file mode 100644 index 000000000000..3cc9130265a1 --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc7cdc9cec8c6ccc8dfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcacfc6cac6ccc8c6fffe-CHECKSUM @@ -0,0 +1 @@ +MI= \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe new file mode 100644 index 000000000000..a67d6611b690 Binary files /dev/null and b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe-CHECKSUM new file mode 100644 index 000000000000..3d5ce0df0e2b --- /dev/null +++ b/pkg/ccl/backupccl/testdata/restore_old_versions/cluster/22.2.0/2022/12/22-030544.02/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cecdd2cdcddfcfccc5cfcac5cbcbd1cfc9cacdcdcbcac7cadfd4cfcfcfcfdfaaabbcdf92c2d4cecdcad1cfcccccac9c9cfcdc8fffe-CHECKSUM @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 554deb620e85..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -iP> \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP_MANIFEST deleted file mode 100644 index 880f8b20bc51..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 6c41ad1aaf1e..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/1/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -o \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715397730305.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715397730305.sst deleted file mode 100644 index 414109fb148b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715397730305.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715397959681.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715397959681.sst deleted file mode 100644 index 22a4d1e00af6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715397959681.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715398057985.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715398057985.sst deleted file mode 100644 index 63458975c84c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715398057985.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715692478465.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715692478465.sst deleted file mode 100644 index fb411f0ce492..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715692478465.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715692609537.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715692609537.sst deleted file mode 100644 index e4203f648abc..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/647935715692609537.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP-CHECKPOINT-647935714957623297-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP-CHECKPOINT-647935714957623297-CHECKSUM deleted file mode 100644 index 77407c666f8e..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP-CHECKPOINT-647935714957623297-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -7c| \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 77407c666f8e..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -7c| \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP_MANIFEST deleted file mode 100644 index f1b42fdb7913..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index cc454729f83d..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/2/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -z@ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596383745.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596383745.sst deleted file mode 100644 index 0a55c7525615..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596383745.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596482049.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596482049.sst deleted file mode 100644 index c1cb76df4b14..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596482049.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596514817.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596514817.sst deleted file mode 100644 index 68072f50c032..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716596514817.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716895195137.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716895195137.sst deleted file mode 100644 index 844feb8fefc6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716895195137.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716895948801.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716895948801.sst deleted file mode 100644 index a24d83aa1131..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/647935716895948801.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP-CHECKPOINT-647935716225351681-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP-CHECKPOINT-647935716225351681-CHECKSUM deleted file mode 100644 index d0f4503d6250..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP-CHECKPOINT-647935716225351681-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -a \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index d0f4503d6250..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -a \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP_MANIFEST deleted file mode 100644 index 174de255a234..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index a8b83633fbd5..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/3/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -Rcl \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717870960641.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717870960641.sst deleted file mode 100644 index 44662372c89a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717870960641.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717871124481.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717871124481.sst deleted file mode 100644 index de0691b727c4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717871124481.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717871222785.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717871222785.sst deleted file mode 100644 index ba474b0c7938..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935717871222785.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156238849.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156238849.sst deleted file mode 100644 index d147e6b0c6c1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156238849.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156304385.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156304385.sst deleted file mode 100644 index 68ae156ec874..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156304385.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156337153.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156337153.sst deleted file mode 100644 index 030cf88caa89..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/647935718156337153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP-CHECKPOINT-647935717507301377-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP-CHECKPOINT-647935717507301377-CHECKSUM deleted file mode 100644 index 9f3cd96678cf..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP-CHECKPOINT-647935717507301377-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -s \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 9f3cd96678cf..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -s \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP_MANIFEST deleted file mode 100644 index d659948fa23a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 197b9599b6e2..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/4/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -$k \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179026433.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179026433.sst deleted file mode 100644 index d3d98820705d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179026433.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179059201.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179059201.sst deleted file mode 100644 index 6aed96bd4728..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179059201.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179157505.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179157505.sst deleted file mode 100644 index 7dd2cedf125e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719179157505.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719537639425.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719537639425.sst deleted file mode 100644 index 4e0da9933cfb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719537639425.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719537704961.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719537704961.sst deleted file mode 100644 index 075ea808dfc7..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719537704961.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719538262017.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719538262017.sst deleted file mode 100644 index a11c5fae73e5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/647935719538262017.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP-CHECKPOINT-647935718813171713-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP-CHECKPOINT-647935718813171713-CHECKSUM deleted file mode 100644 index d08f4b4c47ba..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP-CHECKPOINT-647935718813171713-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -6:{ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index d08f4b4c47ba..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -6:{ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP_MANIFEST deleted file mode 100644 index de43af9782ad..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 60f58f76a74d..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/5/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -s \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508260353.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508260353.sst deleted file mode 100644 index 62788501f17d..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508260353.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508293121.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508293121.sst deleted file mode 100644 index 0c94f1ee1ce1..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508293121.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508456961.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508456961.sst deleted file mode 100644 index 7fea95542c9c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720508456961.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720810512385.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720810512385.sst deleted file mode 100644 index c1585d68df8e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720810512385.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720810676225.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720810676225.sst deleted file mode 100644 index 4fd6f3065c45..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720810676225.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720811823105.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720811823105.sst deleted file mode 100644 index 443cd5a60b89..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/647935720811823105.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP-CHECKPOINT-647935720136638465-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP-CHECKPOINT-647935720136638465-CHECKSUM deleted file mode 100644 index eee30d877a8d..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP-CHECKPOINT-647935720136638465-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -/h \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index eee30d877a8d..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -/h \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP_MANIFEST deleted file mode 100644 index 3fd04e0f31ea..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 7ca55d79e430..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/6/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -Z \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722270261249.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722270261249.sst deleted file mode 100644 index 49dcfddb18cb..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722270261249.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722270621697.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722270621697.sst deleted file mode 100644 index 799c13046c32..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722270621697.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722271244289.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722271244289.sst deleted file mode 100644 index adaa46f0a2b4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722271244289.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722637590529.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722637590529.sst deleted file mode 100644 index 4a130f0a328a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722637590529.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722641129473.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722641129473.sst deleted file mode 100644 index ed0cf1a4abf8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722641129473.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722642407425.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722642407425.sst deleted file mode 100644 index aa2199776328..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722642407425.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722725900289.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722725900289.sst deleted file mode 100644 index fc2e490d368c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/647935722725900289.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP-CHECKPOINT-647935721908338689-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP-CHECKPOINT-647935721908338689-CHECKSUM deleted file mode 100644 index 2dc7d56c0f66..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP-CHECKPOINT-647935721908338689-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -TeP \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 2dc7d56c0f66..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -TeP \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP_MANIFEST deleted file mode 100644 index ff2fb0f756b4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 06cc7f246240..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/7/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -xi \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724153962497.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724153962497.sst deleted file mode 100644 index bbef3edaf826..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724153962497.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724154028033.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724154028033.sst deleted file mode 100644 index e905ccf00193..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724154028033.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724154159105.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724154159105.sst deleted file mode 100644 index 77e2bdbf9d11..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724154159105.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648562689.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648562689.sst deleted file mode 100644 index 2b5e556820ef..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648562689.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648628225.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648628225.sst deleted file mode 100644 index aa1648bd57c9..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648628225.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648660993.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648660993.sst deleted file mode 100644 index bfbe47b48332..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724648660993.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724726845441.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724726845441.sst deleted file mode 100644 index d0b58e929254..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/647935724726845441.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP-CHECKPOINT-647935723775950849-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP-CHECKPOINT-647935723775950849-CHECKSUM deleted file mode 100644 index af15604a6fa7..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP-CHECKPOINT-647935723775950849-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -k4N \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index af15604a6fa7..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -k4N \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP_MANIFEST deleted file mode 100644 index 290637737be6..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index a90e88126d48..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/inc_missing_addsst/v20.2.7/8/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -*; \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-CHECKPOINT-689695912042364929-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-CHECKPOINT-689695912042364929-CHECKSUM deleted file mode 100644 index 2b52304996c3..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-CHECKPOINT-689695912042364929-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ڪ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 2b52304996c3..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ڪ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-STATISTICS deleted file mode 100644 index 0541731d99a2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP-STATISTICS and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP_MANIFEST deleted file mode 100644 index 4da346495dc4..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index a43745d920cc..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -Vf \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934306746371.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934306746371.sst deleted file mode 100644 index 2519dda27920..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934306746371.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934419206148.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934419206148.sst deleted file mode 100644 index aa7d71f2a6ad..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934419206148.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934447878153.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934447878153.sst deleted file mode 100644 index b47a9929ceca..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934447878153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934447910921.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934447910921.sst deleted file mode 100644 index 6f6953239341..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934447910921.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934449156104.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934449156104.sst deleted file mode 100644 index 6ac5e0a63943..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934449156104.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934449188872.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934449188872.sst deleted file mode 100644 index c875d79c0ec5..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934449188872.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450302983.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450302983.sst deleted file mode 100644 index 94af30b28f44..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450302983.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450434056.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450434056.sst deleted file mode 100644 index bedd4652be3e..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450434056.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450565127.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450565127.sst deleted file mode 100644 index 3fac1e95722c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934450565127.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934593073153.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934593073153.sst deleted file mode 100644 index 2e403faeb8b2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934593073153.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934593105921.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934593105921.sst deleted file mode 100644 index 260ddac94630..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934593105921.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934739775496.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934739775496.sst deleted file mode 100644 index b8cae221fa60..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/multi-region/v21.1/data/689695934739775496.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481816066.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481816066.sst deleted file mode 100644 index a9878518f097..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481816066.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481848836.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481848836.sst deleted file mode 100644 index 571ed1380a27..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481848836.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481881604.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481881604.sst deleted file mode 100644 index fa68149d7e22..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481881604.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481914372.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481914372.sst deleted file mode 100644 index f521799b4946..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117481914372.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482045442.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482045442.sst deleted file mode 100644 index 7b2f468a506c..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482045442.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482078210.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482078210.sst deleted file mode 100644 index 400956ef6afe..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117482078210.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117485420546.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117485420546.sst deleted file mode 100644 index 72119886c1ee..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117485420546.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117485879300.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117485879300.sst deleted file mode 100644 index 3adfb047113f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117485879300.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486469124.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486469124.sst deleted file mode 100644 index 780aa8a82a06..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486469124.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486829572.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486829572.sst deleted file mode 100644 index cad6a9ec293b..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/657900117486829572.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/BACKUP b/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/BACKUP deleted file mode 100644 index 37904764a85a..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/privileges/v20.1.6/BACKUP and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/713118588046376961.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/713118588046376961.sst deleted file mode 100644 index 041a12551b1f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/713118588046376961.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/713118588046409729.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/713118588046409729.sst deleted file mode 100644 index bc92dec66951..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/713118588046409729.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-CHECKPOINT-713118584974475265-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-CHECKPOINT-713118584974475265-CHECKSUM deleted file mode 100644 index 40ca411f915d..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-CHECKPOINT-713118584974475265-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -ژxy \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index 47009c2b773c..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -KG/ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-STATISTICS deleted file mode 100644 index 64595047fbbf..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP-STATISTICS and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP_MANIFEST deleted file mode 100644 index 5eefcfb63a9f..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 2d75cee934f1..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/public-schema-remap/21.1.1/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -(w \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP-STATISTICS deleted file mode 100644 index aeb2935542de..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP-STATISTICS and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP_MANIFEST deleted file mode 100644 index f2608b324493..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 866078439ede..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -5)ۀ \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701267845349377.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701267845349377.sst deleted file mode 100644 index 419d765acfff..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701267845349377.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701267962789889.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701267962789889.sst deleted file mode 100644 index 833d824da7ef..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701267962789889.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701268033142785.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701268033142785.sst deleted file mode 100644 index 6081ab1494b8..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/data/786701268033142785.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/fileinfo.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/fileinfo.sst deleted file mode 100644 index a930a8a3ff54..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/fileinfo.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/metadata.sst b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/metadata.sst deleted file mode 100644 index 8ee3682f1540..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/metadata.sst and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5cccbd1cfc9cdcec8cddfd4cfcfcfcfdfaaabbcfffe b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5cccbd1cfc9cdcec8cddfd4cfcfcfcfdfaaabbcfffe deleted file mode 100644 index c92d86de75a0..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5cccbd1cfc9cdcec8cddfd4cfcfcfcfdfaaabbcfffe and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5cccbd1cfc9cdcec8cddfd4cfcfcfcfdfaaabbcfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5cccbd1cfc9cdcec8cddfd4cfcfcfcfdfaaabbcfffe-CHECKSUM deleted file mode 100644 index 59b0d3d112dc..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5cccbd1cfc9cdcec8cddfd4cfcfcfcfdfaaabbcfffe-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -@º- \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5ccccd1c7c8c7c9c6dfd4cfcfcfcfdfaaabbcfffe b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5ccccd1c7c8c7c9c6dfd4cfcfcfcfdfaaabbcfffe deleted file mode 100644 index a0230a993938..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5ccccd1c7c8c7c9c6dfd4cfcfcfcfdfaaabbcfffe and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5ccccd1c7c8c7c9c6dfd4cfcfcfcfdfaaabbcfffe-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5ccccd1c7c8c7c9c6dfd4cfcfcfcfdfaaabbcfffe-CHECKSUM deleted file mode 100644 index 04cd6eadd857..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_old_versions/system-users-restore/22.1.3/progress/BACKUP-CHECKPOINT-13cdcfcdcdd2cfc7d2cecfdfcec8c5cdc6c5ccccd1c7c8c7c9c6dfd4cfcfcfcfdfaaabbcfffe-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -"r \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/create.sql b/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/create.sql deleted file mode 100644 index 9c0749552da5..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/create.sql +++ /dev/null @@ -1,14 +0,0 @@ --- The below SQL is used to create a backup of a database that --- contains a corrupted database descriptor. Data is produced --- using version 20.2.7. This backup is used in --- TestRestoreWithDroppedSchemaCorruption test. - -CREATE DATABASE foo; - -SET DATABASE = foo; - -CREATE SCHEMA bar; - -DROP SCHEMA bar; - -BACKUP DATABASE foo to 'nodelocal://0/foo_backup'; diff --git a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP-CHECKPOINT-683775825115512833-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP-CHECKPOINT-683775825115512833-CHECKSUM deleted file mode 100644 index b6f4e0b22332..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP-CHECKPOINT-683775825115512833-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -T \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP-CHECKPOINT-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP-CHECKPOINT-CHECKSUM deleted file mode 100644 index b6f4e0b22332..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP-CHECKPOINT-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -T \ No newline at end of file diff --git a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP-STATISTICS b/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP-STATISTICS deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP_MANIFEST b/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP_MANIFEST deleted file mode 100644 index 48a71b53c0a2..000000000000 Binary files a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP_MANIFEST and /dev/null differ diff --git a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP_MANIFEST-CHECKSUM b/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP_MANIFEST-CHECKSUM deleted file mode 100644 index 4ef192e60070..000000000000 --- a/pkg/ccl/backupccl/testdata/restore_with_dropped_schema/exports/v20.2.7/BACKUP_MANIFEST-CHECKSUM +++ /dev/null @@ -1 +0,0 @@ -=f \ No newline at end of file diff --git a/pkg/server/testserver.go b/pkg/server/testserver.go index 6fcbdba9b1ec..76aa3b1b222a 100644 --- a/pkg/server/testserver.go +++ b/pkg/server/testserver.go @@ -555,6 +555,7 @@ func (ts *TestServer) maybeStartDefaultTestTenant(ctx context.Context) error { SSLCertsDir: ts.params.SSLCertsDir, TestingKnobs: ts.params.Knobs, StartDiagnosticsReporting: ts.params.StartDiagnosticsReporting, + Settings: ts.params.Settings, } // Since we're creating a tenant, it doesn't make sense to pass through the