diff --git a/pkg/base/config.go b/pkg/base/config.go index 3a22f68a2690..52f2d3588bf8 100644 --- a/pkg/base/config.go +++ b/pkg/base/config.go @@ -721,7 +721,7 @@ type StorageConfig struct { // BallastSize is the amount reserved by a ballast file for manual // out-of-disk recovery. BallastSize int64 - // Settings instance for cluster-wide knobs. + // Settings instance for cluster-wide knobs. Must not be nil. Settings *cluster.Settings // UseFileRegistry is true if the file registry is needed (eg: encryption-at-rest). // This may force the store version to versionFileRegistry if currently lower. diff --git a/pkg/ccl/cliccl/BUILD.bazel b/pkg/ccl/cliccl/BUILD.bazel index 6806899f470e..2da793e4a6d0 100644 --- a/pkg/ccl/cliccl/BUILD.bazel +++ b/pkg/ccl/cliccl/BUILD.bazel @@ -62,6 +62,7 @@ go_test( "//pkg/ccl/storageccl/engineccl", "//pkg/cli", "//pkg/server", + "//pkg/settings/cluster", "//pkg/storage", "//pkg/testutils/serverutils", "//pkg/util/envutil", diff --git a/pkg/ccl/cliccl/ear_test.go b/pkg/ccl/cliccl/ear_test.go index 64353c04a5e9..43f9e534d396 100644 --- a/pkg/ccl/cliccl/ear_test.go +++ b/pkg/ccl/cliccl/ear_test.go @@ -22,6 +22,7 @@ import ( // NewEncryptedEnvFunc in `pkg/storage`. _ "github.com/cockroachdb/cockroach/pkg/ccl/storageccl/engineccl" "github.com/cockroachdb/cockroach/pkg/cli" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/envutil" "github.com/cockroachdb/cockroach/pkg/util/leaktest" @@ -49,7 +50,7 @@ func TestDecrypt(t *testing.T) { require.NoError(t, err) encOpts, err := encSpec.ToEncryptionOptions() require.NoError(t, err) - p, err := storage.Open(ctx, storage.Filesystem(dir), storage.EncryptionAtRest(encOpts)) + p, err := storage.Open(ctx, storage.Filesystem(dir), cluster.MakeClusterSettings(), storage.EncryptionAtRest(encOpts)) require.NoError(t, err) // Find a manifest file to check. @@ -128,7 +129,7 @@ func TestList(t *testing.T) { require.NoError(t, err) encOpts, err := encSpec.ToEncryptionOptions() require.NoError(t, err) - p, err := storage.Open(ctx, storage.Filesystem(dir), storage.EncryptionAtRest(encOpts)) + p, err := storage.Open(ctx, storage.Filesystem(dir), cluster.MakeClusterSettings(), storage.EncryptionAtRest(encOpts)) require.NoError(t, err) // Write a key and flush, to create a table in the store. diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index b/pkg/ccl/schemachangerccl/testdata/explain/create_index index 0e78d2153cf4..d7f5d2432025 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index @@ -7,7 +7,7 @@ EXPLAIN (ddl) CREATE INDEX id1 STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); ---- -Schema change plan for CREATE INDEX ‹id1› ON ‹defaultdb›.‹public›.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for CREATE INDEX ‹id1› ON ‹defaultdb›.‹public›.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_1_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_1_of_7 index d4c65569f50f..99edc5e83d8a 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_1_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_1_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 12 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_2_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_2_of_7 index 6b4a9d8b67ec..654e424e0b69 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_2_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_2_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_3_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_3_of_7 index 32043346598e..bf11f1486377 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_3_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_3_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_4_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_4_of_7 index 6e1b513b28ff..904e89f420c6 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_4_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_4_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_5_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_5_of_7 index ff368373afb1..a851fbdf8eb9 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_5_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_5_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_6_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_6_of_7 index f0d157cd29d5..920a6076a284 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_6_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_6_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_7_of_7 b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_7_of_7 index 4123c2e1569f..33ef6af9de91 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_7_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain/create_index.rollback_7_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 11 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region index 533110682d33..525e694e4629 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region @@ -7,7 +7,7 @@ CREATE TABLE multi_region_test_db.public.table_regional_by_table ( /* test */ EXPLAIN (ddl) DROP DATABASE multi_region_test_db CASCADE; ---- -Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; +Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion index de88e8eb889e..6235736faf75 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion @@ -7,7 +7,7 @@ CREATE TABLE multi_region_test_db.public.table_regional_by_row ( /* test */ EXPLAIN (ddl) DROP TABLE multi_region_test_db.public.table_regional_by_row; ---- -Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row›; +Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row›; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 6 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region index be935bddcfaa..ee4952b4f311 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region @@ -7,7 +7,7 @@ CREATE TABLE multi_region_test_db.public.table_regional_by_table ( /* test */ EXPLAIN (ddl) DROP TABLE multi_region_test_db.public.table_regional_by_table CASCADE; ---- -Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› CASCADE; +Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 5 elements transitioning toward ABSENT diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index index ffaf4a9dc864..f3d60649cf56 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index @@ -7,7 +7,7 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); ---- -• Schema change plan for CREATE INDEX ‹id1› ON ‹defaultdb›.‹public›.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +• Schema change plan for CREATE INDEX ‹id1› ON ‹defaultdb›.‹public›.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); │ ├── • StatementPhase │ │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_1_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_1_of_7 index ff1ed71a213a..dccb4c9ee4db 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_1_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_1_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_2_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_2_of_7 index 52f47bcdf1a1..84107e2cd750 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_2_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_2_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_3_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_3_of_7 index 0cdb972dd902..4ea46eac892d 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_3_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_3_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_4_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_4_of_7 index 0061aba82187..cb6555032ebd 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_4_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_4_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_5_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_5_of_7 index 412ccf271518..f83ce77d27fc 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_5_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_5_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_6_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_6_of_7 index 8ccdc480d283..a71b8b563241 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_6_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_6_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_7_of_7 b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_7_of_7 index e4281f273bef..f1c46228a6a2 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_7_of_7 +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index.rollback_7_of_7 @@ -8,7 +8,7 @@ CREATE INDEX id1 PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)); EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); +• Schema change plan for rolling back CREATE INDEX ‹id1› ON ‹defaultdb›.public.‹t1› (‹id›, ‹name›) STORING (‹money›) PARTITION BY LIST (‹id›) (PARTITION ‹p1› VALUES IN (‹1›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region index 18924e33e117..ba177331700b 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region @@ -7,7 +7,7 @@ CREATE TABLE multi_region_test_db.public.table_regional_by_table ( /* test */ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; ---- -• Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; +• Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion index 2ef6f62c9576..9cd57bb218a2 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion @@ -7,7 +7,7 @@ CREATE TABLE multi_region_test_db.public.table_regional_by_row ( /* test */ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_row; ---- -• Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row›; +• Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row›; │ ├── • StatementPhase │ │ diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region index 4674eaf3ecc1..14ebdd64aa77 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region @@ -7,7 +7,7 @@ CREATE TABLE multi_region_test_db.public.table_regional_by_table ( /* test */ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_table CASCADE; ---- -• Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› CASCADE; +• Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/ccl/storageccl/engineccl/bench_test.go b/pkg/ccl/storageccl/engineccl/bench_test.go index 8d50740c1083..08cde2494f20 100644 --- a/pkg/ccl/storageccl/engineccl/bench_test.go +++ b/pkg/ccl/storageccl/engineccl/bench_test.go @@ -55,7 +55,7 @@ func loadTestData( eng, err := storage.Open( ctx, storage.Filesystem(dir), - storage.Settings(cluster.MakeTestingClusterSettings())) + cluster.MakeTestingClusterSettings()) if err != nil { return nil, err } diff --git a/pkg/ccl/storageccl/engineccl/encrypted_fs_test.go b/pkg/ccl/storageccl/engineccl/encrypted_fs_test.go index a17854800ad7..74a00395eca4 100644 --- a/pkg/ccl/storageccl/engineccl/encrypted_fs_test.go +++ b/pkg/ccl/storageccl/engineccl/encrypted_fs_test.go @@ -294,6 +294,7 @@ func TestPebbleEncryption(t *testing.T) { context.Background(), storage.PebbleConfig{ StorageConfig: base.StorageConfig{ + Settings: cluster.MakeTestingClusterSettings(), Attrs: roachpb.Attributes{}, MaxSize: 512 << 20, UseFileRegistry: true, @@ -380,6 +381,7 @@ func TestPebbleEncryption2(t *testing.T) { context.Background(), storage.PebbleConfig{ StorageConfig: base.StorageConfig{ + Settings: cluster.MakeTestingClusterSettings(), Attrs: roachpb.Attributes{}, MaxSize: 512 << 20, UseFileRegistry: true, diff --git a/pkg/cli/debug.go b/pkg/cli/debug.go index 09927c7c0886..13f2e47345c4 100644 --- a/pkg/cli/debug.go +++ b/pkg/cli/debug.go @@ -170,11 +170,12 @@ func OpenEngine( if err != nil { return nil, err } - db, err := storage.Open(context.Background(), + db, err := storage.Open( + context.Background(), storage.Filesystem(dir), + serverCfg.Settings, storage.MaxOpenFiles(int(maxOpenFiles)), storage.CacheSize(server.DefaultCacheSize), - storage.Settings(serverCfg.Settings), storage.Hook(PopulateStorageConfigHook), storage.CombineOptions(opts...)) if err != nil { diff --git a/pkg/cli/debug_check_store_test.go b/pkg/cli/debug_check_store_test.go index 4153ef5049e8..a5544ced6d99 100644 --- a/pkg/cli/debug_check_store_test.go +++ b/pkg/cli/debug_check_store_test.go @@ -21,6 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/testcluster" @@ -83,6 +84,7 @@ func TestDebugCheckStore(t *testing.T) { func() { eng, err := storage.Open(ctx, storage.Filesystem(storePaths[0]), + cluster.MakeClusterSettings(), storage.CacheSize(10<<20 /* 10 MiB */), storage.MustExist) require.NoError(t, err) diff --git a/pkg/cli/debug_test.go b/pkg/cli/debug_test.go index 0574deb16994..31b88eda54e6 100644 --- a/pkg/cli/debug_test.go +++ b/pkg/cli/debug_test.go @@ -23,6 +23,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/gossip" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" @@ -37,6 +38,7 @@ func createStore(t *testing.T, path string) { db, err := storage.Open( context.Background(), storage.Filesystem(path), + cluster.MakeClusterSettings(), storage.CacheSize(server.DefaultCacheSize)) if err != nil { t.Fatal(err) diff --git a/pkg/cli/syncbench/syncbench.go b/pkg/cli/syncbench/syncbench.go index 4a7d09914799..947703807450 100644 --- a/pkg/cli/syncbench/syncbench.go +++ b/pkg/cli/syncbench/syncbench.go @@ -141,8 +141,8 @@ func Run(opts Options) error { db, err := storage.Open( context.Background(), storage.Filesystem(opts.Dir), - storage.CacheSize(0), - storage.Settings(cluster.MakeTestingClusterSettings())) + cluster.MakeTestingClusterSettings(), + storage.CacheSize(0)) if err != nil { return err } diff --git a/pkg/kv/kvserver/batcheval/cmd_clear_range.go b/pkg/kv/kvserver/batcheval/cmd_clear_range.go index 11b06f026c94..46341529681d 100644 --- a/pkg/kv/kvserver/batcheval/cmd_clear_range.go +++ b/pkg/kv/kvserver/batcheval/cmd_clear_range.go @@ -189,10 +189,14 @@ func computeStatsDelta( if err != nil { return enginepb.MVCCStats{}, err } - // If we took the fast path but race is enabled, assert stats were correctly computed. + // If we took the fast path but race is enabled, assert stats were correctly + // computed. if entireRange { - computed.ContainsEstimates = delta.ContainsEstimates // retained for tests under race - if !delta.Equal(computed) { + // Retain the value of ContainsEstimates for tests under race. + computed.ContainsEstimates = delta.ContainsEstimates + // We only want to assert the correctness of stats that do not contain + // estimates. + if delta.ContainsEstimates == 0 && !delta.Equal(computed) { log.Fatalf(ctx, "fast-path MVCCStats computation gave wrong result: diff(fast, computed) = %s", pretty.Diff(delta, computed)) } diff --git a/pkg/kv/kvserver/batcheval/cmd_export_test.go b/pkg/kv/kvserver/batcheval/cmd_export_test.go index e86f7694fdb3..78c0fc3d0850 100644 --- a/pkg/kv/kvserver/batcheval/cmd_export_test.go +++ b/pkg/kv/kvserver/batcheval/cmd_export_test.go @@ -686,7 +686,7 @@ func TestRandomKeyAndTimestampExport(t *testing.T) { st := cluster.MakeTestingClusterSettings() mkEngine := func(t *testing.T) (e storage.Engine, cleanup func()) { dir, cleanupDir := testutils.TempDir(t) - e, err := storage.Open(ctx, storage.Filesystem(dir), storage.CacheSize(0), storage.Settings(st)) + e, err := storage.Open(ctx, storage.Filesystem(dir), st, storage.CacheSize(0)) if err != nil { t.Fatal(err) } diff --git a/pkg/kv/kvserver/consistency_queue_test.go b/pkg/kv/kvserver/consistency_queue_test.go index e3da77f39afd..993c64705e98 100644 --- a/pkg/kv/kvserver/consistency_queue_test.go +++ b/pkg/kv/kvserver/consistency_queue_test.go @@ -29,6 +29,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/testutils" @@ -382,7 +383,7 @@ func TestCheckConsistencyInconsistent(t *testing.T) { // VFS to verify its contents. fs, err := stickyEngineRegistry.GetUnderlyingFS(base.StoreSpec{StickyInMemoryEngineID: strconv.FormatInt(int64(i), 10)}) assert.NoError(t, err) - cpEng := storage.InMemFromFS(context.Background(), fs, cps[0], storage.CacheSize(1<<20)) + cpEng := storage.InMemFromFS(context.Background(), fs, cps[0], cluster.MakeClusterSettings(), storage.CacheSize(1<<20)) defer cpEng.Close() // Find the problematic range in the storage. @@ -520,6 +521,7 @@ func testConsistencyQueueRecomputeStatsImpl(t *testing.T, hadEstimates bool) { func() { eng, err := storage.Open(ctx, storage.Filesystem(path), + cluster.MakeClusterSettings(), storage.CacheSize(1<<20 /* 1 MiB */), storage.MustExist) require.NoError(t, err) diff --git a/pkg/kv/kvserver/logstore/sideload_test.go b/pkg/kv/kvserver/logstore/sideload_test.go index 4d9cc93e36f1..65f98509af02 100644 --- a/pkg/kv/kvserver/logstore/sideload_test.go +++ b/pkg/kv/kvserver/logstore/sideload_test.go @@ -566,6 +566,7 @@ func newOnDiskEngine(ctx context.Context, t *testing.T) (func(), storage.Engine) eng, err := storage.Open( ctx, storage.Filesystem(dir), + cluster.MakeClusterSettings(), storage.CacheSize(1<<20 /* 1 MiB */)) if err != nil { t.Fatal(err) diff --git a/pkg/kv/kvserver/loqrecovery/BUILD.bazel b/pkg/kv/kvserver/loqrecovery/BUILD.bazel index f6d88bc6365a..a9dc50a46fec 100644 --- a/pkg/kv/kvserver/loqrecovery/BUILD.bazel +++ b/pkg/kv/kvserver/loqrecovery/BUILD.bazel @@ -73,6 +73,7 @@ go_test( "//pkg/security/securitytest", "//pkg/server", "//pkg/server/serverpb", + "//pkg/settings/cluster", "//pkg/storage", "//pkg/storage/enginepb", "//pkg/testutils", diff --git a/pkg/kv/kvserver/loqrecovery/recovery_env_test.go b/pkg/kv/kvserver/loqrecovery/recovery_env_test.go index b0bf5a05cb1a..68036eff3932 100644 --- a/pkg/kv/kvserver/loqrecovery/recovery_env_test.go +++ b/pkg/kv/kvserver/loqrecovery/recovery_env_test.go @@ -27,6 +27,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver/raftlog" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" @@ -495,6 +496,7 @@ func (e *quorumRecoveryEnv) getOrCreateStore( var err error eng, err := storage.Open(ctx, storage.InMemory(), + cluster.MakeClusterSettings(), storage.CacheSize(1<<20 /* 1 MiB */)) if err != nil { t.Fatalf("failed to crate in mem store: %v", err) diff --git a/pkg/kv/kvserver/rditer/replica_data_iter_test.go b/pkg/kv/kvserver/rditer/replica_data_iter_test.go index 317cc9ecaff1..cb348e2f6f15 100644 --- a/pkg/kv/kvserver/rditer/replica_data_iter_test.go +++ b/pkg/kv/kvserver/rditer/replica_data_iter_test.go @@ -522,8 +522,8 @@ func benchReplicaEngineDataIterator(b *testing.B, numRanges, numKeysPerRange, va // Write data for ranges. eng, err := storage.Open(ctx, storage.Filesystem(b.TempDir()), - storage.CacheSize(1e9), - storage.Settings(cluster.MakeTestingClusterSettings())) + cluster.MakeTestingClusterSettings(), + storage.CacheSize(1e9)) require.NoError(b, err) defer eng.Close() diff --git a/pkg/kv/kvserver/replica_sst_snapshot_storage_test.go b/pkg/kv/kvserver/replica_sst_snapshot_storage_test.go index 74d83a662e9d..1f84cbf929a3 100644 --- a/pkg/kv/kvserver/replica_sst_snapshot_storage_test.go +++ b/pkg/kv/kvserver/replica_sst_snapshot_storage_test.go @@ -332,6 +332,7 @@ func newOnDiskEngine(ctx context.Context, t *testing.T) (func(), storage.Engine) eng, err := storage.Open( ctx, storage.Filesystem(dir), + cluster.MakeClusterSettings(), storage.CacheSize(1<<20 /* 1 MiB */)) if err != nil { t.Fatal(err) diff --git a/pkg/kv/kvserver/store_snapshot.go b/pkg/kv/kvserver/store_snapshot.go index e3e07b07297b..830faf132846 100644 --- a/pkg/kv/kvserver/store_snapshot.go +++ b/pkg/kv/kvserver/store_snapshot.go @@ -1340,6 +1340,7 @@ func SendEmptySnapshot( eng, err := storage.Open( context.Background(), storage.InMemory(), + cluster.MakeClusterSettings(), storage.CacheSize(1<<20 /* 1 MiB */), storage.MaxSize(512<<20 /* 512 MiB */)) if err != nil { diff --git a/pkg/security/BUILD.bazel b/pkg/security/BUILD.bazel index 3b57e9d24259..b7f8d712ad63 100644 --- a/pkg/security/BUILD.bazel +++ b/pkg/security/BUILD.bazel @@ -15,6 +15,7 @@ go_library( "pem.go", "permission_check.go", "tls.go", + "tls_ciphersuites.go", "tls_settings.go", "utils.go", "x509.go", diff --git a/pkg/security/tls.go b/pkg/security/tls.go index 96a2caebab7b..d892f1ae8303 100644 --- a/pkg/security/tls.go +++ b/pkg/security/tls.go @@ -48,6 +48,13 @@ func newServerTLSConfig( cfg.ClientCAs = certPool } + if settings.oldCipherSuitesEnabled() { + cfg.CipherSuites = append( + cfg.CipherSuites, + OldCipherSuites()..., + ) + } + // Should we disable session resumption? This may break forward secrecy. // cfg.SessionTicketsDisabled = true return cfg, nil @@ -64,6 +71,13 @@ func newUIServerTLSConfig(settings TLSSettings, certPEM, keyPEM []byte) (*tls.Co return nil, err } + if settings.oldCipherSuitesEnabled() { + cfg.CipherSuites = append( + cfg.CipherSuites, + OldCipherSuites()..., + ) + } + // Should we disable session resumption? This may break forward secrecy. // cfg.SessionTicketsDisabled = true return cfg, nil @@ -118,41 +132,7 @@ func newBaseTLSConfig(settings TLSSettings, caPEM []byte) (*tls.Config, error) { VerifyPeerCertificate: makeOCSPVerifier(settings), - // CipherSuites is a list of enabled TLS 1.2 cipher suites. The - // order of the list is ignored; prioritization of cipher suites - // follows hard-coded rules in the Go standard library[1]. Note - // that TLS 1.3 ciphersuites are not configurable. - // - // This is the subset of Go's default cipher suite list which are - // also marked as "recommended" by IETF[2] (As of June 1, 2022). - // Mozilla recommends the same list with some comments on - // rationale and compatibility[3]. These ciphers are recommended - // because they are the ones that provide forward secrecy and - // authenticated encryption (AEAD). Mozilla claims they are - // compatible with "nearly all" clients from the last five years. - // - // [1]: https://github.com/golang/go/blob/4aa1efed4853ea067d665a952eee77c52faac774/src/crypto/tls/cipher_suites.go#L215-L270 - // [2]: https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4 - // [3]: https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29 - CipherSuites: []uint16{ - tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, - tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, - tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, - tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, - tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, - // Note: the codec names - // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 - // and - // TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 - // are merely aliases for the two above. - // - // NB: no need to add TLS 1.3 ciphers here. As per the - // documentation of CipherSuites, the TLS 1.3 ciphers are not - // configurable. Go's predefined list always applies. All TLS - // 1.3 ciphers meet the forward secrecy and authenticated - // encryption requirements mentioned above. - }, + CipherSuites: RecommendedCipherSuites(), MinVersion: tls.VersionTLS12, }, nil diff --git a/pkg/security/tls_ciphersuites.go b/pkg/security/tls_ciphersuites.go new file mode 100644 index 000000000000..fd62efd316f1 --- /dev/null +++ b/pkg/security/tls_ciphersuites.go @@ -0,0 +1,72 @@ +// Copyright 2023 The Cockroach Authors. +// +// Use of this software is governed by the Business Source License +// included in the file licenses/BSL.txt. +// +// As of the Change Date specified in that file, in accordance with +// the Business Source License, use of this software will be governed +// by the Apache License, Version 2.0, included in the file +// licenses/APL.txt. + +package security + +import "crypto/tls" + +// RecommendedCipherSuites returns a list of enabled TLS 1.2 cipher +// suites. The order of the list is ignored; prioritization of cipher +// suites follows hard-coded rules in the Go standard library[1]. +// +// Note that TLS 1.3 ciphersuites are not configurable. +// +// This is the subset of Go's default cipher suite list which are +// also marked as "recommended" by IETF[2] (As of June 1, 2022). +// Mozilla recommends the same list with some comments on +// rationale and compatibility[3]. These ciphers are recommended +// because they are the ones that provide forward secrecy and +// authenticated encryption (AEAD). Mozilla claims they are +// compatible with "nearly all" clients from the last five years. +// +// [1]: https://github.com/golang/go/blob/4aa1efed4853ea067d665a952eee77c52faac774/src/crypto/tls/cipher_suites.go#L215-L270 +// [2]: https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-parameters-4 +// [3]: https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28recommended.29 +func RecommendedCipherSuites() []uint16 { + return []uint16{ + tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, + tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, + tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, + tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, + tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256, + tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, + // Note: the codec names + // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 + // and + // TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305 + // are merely aliases for the two above. + // + // NB: no need to add TLS 1.3 ciphers here. As per the + // documentation of CipherSuites, the TLS 1.3 ciphers are not + // configurable. Go's predefined list always applies. All TLS + // 1.3 ciphers meet the forward secrecy and authenticated + // encryption requirements mentioned above. + } +} + +// OldCipherSuites returns a list of "old" cipher suites for TLS v1.2, +// from the list created by Mozilla[1]. These are enabled with the +// use of the COCKROACH_TLS_ENABLE_OLD_CIPHER_SUITES environment +// variable, and should strictly be used when the software +// CockroachDB is being used with cannot be upgraded. +// +// Cipher suites not included in the recommended lists referred to +// in the RecommendedCipherSuites documentation but required for +// backwards compatibility should be added here, so organizations +// can opt into using deprecated cipher suites rather than opting +// every CRDB cluster into a worse security stance. +// +// [1]: https://wiki.mozilla.org/Security/Server_Side_TLS#Old_backward_compatibility +func OldCipherSuites() []uint16 { + return []uint16{ + tls.TLS_RSA_WITH_AES_128_GCM_SHA256, + tls.TLS_RSA_WITH_AES_256_GCM_SHA384, + } +} diff --git a/pkg/security/tls_settings.go b/pkg/security/tls_settings.go index 767b89b9bdc4..ca5e011d13ae 100644 --- a/pkg/security/tls_settings.go +++ b/pkg/security/tls_settings.go @@ -15,12 +15,18 @@ import ( "github.com/cockroachdb/cockroach/pkg/settings" "github.com/cockroachdb/cockroach/pkg/settings/cluster" + "github.com/cockroachdb/cockroach/pkg/util/envutil" ) const ( ocspOff = 0 ocspLax = 1 ocspStrict = 2 + + // OldCipherSuitesEnabledEnv is the environment variable used to reenable + // use of old cipher suites for backwards compatibility with applications + // that do not support any of the recommended cipher suites. + OldCipherSuitesEnabledEnv = "COCKROACH_TLS_ENABLE_OLD_CIPHER_SUITES" ) // TLSSettings allows for customization of TLS behavior. It's called @@ -31,6 +37,7 @@ type TLSSettings interface { ocspEnabled() bool ocspStrict() bool ocspTimeout() time.Duration + oldCipherSuitesEnabled() bool } var ocspMode = settings.RegisterEnumSetting( @@ -65,6 +72,10 @@ func (c clusterTLSSettings) ocspTimeout() time.Duration { return ocspTimeout.Get(&c.settings.SV) } +func (c clusterTLSSettings) oldCipherSuitesEnabled() bool { + return areOldCipherSuitesEnabled() +} + // ClusterTLSSettings creates a TLSSettings backed by the // given cluster settings. func ClusterTLSSettings(settings *cluster.Settings) TLSSettings { @@ -88,3 +99,14 @@ func (CommandTLSSettings) ocspStrict() bool { func (CommandTLSSettings) ocspTimeout() time.Duration { return 0 } + +func (c CommandTLSSettings) oldCipherSuitesEnabled() bool { + return areOldCipherSuitesEnabled() +} + +// areOldCipherSuites returns true if CRDB should enable the use of +// old, no longer recommended TLS cipher suites for the sake of +// compatibility. +func areOldCipherSuitesEnabled() bool { + return envutil.EnvOrDefaultBool(OldCipherSuitesEnabledEnv, false) +} diff --git a/pkg/security/tls_test.go b/pkg/security/tls_test.go index 3b0d57aaec2a..c7d401f5d3bc 100644 --- a/pkg/security/tls_test.go +++ b/pkg/security/tls_test.go @@ -17,6 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/security" "github.com/cockroachdb/cockroach/pkg/security/certnames" + "github.com/cockroachdb/cockroach/pkg/util/envutil" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/stretchr/testify/require" ) @@ -25,19 +26,28 @@ func TestLoadTLSConfig(t *testing.T) { defer leaktest.AfterTest(t)() cm, err := security.NewCertificateManager(certnames.EmbeddedCertsDir, security.CommandTLSSettings{}) require.NoError(t, err) - config, err := cm.GetServerTLSConfig() + // We check that the UI Server tls.Config doesn't include the old cipher suites by default. + config, err := cm.GetUIServerTLSConfig() + require.NoError(t, err) + clientConfig, err := config.GetConfigForClient(&tls.ClientHelloInfo{}) require.NoError(t, err) require.NotNil(t, config.GetConfigForClient) - config, err = config.GetConfigForClient(&tls.ClientHelloInfo{}) + require.NotNil(t, clientConfig) + require.Equal(t, security.RecommendedCipherSuites(), clientConfig.CipherSuites) + + // Next we check that the Server tls.Config is correctly generated. + config, err = cm.GetServerTLSConfig() require.NoError(t, err) - if err != nil { - t.Fatalf("Failed to load TLS config: %v", err) - } + require.NotNil(t, config.GetConfigForClient) - if len(config.Certificates) != 1 { - t.Fatalf("config.Certificates should have 1 cert; found %d", len(config.Certificates)) + clientConfig, err = config.GetConfigForClient(&tls.ClientHelloInfo{}) + require.NoError(t, err) + require.NotNil(t, clientConfig) + require.Equal(t, security.RecommendedCipherSuites(), clientConfig.CipherSuites) + if len(clientConfig.Certificates) != 1 { + t.Fatalf("clientConfig.Certificates should have 1 cert; found %d", len(clientConfig.Certificates)) } - cert := config.Certificates[0] + cert := clientConfig.Certificates[0] asn1Data := cert.Certificate[0] // TODO Check len() x509Cert, err := x509.ParseCertificate(asn1Data) @@ -45,19 +55,50 @@ func TestLoadTLSConfig(t *testing.T) { t.Fatalf("Couldn't parse test cert: %v", err) } - if err = verifyX509Cert(x509Cert, "localhost", config.RootCAs); err != nil { + if err = verifyX509Cert(x509Cert, "localhost", clientConfig.RootCAs); err != nil { t.Errorf("Couldn't verify test cert against server CA: %v", err) } - if err = verifyX509Cert(x509Cert, "localhost", config.ClientCAs); err != nil { + if err = verifyX509Cert(x509Cert, "localhost", clientConfig.ClientCAs); err != nil { t.Errorf("Couldn't verify test cert against client CA: %v", err) } - if err = verifyX509Cert(x509Cert, "google.com", config.RootCAs); err == nil { + if err = verifyX509Cert(x509Cert, "google.com", clientConfig.RootCAs); err == nil { t.Errorf("Verified test cert for wrong hostname") } } +func TestLoadTLSConfigWithOldCipherSuites(t *testing.T) { + defer leaktest.AfterTest(t)() + reset := envutil.TestSetEnv(t, security.OldCipherSuitesEnabledEnv, "true") + defer reset() + + cm, err := security.NewCertificateManager(certnames.EmbeddedCertsDir, security.CommandTLSSettings{}) + require.NoError(t, err) + + recommendedAndOldCipherSuites := append( + security.RecommendedCipherSuites(), + security.OldCipherSuites()..., + ) + + // We check that the UI Server tls.Config now includes the old cipher suites after the existing cipher suites. + config, err := cm.GetUIServerTLSConfig() + require.NoError(t, err) + clientConfig, err := config.GetConfigForClient(&tls.ClientHelloInfo{}) + require.NoError(t, err) + require.NotNil(t, clientConfig) + require.Equal(t, recommendedAndOldCipherSuites, clientConfig.CipherSuites) + + // We check that the Server tls.Config now includes the old cipher suites after the existing cipher suites. + config, err = cm.GetServerTLSConfig() + require.NoError(t, err) + require.NotNil(t, config.GetConfigForClient) + clientConfig, err = config.GetConfigForClient(&tls.ClientHelloInfo{}) + require.NoError(t, err) + require.NotNil(t, clientConfig) + require.Equal(t, recommendedAndOldCipherSuites, clientConfig.CipherSuites) +} + func verifyX509Cert(cert *x509.Certificate, dnsName string, roots *x509.CertPool) error { verifyOptions := x509.VerifyOptions{ DNSName: dnsName, diff --git a/pkg/server/config.go b/pkg/server/config.go index 714ff7bf4545..319b665ded32 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -706,7 +706,6 @@ func (cfg *Config) CreateEngines(ctx context.Context) (Engines, error) { storage.CacheSize(cfg.CacheSize), storage.MaxSize(sizeInBytes), storage.EncryptionAtRest(spec.EncryptionOptions), - storage.Settings(cfg.Settings), storage.If(storeKnobs.SmallEngineBlocks, storage.BlockSize(1)), } if len(storeKnobs.EngineKnobs) > 0 { @@ -714,6 +713,7 @@ func (cfg *Config) CreateEngines(ctx context.Context) (Engines, error) { } e, err := storage.Open(ctx, storage.InMemory(), + cfg.Settings, storageConfigs..., ) if err != nil { diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go index 712d28357ebd..72bc555d8b1c 100644 --- a/pkg/server/server_test.go +++ b/pkg/server/server_test.go @@ -40,6 +40,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/server/serverpb" "github.com/cockroachdb/cockroach/pkg/server/status/statuspb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/storage" @@ -1071,7 +1072,7 @@ func TestAssertEnginesEmpty(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - eng, err := storage.Open(ctx, storage.InMemory()) + eng, err := storage.Open(ctx, storage.InMemory(), cluster.MakeClusterSettings()) require.NoError(t, err) defer eng.Close() diff --git a/pkg/server/settings_cache_test.go b/pkg/server/settings_cache_test.go index 948a910cc29e..74abd5830c66 100644 --- a/pkg/server/settings_cache_test.go +++ b/pkg/server/settings_cache_test.go @@ -20,6 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/kv/kvserver" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/closedts" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" @@ -45,6 +46,7 @@ func TestCachedSettingsStoreAndLoad(t *testing.T) { ctx := context.Background() engine, err := storage.Open(ctx, storage.InMemory(), + cluster.MakeClusterSettings(), storage.MaxSize(512<<20 /* 512 MiB */), storage.ForTesting) require.NoError(t, err) diff --git a/pkg/server/sticky_engine.go b/pkg/server/sticky_engine.go index 026df92603a6..ef6433bd62f3 100644 --- a/pkg/server/sticky_engine.go +++ b/pkg/server/sticky_engine.go @@ -15,6 +15,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/kv/kvserver" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/syncutil" @@ -157,15 +158,11 @@ func (registry *stickyInMemEnginesRegistryImpl) GetOrCreateStickyInMemEngine( } log.Infof(ctx, "creating new sticky in-mem engine %s", spec.StickyInMemoryEngineID) - engine := storage.InMemFromFS(ctx, fs, "", options...) + engine := storage.InMemFromFS(ctx, fs, "", cluster.MakeClusterSettings(), options...) engineEntry := &stickyInMemEngine{ id: spec.StickyInMemoryEngineID, closed: false, - // This engine will stay alive after the node dies, so we don't want the - // caller to pass in a *cluster.Settings from the current node. Just - // create a random one since that is what we like to do in tests (for - // better test coverage). Engine: engine, fs: fs, } diff --git a/pkg/server/testserver.go b/pkg/server/testserver.go index b61105797a11..68448d67c811 100644 --- a/pkg/server/testserver.go +++ b/pkg/server/testserver.go @@ -281,6 +281,7 @@ func makeTestConfigFromParams(params base.TestServerArgs) Config { cfg.Stores = base.StoreSpecList{Specs: params.StoreSpecs} if params.TempStorageConfig.InMemory || params.TempStorageConfig.Path != "" { cfg.TempStorageConfig = params.TempStorageConfig + cfg.TempStorageConfig.Settings = st } cfg.DisableDefaultTestTenant = params.DisableDefaultTestTenant diff --git a/pkg/sql/colflow/vectorized_flow_test.go b/pkg/sql/colflow/vectorized_flow_test.go index 341bf316f4fb..0491d086f689 100644 --- a/pkg/sql/colflow/vectorized_flow_test.go +++ b/pkg/sql/colflow/vectorized_flow_test.go @@ -269,7 +269,7 @@ func TestVectorizedFlowTempDirectory(t *testing.T) { // We use an on-disk engine for this test since we're testing FS interactions // and want to get the same behavior as a non-testing environment. tempPath, dirCleanup := testutils.TempDir(t) - ngn, err := storage.Open(ctx, storage.Filesystem(tempPath), storage.CacheSize(0)) + ngn, err := storage.Open(ctx, storage.Filesystem(tempPath), cluster.MakeClusterSettings(), storage.CacheSize(0)) require.NoError(t, err) defer ngn.Close() defer dirCleanup() diff --git a/pkg/sql/rowcontainer/row_container_test.go b/pkg/sql/rowcontainer/row_container_test.go index 35122e85bc7a..1e045ff1ed10 100644 --- a/pkg/sql/rowcontainer/row_container_test.go +++ b/pkg/sql/rowcontainer/row_container_test.go @@ -195,7 +195,14 @@ func TestDiskBackedRowContainer(t *testing.T) { ctx := context.Background() st := cluster.MakeTestingClusterSettings() evalCtx := eval.MakeTestingEvalContext(st) - tempEngine, _, err := storage.NewTempEngine(ctx, base.TempStorageConfig{InMemory: true}, base.DefaultTestStoreSpec) + tempEngine, _, err := storage.NewTempEngine( + ctx, + base.TempStorageConfig{ + InMemory: true, + Settings: st, + }, + base.DefaultTestStoreSpec, + ) if err != nil { t.Fatal(err) } @@ -351,7 +358,14 @@ func TestDiskBackedRowContainerDeDuping(t *testing.T) { ctx := context.Background() st := cluster.MakeTestingClusterSettings() evalCtx := eval.MakeTestingEvalContext(st) - tempEngine, _, err := storage.NewTempEngine(ctx, base.TempStorageConfig{InMemory: true}, base.DefaultTestStoreSpec) + tempEngine, _, err := storage.NewTempEngine( + ctx, + base.TempStorageConfig{ + InMemory: true, + Settings: st, + }, + base.DefaultTestStoreSpec, + ) if err != nil { t.Fatal(err) } @@ -471,7 +485,14 @@ func TestDiskBackedIndexedRowContainer(t *testing.T) { ctx := context.Background() st := cluster.MakeTestingClusterSettings() evalCtx := eval.MakeTestingEvalContext(st) - tempEngine, _, err := storage.NewTempEngine(ctx, base.TempStorageConfig{InMemory: true}, base.DefaultTestStoreSpec) + tempEngine, _, err := storage.NewTempEngine( + ctx, + base.TempStorageConfig{ + InMemory: true, + Settings: st, + }, + base.DefaultTestStoreSpec, + ) if err != nil { t.Fatal(err) } @@ -935,7 +956,14 @@ func BenchmarkDiskBackedIndexedRowContainer(b *testing.B) { ctx := context.Background() st := cluster.MakeTestingClusterSettings() evalCtx := eval.MakeTestingEvalContext(st) - tempEngine, _, err := storage.NewTempEngine(ctx, base.TempStorageConfig{InMemory: true}, base.DefaultTestStoreSpec) + tempEngine, _, err := storage.NewTempEngine( + ctx, + base.TempStorageConfig{ + InMemory: true, + Settings: st, + }, + base.DefaultTestStoreSpec, + ) if err != nil { b.Fatal(err) } diff --git a/pkg/sql/schemachanger/scbuild/testdata/alter_table_drop_column b/pkg/sql/schemachanger/scbuild/testdata/alter_table_drop_column index 238b0f9e8159..750356eb8647 100644 --- a/pkg/sql/schemachanger/scbuild/testdata/alter_table_drop_column +++ b/pkg/sql/schemachanger/scbuild/testdata/alter_table_drop_column @@ -84,7 +84,7 @@ ALTER TABLE defaultdb.t DROP COLUMN j {indexId: 5, tableId: 104} build -ALTER TABLE defaultdb.t DROP COLUMN k +ALTER TABLE defaultdb.t DROP COLUMN k, DROP COLUMN l ---- - [[Column:{DescID: 104, ColumnID: 3}, ABSENT], PUBLIC] {columnId: 3, pgAttributeNum: 3, tableId: 104} @@ -92,6 +92,16 @@ ALTER TABLE defaultdb.t DROP COLUMN k {columnId: 3, name: k, tableId: 104} - [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] {columnId: 3, tableId: 104, type: {family: IntFamily, oid: 20, width: 64}} +- [[Column:{DescID: 104, ColumnID: 4}, ABSENT], PUBLIC] + {columnId: 4, pgAttributeNum: 4, tableId: 104} +- [[ColumnName:{DescID: 104, Name: l, ColumnID: 4}, ABSENT], PUBLIC] + {columnId: 4, name: l, tableId: 104} +- [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 4}, ABSENT], PUBLIC] + {columnId: 4, tableId: 104, type: {family: IntFamily, oid: 20, width: 64}} +- [[ColumnDefaultExpression:{DescID: 104, ColumnID: 4, ReferencedSequenceIDs: [105]}, ABSENT], PUBLIC] + {columnId: 4, expr: 'nextval(105:::REGCLASS)', tableId: 104, usesSequenceIds: [105]} +- [[SequenceOwner:{DescID: 104, ColumnID: 4, ReferencedDescID: 105}, ABSENT], PUBLIC] + {columnId: 4, sequenceId: 105, tableId: 104} - [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] {columnId: 1, indexId: 1, tableId: 104} - [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 1}, ABSENT], PUBLIC] @@ -126,7 +136,7 @@ ALTER TABLE defaultdb.t DROP COLUMN k {columnId: 1, indexId: 4, tableId: 104} - [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4}, PUBLIC], ABSENT] {columnId: 2, indexId: 4, kind: STORED, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 4, IndexID: 4}, PUBLIC], ABSENT] +- [[IndexColumn:{DescID: 104, ColumnID: 4, IndexID: 4}, ABSENT], ABSENT] {columnId: 4, indexId: 4, kind: STORED, ordinalInKind: 1, tableId: 104} - [[IndexData:{DescID: 104, IndexID: 4}, PUBLIC], ABSENT] {indexId: 4, tableId: 104} @@ -136,38 +146,10 @@ ALTER TABLE defaultdb.t DROP COLUMN k {columnId: 1, indexId: 5, tableId: 104} - [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] {columnId: 2, indexId: 5, kind: STORED, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 4, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] +- [[IndexColumn:{DescID: 104, ColumnID: 4, IndexID: 5}, ABSENT], ABSENT] {columnId: 4, indexId: 5, kind: STORED, ordinalInKind: 1, tableId: 104} - [[IndexData:{DescID: 104, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] {indexId: 5, tableId: 104} - -build -ALTER TABLE defaultdb.t DROP COLUMN l ----- -- [[Column:{DescID: 104, ColumnID: 4}, ABSENT], PUBLIC] - {columnId: 4, pgAttributeNum: 4, tableId: 104} -- [[ColumnName:{DescID: 104, Name: l, ColumnID: 4}, ABSENT], PUBLIC] - {columnId: 4, name: l, tableId: 104} -- [[ColumnType:{DescID: 104, ColumnFamilyID: 0, ColumnID: 4}, ABSENT], PUBLIC] - {columnId: 4, tableId: 104, type: {family: IntFamily, oid: 20, width: 64}} -- [[ColumnDefaultExpression:{DescID: 104, ColumnID: 4, ReferencedSequenceIDs: [105]}, ABSENT], PUBLIC] - {columnId: 4, expr: 'nextval(105:::REGCLASS)', tableId: 104, usesSequenceIds: [105]} -- [[SequenceOwner:{DescID: 104, ColumnID: 4, ReferencedDescID: 105}, ABSENT], PUBLIC] - {columnId: 4, sequenceId: 105, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] - {columnId: 1, indexId: 1, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 1}, ABSENT], PUBLIC] - {columnId: 2, indexId: 1, kind: STORED, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 1}, ABSENT], PUBLIC] - {columnId: 3, indexId: 1, kind: STORED, ordinalInKind: 1, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 4, IndexID: 1}, ABSENT], PUBLIC] - {columnId: 4, indexId: 1, kind: STORED, ordinalInKind: 2, tableId: 104} -- [[PrimaryIndex:{DescID: 104, IndexID: 1, ConstraintID: 1}, ABSENT], PUBLIC] - {constraintId: 1, indexId: 1, isUnique: true, tableId: 104} -- [[IndexName:{DescID: 104, Name: t_pkey, IndexID: 1}, ABSENT], PUBLIC] - {indexId: 1, name: t_pkey, tableId: 104} -- [[IndexData:{DescID: 104, IndexID: 1}, ABSENT], PUBLIC] - {indexId: 1, tableId: 104} - [[Namespace:{DescID: 105, Name: t_l_seq, ReferencedDescID: 100}, ABSENT], PUBLIC] {databaseId: 100, descriptorId: 105, name: t_l_seq, schemaId: 101} - [[Owner:{DescID: 105}, ABSENT], PUBLIC] @@ -182,25 +164,3 @@ ALTER TABLE defaultdb.t DROP COLUMN l {objectId: 105, parentSchemaId: 101} - [[TableData:{DescID: 105, ReferencedDescID: 100}, ABSENT], PUBLIC] {databaseId: 100, tableId: 105} -- [[PrimaryIndex:{DescID: 104, IndexID: 4, ConstraintID: 2, TemporaryIndexID: 5, SourceIndexID: 1}, PUBLIC], ABSENT] - {constraintId: 2, indexId: 4, isUnique: true, sourceIndexId: 1, tableId: 104, temporaryIndexId: 5} -- [[IndexName:{DescID: 104, Name: t_pkey, IndexID: 4}, PUBLIC], ABSENT] - {indexId: 4, name: t_pkey, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 4}, PUBLIC], ABSENT] - {columnId: 1, indexId: 4, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 4}, PUBLIC], ABSENT] - {columnId: 2, indexId: 4, kind: STORED, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 4}, PUBLIC], ABSENT] - {columnId: 3, indexId: 4, kind: STORED, ordinalInKind: 1, tableId: 104} -- [[IndexData:{DescID: 104, IndexID: 4}, PUBLIC], ABSENT] - {indexId: 4, tableId: 104} -- [[TemporaryIndex:{DescID: 104, IndexID: 5, ConstraintID: 3, SourceIndexID: 1}, TRANSIENT_ABSENT], ABSENT] - {constraintId: 3, indexId: 5, isUnique: true, sourceIndexId: 1, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 1, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] - {columnId: 1, indexId: 5, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] - {columnId: 2, indexId: 5, kind: STORED, tableId: 104} -- [[IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] - {columnId: 3, indexId: 5, kind: STORED, ordinalInKind: 1, tableId: 104} -- [[IndexData:{DescID: 104, IndexID: 5}, TRANSIENT_ABSENT], ABSENT] - {indexId: 5, tableId: 104} diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/constraint.go b/pkg/sql/schemachanger/scexec/scmutationexec/constraint.go index baa618f266f1..57eeed68176c 100644 --- a/pkg/sql/schemachanger/scexec/scmutationexec/constraint.go +++ b/pkg/sql/schemachanger/scexec/scmutationexec/constraint.go @@ -58,7 +58,7 @@ func (m *visitor) MakeAbsentCheckConstraintWriteOnly( // is syntactically valid in the builder, so we just need to // enqueue it to the descriptor's mutation slice. ck := &descpb.TableDescriptor_CheckConstraint{ - Expr: string(op.Expr), + Expr: string(op.CheckExpr), Name: tabledesc.ConstraintNamePlaceholder(op.ConstraintID), Validity: descpb.ConstraintValidity_Validating, ColumnIDs: op.ColumnIDs, @@ -353,9 +353,7 @@ func (m *visitor) MakeAbsentUniqueWithoutIndexConstraintWriteOnly( Name: tabledesc.ConstraintNamePlaceholder(op.ConstraintID), Validity: descpb.ConstraintValidity_Validating, ConstraintID: op.ConstraintID, - } - if op.Predicate != nil { - uwi.Predicate = string(op.Predicate.Expr) + Predicate: string(op.PartialExpr), } if err = enqueueAddUniqueWithoutIndexConstraintMutation(tbl, uwi); err != nil { return err diff --git a/pkg/sql/schemachanger/scop/mutation.go b/pkg/sql/schemachanger/scop/mutation.go index cbc3ebe629aa..3ffd20aef7fd 100644 --- a/pkg/sql/schemachanger/scop/mutation.go +++ b/pkg/sql/schemachanger/scop/mutation.go @@ -298,10 +298,10 @@ type RemoveCheckConstraint struct { // to the table in the WRITE_ONLY state. type MakeAbsentCheckConstraintWriteOnly struct { mutationOp - TableID descpb.ID - ConstraintID descpb.ConstraintID - ColumnIDs []descpb.ColumnID - scpb.Expression + TableID descpb.ID + ConstraintID descpb.ConstraintID + ColumnIDs []descpb.ColumnID + CheckExpr catpb.Expression FromHashShardedColumn bool } @@ -375,7 +375,7 @@ type MakeAbsentUniqueWithoutIndexConstraintWriteOnly struct { TableID descpb.ID ConstraintID descpb.ConstraintID ColumnIDs []descpb.ColumnID - Predicate *scpb.Expression + PartialExpr catpb.Expression } // MakeValidatedUniqueWithoutIndexConstraintPublic moves a new, validated unique_without_index diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel index 59018a261628..ea41b8443b8a 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel +++ b/pkg/sql/schemachanger/scplan/internal/opgen/BUILD.bazel @@ -67,6 +67,7 @@ go_library( deps = [ "//pkg/clusterversion", "//pkg/sql/catalog", + "//pkg/sql/catalog/catpb", "//pkg/sql/catalog/descpb", "//pkg/sql/catalog/tabledesc", "//pkg/sql/schemachanger/rel", diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_check_constraint.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_check_constraint.go index 3d3687195e9a..3ae443e1b7a6 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_check_constraint.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_check_constraint.go @@ -25,7 +25,7 @@ func init() { TableID: this.TableID, ConstraintID: this.ConstraintID, ColumnIDs: this.ColumnIDs, - Expression: this.Expression, + CheckExpr: this.Expr, FromHashShardedColumn: this.FromHashShardedColumn, } }), diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_unique_without_index_constraint.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_unique_without_index_constraint.go index 5a822e52cc87..a9211591a31a 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_unique_without_index_constraint.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_unique_without_index_constraint.go @@ -11,6 +11,7 @@ package opgen import ( + "github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb" "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scop" "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb" ) @@ -21,11 +22,15 @@ func init() { scpb.Status_ABSENT, to(scpb.Status_WRITE_ONLY, emit(func(this *scpb.UniqueWithoutIndexConstraint) *scop.MakeAbsentUniqueWithoutIndexConstraintWriteOnly { + var partialExpr catpb.Expression + if this.Predicate != nil { + partialExpr = this.Predicate.Expr + } return &scop.MakeAbsentUniqueWithoutIndexConstraintWriteOnly{ TableID: this.TableID, ConstraintID: this.ConstraintID, ColumnIDs: this.ColumnIDs, - Predicate: this.Predicate, + PartialExpr: partialExpr, } }), emit(func(this *scpb.UniqueWithoutIndexConstraint) *scop.UpdateTableBackReferencesInTypes { diff --git a/pkg/sql/schemachanger/scplan/internal/rules/current/dep_drop_object.go b/pkg/sql/schemachanger/scplan/internal/rules/current/dep_drop_object.go index 7a9227aba6b0..f430dfcfa555 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/current/dep_drop_object.go +++ b/pkg/sql/schemachanger/scplan/internal/rules/current/dep_drop_object.go @@ -45,6 +45,7 @@ func init() { StatusesToAbsent(from, scpb.Status_TXN_DROPPED, to, scpb.Status_DROPPED), } }) + registerDepRule( "descriptor DROPPED in transaction before removal", scgraph.PreviousTransactionPrecedence, @@ -68,9 +69,9 @@ func init() { to.TypeFilter(IsSimpleDependent), JoinOnDescID(from, to, "desc-id"), StatusesToAbsent(from, scpb.Status_DROPPED, to, scpb.Status_ABSENT), - FromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL(from.Target, from.El, to.El), } - }) + }, + ) } // These rules ensure that cross-referencing simple dependent elements reach diff --git a/pkg/sql/schemachanger/scplan/internal/rules/current/testdata/deprules b/pkg/sql/schemachanger/scplan/internal/rules/current/testdata/deprules index f7adc6f90e53..70e716806cd7 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/current/testdata/deprules +++ b/pkg/sql/schemachanger/scplan/internal/rules/current/testdata/deprules @@ -18,13 +18,6 @@ DescriptorIsNotBeingDropped($element): ToPublicOrTransient($target1, $target2): - $target1[TargetStatus] IN [PUBLIC, TRANSIENT_ABSENT] - $target2[TargetStatus] IN [PUBLIC, TRANSIENT_ABSENT] -fromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL($fromTarget, $fromEl, $toEl): - not-join: - - $fromEl[Type] = '*scpb.Table' - - $toEl[Type] = '*scpb.RowLevelTTL' - - $n[Type] = '*screl.Node' - - $n[Target] = $fromTarget - - nodeHasNoPublicStatus($n) joinOnColumnID($a, $b, $desc-id, $col-id): - joinOnDescID($a, $b, $desc-id) - $a[ColumnID] = $col-id @@ -51,10 +44,6 @@ joinTargetNode($element, $target, $node): - joinTarget($element, $target) - $node[Type] = '*screl.Node' - $node[Target] = $target -nodeHasNoPublicStatus($n): - not-join: - - $public = PUBLIC - - $n[CurrentStatus] = $public nodeNotExistsWithStatusIn_BACKFILLED_BACKFILL_ONLY($sharedTarget): not-join: - $n[Type] = '*screl.Node' @@ -2079,7 +2068,6 @@ deprules - toAbsent($descriptor-Target, $dependent-Target) - $descriptor-Node[CurrentStatus] = DROPPED - $dependent-Node[CurrentStatus] = ABSENT - - fromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL($descriptor-Target, $descriptor, $dependent) - joinTargetNode($descriptor, $descriptor-Target, $descriptor-Node) - joinTargetNode($dependent, $dependent-Target, $dependent-Node) - name: descriptor drop right before removing dependent with attr ref diff --git a/pkg/sql/schemachanger/scplan/internal/rules/current/testdata/oprules b/pkg/sql/schemachanger/scplan/internal/rules/current/testdata/oprules index 988fd71b6a99..b9054d7fcf8a 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/current/testdata/oprules +++ b/pkg/sql/schemachanger/scplan/internal/rules/current/testdata/oprules @@ -18,13 +18,6 @@ DescriptorIsNotBeingDropped($element): ToPublicOrTransient($target1, $target2): - $target1[TargetStatus] IN [PUBLIC, TRANSIENT_ABSENT] - $target2[TargetStatus] IN [PUBLIC, TRANSIENT_ABSENT] -fromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL($fromTarget, $fromEl, $toEl): - not-join: - - $fromEl[Type] = '*scpb.Table' - - $toEl[Type] = '*scpb.RowLevelTTL' - - $n[Type] = '*screl.Node' - - $n[Target] = $fromTarget - - nodeHasNoPublicStatus($n) joinOnColumnID($a, $b, $desc-id, $col-id): - joinOnDescID($a, $b, $desc-id) - $a[ColumnID] = $col-id @@ -51,10 +44,6 @@ joinTargetNode($element, $target, $node): - joinTarget($element, $target) - $node[Type] = '*screl.Node' - $node[Target] = $target -nodeHasNoPublicStatus($n): - not-join: - - $public = PUBLIC - - $n[CurrentStatus] = $public nodeNotExistsWithStatusIn_BACKFILLED_BACKFILL_ONLY($sharedTarget): not-join: - $n[Type] = '*screl.Node' diff --git a/pkg/sql/schemachanger/scplan/internal/rules/helpers.go b/pkg/sql/schemachanger/scplan/internal/rules/helpers.go index fd055294ef89..e389328e4a44 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/helpers.go +++ b/pkg/sql/schemachanger/scplan/internal/rules/helpers.go @@ -524,33 +524,6 @@ var descriptorIsNotBeingDropped = screl.Schema.DefNotJoin1( }, ) -// FromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL creates -// a clause which leads to the outer clause failing to unify -// if the passed element `from` is a Table, `to` is a RowLevelTTl, -// and there does not exist a Node with the same Target as -// `fromTarget` in PUBLIC status. -// It is used to suppress rule "descriptor drop right before dependent element removal" -// for the special case where we drop a rowLevelTTL table in mixed -// version state for forward compatibility (issue #86672). -var FromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL = screl.Schema.DefNotJoin3( - "fromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL", - "fromTarget", "fromEl", "toEl", func(fromTarget, fromEl, toEl rel.Var) rel.Clauses { - n := rel.Var("n") - return rel.Clauses{ - fromEl.Type((*scpb.Table)(nil)), - toEl.Type((*scpb.RowLevelTTL)(nil)), - n.Type((*screl.Node)(nil)), - n.AttrEqVar(screl.Target, fromTarget), - screl.Schema.DefNotJoin1("nodeHasNoPublicStatus", "n", func(n rel.Var) rel.Clauses { - public := rel.Var("public") - return rel.Clauses{ - public.Eq(scpb.Status_PUBLIC), - n.AttrEqVar(screl.CurrentStatus, public), - } - })(n), - } - }) - // notJoinOnNodeWithStatusIn is a cache to memoize getNotJoinOnNodeWithStatusIn. var notJoinOnNodeWithStatusIn = map[string]rel.Rule1{} diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/BUILD.bazel b/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/BUILD.bazel index b92fce58ef28..5228fe6f6523 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/BUILD.bazel +++ b/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/BUILD.bazel @@ -18,6 +18,7 @@ go_library( "op_drop.go", "op_index_and_column.go", "registry.go", + "release_22_2_helpers.go", ], importpath = "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/rules/release_22_2", visibility = ["//pkg/sql/schemachanger/scplan:__subpackages__"], diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/release_22_2_helpers.go b/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/release_22_2_helpers.go new file mode 100644 index 000000000000..adea8c5c9587 --- /dev/null +++ b/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/release_22_2_helpers.go @@ -0,0 +1,44 @@ +// Copyright 2023 The Cockroach Authors. +// +// Use of this software is governed by the Business Source License +// included in the file licenses/BSL.txt. +// +// As of the Change Date specified in that file, in accordance with +// the Business Source License, use of this software will be governed +// by the Apache License, Version 2.0, included in the file +// licenses/APL.txt. + +package release_22_2 + +import ( + "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/rel" + "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb" + "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/screl" +) + +// FromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL creates +// a clause which leads to the outer clause failing to unify +// if the passed element `from` is a Table, `to` is a RowLevelTTl, +// and there does not exist a Node with the same Target as +// `fromTarget` in PUBLIC status. +// It is used to suppress rule "descriptor drop right before dependent element removal" +// for the special case where we drop a rowLevelTTL table in mixed +// version state for forward compatibility (issue #86672). +var FromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL = screl.Schema.DefNotJoin3( + "fromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL", + "fromTarget", "fromEl", "toEl", func(fromTarget, fromEl, toEl rel.Var) rel.Clauses { + n := rel.Var("n") + return rel.Clauses{ + fromEl.Type((*scpb.Table)(nil)), + toEl.Type((*scpb.RowLevelTTL)(nil)), + n.Type((*screl.Node)(nil)), + n.AttrEqVar(screl.Target, fromTarget), + screl.Schema.DefNotJoin1("nodeHasNoPublicStatus", "n", func(n rel.Var) rel.Clauses { + public := rel.Var("public") + return rel.Clauses{ + public.Eq(scpb.Status_PUBLIC), + n.AttrEqVar(screl.CurrentStatus, public), + } + })(n), + } + }) diff --git a/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/rules_test.go b/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/rules_test.go index 99382dcb5e58..054d1be359bb 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/rules_test.go +++ b/pkg/sql/schemachanger/scplan/internal/rules/release_22_2/rules_test.go @@ -35,7 +35,7 @@ func TestRulesYAML(t *testing.T) { screl.Schema.ForEachRule(func(def rel.RuleDef) { s = append(s, def) }) - sort.Slice(s, func(i, j int) bool { + sort.SliceStable(s, func(i, j int) bool { return s[i].Name < s[j].Name }) for _, def := range s { diff --git a/pkg/sql/schemachanger/scplan/plan_explain.go b/pkg/sql/schemachanger/scplan/plan_explain.go index 6e7cfbcce502..b1bc8ba18178 100644 --- a/pkg/sql/schemachanger/scplan/plan_explain.go +++ b/pkg/sql/schemachanger/scplan/plan_explain.go @@ -110,11 +110,20 @@ func (p Plan) explain(style treeprinter.Style) (string, error) { if p.InRollback { sb.WriteString("rolling back ") } - for _, stmt := range p.Statements { - sb.WriteString(strings.TrimSuffix(stmt.RedactedStatement, ";")) - sb.WriteString("; ") + lastStmt := p.Statements[len(p.Statements)-1].RedactedStatement + sb.WriteString(strings.TrimSuffix(lastStmt, ";")) + if len(p.Statements) > 1 { + sb.WriteString("; following ") + for i, stmt := range p.Statements[:len(p.Statements)-1] { + if i > 0 { + sb.WriteString("; ") + } + sb.WriteString(strings.TrimSuffix(stmt.RedactedStatement, ";")) + } } + sb.WriteString(";") } + root := tp.Child(sb.String()) var pn treeprinter.Node for i, s := range p.Stages { diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check index b797c2a58843..54fc28a5a2c5 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_check @@ -10,7 +10,11 @@ StatementPhase stage 1 of 1 with 1 MutationType op [[CheckConstraint:{DescID: 104, IndexID: 0, ConstraintID: 2}, PUBLIC], ABSENT] -> WRITE_ONLY ops: *scop.MakeAbsentCheckConstraintWriteOnly - {} + CheckExpr: i > 0:::INT8 + ColumnIDs: + - 1 + ConstraintID: 2 + TableID: 104 PreCommitPhase stage 1 of 1 with 2 MutationType ops transitions: ops: diff --git a/pkg/sql/schemachanger/testdata/explain/add_column b/pkg/sql/schemachanger/testdata/explain/add_column index 13854876244d..4b446c528154 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column +++ b/pkg/sql/schemachanger/testdata/explain/add_column @@ -6,7 +6,7 @@ CREATE SEQUENCE db.public.sq1; /* test */ EXPLAIN (ddl) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; ---- -Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 8 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_1_of_7 index 7272258a7475..fc0f5a16f020 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_1_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_2_of_7 index f72487005c1a..679ef5e89005 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_2_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_3_of_7 index a2407e87aa7a..4c9c770b621d 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_3_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_4_of_7 index e457ac3226f9..adf462b30551 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_4_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_5_of_7 index 8e36c10cd2d8..17c97e20d679 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_5_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_6_of_7 index 2747a3c9c05a..d0f04b0efbcd 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_6_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_7_of_7 index 1879ea2f43f9..72deb7d8006e 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column.rollback_7_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq index 5b221d0a4cae..64f58345c27d 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq @@ -6,7 +6,7 @@ CREATE SEQUENCE db.public.sq1; /* test */ EXPLAIN (ddl) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); ---- -Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 8 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_1_of_7 index 3c920c24e9ba..98428962a8ee 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_1_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_2_of_7 index 4b3def1afdcb..c64dd1eeff7f 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_2_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_3_of_7 index 1f007c9eb5ea..e837c8f61699 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_3_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_4_of_7 index 2500c6f919e7..c7e4d9072395 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_4_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_5_of_7 index 1cb3438a46b6..32f1955f9d2c 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_5_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_6_of_7 index a51956b9e271..d2832aee89a5 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_6_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_7_of_7 index c02ac0477679..b55454d8c665 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_seq.rollback_7_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique index cd3dcf985a82..a8958b4c8004 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique @@ -5,7 +5,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); /* test */ EXPLAIN (ddl) ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); ---- -Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 8 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_10_of_15 index e3c31135e53c..3d78b3e1ef5b 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_10_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_11_of_15 index 19b2367fb81a..9f67d4ff540b 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_11_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_12_of_15 index 26b0d9b17afb..aaa9c984df6b 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_12_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_13_of_15 index 573d2ddfbe13..26f6a2e88743 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_13_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_14_of_15 index 0874b911ec3f..a223f8fafe68 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_14_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_15_of_15 index 904564810fca..1bbb0a2f562d 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_15_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_1_of_15 index 67ce5121da6a..f954285aeb36 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_1_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 11 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_2_of_15 index 67c618bd2ba8..eb1968a76e6a 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_2_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_3_of_15 index 11d9db7136e8..e8ac2f737b10 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_3_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_4_of_15 index e5a815c07a0a..9f34ff4acb4d 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_4_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_5_of_15 index 0855fef5b50c..b857737bf531 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_5_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_6_of_15 index 73bf16bd140f..f23a52df608c 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_6_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_7_of_15 index a7af0abaf702..4b058b7c2586 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_7_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_8_of_15 index defe9cc62d2c..c36de4415376 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_8_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_9_of_15 index 284bc2fa378e..ecd5bd465441 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_default_unique.rollback_9_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_no_default b/pkg/sql/schemachanger/testdata/explain/add_column_no_default index 8a7a1c7398fa..05964fabdeb2 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_no_default +++ b/pkg/sql/schemachanger/testdata/explain/add_column_no_default @@ -5,7 +5,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); /* test */ EXPLAIN (ddl) ALTER TABLE db.public.tbl ADD COLUMN j INT; ---- -Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8; +Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_1_of_1 b/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_1_of_1 index e008c65cc8eb..53e79c759719 100644 --- a/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_1_of_1 +++ b/pkg/sql/schemachanger/testdata/explain/add_column_no_default.rollback_1_of_1 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT; EXPLAIN (ddl) rollback at post-commit stage 1 of 1; ---- -Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8; +Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 4 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla index c3de41458f8b..c20113406bde 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla @@ -5,13 +5,13 @@ CREATE TABLE t (i INT PRIMARY KEY); EXPLAIN (ddl) ALTER TABLE t ADD CHECK (i > 0) ---; ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CHECK (‹i› > ‹0›); +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CHECK (‹i› > ‹0›); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 1 element transitioning toward PUBLIC │ │ └── ABSENT → WRITE_ONLY CheckConstraint:{DescID: 104, IndexID: 0, ConstraintID: 2} │ └── 1 Mutation operation - │ └── MakeAbsentCheckConstraintWriteOnly + │ └── MakeAbsentCheckConstraintWriteOnly {"CheckExpr":"i \u003e 0:::INT8","ConstraintID":2,"TableID":104} ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ └── 2 Mutation operations diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla.rollback_1_of_2 index 669d218f53d8..6efdcf37e6e2 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla.rollback_1_of_2 @@ -6,7 +6,7 @@ ALTER TABLE t ADD CHECK (i > 0) ---; EXPLAIN (ddl) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla.rollback_2_of_2 index 16de93cd5f58..e6abbc38bbe0 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_vanilla.rollback_2_of_2 @@ -6,7 +6,7 @@ ALTER TABLE t ADD CHECK (i > 0) ---; EXPLAIN (ddl) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt index cfbd152944c5..27b427b94d78 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt @@ -6,13 +6,13 @@ CREATE TABLE t (i INT PRIMARY KEY, j STRING); /* test */ EXPLAIN (ddl) ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a'); ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 1 element transitioning toward PUBLIC │ │ └── ABSENT → WRITE_ONLY CheckConstraint:{DescID: 107, ReferencedTypeIDs: [105 106], IndexID: 0, ConstraintID: 2, ReferencedSequenceIDs: [104]} │ └── 3 Mutation operations - │ ├── MakeAbsentCheckConstraintWriteOnly + │ ├── MakeAbsentCheckConstraintWriteOnly {"CheckExpr":"(i \u003e nextval(104...","ConstraintID":2,"TableID":107} │ ├── UpdateTableBackReferencesInTypes {"BackReferencedTableID":107} │ └── UpdateBackReferencesInSequences {"BackReferencedTableID":107} ├── PreCommitPhase diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt.rollback_1_of_2 index dc9b53219401..1e8f94739ea7 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt.rollback_1_of_2 @@ -7,7 +7,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j STRING); ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a'); EXPLAIN (ddl) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt.rollback_2_of_2 index b007cf9be0ab..38e43ec17c55 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_check_with_seq_and_udt.rollback_2_of_2 @@ -7,7 +7,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j STRING); ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a'); EXPLAIN (ddl) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key b/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key index f1e50a614857..592718156c20 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key @@ -5,7 +5,7 @@ CREATE TABLE t2 (i INT PRIMARY KEY); /* test */ EXPLAIN (ddl) ALTER TABLE t1 ADD FOREIGN KEY (i) REFERENCES t2(i); ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.‹public›.‹t2› (‹i›); +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.‹public›.‹t2› (‹i›); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key.rollback_1_of_2 index f135aa1e6247..ec1f54603731 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key.rollback_1_of_2 @@ -6,7 +6,7 @@ CREATE TABLE t2 (i INT PRIMARY KEY); ALTER TABLE t1 ADD FOREIGN KEY (i) REFERENCES t2(i); EXPLAIN (ddl) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key.rollback_2_of_2 index 66f0b3181bf8..ed38dff2d1b2 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_foreign_key.rollback_2_of_2 @@ -6,7 +6,7 @@ CREATE TABLE t2 (i INT PRIMARY KEY); ALTER TABLE t1 ADD FOREIGN KEY (i) REFERENCES t2(i); EXPLAIN (ddl) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid index 8157b6169935..7eab6d4bd36a 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid @@ -4,7 +4,7 @@ CREATE TABLE t (a INT NOT NULL); /* test */ EXPLAIN (ddl) alter table t add primary key (a); ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIMARY KEY (‹a›); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 index 0e8e0c7e1c1b..198b3a75119f 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 index 0a52a4e30354..01541d0fe0de 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 index c8ce547f7665..e28e149a456e 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 index 76097077a791..8f65b1c10844 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 index 0e20871f94a5..4896a6a0d3e6 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 index 300f232e2f15..f81e5f31681e 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 index 60fbe088e4da..054be41c6646 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 index a11b193836b7..9a2122ed8605 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 index e46cd35a7bcd..14fd22240ae2 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 index 3b4a3a54c926..db07b73c6cf9 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 index db7b08baca5d..d8521b35951e 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 index 788a6818af54..7c45d967e93e 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 index 052012555096..4d6987645397 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 index feb488af5ca0..713f962a3060 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 index 9cfe2af3d1b9..e6fead0d0675 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index b/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index index 7a9dc00094c2..b7e2bbbc4f41 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index @@ -5,7 +5,7 @@ SET experimental_enable_unique_without_index_constraints = true; /* test */ EXPLAIN (ddl) ALTER TABLE t ADD UNIQUE WITHOUT INDEX (j); ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 1 element transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index.rollback_1_of_2 index aaef8a063504..50da00569aee 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index.rollback_1_of_2 @@ -6,7 +6,7 @@ SET experimental_enable_unique_without_index_constraints = true; ALTER TABLE t ADD UNIQUE WITHOUT INDEX (j); EXPLAIN (ddl) rollback at post-commit stage 1 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index.rollback_2_of_2 index 92066dcd8338..0d35284f8d81 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_add_unique_without_index.rollback_2_of_2 @@ -6,7 +6,7 @@ SET experimental_enable_unique_without_index_constraints = true; ALTER TABLE t ADD UNIQUE WITHOUT INDEX (j); EXPLAIN (ddl) rollback at post-commit stage 2 of 2; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid index a489b3330a5b..3bbc86874a51 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid @@ -4,7 +4,7 @@ CREATE TABLE t (a INT NOT NULL); /* test */ EXPLAIN (ddl) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 index 023ac38e0387..c4392fb90aee 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 index d16327fa4656..2174ea1548c6 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 index f30efd9f1473..ba4fbe99c675 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 index 776d969461a8..b05a04a253c6 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 index 83913ab8284e..a92fc226690c 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 index a9abff972616..0a25c37c93fb 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 index 05651f009e33..64fafc79223a 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 index 5eaef431e8ea..438409302183 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 index 043f79e43554..6909221951b1 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 index 562f77894c6e..10bb5b0fd536 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 index 0850cac71071..b342781fab5f 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 index baff94478065..b54440cfb903 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 index b70483100a96..203b67c6da28 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 index 8cd06a8ee431..a09972314cdb 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 index 71e53ca232ab..2101097c322a 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla index b1f747ec2a83..97099049b3ed 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla @@ -4,7 +4,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); /* test */ EXPLAIN (ddl) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 11 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_1_of_7 index 371697ed7c75..d05604cc2bf9 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_1_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 15 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_2_of_7 index efa73be43496..76ba49eea39a 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_2_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_3_of_7 index 907d510091f4..c0938ff6eef2 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_3_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_4_of_7 index bd158017c048..2eba1327831e 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_4_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_5_of_7 index 226e3742edcb..a937e3643ffb 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_5_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_6_of_7 index 292f52998c4c..43686f58d43c 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_6_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_7_of_7 index e3a07a6c2dde..5a24458d92d3 100644 --- a/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/alter_table_alter_primary_key_vanilla.rollback_7_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 13 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/create_index b/pkg/sql/schemachanger/testdata/explain/create_index index 9b4a7a6ed51a..64f28416a5e6 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index +++ b/pkg/sql/schemachanger/testdata/explain/create_index @@ -5,7 +5,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); /* test */ EXPLAIN (ddl) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); ---- -Schema change plan for CREATE INDEX ‹idx1› ON ‹defaultdb›.‹public›.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for CREATE INDEX ‹idx1› ON ‹defaultdb›.‹public›.‹t› (‹v›) WHERE (‹v› = ‹'a'›); ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 6 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_1_of_7 index b49700ef274a..7b66f6488860 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_1_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 10 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_2_of_7 index 63304501500c..353c846def7f 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_2_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_3_of_7 index df7e0644bd50..2a36b9cd1025 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_3_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_4_of_7 index 284809ee14c2..6a51f1d5aab0 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_4_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 9 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_5_of_7 index 27b16c14d93f..6864fdd1c6ed 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_5_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_6_of_7 index db27cad358b0..99b0509025e7 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_6_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_7_of_7 index 3d02d59e73a9..832dc92096a9 100644 --- a/pkg/sql/schemachanger/testdata/explain/create_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/create_index.rollback_7_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 8 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic b/pkg/sql/schemachanger/testdata/explain/drop_column_basic index 39d04acc792e..21814ff421f2 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic @@ -6,7 +6,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; /* test */ EXPLAIN (ddl) ALTER TABLE t DROP COLUMN j; ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j›; +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j›; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_1_of_7 index 17b2e8c8a07d..9b0494ba1e0e 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_1_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_2_of_7 index f7f30fae77bf..01e3106c3dbd 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_2_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_3_of_7 index 2731277837de..46a5e5fa45a1 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_3_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_4_of_7 index ff4da9d1f7d0..56ef8f74e68b 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_4_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_5_of_7 index 2c2397f8fd3f..9b0e4ef6986e 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_5_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_6_of_7 index 514e4f71d1aa..96544a415864 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_6_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_7_of_7 index b35d29bb27f6..39465446bbd1 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_basic.rollback_7_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index index f1d1b1b8a7c7..393d8c26b83c 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index @@ -4,7 +4,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); /* test */ EXPLAIN (ddl) ALTER TABLE t DROP COLUMN j CASCADE; ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_1_of_7 index 0a1cf0389d01..9c8bc2d2c43a 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_1_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_2_of_7 index a81501ed6ecc..6f552328f880 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_2_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_3_of_7 index 70996194847e..5a0c79418f94 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_3_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_4_of_7 index 7fc73a3d85f0..d54eab4e1e1a 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_4_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_5_of_7 index 9b500630e53a..1cad9b369302 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_5_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_6_of_7 index c115742ad0ac..bf48dfb0fb86 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_6_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_7_of_7 index e5ed7f9485b6..e0737864a195 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_computed_index.rollback_7_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_10_of_15 index 9912c5965fc1..d9e6b043b7f8 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_10_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 10 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_11_of_15 index a5e07bf049f6..d0864d434890 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_11_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 11 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_12_of_15 index 9245b4a49080..ee38297a93d0 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_12_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 12 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_13_of_15 index 6f3b70b86fe4..94f68eab82f9 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_13_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 13 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_14_of_15 index 7c5711e1ad13..bfc52ecab960 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_14_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 14 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_15_of_15 index cef12cbcc5a6..5f02a800cf1c 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_15_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 15 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_1_of_15 index b27afc20d5fd..6e431c434753 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_1_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 1 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_2_of_15 index 3ec8480cd952..1f1639e64b42 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_2_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 2 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_3_of_15 index 12169e6da288..81da5cad9310 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_3_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 3 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_4_of_15 index 4b14070ecc20..d8dc8c376106 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_4_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 4 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_5_of_15 index 212fd475e2f0..0cd83d935761 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_5_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 5 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_6_of_15 index 11c91449c755..0af64568bd9e 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_6_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 6 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_7_of_15 index 8339fe3ba885..1a114b11423c 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_7_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 7 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_8_of_15 index 69bab44b8b79..fd60035562ee 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_8_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 8 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_9_of_15 index 620487c24910..28c4e721f18a 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.rollback_9_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl) rollback at post-commit stage 9 of 15; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 3 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_1_of_2 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_1_of_2 index 8b3dee647060..5a6acedffb6d 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_1_of_2 @@ -4,7 +4,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, k INT DEFAULT 32 ON UPDATE 42, INDEX(( /* test */ EXPLAIN (ddl) ALTER TABLE t DROP COLUMN j CASCADE; ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_2_of_2 b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_2_of_2 index 864a87da5913..2606dd1feba3 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_create_index_separate_statements.statement_2_of_2 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, k INT DEFAULT 32 ON UPDATE 42, INDEX(( ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) CREATE UNIQUE INDEX idx ON t(k); ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.‹public›.‹t› (‹k›); +Schema change plan for CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.‹public›.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ └── 2 Mutation operations diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index index 622440173e40..4db135b0ea38 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index @@ -7,7 +7,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); /* test */ EXPLAIN (ddl) ALTER TABLE t.test DROP pi; ---- -Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN ‹pi›; +Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN ‹pi›; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 5 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_1_of_7 index 6239a8fe9f82..8a6244e7ffc7 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_1_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_2_of_7 index 604e7cc3c3f0..41517d5769c9 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_2_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_3_of_7 index 7f8c308f55ef..cf13e8b8d667 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_3_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_4_of_7 index 8279be4c609e..064cc86b27da 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_4_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_5_of_7 index fc63ae6c0357..b88bd71a3e4f 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_5_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_6_of_7 index 444536548df7..db5232534083 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_6_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_7_of_7 index b2645dae3a16..267cc565f80b 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_unique_index.rollback_7_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 2 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index index d567d9280b24..c7bea7f84d22 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index @@ -4,7 +4,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); /* test */ EXPLAIN (ddl) ALTER TABLE t DROP COLUMN j; ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j›; +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j›; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_1_of_7 index 983a5a1d8cdb..07e7246ad03f 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_1_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_2_of_7 index edcd1c5ee6d6..388c877fc5ac 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_2_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_3_of_7 index d0a65cab81ce..abb1d8ce3ce2 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_3_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_4_of_7 index 9defef9b0747..8aa01c813633 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_4_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_5_of_7 index ee5d7b9b5229..ac7641326020 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_5_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_6_of_7 index 0aafb43b5aa7..409c250e8fdd 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_6_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_7_of_7 index e0c18797a8a4..62f2b6725cde 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_column_with_index.rollback_7_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 3 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_index_hash_sharded_index b/pkg/sql/schemachanger/testdata/explain/drop_index_hash_sharded_index index c5bfabb474e5..826f916e96b3 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_index_hash_sharded_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_index_hash_sharded_index @@ -5,7 +5,7 @@ CREATE INDEX idx ON t(j) USING HASH; /* test */ EXPLAIN (ddl) DROP INDEX idx CASCADE; ---- -Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; +Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 5 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/drop_index_partial_expression_index b/pkg/sql/schemachanger/testdata/explain/drop_index_partial_expression_index index d8fc8eb9c71e..09e74699c2f0 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_index_partial_expression_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_index_partial_expression_index @@ -5,7 +5,7 @@ CREATE INDEX idx ON t(lower(j)) WHERE i > 0; /* test */ EXPLAIN (ddl) DROP INDEX idx CASCADE; ---- -Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; +Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 3 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/drop_index_vanilla_index b/pkg/sql/schemachanger/testdata/explain/drop_index_vanilla_index index d044be54ccd4..862daba196a5 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_index_vanilla_index +++ b/pkg/sql/schemachanger/testdata/explain/drop_index_vanilla_index @@ -5,7 +5,7 @@ CREATE INDEX idx ON t(j); /* test */ EXPLAIN (ddl) DROP INDEX idx CASCADE; ---- -Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; +Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/drop_index_with_materialized_view_dep b/pkg/sql/schemachanger/testdata/explain/drop_index_with_materialized_view_dep index 92581c92d0b7..e214af1a7e46 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_index_with_materialized_view_dep +++ b/pkg/sql/schemachanger/testdata/explain/drop_index_with_materialized_view_dep @@ -7,7 +7,7 @@ CREATE MATERIALIZED VIEW v3 AS SELECT j FROM v2@idx; /* test */ EXPLAIN (ddl) DROP INDEX idx CASCADE; ---- -Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹v2›@‹idx› CASCADE; +Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹v2›@‹idx› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 6 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_1_of_7 index 6a81182c30b4..f49bec21d13e 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_1_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl) rollback at post-commit stage 1 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_2_of_7 index 539eb1dfde01..0d24a66ea573 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_2_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl) rollback at post-commit stage 2 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_3_of_7 index f6fbf96ec20b..42a155eb26db 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_3_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl) rollback at post-commit stage 3 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_4_of_7 index 83f3722ac003..837a04521dab 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_4_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl) rollback at post-commit stage 4 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_5_of_7 index e408280f4d9c..dc8621e5dde0 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_5_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl) rollback at post-commit stage 5 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_6_of_7 index d4e9603200c4..a7848a88a372 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_6_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl) rollback at post-commit stage 6 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_7_of_7 index a523cfc13c89..4660ce6999ae 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.rollback_7_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl) rollback at post-commit stage 7 of 7; ---- -Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; └── PostCommitNonRevertiblePhase ├── Stage 1 of 2 in PostCommitNonRevertiblePhase │ ├── 7 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_1_of_2 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_1_of_2 index 8b3dee647060..5a6acedffb6d 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_1_of_2 @@ -4,7 +4,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, k INT DEFAULT 32 ON UPDATE 42, INDEX(( /* test */ EXPLAIN (ddl) ALTER TABLE t DROP COLUMN j CASCADE; ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 4 elements transitioning toward PUBLIC diff --git a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_2_of_2 b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_2_of_2 index 854ca0738205..ed1f893bb5d1 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain/drop_multiple_columns_separate_statements.statement_2_of_2 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, k INT DEFAULT 32 ON UPDATE 42, INDEX(( ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl) ALTER TABLE t DROP COLUMN k CASCADE; ---- -Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹k› CASCADE; +Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 2 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/drop_schema b/pkg/sql/schemachanger/testdata/explain/drop_schema index 768b6e281e2a..443312f93ce2 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_schema +++ b/pkg/sql/schemachanger/testdata/explain/drop_schema @@ -5,7 +5,7 @@ CREATE SCHEMA db.sc; /* test */ EXPLAIN (ddl) DROP SCHEMA db.sc; ---- -Schema change plan for DROP SCHEMA ‹db›.‹sc›; +Schema change plan for DROP SCHEMA ‹db›.‹sc›; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 1 element transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain/drop_table b/pkg/sql/schemachanger/testdata/explain/drop_table index fc01d308bd10..214e093f5695 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_table +++ b/pkg/sql/schemachanger/testdata/explain/drop_table @@ -8,7 +8,7 @@ CREATE TYPE db.sc.e AS ENUM('a', 'b', 'c'); /* test */ EXPLAIN (ddl) DROP TABLE db.sc.t; ---- -Schema change plan for DROP TABLE ‹db›.‹sc›.‹t›; +Schema change plan for DROP TABLE ‹db›.‹sc›.‹t›; ├── StatementPhase │ └── Stage 1 of 1 in StatementPhase │ ├── 7 elements transitioning toward ABSENT diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column b/pkg/sql/schemachanger/testdata/explain_verbose/add_column index b580ab95bf2e..e2b00d4e7a86 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column @@ -6,7 +6,7 @@ CREATE SEQUENCE db.public.sq1; /* test */ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; ---- -• Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +• Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_1_of_7 index ae29b8b17807..5616e0aebb70 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_1_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_2_of_7 index 803bca0eeead..693c1bc6a4a6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_2_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_3_of_7 index 79e4593975d7..919365db35cb 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_3_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_4_of_7 index d3b3e2cc40e7..43cc850c7eab 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_4_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_5_of_7 index 5d09699b529d..8643a0c19977 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_5_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_6_of_7 index 1c1619cf65d8..b75d8821b99d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_6_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_7_of_7 index d60c94cd6b4d..24f1351a1bc7 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column.rollback_7_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAULT 42; EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 NOT NULL DEFAULT ‹42›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq index aadb13fed1c3..58d4409c61ff 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq @@ -6,7 +6,7 @@ CREATE SEQUENCE db.public.sq1; /* test */ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); ---- -• Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +• Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_1_of_7 index 3d823ccaa42e..3fc83964cd04 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_1_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_2_of_7 index b748461e33a0..49792002a653 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_2_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_3_of_7 index b25974088032..feb62a213815 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_3_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_4_of_7 index e889f2d85b99..52871a0f79b6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_4_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_5_of_7 index bbaa39410e7a..9c42d36f7165 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_5_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_6_of_7 index 1f967b85146d..cd85add48f93 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_6_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_7_of_7 index 8f13e281b544..8b6b2833cc9a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq.rollback_7_of_7 @@ -7,7 +7,7 @@ CREATE SEQUENCE db.public.sq1; ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAULT nextval('db.public.sq1'); EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹l› INT8 NOT NULL DEFAULT nextval(‹'db.public.sq1'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique index 62a51b936661..e14d93b22d54 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique @@ -5,7 +5,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); ---- -• Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_10_of_15 index d6018a680e94..f6a22c0a694c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_10_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_11_of_15 index 9835db655408..45a290284b73 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_11_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_12_of_15 index c58ad37eec55..9b4843ff64ef 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_12_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_13_of_15 index 85d49e28a785..360428f15475 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_13_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_14_of_15 index baa905ff2543..b3ac1f948357 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_14_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_15_of_15 index 60ac47811791..288464145e5d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_15_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_1_of_15 index ea8e5b239120..d82b908baca7 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_1_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_2_of_15 index 07193aa227cd..b9cc34c13bc1 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_2_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_3_of_15 index 4d2366d8b188..14c536b0fbb5 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_3_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_4_of_15 index a173d3c79144..e9d6c1aea53d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_4_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_5_of_15 index 416f345284fd..86bcf6ffe16e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_5_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_6_of_15 index b128ac6532c8..f16e944fbbb6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_6_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_7_of_15 index 44810cc8c2a1..82f1a6be100e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_7_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_8_of_15 index 325e14e1f8ba..65102ac67f76 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_8_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_9_of_15 index e34259e7338a..2aee1a65324d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_unique.rollback_9_of_15 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT UNIQUE DEFAULT CAST(date_part('year', now()) AS INT); EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8 UNIQUE DEFAULT CAST(date_part(‹'year'›, now()) AS INT8); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default index 46c8f50fedeb..d9c3b4cc8ace 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default @@ -5,7 +5,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT; ---- -• Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8; +• Schema change plan for ALTER TABLE ‹db›.‹public›.‹tbl› ADD COLUMN ‹j› INT8; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_1 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_1 index c7ff27303055..c07a286b62ec 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_1 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_1 @@ -6,7 +6,7 @@ CREATE TABLE db.public.tbl (i INT PRIMARY KEY); ALTER TABLE db.public.tbl ADD COLUMN j INT; EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 1; ---- -• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8; +• Schema change plan for rolling back ALTER TABLE ‹db›.public.‹tbl› ADD COLUMN ‹j› INT8; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla index 7ae32e037330..ad470dd8bb72 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY); EXPLAIN (ddl, verbose) ALTER TABLE t ADD CHECK (i > 0) ---; ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CHECK (‹i› > ‹0›); +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CHECK (‹i› > ‹0›); │ ├── • StatementPhase │ │ @@ -22,7 +22,11 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ADD CHECK (i > 0) │ └── • 1 Mutation operation │ │ │ └── • MakeAbsentCheckConstraintWriteOnly -│ {} +│ CheckExpr: i > 0:::INT8 +│ ColumnIDs: +│ - 1 +│ ConstraintID: 2 +│ TableID: 104 │ ├── • PreCommitPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla.rollback_1_of_2 index f52135c0771d..d5ffc5997c3e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla.rollback_1_of_2 @@ -6,7 +6,7 @@ ALTER TABLE t ADD CHECK (i > 0) ---; EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 2; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla.rollback_2_of_2 index c09bc31f4cc2..562c362aae1d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_vanilla.rollback_2_of_2 @@ -6,7 +6,7 @@ ALTER TABLE t ADD CHECK (i > 0) ---; EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 2; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK (‹i› > ‹0›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt index f33841786156..cc3aca4d51c9 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt @@ -6,7 +6,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j STRING); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a'); ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); │ ├── • StatementPhase │ │ @@ -23,7 +23,12 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a' │ └── • 3 Mutation operations │ │ │ ├── • MakeAbsentCheckConstraintWriteOnly -│ │ {} +│ │ CheckExpr: (i > nextval(104:::REGCLASS)) OR (j::@100105 = b'@':::@100105) +│ │ ColumnIDs: +│ │ - 1 +│ │ - 2 +│ │ ConstraintID: 2 +│ │ TableID: 107 │ │ │ ├── • UpdateTableBackReferencesInTypes │ │ BackReferencedTableID: 107 diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt.rollback_1_of_2 index bbf056c49355..fb87c23a48c2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt.rollback_1_of_2 @@ -7,7 +7,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j STRING); ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 2; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt.rollback_2_of_2 index dde1f6bbe2f0..9750d804d054 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_check_with_seq_and_udt.rollback_2_of_2 @@ -7,7 +7,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j STRING); ALTER TABLE t ADD CHECK (i > nextval('s') OR j::typ = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 2; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CHECK ((‹i› > nextval(‹'s'›)) OR (‹j›::‹typ› = ‹'a'›)); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key index 0ff6b0de9326..d309b9c4453b 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key @@ -5,7 +5,7 @@ CREATE TABLE t2 (i INT PRIMARY KEY); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t1 ADD FOREIGN KEY (i) REFERENCES t2(i); ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.‹public›.‹t2› (‹i›); +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.‹public›.‹t2› (‹i›); │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key.rollback_1_of_2 index 81ea88a930a3..d04bc84c6645 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key.rollback_1_of_2 @@ -6,7 +6,7 @@ CREATE TABLE t2 (i INT PRIMARY KEY); ALTER TABLE t1 ADD FOREIGN KEY (i) REFERENCES t2(i); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 2; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key.rollback_2_of_2 index 1c9c92f7a799..ee3bcf3a1ec2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_foreign_key.rollback_2_of_2 @@ -6,7 +6,7 @@ CREATE TABLE t2 (i INT PRIMARY KEY); ALTER TABLE t1 ADD FOREIGN KEY (i) REFERENCES t2(i); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 2; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t1› ADD CONSTRAINT ‹t1_i_fkey› FOREIGN KEY (‹i›) REFERENCES ‹defaultdb›.public.‹t2› (‹i›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid index b34c0583f625..b47c75567b0e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid @@ -4,7 +4,7 @@ CREATE TABLE t (a INT NOT NULL); /* test */ EXPLAIN (ddl, verbose) alter table t add primary key (a); ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD PRIMARY KEY (‹a›); │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 index babc2b374962..14aaf68460e4 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_10_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 index ef2f2114b056..c2b27ae78f00 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_11_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 index ed595f12d917..af2481eb709f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_12_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 index 948fd0ec9312..69ed2888ac62 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_13_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 index d214c4c48841..569bcc39a6af 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_14_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 index a032302f62f1..e2f8a769dace 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_15_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 index ba34ae67b643..7cac73febc4a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_1_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 index da0f0527a5f0..aec8f70e512d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_2_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 index dde275fa74a5..72510f9e3705 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_3_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 index 6f25237c7a9f..e2178d3f26c1 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_4_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 index bdc5ee13baf8..21aa35cd105d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_5_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 index 6bd409659557..5ed665618d66 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_6_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 index 60388c1fe14b..060ac289b3d2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_7_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 index d20338635bb8..ac1c87b7f69a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_8_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 index 2a4321e1820f..64bb3540de76 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_primary_key_drop_rowid.rollback_9_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); alter table t add primary key (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD PRIMARY KEY (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index index cd5de74ba90e..42c80299d604 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index @@ -5,7 +5,7 @@ SET experimental_enable_unique_without_index_constraints = true; /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t ADD UNIQUE WITHOUT INDEX (j); ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index.rollback_1_of_2 index 730d7667f052..416d332668b8 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index.rollback_1_of_2 @@ -6,7 +6,7 @@ SET experimental_enable_unique_without_index_constraints = true; ALTER TABLE t ADD UNIQUE WITHOUT INDEX (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 2; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index.rollback_2_of_2 index 3ca04f084fff..55fadec6eb85 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_add_unique_without_index.rollback_2_of_2 @@ -6,7 +6,7 @@ SET experimental_enable_unique_without_index_constraints = true; ALTER TABLE t ADD UNIQUE WITHOUT INDEX (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 2; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ADD CONSTRAINT ‹unique_j› UNIQUE WITHOUT INDEX (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid index 1022b313f082..8c07cc216997 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid @@ -4,7 +4,7 @@ CREATE TABLE t (a INT NOT NULL); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 index 2871097c4091..518ec2bdd5d6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_10_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 index d1d3206ed47e..a458c36542f7 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_11_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 index 9e7b45c2df02..9fd7d1e377e7 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_12_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 index 24874a2b63c3..add2bd22bbbe 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_13_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 index 9022dc7e5193..a80d384909e1 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_14_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 index 8db059d91034..c601fcdefdbe 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_15_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 index a7132988ffc9..0b18e6097351 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_1_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 index cbf42c884156..16316f874c20 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_2_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 index 89457acb339e..dc80eb880558 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_3_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 index 787bda8c33e0..be7b03bd9a04 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_4_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 index 9fca989b12bf..fdbedb34505d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_5_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 index 9731bb55021d..41e9350f7d40 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_6_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 index f95df8a1641e..9a7f8048e4d9 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_7_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 index 6aec45f8b3f3..5e1e747292a4 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_8_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 index 95d4185d1d1e..e3c96eec3b85 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_drop_rowid.rollback_9_of_15 @@ -5,7 +5,7 @@ CREATE TABLE t (a INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹a›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla index e810ed43b237..4f7697614e15 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla @@ -4,7 +4,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_1_of_7 index 61dd1d095d75..7542817adcda 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_1_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_2_of_7 index dda6fd330db0..1b5e9628f0f8 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_2_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_3_of_7 index c4fa5015147b..8f56d7c207a5 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_3_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_4_of_7 index ddbea539e9ce..80fe45c71c75 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_4_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_5_of_7 index 39ef3f4849ed..7ef61b063bce 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_5_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_6_of_7 index 4726e0c82bae..8c5961e406c9 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_6_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_7_of_7 index fca319b81dc1..a604760d3827 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/alter_table_alter_primary_key_vanilla.rollback_7_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT NOT NULL); ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› ALTER PRIMARY KEY USING COLUMNS (‹j›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index b/pkg/sql/schemachanger/testdata/explain_verbose/create_index index da4542c9e3bd..fd36298eadf6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index @@ -5,7 +5,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); /* test */ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); ---- -• Schema change plan for CREATE INDEX ‹idx1› ON ‹defaultdb›.‹public›.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +• Schema change plan for CREATE INDEX ‹idx1› ON ‹defaultdb›.‹public›.‹t› (‹v›) WHERE (‹v› = ‹'a'›); │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_1_of_7 index e080f6a66099..a93e2e92fbeb 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_1_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_2_of_7 index b2f7c261e7bf..69eaba81c64b 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_2_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_3_of_7 index e14b53c2351d..3436318de280 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_3_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_4_of_7 index da47a336a7c7..24d55c265e6f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_4_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_5_of_7 index f662d30c3f80..7edcf0546796 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_5_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_6_of_7 index 1acdd10aee7a..54dc2a758456 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_6_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_7_of_7 index e519d75bc203..44782bc676ea 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index.rollback_7_of_7 @@ -6,7 +6,7 @@ CREATE TABLE t (k INT PRIMARY KEY, v e NOT NULL); CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); +• Schema change plan for rolling back CREATE INDEX ‹idx1› ON ‹defaultdb›.public.‹t› (‹v›) WHERE (‹v› = ‹'a'›); │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic index a5a67ea2b915..863eb77a8f20 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic @@ -6,7 +6,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j›; +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j›; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_1_of_7 index 71d7dba1f03a..add52a5c222a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_1_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_2_of_7 index 0fd105a4e6d7..7143b248c612 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_2_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_3_of_7 index 6cd224362737..8735bc01c826 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_3_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_4_of_7 index 5429b7ca7488..25b81d93d547 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_4_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_5_of_7 index b67763c3fb45..df128287ff74 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_5_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_6_of_7 index c8c430ec771d..82b65e2bfdba 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_6_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_7_of_7 index 984e078ea2a7..5ac8ddbcd8ad 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic.rollback_7_of_7 @@ -7,7 +7,7 @@ COMMENT ON COLUMN t.j IS 'j has a comment'; ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index index cdad1662782f..23bf02307fb9 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index @@ -4,7 +4,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_1_of_7 index ef192c0deebb..757626b69bf7 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_1_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_2_of_7 index c016a292e6c4..0bfe921189c9 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_2_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_3_of_7 index 35e192388398..5973a8318d23 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_3_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_4_of_7 index f0c7c2a8de90..ca4b53eef80f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_4_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_5_of_7 index dfba714d56d8..0ef838c373cc 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_5_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_6_of_7 index f203468d675f..d11781dd5689 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_6_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_7_of_7 index 28babddca52a..3ef9b90d2ea3 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index.rollback_7_of_7 @@ -5,7 +5,7 @@ create table t (i INT PRIMARY KEY, j INT, INDEX((j+1))); ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_10_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_10_of_15 index b4889da4e252..a35fb214b1a6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_10_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_10_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_11_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_11_of_15 index b6f71945f696..41728115cb0e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_11_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_11_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_12_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_12_of_15 index 0673d9977a55..0d2a46fc59a3 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_12_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_12_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_13_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_13_of_15 index 35de8bc35042..8c2af8e473f0 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_13_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_13_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_14_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_14_of_15 index dc73124c8762..3631a22afe0d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_14_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_14_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_15_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_15_of_15 index 9d18b19b50b1..dde0f8d2896d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_15_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_15_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_1_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_1_of_15 index df96a401f2be..2d2b422aaf0f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_1_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_1_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_2_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_2_of_15 index 5895ec594902..12dbae613f59 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_2_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_2_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_3_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_3_of_15 index f5da6af4adf1..bb3bbaa10837 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_3_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_3_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_4_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_4_of_15 index b7aac6a1ec57..f8c0f8587aac 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_4_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_4_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_5_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_5_of_15 index 254adf097530..6aa70e472c84 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_5_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_5_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_6_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_6_of_15 index 194cfa1c7c24..ecee9dcab77a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_6_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_6_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_7_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_7_of_15 index 57b7a4b15ccb..7cb086d379ac 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_7_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_7_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_8_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_8_of_15 index 1d79f6628f57..6da528ff25a8 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_8_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_8_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_9_of_15 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_9_of_15 index 8dfbedb07c7b..f7c0e16abf86 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_9_of_15 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.rollback_9_of_15 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; CREATE UNIQUE INDEX idx ON t(k); EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); +• Schema change plan for rolling back CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.public.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_1_of_2 index a69edab76643..a4fd228e9e58 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_1_of_2 @@ -4,7 +4,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, k INT DEFAULT 32 ON UPDATE 42, INDEX(( /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_2_of_2 index 050ce1cb9015..c1e847c994aa 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_create_index_separate_statements.statement_2_of_2 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, k INT DEFAULT 32 ON UPDATE 42, INDEX(( ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.‹public›.‹t› (‹k›); +• Schema change plan for CREATE UNIQUE INDEX ‹idx› ON ‹defaultdb›.‹public›.‹t› (‹k›); following ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; │ ├── • PreCommitPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index index bd161ab0357d..17261317b382 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index @@ -7,7 +7,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; ---- -• Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN ‹pi›; +• Schema change plan for ALTER TABLE ‹t›.‹public›.‹test› DROP COLUMN ‹pi›; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_1_of_7 index b6dc52031754..1ce16366942a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_1_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_2_of_7 index a338f6ffe954..216556cc9216 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_2_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_3_of_7 index eb26604f1637..08cd898ba85b 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_3_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_4_of_7 index d5bb113e4543..d6392cfc1e1a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_4_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_5_of_7 index bc0230f95a55..f19f5ac60f09 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_5_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_6_of_7 index f704c0312438..71f1de0a827e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_6_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_7_of_7 index c838856cf767..a3df4e3b0fd2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index.rollback_7_of_7 @@ -8,7 +8,7 @@ ALTER TABLE t.test ADD COLUMN x DECIMAL DEFAULT (DECIMAL '1.4') CHECK (x >= 0); ALTER TABLE t.test DROP pi; EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; +• Schema change plan for rolling back ALTER TABLE ‹t›.public.‹test› DROP COLUMN ‹pi›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index index cac97c461485..67ce28e59624 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index @@ -4,7 +4,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j›; +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j›; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_1_of_7 index 5abf70cb0253..a287260d93c6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_1_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_2_of_7 index 7911e0e9f872..b234877f836c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_2_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_3_of_7 index 36e345eb56aa..ae5a8c39e0d2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_3_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_4_of_7 index c8671da39207..aaa575870bdb 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_4_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_5_of_7 index 52c81adbf38f..db9bbcc8cc17 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_5_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_6_of_7 index a10264d84d21..45119e457a9c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_6_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_7_of_7 index e5054c412442..a7f16a8bb06b 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index.rollback_7_of_7 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, INDEX (j)); ALTER TABLE t DROP COLUMN j; EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j›; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_hash_sharded_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_hash_sharded_index index 6bef9a8e3049..d09f55234ecf 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_hash_sharded_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_hash_sharded_index @@ -5,7 +5,7 @@ CREATE INDEX idx ON t(j) USING HASH; /* test */ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; ---- -• Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; +• Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_partial_expression_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_partial_expression_index index f6a23e10cedd..8f4339cc78ab 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_partial_expression_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_partial_expression_index @@ -5,7 +5,7 @@ CREATE INDEX idx ON t(lower(j)) WHERE i > 0; /* test */ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; ---- -• Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; +• Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index index 668cf5540606..f27ff5c2f981 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index @@ -5,7 +5,7 @@ CREATE INDEX idx ON t(j); /* test */ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; ---- -• Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; +• Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_with_materialized_view_dep b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_with_materialized_view_dep index 67e459fad44a..297f2fe744eb 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_with_materialized_view_dep +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_with_materialized_view_dep @@ -7,7 +7,7 @@ CREATE MATERIALIZED VIEW v3 AS SELECT j FROM v2@idx; /* test */ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; ---- -• Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹v2›@‹idx› CASCADE; +• Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹v2›@‹idx› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_1_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_1_of_7 index 70bda70e235b..dd62dac77a2a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_1_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_1_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_2_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_2_of_7 index 659874a40d8b..3a243a2e43ee 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_2_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_2_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_3_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_3_of_7 index 04defae2b749..c7c372c36ca6 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_3_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_3_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_4_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_4_of_7 index 319a80e98ce7..2c4977f841e0 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_4_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_4_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_5_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_5_of_7 index 4f15b9060d4a..070766dadaed 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_5_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_5_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_6_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_6_of_7 index f219a8a5bec8..4465633054bf 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_6_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_6_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_7_of_7 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_7_of_7 index d6f183a54902..7198934af1f4 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_7_of_7 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.rollback_7_of_7 @@ -6,7 +6,7 @@ ALTER TABLE t DROP COLUMN j CASCADE; ALTER TABLE t DROP COLUMN k CASCADE; EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; ---- -• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; +• Schema change plan for rolling back ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.public.‹t› DROP COLUMN ‹j› CASCADE; │ └── • PostCommitNonRevertiblePhase │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_1_of_2 index a69edab76643..a4fd228e9e58 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_1_of_2 @@ -4,7 +4,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, k INT DEFAULT 32 ON UPDATE 42, INDEX(( /* test */ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_2_of_2 index 4847bba3e09d..25340ef361c2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_multiple_columns_separate_statements.statement_2_of_2 @@ -5,7 +5,7 @@ CREATE TABLE t (i INT PRIMARY KEY, j INT, k INT DEFAULT 32 ON UPDATE 42, INDEX(( ALTER TABLE t DROP COLUMN j CASCADE; EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; ---- -• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹k› CASCADE; +• Schema change plan for ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹k› CASCADE; following ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema b/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema index 49a23cf513b4..75e3628f0534 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema @@ -5,7 +5,7 @@ CREATE SCHEMA db.sc; /* test */ EXPLAIN (ddl, verbose) DROP SCHEMA db.sc; ---- -• Schema change plan for DROP SCHEMA ‹db›.‹sc›; +• Schema change plan for DROP SCHEMA ‹db›.‹sc›; │ ├── • StatementPhase │ │ diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_table b/pkg/sql/schemachanger/testdata/explain_verbose/drop_table index 4e4b1862cef2..0e6c470fcd4d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_table +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_table @@ -8,7 +8,7 @@ CREATE TYPE db.sc.e AS ENUM('a', 'b', 'c'); /* test */ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; ---- -• Schema change plan for DROP TABLE ‹db›.‹sc›.‹t›; +• Schema change plan for DROP TABLE ‹db›.‹sc›.‹t›; │ ├── • StatementPhase │ │ diff --git a/pkg/storage/batch_test.go b/pkg/storage/batch_test.go index 15487975ad8e..a6312f79d640 100644 --- a/pkg/storage/batch_test.go +++ b/pkg/storage/batch_test.go @@ -20,6 +20,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/storage/enginepb" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/iterutil" @@ -856,7 +857,7 @@ func TestDecodeKey(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - e, err := Open(context.Background(), InMemory(), CacheSize(1<<20 /* 1 MiB */)) + e, err := Open(context.Background(), InMemory(), cluster.MakeClusterSettings(), CacheSize(1<<20 /* 1 MiB */)) assert.NoError(t, err) defer e.Close() diff --git a/pkg/storage/bench_data_test.go b/pkg/storage/bench_data_test.go index 6914cc0305d6..57bb9c586c94 100644 --- a/pkg/storage/bench_data_test.go +++ b/pkg/storage/bench_data_test.go @@ -19,6 +19,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/encoding" "github.com/cockroachdb/cockroach/pkg/util/hlc" @@ -103,7 +104,7 @@ func getInitialStateEngine( testutils.ReadAllFiles(filepath.Join(testRunDir, "*")) loc := Filesystem(testRunDir) - e, err := Open(ctx, loc, opts...) + e, err := Open(ctx, loc, cluster.MakeClusterSettings(), opts...) require.NoError(b, err) return engineWithLocation{Engine: e, Location: loc} } @@ -124,7 +125,7 @@ func getInitialStateEngine( } loc := Location{fs: fs} - e, err := Open(ctx, loc, opts...) + e, err := Open(ctx, loc, cluster.MakeClusterSettings(), opts...) require.NoError(b, err) return engineWithLocation{Engine: e, Location: loc} } @@ -156,7 +157,8 @@ func buildInitialState( buildFS = vfs.NewMem() var err error - e, err := Open(ctx, Location{fs: buildFS}, opts...) + e, err := Open(ctx, Location{fs: buildFS}, cluster.MakeClusterSettings(), opts...) + require.NoError(b, err) require.NoError(b, initial.Build(ctx, b, e)) diff --git a/pkg/storage/bench_pebble_test.go b/pkg/storage/bench_pebble_test.go index 728fd6034040..110ef6ff1394 100644 --- a/pkg/storage/bench_pebble_test.go +++ b/pkg/storage/bench_pebble_test.go @@ -35,8 +35,8 @@ func setupMVCCPebble(b testing.TB, dir string) Engine { peb, err := Open( context.Background(), Filesystem(dir), - CacheSize(testCacheSize), - Settings(cluster.MakeTestingClusterSettings())) + cluster.MakeTestingClusterSettings(), + CacheSize(testCacheSize)) if err != nil { b.Fatalf("could not create new pebble instance at %s: %+v", dir, err) } @@ -51,6 +51,7 @@ func setupMVCCInMemPebbleWithSeparatedIntents(b testing.TB) Engine { peb, err := Open( context.Background(), InMemory(), + cluster.MakeClusterSettings(), CacheSize(testCacheSize)) if err != nil { b.Fatalf("could not create new in-mem pebble instance: %+v", err) @@ -66,7 +67,7 @@ func setupPebbleInMemPebbleForLatestRelease(b testing.TB, _ string) Engine { b.Fatalf("failed to set current cluster version: %+v", err) } - peb, err := Open(ctx, InMemory(), CacheSize(testCacheSize), Settings(s)) + peb, err := Open(ctx, InMemory(), s, CacheSize(testCacheSize)) if err != nil { b.Fatalf("could not create new in-mem pebble instance: %+v", err) } diff --git a/pkg/storage/bench_test.go b/pkg/storage/bench_test.go index 22374aa05051..db02a0893085 100644 --- a/pkg/storage/bench_test.go +++ b/pkg/storage/bench_test.go @@ -663,7 +663,7 @@ func loadTestData(dir string, numKeys, numBatches, batchTimeSpan, valueBytes int eng, err := Open( context.Background(), Filesystem(dir), - Settings(cluster.MakeTestingClusterSettings())) + cluster.MakeTestingClusterSettings()) if err != nil { return nil, err } diff --git a/pkg/storage/disk_map_test.go b/pkg/storage/disk_map_test.go index 1198ca0958e4..d8c4da4dba15 100644 --- a/pkg/storage/disk_map_test.go +++ b/pkg/storage/disk_map_test.go @@ -21,6 +21,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/base" "github.com/cockroachdb/cockroach/pkg/kv/kvserver/diskmap" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/datapathutils" "github.com/cockroachdb/cockroach/pkg/testutils/skip" @@ -173,7 +174,10 @@ func TestPebbleMap(t *testing.T) { dir, cleanup := testutils.TempDir(t) defer cleanup() - e, _, err := NewPebbleTempEngine(ctx, base.TempStorageConfig{Path: dir}, base.StoreSpec{}) + e, _, err := NewPebbleTempEngine(ctx, base.TempStorageConfig{ + Path: dir, + Settings: cluster.MakeClusterSettings(), + }, base.StoreSpec{}) if err != nil { t.Fatal(err) } @@ -189,7 +193,10 @@ func TestPebbleMultiMap(t *testing.T) { dir, cleanup := testutils.TempDir(t) defer cleanup() - e, _, err := NewPebbleTempEngine(ctx, base.TempStorageConfig{Path: dir}, base.StoreSpec{}) + e, _, err := NewPebbleTempEngine(ctx, base.TempStorageConfig{ + Path: dir, + Settings: cluster.MakeClusterSettings(), + }, base.StoreSpec{}) if err != nil { t.Fatal(err) } @@ -205,7 +212,10 @@ func TestPebbleMapClose(t *testing.T) { ctx := context.Background() dir, cleanup := testutils.TempDir(t) defer cleanup() - e, _, err := newPebbleTempEngine(ctx, base.TempStorageConfig{Path: dir}, base.StoreSpec{}) + e, _, err := newPebbleTempEngine(ctx, base.TempStorageConfig{ + Path: dir, + Settings: cluster.MakeClusterSettings(), + }, base.StoreSpec{}) if err != nil { t.Fatal(err) } @@ -309,7 +319,10 @@ func TestPebbleMapClose(t *testing.T) { func BenchmarkPebbleMapWrite(b *testing.B) { dir := b.TempDir() ctx := context.Background() - tempEngine, _, err := NewPebbleTempEngine(ctx, base.TempStorageConfig{Path: dir}, base.DefaultTestStoreSpec) + tempEngine, _, err := NewPebbleTempEngine(ctx, base.TempStorageConfig{ + Path: dir, + Settings: cluster.MakeClusterSettings(), + }, base.DefaultTestStoreSpec) if err != nil { b.Fatal(err) } @@ -347,7 +360,10 @@ func BenchmarkPebbleMapIteration(b *testing.B) { skip.UnderShort(b) dir := b.TempDir() ctx := context.Background() - tempEngine, _, err := NewPebbleTempEngine(ctx, base.TempStorageConfig{Path: dir}, base.DefaultTestStoreSpec) + tempEngine, _, err := NewPebbleTempEngine(ctx, base.TempStorageConfig{ + Path: dir, + Settings: cluster.MakeClusterSettings(), + }, base.DefaultTestStoreSpec) if err != nil { b.Fatal(err) } diff --git a/pkg/storage/engine_test.go b/pkg/storage/engine_test.go index 19451058c2eb..4082c75086a1 100644 --- a/pkg/storage/engine_test.go +++ b/pkg/storage/engine_test.go @@ -523,7 +523,7 @@ func TestEngineMustExist(t *testing.T) { tempDir, dirCleanupFn := testutils.TempDir(t) defer dirCleanupFn() - _, err := Open(context.Background(), Filesystem(tempDir), MustExist) + _, err := Open(context.Background(), Filesystem(tempDir), cluster.MakeClusterSettings(), MustExist) if err == nil { t.Fatal("expected error related to missing directory") } @@ -1001,7 +1001,7 @@ func TestCreateCheckpoint(t *testing.T) { db, err := Open( context.Background(), Filesystem(dir), - Settings(cluster.MakeTestingClusterSettings())) + cluster.MakeTestingClusterSettings()) assert.NoError(t, err) defer db.Close() @@ -1219,7 +1219,7 @@ func TestEngineFSFileNotFoundError(t *testing.T) { dir, dirCleanup := testutils.TempDir(t) defer dirCleanup() - db, err := Open(context.Background(), Filesystem(dir), CacheSize(testCacheSize)) + db, err := Open(context.Background(), Filesystem(dir), cluster.MakeClusterSettings(), CacheSize(testCacheSize)) require.NoError(t, err) defer db.Close() @@ -1283,7 +1283,7 @@ func TestFS(t *testing.T) { } for name, loc := range engineDest { t.Run(name, func(t *testing.T) { - fs, err := Open(context.Background(), loc, CacheSize(testCacheSize), ForTesting) + fs, err := Open(context.Background(), loc, cluster.MakeClusterSettings(), CacheSize(testCacheSize), ForTesting) require.NoError(t, err) defer fs.Close() @@ -1348,7 +1348,7 @@ func TestGetIntent(t *testing.T) { defer log.Scope(t).Close(t) ctx := context.Background() - reader, err := Open(ctx, InMemory(), CacheSize(1<<20 /* 1 MiB */)) + reader, err := Open(ctx, InMemory(), cluster.MakeClusterSettings(), CacheSize(1<<20 /* 1 MiB */)) require.NoError(t, err) defer reader.Close() @@ -1437,7 +1437,7 @@ func TestScanIntents(t *testing.T) { "1000 bytes": {keys[0], maxKey, 0, 1000, keys}, } - eng, err := Open(ctx, InMemory(), CacheSize(1<<20 /* 1 MiB */)) + eng, err := Open(ctx, InMemory(), cluster.MakeClusterSettings(), CacheSize(1<<20 /* 1 MiB */)) require.NoError(t, err) defer eng.Close() @@ -2044,7 +2044,10 @@ func TestEngineRangeKeysUnsupported(t *testing.T) { version := clusterversion.ByKey(clusterversion.V22_2EnsurePebbleFormatVersionRangeKeys - 1) st := cluster.MakeTestingClusterSettingsWithVersions(version, version, true) - eng := NewDefaultInMemForTesting(Settings(st)) + eng, err := Open(context.Background(), InMemory(), st, MaxSize(1<<20)) + if err != nil { + panic(err) + } defer eng.Close() require.NoError(t, eng.PutMVCC(pointKey("a", 1), stringValue("a1"))) diff --git a/pkg/storage/in_mem.go b/pkg/storage/in_mem.go index ded9f73a1109..371fd1440ae5 100644 --- a/pkg/storage/in_mem.go +++ b/pkg/storage/in_mem.go @@ -13,6 +13,7 @@ package storage import ( "context" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/pebble/vfs" ) @@ -20,11 +21,13 @@ import ( // uses provided in mem file system and base directory to store data. The // caller must call obtained engine's Close method when engine is no longer // needed. -func InMemFromFS(ctx context.Context, fs vfs.FS, dir string, opts ...ConfigOption) Engine { +func InMemFromFS( + ctx context.Context, fs vfs.FS, dir string, settings *cluster.Settings, opts ...ConfigOption, +) Engine { // TODO(jackson): Replace this function with a special Location // constructor that allows both specifying a directory and supplying your // own VFS? - eng, err := Open(ctx, Location{dir: dir, fs: fs}, opts...) + eng, err := Open(ctx, Location{dir: dir, fs: fs}, settings, opts...) if err != nil { panic(err) } @@ -47,7 +50,10 @@ func InMemFromFS(ctx context.Context, fs vfs.FS, dir string, opts ...ConfigOptio // Close method when the engine is no longer needed. This method randomizes // whether separated intents are written. func NewDefaultInMemForTesting(opts ...ConfigOption) Engine { - eng, err := Open(context.Background(), InMemory(), ForTesting, MaxSize(1<<20), CombineOptions(opts...)) + eng, err := Open( + context.Background(), InMemory(), cluster.MakeTestingClusterSettings(), + ForTesting, MaxSize(1<<20), CombineOptions(opts...), + ) if err != nil { panic(err) } diff --git a/pkg/storage/min_version_test.go b/pkg/storage/min_version_test.go index 9afbe14ea71e..de903f6dd712 100644 --- a/pkg/storage/min_version_test.go +++ b/pkg/storage/min_version_test.go @@ -17,6 +17,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/clusterversion" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/pebble" @@ -91,7 +92,7 @@ func TestSetMinVersion(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - p, err := Open(context.Background(), InMemory(), CacheSize(0)) + p, err := Open(context.Background(), InMemory(), cluster.MakeClusterSettings(), CacheSize(0)) require.NoError(t, err) defer p.Close() require.Equal(t, pebble.FormatMostCompatible, p.db.FormatMajorVersion()) @@ -119,6 +120,7 @@ func TestMinVersion_IsNotEncrypted(t *testing.T) { p, err := Open( context.Background(), Location{dir: "", fs: fs}, + cluster.MakeClusterSettings(), EncryptionAtRest(nil)) require.NoError(t, err) defer p.Close() diff --git a/pkg/storage/mvcc_history_test.go b/pkg/storage/mvcc_history_test.go index 49e384928748..e597c211b71d 100644 --- a/pkg/storage/mvcc_history_test.go +++ b/pkg/storage/mvcc_history_test.go @@ -184,9 +184,8 @@ func TestMVCCHistories(t *testing.T) { disableSeparateEngineBlocks := strings.Contains(path, "_disable_separate_engine_blocks") // We start from a clean slate in every test file. - engine, err := storage.Open(ctx, storage.InMemory(), + engine, err := storage.Open(ctx, storage.InMemory(), st, storage.CacheSize(1<<20 /* 1 MiB */), - storage.Settings(st), storage.If(separateEngineBlocks && !disableSeparateEngineBlocks, storage.BlockSize(1)), ) require.NoError(t, err) diff --git a/pkg/storage/mvcc_incremental_iterator_test.go b/pkg/storage/mvcc_incremental_iterator_test.go index 296beb383444..f869edff3c84 100644 --- a/pkg/storage/mvcc_incremental_iterator_test.go +++ b/pkg/storage/mvcc_incremental_iterator_test.go @@ -1309,7 +1309,7 @@ func TestMVCCIncrementalIteratorIntentStraddlesSStables(t *testing.T) { // regular MVCCPut operation to generate these keys, which we'll later be // copying into manually created sstables. ctx := context.Background() - db1, err := Open(ctx, InMemory(), ForTesting) + db1, err := Open(ctx, InMemory(), cluster.MakeClusterSettings(), ForTesting) require.NoError(t, err) defer db1.Close() @@ -1342,7 +1342,7 @@ func TestMVCCIncrementalIteratorIntentStraddlesSStables(t *testing.T) { // SSTable 2: // a@2 // b@1 - db2, err := Open(ctx, InMemory(), ForTesting) + db2, err := Open(ctx, InMemory(), cluster.MakeTestingClusterSettings(), ForTesting) require.NoError(t, err) defer db2.Close() @@ -1572,6 +1572,7 @@ func BenchmarkMVCCIncrementalIteratorForOldData(b *testing.B) { eng, err := Open( context.Background(), InMemory(), + cluster.MakeClusterSettings(), // Use a small cache size. Scanning large tables with mostly cold data // will mostly miss the cache (especially since the block cache is meant // to be scan resistant). diff --git a/pkg/storage/mvcc_test.go b/pkg/storage/mvcc_test.go index 604abc7084e7..749849930bf0 100644 --- a/pkg/storage/mvcc_test.go +++ b/pkg/storage/mvcc_test.go @@ -3679,7 +3679,7 @@ func generateBytes(rng *rand.Rand, min int, max int) []byte { } func createEngWithSeparatedIntents(t *testing.T) Engine { - eng, err := Open(context.Background(), InMemory(), MaxSize(1<<20)) + eng, err := Open(context.Background(), InMemory(), cluster.MakeClusterSettings(), MaxSize(1<<20)) require.NoError(t, err) return eng } @@ -3917,11 +3917,13 @@ func TestRandomizedSavepointRollbackAndIntentResolution(t *testing.T) { fmt.Printf("seed: %d\n", seed) rng := rand.New(rand.NewSource(seed)) ctx := context.Background() - eng, err := Open(context.Background(), InMemory(), func(cfg *engineConfig) error { - cfg.Opts.LBaseMaxBytes = int64(100 + rng.Intn(16384)) - log.Infof(ctx, "lbase: %d", cfg.Opts.LBaseMaxBytes) - return nil - }) + eng, err := Open( + context.Background(), InMemory(), cluster.MakeClusterSettings(), + func(cfg *engineConfig) error { + cfg.Opts.LBaseMaxBytes = int64(100 + rng.Intn(16384)) + log.Infof(ctx, "lbase: %d", cfg.Opts.LBaseMaxBytes) + return nil + }) require.NoError(t, err) defer eng.Close() diff --git a/pkg/storage/open.go b/pkg/storage/open.go index 6cd9bd82f199..92285225bfa5 100644 --- a/pkg/storage/open.go +++ b/pkg/storage/open.go @@ -65,9 +65,6 @@ var ForceWriterParallelism ConfigOption = func(cfg *engineConfig) error { // ForTesting configures the engine for use in testing. It may randomize some // config options to improve test coverage. var ForTesting ConfigOption = func(cfg *engineConfig) error { - if cfg.Settings == nil { - cfg.Settings = cluster.MakeTestingClusterSettings() - } return nil } @@ -78,9 +75,6 @@ var ForTesting ConfigOption = func(cfg *engineConfig) error { // we know there are only separated intents, this sidesteps any test issues // due to inconsistencies. var ForStickyEngineTesting ConfigOption = func(cfg *engineConfig) error { - if cfg.Settings == nil { - cfg.Settings = cluster.MakeTestingClusterSettings() - } return nil } @@ -132,14 +126,6 @@ func MaxOpenFiles(count int) ConfigOption { } -// Settings sets the cluster settings to use. -func Settings(settings *cluster.Settings) ConfigOption { - return func(cfg *engineConfig) error { - cfg.Settings = settings - return nil - } -} - // CacheSize configures the size of the block cache. func CacheSize(size int64) ConfigOption { return func(cfg *engineConfig) error { @@ -233,9 +219,12 @@ type engineConfig struct { // Open opens a new Pebble storage engine, reading and writing data to the // provided Location, configured with the provided options. -func Open(ctx context.Context, loc Location, opts ...ConfigOption) (*Pebble, error) { +func Open( + ctx context.Context, loc Location, settings *cluster.Settings, opts ...ConfigOption, +) (*Pebble, error) { var cfg engineConfig cfg.Dir = loc.dir + cfg.Settings = settings cfg.Opts = DefaultPebbleOptions() cfg.Opts.FS = loc.fs for _, opt := range opts { @@ -247,9 +236,6 @@ func Open(ctx context.Context, loc Location, opts ...ConfigOption) (*Pebble, err cfg.Opts.Cache = pebble.NewCache(*cfg.cacheSize) defer cfg.Opts.Cache.Unref() } - if cfg.Settings == nil { - cfg.Settings = cluster.MakeClusterSettings() - } p, err := NewPebble(ctx, cfg.PebbleConfig) if err != nil { return nil, err @@ -257,7 +243,7 @@ func Open(ctx context.Context, loc Location, opts ...ConfigOption) (*Pebble, err // Set the active cluster version, ensuring the engine's format // major version is ratcheted sufficiently high to match the // settings cluster version. - if v := p.settings.Version.ActiveVersionOrEmpty(ctx).Version; v != (roachpb.Version{}) { + if v := settings.Version.ActiveVersionOrEmpty(ctx).Version; v != (roachpb.Version{}) { if err := p.SetMinVersion(v); err != nil { p.Close() return nil, err diff --git a/pkg/storage/pebble.go b/pkg/storage/pebble.go index 734873d08a74..b2ba5dd062cf 100644 --- a/pkg/storage/pebble.go +++ b/pkg/storage/pebble.go @@ -58,8 +58,6 @@ import ( humanize "github.com/dustin/go-humanize" ) -const maxSyncDurationFatalOnExceededDefault = true - // Default for MaxSyncDuration below. var maxSyncDurationDefault = envutil.EnvOrDefaultDuration("COCKROACH_ENGINE_MAX_SYNC_DURATION_DEFAULT", 20*time.Second) @@ -79,7 +77,7 @@ var MaxSyncDurationFatalOnExceeded = settings.RegisterBoolSetting( settings.TenantWritable, "storage.max_sync_duration.fatal.enabled", "if true, fatal the process when a disk operation exceeds storage.max_sync_duration", - maxSyncDurationFatalOnExceededDefault, + true, ) // valueBlocksEnabled controls whether older versions of MVCC keys in the same @@ -705,17 +703,15 @@ type Pebble struct { db *pebble.DB - closed bool - readOnly bool - path string - auxDir string - ballastPath string - ballastSize int64 - maxSize int64 - attrs roachpb.Attributes - properties roachpb.StoreProperties - // settings must be non-nil if this Pebble instance will be used to write - // intents. + closed bool + readOnly bool + path string + auxDir string + ballastPath string + ballastSize int64 + maxSize int64 + attrs roachpb.Attributes + properties roachpb.StoreProperties settings *cluster.Settings encryption *EncryptionEnv fileRegistry *PebbleFileRegistry @@ -867,6 +863,9 @@ func NewPebble(ctx context.Context, cfg PebbleConfig) (p *Pebble, err error) { if cfg.Opts == nil { cfg.Opts = DefaultPebbleOptions() } + if cfg.Settings == nil { + return nil, errors.AssertionFailedf("NewPebble requires cfg.Settings to be set") + } // Initialize the FS, wrapping it with disk health-checking and // ENOSPC-detection. @@ -888,16 +887,14 @@ func NewPebble(ctx context.Context, cfg PebbleConfig) (p *Pebble, err error) { cfg.Opts.EnsureDefaults() cfg.Opts.ErrorIfNotExists = cfg.MustExist - if settings := cfg.Settings; settings != nil { - cfg.Opts.WALMinSyncInterval = func() time.Duration { - return minWALSyncInterval.Get(&settings.SV) - } - cfg.Opts.Experimental.EnableValueBlocks = func() bool { - version := settings.Version.ActiveVersionOrEmpty(logCtx) - return !version.Less(clusterversion.ByKey( - clusterversion.V23_1EnablePebbleFormatSSTableValueBlocks)) && - valueBlocksEnabled.Get(&settings.SV) - } + cfg.Opts.WALMinSyncInterval = func() time.Duration { + return minWALSyncInterval.Get(&cfg.Settings.SV) + } + cfg.Opts.Experimental.EnableValueBlocks = func() bool { + version := cfg.Settings.Version.ActiveVersionOrEmpty(logCtx) + return !version.Less(clusterversion.ByKey( + clusterversion.V23_1EnablePebbleFormatSSTableValueBlocks)) && + valueBlocksEnabled.Get(&cfg.Settings.SV) } auxDir := cfg.Opts.FS.PathJoin(cfg.Dir, base.AuxiliaryDir) @@ -1063,12 +1060,8 @@ func (p *Pebble) makeMetricEtcEventListener(ctx context.Context) pebble.EventLis atomic.AddInt64((*int64)(&p.writeStallDuration), stallDuration) }, DiskSlow: func(info pebble.DiskSlowInfo) { - maxSyncDuration := maxSyncDurationDefault - fatalOnExceeded := maxSyncDurationFatalOnExceededDefault - if p.settings != nil { - maxSyncDuration = MaxSyncDuration.Get(&p.settings.SV) - fatalOnExceeded = MaxSyncDurationFatalOnExceeded.Get(&p.settings.SV) - } + maxSyncDuration := MaxSyncDuration.Get(&p.settings.SV) + fatalOnExceeded := MaxSyncDurationFatalOnExceeded.Get(&p.settings.SV) if info.Duration.Seconds() >= maxSyncDuration.Seconds() { atomic.AddInt64(&p.diskStallCount, 1) // Note that the below log messages go to the main cockroach log, not diff --git a/pkg/storage/pebble_iterator_test.go b/pkg/storage/pebble_iterator_test.go index 44a049fa848f..7628ed93ef5e 100644 --- a/pkg/storage/pebble_iterator_test.go +++ b/pkg/storage/pebble_iterator_test.go @@ -37,7 +37,7 @@ func TestPebbleIterator_Corruption(t *testing.T) { // Create a Pebble DB that can be used to back a pebbleIterator. dir := t.TempDir() dataDir := filepath.Join(dir, "data") - p, err := Open(context.Background(), Filesystem(dataDir)) + p, err := Open(context.Background(), Filesystem(dataDir), cluster.MakeClusterSettings()) require.NoError(t, err) defer p.Close() diff --git a/pkg/storage/pebble_mvcc_scanner_test.go b/pkg/storage/pebble_mvcc_scanner_test.go index fce804e97760..e47433608390 100644 --- a/pkg/storage/pebble_mvcc_scanner_test.go +++ b/pkg/storage/pebble_mvcc_scanner_test.go @@ -35,6 +35,7 @@ func TestMVCCScanWithManyVersionsAndSeparatedIntents(t *testing.T) { // We default to separated intents enabled. eng, err := Open(context.Background(), InMemory(), + cluster.MakeClusterSettings(), CacheSize(1<<20)) require.NoError(t, err) defer eng.Close() diff --git a/pkg/storage/pebble_test.go b/pkg/storage/pebble_test.go index 64e09b9415af..99c32d91bbc2 100644 --- a/pkg/storage/pebble_test.go +++ b/pkg/storage/pebble_test.go @@ -256,7 +256,7 @@ func TestPebbleMetricEventListener(t *testing.T) { settings := cluster.MakeTestingClusterSettings() MaxSyncDurationFatalOnExceeded.Override(ctx, &settings.SV, false) - p, err := Open(ctx, InMemory(), CacheSize(1<<20 /* 1 MiB */), Settings(settings)) + p, err := Open(ctx, InMemory(), settings, CacheSize(1<<20 /* 1 MiB */)) require.NoError(t, err) defer p.Close() @@ -547,7 +547,7 @@ func TestPebbleBackgroundError(t *testing.T) { errorCount: 3, }, } - eng, err := Open(context.Background(), loc) + eng, err := Open(context.Background(), loc, cluster.MakeClusterSettings()) require.NoError(t, err) defer eng.Close() @@ -1206,7 +1206,8 @@ func TestFSOpenFd(t *testing.T) { defer log.Scope(t).Close(t) dir := t.TempDir() - eng, err := Open(context.Background(), Filesystem(dir), ForTesting, MaxSize(1<<20)) + eng, err := Open(context.Background(), Filesystem(dir), cluster.MakeClusterSettings(), + ForTesting, MaxSize(1<<20)) require.NoError(t, err) defer eng.Close() diff --git a/pkg/storage/read_as_of_iterator_test.go b/pkg/storage/read_as_of_iterator_test.go index 689850044459..600d341d42b4 100644 --- a/pkg/storage/read_as_of_iterator_test.go +++ b/pkg/storage/read_as_of_iterator_test.go @@ -18,6 +18,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/keys" "github.com/cockroachdb/cockroach/pkg/roachpb" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/util/hlc" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -34,7 +35,7 @@ func TestReadAsOfIterator(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - pebble, err := Open(context.Background(), InMemory(), CacheSize(1<<20 /* 1 MiB */)) + pebble, err := Open(context.Background(), InMemory(), cluster.MakeClusterSettings(), CacheSize(1<<20 /* 1 MiB */)) require.NoError(t, err) defer pebble.Close() @@ -108,7 +109,7 @@ func TestReadAsOfIteratorSeek(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - pebble, err := Open(context.Background(), InMemory(), CacheSize(1<<20 /* 1 MiB */)) + pebble, err := Open(context.Background(), InMemory(), cluster.MakeClusterSettings(), CacheSize(1<<20 /* 1 MiB */)) require.NoError(t, err) defer pebble.Close() diff --git a/pkg/storage/sst_test.go b/pkg/storage/sst_test.go index a171fcfb5002..cbb440eaae5a 100644 --- a/pkg/storage/sst_test.go +++ b/pkg/storage/sst_test.go @@ -63,7 +63,10 @@ func TestCheckSSTConflictsMaxIntents(t *testing.T) { sstWriter.Close() ctx := context.Background() - engine := NewDefaultInMemForTesting(Settings(cs)) + engine, err := Open(context.Background(), InMemory(), cs, MaxSize(1<<20)) + if err != nil { + t.Fatal(err) + } defer engine.Close() // Write some committed keys and intents at txn1TS. diff --git a/pkg/storage/temp_engine.go b/pkg/storage/temp_engine.go index 9ee536552be9..103037cce18c 100644 --- a/pkg/storage/temp_engine.go +++ b/pkg/storage/temp_engine.go @@ -75,6 +75,7 @@ func newPebbleTempEngine( } p, err := Open(ctx, loc, + tempStorage.Settings, CacheSize(cacheSize), func(cfg *engineConfig) error { cfg.UseFileRegistry = storeSpec.UseFileRegistry diff --git a/pkg/storage/temp_engine_test.go b/pkg/storage/temp_engine_test.go index 138a9df04b60..3bbc94718082 100644 --- a/pkg/storage/temp_engine_test.go +++ b/pkg/storage/temp_engine_test.go @@ -15,6 +15,7 @@ import ( "testing" "github.com/cockroachdb/cockroach/pkg/base" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -28,7 +29,10 @@ func TestNewPebbleTempEngine(t *testing.T) { tempDir, tempDirCleanup := testutils.TempDir(t) defer tempDirCleanup() - db, fs, err := NewPebbleTempEngine(context.Background(), base.TempStorageConfig{Path: tempDir}, base.StoreSpec{Path: tempDir}) + db, fs, err := NewPebbleTempEngine(context.Background(), base.TempStorageConfig{ + Path: tempDir, + Settings: cluster.MakeTestingClusterSettings(), + }, base.StoreSpec{Path: tempDir}) if err != nil { t.Fatalf("error encountered when invoking NewRocksDBTempEngine: %+v", err) } diff --git a/pkg/testutils/colcontainerutils/BUILD.bazel b/pkg/testutils/colcontainerutils/BUILD.bazel index d8c7f3d4ab6f..9c81e839c0de 100644 --- a/pkg/testutils/colcontainerutils/BUILD.bazel +++ b/pkg/testutils/colcontainerutils/BUILD.bazel @@ -7,6 +7,7 @@ go_library( importpath = "github.com/cockroachdb/cockroach/pkg/testutils/colcontainerutils", visibility = ["//visibility:public"], deps = [ + "//pkg/settings/cluster", "//pkg/sql/colcontainer", "//pkg/storage", "//pkg/testutils", diff --git a/pkg/testutils/colcontainerutils/diskqueuecfg.go b/pkg/testutils/colcontainerutils/diskqueuecfg.go index b41f4ce9fe21..488032af484a 100644 --- a/pkg/testutils/colcontainerutils/diskqueuecfg.go +++ b/pkg/testutils/colcontainerutils/diskqueuecfg.go @@ -14,6 +14,7 @@ import ( "context" "testing" + "github.com/cockroachdb/cockroach/pkg/settings/cluster" "github.com/cockroachdb/cockroach/pkg/sql/colcontainer" "github.com/cockroachdb/cockroach/pkg/storage" "github.com/cockroachdb/cockroach/pkg/testutils" @@ -45,6 +46,7 @@ func NewTestingDiskQueueCfg(t testing.TB, inMem bool) (colcontainer.DiskQueueCfg ngn, err := storage.Open( context.Background(), loc, + cluster.MakeClusterSettings(), storage.ForTesting, storage.CacheSize(0)) if err != nil { diff --git a/pkg/testutils/localtestcluster/local_test_cluster.go b/pkg/testutils/localtestcluster/local_test_cluster.go index d0fbe307886f..2a7111651f1b 100644 --- a/pkg/testutils/localtestcluster/local_test_cluster.go +++ b/pkg/testutils/localtestcluster/local_test_cluster.go @@ -150,6 +150,7 @@ func (ltc *LocalTestCluster) Start(t testing.TB, baseCtx *base.Config, initFacto ltc.Eng, err = storage.Open( ctx, storage.InMemory(), + cfg.Settings, storage.CacheSize(0), storage.MaxSize(50<<20 /* 50 MiB */), ) diff --git a/pkg/ui/workspaces/cluster-ui/src/store/nodes/nodes.selectors.ts b/pkg/ui/workspaces/cluster-ui/src/store/nodes/nodes.selectors.ts index a0f7306dcfcb..9555fe0769e0 100644 --- a/pkg/ui/workspaces/cluster-ui/src/store/nodes/nodes.selectors.ts +++ b/pkg/ui/workspaces/cluster-ui/src/store/nodes/nodes.selectors.ts @@ -13,7 +13,7 @@ import _ from "lodash"; import { AppState } from "../reducers"; import { getDisplayName } from "../../nodes"; import { livenessStatusByNodeIDSelector } from "../liveness"; -import { accumulateMetrics } from "../../util"; +import { accumulateMetrics } from "src/util/proto"; import { cockroach } from "@cockroachlabs/crdb-protobuf-client"; type ILocality = cockroach.roachpb.ILocality;