diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index index ac426f183b54..4ded8e6849bf 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index @@ -385,7 +385,7 @@ upsert descriptor #104 - version: "7" + version: "8" write *eventpb.FinishSchemaChange to event log -create job #2 (non-cancelable: true): "GC for " +create job #2 (non-cancelable: true): "GC for removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1))" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index index af3280f0030d..e06612a1bc15 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index @@ -421,6 +421,9 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent 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 0e42d3f66a49..455e93e8cffa 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 @@ -121,8 +121,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) PARTITION - │ BY LIST (id) (PARTITION p1 VALUES IN (1)) + │ Statement: removed secondary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -131,6 +131,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent 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 b597ecb3f3f1..4bd111f8d5f0 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 @@ -113,8 +113,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) PARTITION - │ │ BY LIST (id) (PARTITION p1 VALUES IN (1)) + │ │ Statement: removed secondary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -155,6 +155,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent 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 fb9c81265616..e4e167e1721a 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 @@ -113,8 +113,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) PARTITION - │ │ BY LIST (id) (PARTITION p1 VALUES IN (1)) + │ │ Statement: removed secondary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -155,6 +155,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent 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 47d67cef7e75..417c9be8dc3b 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 @@ -113,8 +113,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) PARTITION - │ │ BY LIST (id) (PARTITION p1 VALUES IN (1)) + │ │ Statement: removed secondary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -155,6 +155,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent 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 2bc8a3198157..015746b9ce3b 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 @@ -155,8 +155,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) PARTITION - │ BY LIST (id) (PARTITION p1 VALUES IN (1)) + │ Statement: removed secondary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -165,6 +165,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent 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 83a2a06d2b4c..d78e0dcd86ff 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 @@ -155,8 +155,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) PARTITION - │ BY LIST (id) (PARTITION p1 VALUES IN (1)) + │ Statement: removed secondary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -165,6 +165,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent 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 1f346fa16535..bf520c688184 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 @@ -155,8 +155,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: CREATE INDEX id1 ON defaultdb.public.t1 (id, name) STORING (money) PARTITION - │ BY LIST (id) (PARTITION p1 VALUES IN (1)) + │ Statement: removed secondary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -165,6 +165,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + │ name) STORING (money) PARTITION BY LIST (id) (PARTITION p1 VALUES IN (1)) │ TableID: 104 │ ├── • MakeIndexAbsent diff --git a/pkg/sql/catalog/schemadesc/schema_desc.go b/pkg/sql/catalog/schemadesc/schema_desc.go index 0f597b574631..e943643be88a 100644 --- a/pkg/sql/catalog/schemadesc/schema_desc.go +++ b/pkg/sql/catalog/schemadesc/schema_desc.go @@ -425,6 +425,10 @@ func (desc *Mutable) RemoveFunction(name string, id descpb.ID) { updated = append(updated, ol) } } + if len(updated) == 0 { + delete(desc.Functions, name) + return + } desc.Functions[name] = descpb.SchemaDescriptor_Function{ Name: name, Overloads: updated, diff --git a/pkg/sql/covering/BUILD.bazel b/pkg/sql/covering/BUILD.bazel index 2efa2f2ba1f3..9b5434ca2eda 100644 --- a/pkg/sql/covering/BUILD.bazel +++ b/pkg/sql/covering/BUILD.bazel @@ -20,7 +20,6 @@ go_test( embed = [":covering"], deps = [ "//pkg/util/leaktest", - "//pkg/util/timeutil", "@com_github_stretchr_testify//require", ], ) diff --git a/pkg/sql/covering/bench_test.go b/pkg/sql/covering/bench_test.go index c1fb0d463394..be2d01c08dc4 100644 --- a/pkg/sql/covering/bench_test.go +++ b/pkg/sql/covering/bench_test.go @@ -16,7 +16,6 @@ import ( "math/rand" "testing" - "github.com/cockroachdb/cockroach/pkg/util/timeutil" "github.com/stretchr/testify/require" ) @@ -25,7 +24,7 @@ func BenchmarkOverlapCoveringMerge(b *testing.B) { name string inputs []Covering } - rand.Seed(timeutil.Now().Unix()) + rand.Seed(0) for _, numLayers := range []int{ 1, // single backup diff --git a/pkg/sql/logictest/testdata/logic_test/geospatial b/pkg/sql/logictest/testdata/logic_test/geospatial index b9715353c007..beaf77d2751f 100644 --- a/pkg/sql/logictest/testdata/logic_test/geospatial +++ b/pkg/sql/logictest/testdata/logic_test/geospatial @@ -5388,7 +5388,7 @@ SELECT public.ST_AsText('POINT(10.5 20.25)'::geometry) ---- POINT (10.5 20.25) -statement error unknown function: public.log\(\), but log\(\) exists +statement error pq: unknown function: public.log\(\): function undefined SELECT public.log(10) query TT diff --git a/pkg/sql/logictest/testdata/logic_test/udf b/pkg/sql/logictest/testdata/logic_test/udf index 2425df3a6546..ad77aaf228c9 100644 --- a/pkg/sql/logictest/testdata/logic_test/udf +++ b/pkg/sql/logictest/testdata/logic_test/udf @@ -454,7 +454,7 @@ $$ statement ok DROP FUNCTION f_test_drop(INT), f_test_drop(INT); -statement error pq: function public.f_test_drop does not exist +statement error pq: unknown function: public.f_test_drop\(\): function undefined SELECT @2 FROM [SHOW CREATE FUNCTION public.f_test_drop]; query T @@ -473,7 +473,7 @@ $$ statement ok DROP FUNCTION f_test_drop(INT); -statement error pq: function sc1.f_test_drop does not exist +statement error pq: unknown function: sc1.f_test_drop\(\): function undefined SELECT @2 FROM [SHOW CREATE FUNCTION sc1.f_test_drop]; # If there are identical function signatures in different schemas, multiple drop @@ -514,10 +514,10 @@ DROP FUNCTION f_test_drop(); DROP FUNCTION f_test_drop(); COMMIT; -statement error pq: function public.f_test_drop does not exist +statement error pq: unknown function: public.f_test_drop\(\): function undefined SELECT @2 FROM [SHOW CREATE FUNCTION public.f_test_drop]; -statement error pq: function sc1.f_test_drop does not exist +statement error pq: unknown function: sc1.f_test_drop\(\): function undefined SELECT @2 FROM [SHOW CREATE FUNCTION sc1.f_test_drop]; statement ok @@ -1044,7 +1044,7 @@ ALTER FUNCTION f_test_alter_name RENAME TO f_test_alter_name_same_in statement ok ALTER FUNCTION f_test_alter_name RENAME TO f_test_alter_name_new -statement error pq: function f_test_alter_name does not exist +statement error pq: unknown function: f_test_alter_name\(\): function undefined SELECT @2 FROM [SHOW CREATE FUNCTION f_test_alter_name]; query T @@ -1063,7 +1063,7 @@ $$ statement ok ALTER FUNCTION f_test_alter_name_new RENAME to f_test_alter_name_diff_in -statement error pq: function f_test_alter_name_new does not exist +statement error pq: unknown function: f_test_alter_name_new\(\): function undefined SELECT @2 FROM [SHOW CREATE FUNCTION f_test_alter_name_new]; query T @@ -2501,3 +2501,19 @@ subtest variadic # Variadic UDFS are not currently supported. statement error pgcode 0A000 unimplemented: this syntax\nHINT.*\n.*88947 CREATE FUNCTION rec(VARIADIC arr INT[]) RETURNS INT LANGUAGE SQL AS '1' + +subtest execute_dropped_function + +statement ok +CREATE FUNCTION f_test_exec_dropped(a int) RETURNS INT LANGUAGE SQL AS $$ SELECT a $$; + +query I +SELECT f_test_exec_dropped(123); +---- +123 + +statement ok +DROP FUNCTION f_test_exec_dropped; + +statement error pq: unknown function: f_test_exec_dropped\(\): function undefined +SELECT f_test_exec_dropped(321); diff --git a/pkg/sql/schema_resolver.go b/pkg/sql/schema_resolver.go index 5aa60eef1e00..a2f7689947a0 100644 --- a/pkg/sql/schema_resolver.go +++ b/pkg/sql/schema_resolver.go @@ -425,7 +425,12 @@ func (sr *schemaResolver) ResolveFunction( // name which is not lowercase. So here we try to lowercase the given // function name and find a suggested function name if possible. extraMsg := "" - lowerName := tree.MakeUnresolvedName(strings.ToLower(name.Parts[0])) + var lowerName tree.UnresolvedName + if fn.ExplicitSchema { + lowerName = tree.MakeUnresolvedName(strings.ToLower(name.Parts[0]), strings.ToLower(name.Parts[1])) + } else { + lowerName = tree.MakeUnresolvedName(strings.ToLower(name.Parts[0])) + } if lowerName != *name { alternative, err := sr.ResolveFunction(ctx, &lowerName, path) if err == nil && alternative != nil { diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/op_funcs.go b/pkg/sql/schemachanger/scplan/internal/opgen/op_funcs.go index a102fdf63b6d..324e406b2069 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/op_funcs.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/op_funcs.go @@ -54,12 +54,19 @@ func newLogEventOp(e scpb.Element, md *targetsWithElementMap) *scop.LogEvent { func statementForDropJob(e scpb.Element, md *targetsWithElementMap) scop.StatementForDropJob { stmtID := md.Targets[md.elementToTarget[e]].Metadata.StatementID + stmt := redact.RedactableString(md.Statements[stmtID].RedactedStatement).StripMarkers() + switch e.(type) { + case *scpb.PrimaryIndex: + stmt = "removed primary index; " + stmt + case *scpb.SecondaryIndex: + stmt = "removed secondary index; " + stmt + case *scpb.TemporaryIndex: + stmt = "removed temporary index; " + stmt + } return scop.StatementForDropJob{ // Using the redactable string but with stripped markers gives us a // normalized and fully-qualified string value for display use. - Statement: redact.RedactableString( - md.Statements[stmtID].RedactedStatement, - ).StripMarkers(), + Statement: stmt, StatementID: stmtID, Rollback: md.InRollback, } diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_temporary_index.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_temporary_index.go index f9e2293c42cc..cc396cb12381 100644 --- a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_temporary_index.go +++ b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_temporary_index.go @@ -49,10 +49,11 @@ func init() { }), ), to(scpb.Status_ABSENT, - emit(func(this *scpb.TemporaryIndex) *scop.CreateGCJobForIndex { + emit(func(this *scpb.TemporaryIndex, md *targetsWithElementMap) *scop.CreateGCJobForIndex { return &scop.CreateGCJobForIndex{ - TableID: this.TableID, - IndexID: this.IndexID, + TableID: this.TableID, + IndexID: this.IndexID, + StatementForDropJob: statementForDropJob(this, md), } }), emit(func(this *scpb.TemporaryIndex) *scop.MakeIndexAbsent { diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column index 567d04e0cc1f..27be531b1382 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column @@ -377,6 +377,9 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 5 MutationType ops ops: *scop.CreateGCJobForIndex IndexID: 3 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.foo ADD COLUMN + j INT8 NOT NULL DEFAULT 123 TableID: 104 *scop.MakeIndexAbsent IndexID: 3 @@ -396,7 +399,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.foo ADD COLUMN j INT8 NOT NULL DEFAULT 123 + Statement: removed primary index; ALTER TABLE defaultdb.public.foo ADD COLUMN j + INT8 NOT NULL DEFAULT 123 TableID: 104 *scop.MakeIndexAbsent EventBase: @@ -742,6 +746,9 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 5 MutationType ops ops: *scop.CreateGCJobForIndex IndexID: 3 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.foo ADD COLUMN + j INT8 DEFAULT 123 TableID: 104 *scop.MakeIndexAbsent IndexID: 3 @@ -761,7 +768,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.foo ADD COLUMN j INT8 DEFAULT 123 + Statement: removed primary index; ALTER TABLE defaultdb.public.foo ADD COLUMN j + INT8 DEFAULT 123 TableID: 104 *scop.MakeIndexAbsent EventBase: @@ -1023,6 +1031,9 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 5 MutationType ops ops: *scop.CreateGCJobForIndex IndexID: 3 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.foo ADD COLUMN + a INT8 AS (i + 1) STORED TableID: 104 *scop.MakeIndexAbsent IndexID: 3 @@ -1042,7 +1053,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.foo ADD COLUMN a INT8 AS (i + 1) STORED + Statement: removed primary index; ALTER TABLE defaultdb.public.foo ADD COLUMN a + INT8 AS (i + 1) STORED TableID: 104 *scop.MakeIndexAbsent EventBase: @@ -1519,12 +1531,18 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 7 MutationType ops ops: *scop.CreateGCJobForIndex IndexID: 3 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + KEY USING COLUMNS (j) TableID: 108 *scop.MakeIndexAbsent IndexID: 3 TableID: 108 *scop.CreateGCJobForIndex IndexID: 5 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + KEY USING COLUMNS (j) TableID: 108 *scop.MakeIndexAbsent IndexID: 5 @@ -1544,7 +1562,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + USING COLUMNS (j) TableID: 108 *scop.MakeIndexAbsent EventBase: @@ -1947,7 +1966,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 8 MutationType ops *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.baz ADD COLUMN g INT8 UNIQUE DEFAULT 1 + Statement: removed primary index; ALTER TABLE defaultdb.public.baz ADD COLUMN g + INT8 UNIQUE DEFAULT 1 TableID: 109 *scop.MakeIndexAbsent EventBase: @@ -1963,12 +1983,18 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 8 MutationType ops TableID: 109 *scop.CreateGCJobForIndex IndexID: 3 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.baz ADD COLUMN + g INT8 UNIQUE DEFAULT 1 TableID: 109 *scop.MakeIndexAbsent IndexID: 3 TableID: 109 *scop.CreateGCJobForIndex IndexID: 5 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.baz ADD COLUMN + g INT8 UNIQUE DEFAULT 1 TableID: 109 *scop.MakeIndexAbsent IndexID: 5 diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key b/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key index 7bfb90bf9e6a..a8496a5f2981 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key @@ -358,7 +358,8 @@ PostCommitNonRevertiblePhase stage 2 of 4 with 12 MutationType ops *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (k) + Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + USING COLUMNS (k) TableID: 104 *scop.MakeIndexAbsent EventBase: @@ -380,6 +381,9 @@ PostCommitNonRevertiblePhase stage 2 of 4 with 12 MutationType ops TableID: 104 *scop.CreateGCJobForIndex IndexID: 3 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + KEY USING COLUMNS (k) TableID: 104 *scop.MakeIndexAbsent IndexID: 3 @@ -390,6 +394,9 @@ PostCommitNonRevertiblePhase stage 2 of 4 with 12 MutationType ops TableID: 104 *scop.CreateGCJobForIndex IndexID: 5 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + KEY USING COLUMNS (k) TableID: 104 *scop.MakeIndexAbsent IndexID: 5 @@ -432,7 +439,8 @@ PostCommitNonRevertiblePhase stage 4 of 4 with 6 MutationType ops *scop.CreateGCJobForIndex IndexID: 2 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (k) + Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + USING COLUMNS (k) TableID: 104 *scop.MakeIndexAbsent EventBase: diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column index edbc0c92ac0f..d144d492bd20 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column @@ -355,7 +355,8 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops *scop.CreateGCJobForIndex IndexID: 2 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.foo DROP COLUMN v1 CASCADE + Statement: removed secondary index; ALTER TABLE defaultdb.public.foo DROP COLUMN + v1 CASCADE TableID: 107 *scop.MakeIndexAbsent IndexID: 2 @@ -442,6 +443,9 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops TableID: 108 *scop.CreateGCJobForIndex IndexID: 4 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.foo DROP COLUMN + v1 CASCADE TableID: 107 *scop.MakeIndexAbsent IndexID: 4 @@ -469,7 +473,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 9 MutationType ops *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.foo DROP COLUMN v1 CASCADE + Statement: removed primary index; ALTER TABLE defaultdb.public.foo DROP COLUMN v1 + CASCADE TableID: 107 *scop.MakeIndexAbsent EventBase: @@ -1300,7 +1305,8 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops *scop.CreateGCJobForIndex IndexID: 2 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.foo DROP COLUMN v2 CASCADE + Statement: removed secondary index; ALTER TABLE defaultdb.public.foo DROP COLUMN + v2 CASCADE TableID: 107 *scop.MakeIndexAbsent IndexID: 2 @@ -1387,6 +1393,9 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops TableID: 108 *scop.CreateGCJobForIndex IndexID: 4 + StatementForDropJob: + Statement: removed temporary index; ALTER TABLE defaultdb.public.foo DROP COLUMN + v2 CASCADE TableID: 107 *scop.MakeIndexAbsent IndexID: 4 @@ -1417,7 +1426,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 10 MutationType ops *scop.CreateGCJobForIndex IndexID: 1 StatementForDropJob: - Statement: ALTER TABLE defaultdb.public.foo DROP COLUMN v2 CASCADE + Statement: removed primary index; ALTER TABLE defaultdb.public.foo DROP COLUMN v2 + CASCADE TableID: 107 *scop.MakeIndexAbsent EventBase: diff --git a/pkg/sql/schemachanger/scplan/testdata/create_index b/pkg/sql/schemachanger/scplan/testdata/create_index index ba8182bc983c..82e8f7559019 100644 --- a/pkg/sql/schemachanger/scplan/testdata/create_index +++ b/pkg/sql/schemachanger/scplan/testdata/create_index @@ -169,6 +169,9 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 4 MutationType ops ops: *scop.CreateGCJobForIndex IndexID: 3 + StatementForDropJob: + Statement: removed temporary index; CREATE INDEX id1 ON defaultdb.public.t1 (id, + name) STORING (money) TableID: 104 *scop.MakeIndexAbsent IndexID: 3 @@ -466,6 +469,9 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 4 MutationType ops ops: *scop.CreateGCJobForIndex IndexID: 3 + StatementForDropJob: + Statement: removed temporary index; CREATE INVERTED INDEX CONCURRENTLY id1 ON defaultdb.public.t1 + (id, name) STORING (money) TableID: 104 *scop.MakeIndexAbsent IndexID: 3 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_index b/pkg/sql/schemachanger/scplan/testdata/drop_index index d1e3944f3873..6e80707dd438 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_index +++ b/pkg/sql/schemachanger/scplan/testdata/drop_index @@ -81,7 +81,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 5 MutationType ops *scop.CreateGCJobForIndex IndexID: 2 StatementForDropJob: - Statement: DROP INDEX defaultdb.public.t1@idx1 CASCADE + Statement: removed secondary index; DROP INDEX defaultdb.public.t1@idx1 CASCADE TableID: 104 *scop.MakeIndexAbsent IndexID: 2 @@ -239,7 +239,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 7 MutationType ops *scop.CreateGCJobForIndex IndexID: 4 StatementForDropJob: - Statement: DROP INDEX defaultdb.public.t1@idx2 CASCADE + Statement: removed secondary index; DROP INDEX defaultdb.public.t1@idx2 CASCADE TableID: 104 *scop.MakeIndexAbsent IndexID: 4 @@ -470,7 +470,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 6 MutationType ops *scop.CreateGCJobForIndex IndexID: 6 StatementForDropJob: - Statement: DROP INDEX defaultdb.public.t1@idx3 CASCADE + Statement: removed secondary index; DROP INDEX defaultdb.public.t1@idx3 CASCADE TableID: 104 *scop.MakeIndexAbsent IndexID: 6 @@ -762,7 +762,7 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 5 MutationType ops *scop.CreateGCJobForIndex IndexID: 8 StatementForDropJob: - Statement: DROP INDEX defaultdb.public.t1@idx4 CASCADE + Statement: removed secondary index; DROP INDEX defaultdb.public.t1@idx4 CASCADE TableID: 104 *scop.MakeIndexAbsent IndexID: 8 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column b/pkg/sql/schemachanger/testdata/end_to_end/add_column index 3233f9cf0323..5b294e3aca3d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column @@ -412,7 +412,7 @@ upsert descriptor #106 unexposedParentSchemaId: 105 - version: "7" + version: "8" -create job #2 (non-cancelable: true): "GC for " +create job #2 (non-cancelable: true): "GC for removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42" descriptor IDs: [106] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 3 with 2 MutationType ops pending" commit transaction #11 @@ -473,7 +473,7 @@ upsert descriptor #106 - version: "8" + version: "9" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42" descriptor IDs: [106] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq index 80ef65478001..a5a96c668083 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_default_seq @@ -491,7 +491,7 @@ upsert descriptor #107 unexposedParentSchemaId: 105 - version: "7" + version: "8" -create job #2 (non-cancelable: true): "GC for " +create job #2 (non-cancelable: true): "GC for removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1')" descriptor IDs: [106] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 3 with 2 MutationType ops pending" commit transaction #11 @@ -567,7 +567,7 @@ upsert descriptor #107 - version: "8" + version: "9" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1')" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1')" descriptor IDs: [106] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid index 2944b6d980e3..1bc3c897b031 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_add_primary_key_drop_rowid @@ -680,7 +680,7 @@ upsert descriptor #104 unexposedParentSchemaId: 101 - version: "12" + version: "13" -create job #2 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a)" +create job #2 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a)" descriptor IDs: [104] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 4 with 1 MutationType op pending" commit transaction #19 @@ -780,7 +780,7 @@ upsert descriptor #104 - version: "14" + version: "15" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a)" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a)" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid index 733cccb1f3b6..d4be8116b561 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_drop_rowid @@ -681,7 +681,7 @@ upsert descriptor #104 unexposedParentSchemaId: 101 - version: "12" + version: "13" -create job #2 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a)" +create job #2 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a)" descriptor IDs: [104] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 4 with 1 MutationType op pending" commit transaction #19 @@ -782,7 +782,7 @@ upsert descriptor #104 - version: "14" + version: "15" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a)" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a)" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla index f6e9b062dbd6..1ba83a2993b0 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla +++ b/pkg/sql/schemachanger/testdata/end_to_end/alter_table_alter_primary_key_vanilla @@ -524,7 +524,7 @@ upsert descriptor #104 unexposedParentSchemaId: 101 - version: "7" + version: "8" -create job #2 (non-cancelable: true): "GC for " +create job #2 (non-cancelable: true): "GC for removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j)" descriptor IDs: [104] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 3 with 2 MutationType ops pending" commit transaction #11 @@ -589,7 +589,7 @@ upsert descriptor #104 - version: "8" + version: "9" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j)" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j)" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index b/pkg/sql/schemachanger/testdata/end_to_end/create_index index cd76673761e7..1d596b0125c8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index @@ -331,7 +331,7 @@ upsert descriptor #106 - version: "7" + version: "8" write *eventpb.FinishSchemaChange to event log -create job #2 (non-cancelable: true): "GC for " +create job #2 (non-cancelable: true): "GC for removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = 'a')" descriptor IDs: [106] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic index f618083aa36c..217fe2f1b6d2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic @@ -379,7 +379,7 @@ upsert descriptor #104 unexposedParentSchemaId: 101 - version: "7" + version: "8" -create job #2 (non-cancelable: true): "GC for " +create job #2 (non-cancelable: true): "GC for removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j" descriptor IDs: [104] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 3 with 3 MutationType ops pending" commit transaction #11 @@ -461,7 +461,7 @@ upsert descriptor #104 - version: "8" + version: "9" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t DROP COLUMN j" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index index a0c3fa5a44d0..5aaf4641191c 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_computed_index @@ -495,7 +495,7 @@ upsert descriptor #104 - version: "7" + version: "8" write *eventpb.DropIndex to event log: ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE -create job #2 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" +create job #2 (non-cancelable: true): "GC for removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" descriptor IDs: [104] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 3 with 3 MutationType ops pending" commit transaction #11 @@ -577,7 +577,7 @@ upsert descriptor #104 - version: "8" + version: "9" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements index 43401323f03a..c569d5cc6cb1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_create_index_separate_statements @@ -872,7 +872,7 @@ upsert descriptor #104 - version: "12" + version: "13" write *eventpb.DropIndex to event log: ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE -create job #2 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" +create job #2 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE; removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t (k)" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index index f693562e4492..3b3199f898ae 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_unique_index @@ -403,7 +403,7 @@ upsert descriptor #106 unexposedParentSchemaId: 105 - version: "17" + version: "18" -create job #2 (non-cancelable: true): "GC for " +create job #2 (non-cancelable: true): "GC for removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi" descriptor IDs: [106] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops pending" commit transaction #11 @@ -492,7 +492,7 @@ upsert descriptor #106 - version: "18" + version: "19" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE t.public.test DROP COLUMN pi" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE t.public.test DROP COLUMN pi" descriptor IDs: [106] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index index d12d09939de4..f092ec42be56 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_with_index @@ -465,7 +465,7 @@ upsert descriptor #104 - version: "7" + version: "8" write *eventpb.DropIndex to event log: ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› -create job #2 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t DROP COLUMN j" +create job #2 (non-cancelable: true): "GC for removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j" descriptor IDs: [104] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 3 with 3 MutationType ops pending" commit transaction #11 @@ -547,7 +547,7 @@ upsert descriptor #104 - version: "8" + version: "9" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t DROP COLUMN j" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_hash_sharded_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_hash_sharded_index index 5526482fe400..624f5f754424 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_hash_sharded_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_hash_sharded_index @@ -269,7 +269,7 @@ upsert descriptor #104 - version: "10" + version: "11" write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE -create job #2 (non-cancelable: true): "GC for DROP INDEX defaultdb.public.t@idx CASCADE" +create job #2 (non-cancelable: true): "GC for removed secondary index; DROP INDEX defaultdb.public.t@idx CASCADE" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_partial_expression_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_partial_expression_index index 6c2e3635a3ca..a77c95b666f6 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_partial_expression_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_partial_expression_index @@ -224,7 +224,7 @@ upsert descriptor #104 - version: "9" + version: "10" write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE -create job #2 (non-cancelable: true): "GC for DROP INDEX defaultdb.public.t@idx CASCADE" +create job #2 (non-cancelable: true): "GC for removed secondary index; DROP INDEX defaultdb.public.t@idx CASCADE" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_vanilla_index b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_vanilla_index index ae754f68af94..dbed853e5192 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_index_vanilla_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_index_vanilla_index @@ -175,7 +175,7 @@ upsert descriptor #104 + version: "10" write *eventpb.FinishSchemaChange to event log write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›.‹t›@‹idx› CASCADE -create job #2 (non-cancelable: true): "GC for DROP INDEX defaultdb.public.t@idx CASCADE" +create job #2 (non-cancelable: true): "GC for removed secondary index; DROP INDEX defaultdb.public.t@idx CASCADE" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements index 16ed16871d4b..45d95d9d570f 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_multiple_columns_separate_statements @@ -617,7 +617,7 @@ upsert descriptor #104 - version: "7" + version: "8" write *eventpb.DropIndex to event log: ALTER TABLE ‹defaultdb›.‹public›.‹t› DROP COLUMN ‹j› CASCADE -create job #2 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" +create job #2 (non-cancelable: true): "GC for removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" descriptor IDs: [104] update progress of schema change job #1: "PostCommitNonRevertiblePhase stage 3 of 3 with 6 MutationType ops pending" commit transaction #11 @@ -721,7 +721,7 @@ upsert descriptor #104 - version: "8" + version: "9" write *eventpb.FinishSchemaChange to event log -create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" +create job #3 (non-cancelable: true): "GC for removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE" descriptor IDs: [104] update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column b/pkg/sql/schemachanger/testdata/explain_verbose/add_column index 5ec385b3aa48..75805890fd5a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column @@ -559,6 +559,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 + │ │ NOT NULL DEFAULT 42 │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -598,7 +601,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT + │ NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent 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 d79dedfaf40d..391e16d65e5e 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 @@ -114,7 +114,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT + │ NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent @@ -131,6 +132,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 + │ NOT NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent 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 5d63d2f4a3ad..2f09fa5300b2 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 @@ -97,7 +97,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 + │ │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT + │ │ NULL DEFAULT 42 │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -184,6 +185,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 + │ NOT NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent 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 3d0678797e98..54793c7392fc 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 @@ -97,7 +97,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 + │ │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT + │ │ NULL DEFAULT 42 │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -184,6 +185,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 + │ NOT NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent 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 daff38021888..00f96751460d 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 @@ -97,7 +97,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 + │ │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT + │ │ NULL DEFAULT 42 │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -184,6 +185,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 + │ NOT NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent 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 1a3039fc7d62..365284fc75e7 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 @@ -173,7 +173,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT + │ NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent @@ -190,6 +191,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 + │ NOT NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent 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 55c0611cc9a6..a6134d3e6d05 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 @@ -173,7 +173,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT + │ NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent @@ -190,6 +191,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 + │ NOT NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent 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 be8c7e5e5095..a605d85e9c21 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 @@ -173,7 +173,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42 + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT + │ NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent @@ -190,6 +191,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN j INT8 + │ NOT NULL DEFAULT 42 │ TableID: 106 │ ├── • MakeIndexAbsent 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 12c417f0961e..3ffbdf72ec17 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq @@ -587,6 +587,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 + │ │ NOT NULL DEFAULT nextval('db.public.sq1') │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -629,7 +632,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT + │ NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent 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 dbcb8159b129..10a673a1c4fd 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 @@ -114,7 +114,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT + │ NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent @@ -131,6 +132,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 + │ NOT NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent 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 c8571f9e8a15..7b16194befbd 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 @@ -97,7 +97,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') + │ │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT + │ │ NULL DEFAULT nextval('db.public.sq1') │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -193,6 +194,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 + │ NOT NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent 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 3932355e1399..6d5ec08e2596 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 @@ -97,7 +97,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') + │ │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT + │ │ NULL DEFAULT nextval('db.public.sq1') │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -193,6 +194,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 + │ NOT NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent 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 1235b17f9dc4..f7abd6bb617b 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 @@ -97,7 +97,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') + │ │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT + │ │ NULL DEFAULT nextval('db.public.sq1') │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -193,6 +194,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 + │ NOT NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent 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 53c829b8e285..b0e1c04a8be2 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 @@ -176,7 +176,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT + │ NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent @@ -193,6 +194,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 + │ NOT NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent 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 488d69c6e9e0..c41c5a16e8f5 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 @@ -176,7 +176,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT + │ NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent @@ -193,6 +194,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 + │ NOT NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent 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 c68c10189fd9..01dde1ea5f1e 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 @@ -176,7 +176,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1') + │ Statement: removed primary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT + │ NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent @@ -193,6 +194,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE db.public.tbl ADD COLUMN l INT8 + │ NOT NULL DEFAULT nextval('db.public.sq1') │ TableID: 106 │ ├── • MakeIndexAbsent 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 489ae22c99c9..1404e0635200 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 @@ -803,7 +803,8 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ ├── • CreateGCJobForIndex │ │ IndexID: 1 │ │ StatementForDropJob: - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -829,6 +830,9 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -842,6 +846,9 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -964,7 +971,8 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 04dd9c864636..b836ffab34af 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 @@ -196,7 +196,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -254,6 +255,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -262,6 +267,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -305,7 +314,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 b1c7c9d92896..9decb62f6ad4 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 @@ -196,7 +196,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -254,6 +255,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -262,6 +267,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -305,7 +314,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 090efca6a318..5c9d89f54e07 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 @@ -196,7 +196,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -254,6 +255,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -262,6 +267,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -305,7 +314,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 753ec14070a7..9f1bd6cea5ed 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 @@ -245,6 +245,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -255,7 +259,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -272,6 +277,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -315,7 +324,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 3898e23b9430..e48e7c309f37 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 @@ -245,6 +245,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -255,7 +259,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -272,6 +277,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -315,7 +324,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 a14e22817532..ce0fb27a2539 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 @@ -245,6 +245,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -255,7 +259,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -272,6 +277,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -315,7 +324,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 9a3a36fc1fac..a460a2ff0cd4 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 @@ -131,7 +131,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -148,6 +149,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -158,7 +163,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 eec5a3029b99..9891ded73634 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 @@ -129,7 +129,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -148,7 +149,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -191,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 8d8493fab3d2..96811ce4e729 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 @@ -129,7 +129,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -148,7 +149,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -191,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 b7fdf5b5d62b..87880ecd77c2 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 @@ -129,7 +129,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -148,7 +149,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -191,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 d4fd035ccc7a..ac2de7df131a 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 @@ -124,7 +124,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -184,7 +185,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -201,6 +203,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 138d523060a8..b6afa92e17af 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 @@ -124,7 +124,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -184,7 +185,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -201,6 +203,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 d378775d258e..974f8b1b44c5 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 @@ -124,7 +124,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -184,7 +185,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -201,6 +203,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 1fede701916f..af149023a9ff 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 @@ -124,7 +124,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -184,7 +185,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -201,6 +203,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 53a3df0e0591..8ea595c7c994 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 @@ -195,7 +195,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -212,6 +213,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -252,6 +257,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ │ (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -295,7 +304,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ADD PRIMARY KEY (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ADD PRIMARY KEY + │ (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 7df6e55c78ab..a1d4e254deb0 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 @@ -806,7 +806,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ ├── • CreateGCJobForIndex │ │ IndexID: 1 │ │ StatementForDropJob: - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -833,6 +834,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -846,6 +850,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -969,7 +976,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 b705177a28c8..2bf8c42c40f4 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 @@ -196,7 +196,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -254,6 +255,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -262,6 +267,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -305,7 +314,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 cc59b7a3a264..cee2005c8cb8 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 @@ -196,7 +196,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -254,6 +255,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -262,6 +267,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -305,7 +314,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 343f2c02a399..fefb6ce1dd87 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 @@ -196,7 +196,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -254,6 +255,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -262,6 +267,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -305,7 +314,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 acc8a76e54ea..3476e1e72411 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 @@ -245,6 +245,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -255,7 +259,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -272,6 +277,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -315,7 +324,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 254df91b944b..4b62debcafd1 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 @@ -245,6 +245,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -255,7 +259,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -272,6 +277,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -315,7 +324,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 97f33d5827e0..b8aa34c08396 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 @@ -245,6 +245,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -255,7 +259,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -272,6 +277,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -315,7 +324,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 47366497ba53..30a03362a51f 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 @@ -131,7 +131,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -148,6 +149,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -158,7 +163,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 8429c02adacb..f44c663e060a 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 @@ -129,7 +129,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -148,7 +149,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -191,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 3c6ce1c17624..a317be2a2972 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 @@ -129,7 +129,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -148,7 +149,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -191,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 9f3c67517d2a..c6ae218386de 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 @@ -129,7 +129,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -148,7 +149,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -191,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 7857299e12fa..70c92ebe74d3 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 @@ -124,7 +124,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -184,7 +185,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -201,6 +203,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 1b78ff8b495e..7630d2c08ae4 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 @@ -124,7 +124,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -184,7 +185,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -201,6 +203,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 e3a03e40755c..3292a988a8b7 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 @@ -124,7 +124,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -184,7 +185,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -201,6 +203,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 a8c7d661cf01..e9319e6e89d7 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 @@ -124,7 +124,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -184,7 +185,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -201,6 +203,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 3fa2551d5971..953d5cd3d9b1 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 @@ -195,7 +195,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -212,6 +213,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -252,6 +257,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (a) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -295,7 +304,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (a) │ TableID: 104 │ ├── • MakeIndexAbsent 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 3db02c5ae650..ead39d3b858a 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 @@ -630,6 +630,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (j) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -638,6 +641,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (j) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -680,7 +686,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent 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 01983eebc55e..65f19cc97ed9 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 @@ -121,7 +121,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -138,6 +139,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -167,7 +172,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -176,6 +182,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent 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 4a5824781463..28f914183934 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 @@ -117,7 +117,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (j) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -155,7 +156,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (j) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -202,6 +204,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -210,6 +216,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent 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 6c3e1dc513aa..57c267ed7424 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 @@ -117,7 +117,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (j) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -155,7 +156,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (j) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -202,6 +204,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -210,6 +216,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent 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 ddb5987e81dc..f6056846a545 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 @@ -117,7 +117,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ │ USING COLUMNS (j) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -155,7 +156,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ │ KEY USING COLUMNS (j) │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -202,6 +204,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -210,6 +216,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent 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 a1b6cab04320..fede8227cd36 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 @@ -175,7 +175,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -192,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -221,7 +226,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -230,6 +236,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent 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 4b6f8d7a507b..e31066b26a23 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 @@ -175,7 +175,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -192,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -221,7 +226,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -230,6 +236,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent 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 67474d9fdb0d..90809542255d 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 @@ -175,7 +175,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY + │ USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -192,6 +193,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -221,7 +226,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j) + │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent @@ -230,6 +236,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t ALTER PRIMARY + │ KEY USING COLUMNS (j) │ TableID: 104 │ ├── • MakeIndexAbsent diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index b/pkg/sql/schemachanger/testdata/explain_verbose/create_index index 0d63f933ecd4..b4b034200fa4 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index @@ -339,6 +339,9 @@ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Statement: removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent 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 3eca05fa4b53..7fde239379c2 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 @@ -88,7 +88,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = 'a') + │ Statement: removed secondary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent @@ -97,6 +98,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent 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 df5cd426db93..d30742d66f70 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 @@ -86,7 +86,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = 'a') + │ │ Statement: removed secondary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ │ WHERE (v = 'a') │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -121,6 +122,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent 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 b5293b128a37..f08742a1364b 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 @@ -86,7 +86,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = 'a') + │ │ Statement: removed secondary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ │ WHERE (v = 'a') │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -121,6 +122,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent 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 f2f02c3141d0..105b207bfce3 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 @@ -82,7 +82,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = 'a') + │ │ Statement: removed secondary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ │ WHERE (v = 'a') │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -121,6 +122,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent 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 6dd66086d464..271a150d3bc2 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 @@ -122,7 +122,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = 'a') + │ Statement: removed secondary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent @@ -131,6 +132,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent 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 071ca5461865..1e2ac5780766 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 @@ -122,7 +122,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = 'a') + │ Statement: removed secondary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent @@ -131,6 +132,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent 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 3d2c4c61ba3b..166cfeb60d2d 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 @@ -122,7 +122,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: CREATE INDEX idx1 ON defaultdb.public.t (v) WHERE (v = 'a') + │ Statement: removed secondary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent @@ -131,6 +132,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; CREATE INDEX idx1 ON defaultdb.public.t (v) + │ WHERE (v = 'a') │ TableID: 106 │ ├── • MakeIndexAbsent diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic index 7b662c9b5a4e..0a9c5cccfa9e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic @@ -433,6 +433,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 3 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -500,7 +502,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 02c767b4b309..f5e2fab46dc3 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 @@ -92,7 +92,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent @@ -109,6 +109,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 69914673b9a1..5b08e4dbea2f 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 @@ -93,7 +93,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -133,6 +133,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 b4f730f3b019..c04a78ccdc5b 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 @@ -93,7 +93,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -133,6 +133,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 790d78cc1b36..c08a0bf9cfee 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 @@ -93,7 +93,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 2 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -133,6 +133,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 542018adfee0..06fdebd92c9d 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 @@ -126,7 +126,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent @@ -143,6 +143,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 5f395ea2fd97..cf3f84f289bc 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 @@ -126,7 +126,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent @@ -143,6 +143,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 2053bd703b78..8fc306a545a0 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 @@ -126,7 +126,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 2 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent @@ -143,6 +143,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 3 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 479786921ec5..7ab990f553f3 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index @@ -592,7 +592,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -601,6 +602,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -680,7 +684,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 a16e8afd6fe1..2559adbb879f 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 @@ -161,7 +161,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -178,6 +178,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 9de2ed9c691d..d7a3c462a052 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 @@ -162,7 +162,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -202,6 +202,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 1e97983a8436..2020ff9f28d9 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 @@ -162,7 +162,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -202,6 +202,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 b14e5abb67dc..b938106ec894 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 @@ -162,7 +162,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -202,6 +202,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 36d2aaf2afd4..b00c290f1263 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 @@ -195,7 +195,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -212,6 +212,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 f06abea2c23f..31b6bca67ee8 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 @@ -195,7 +195,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -212,6 +212,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 9c60398f0e69..272266fa5220 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 @@ -195,7 +195,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -212,6 +212,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 851dc389f584..913fade2b6b3 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 @@ -304,7 +304,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE UNIQUE INDEX idx ON defaultdb.public.t (k) + │ │ Statement: removed secondary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) │ │ StatementID: 1 │ │ TableID: 104 │ │ @@ -358,6 +359,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -366,6 +371,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 6 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) + │ │ StatementID: 1 │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -409,7 +419,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 93c0df0ad017..d211a208d5e6 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 @@ -304,7 +304,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE UNIQUE INDEX idx ON defaultdb.public.t (k) + │ │ Statement: removed secondary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) │ │ StatementID: 1 │ │ TableID: 104 │ │ @@ -358,6 +359,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -366,6 +371,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 6 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) + │ │ StatementID: 1 │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -409,7 +419,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 01e3e85737ea..db4e5c366081 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 @@ -254,7 +254,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE UNIQUE INDEX idx ON defaultdb.public.t (k) + │ │ Statement: removed secondary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) │ │ StatementID: 1 │ │ TableID: 104 │ │ @@ -358,6 +359,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -366,6 +371,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 6 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) + │ │ StatementID: 1 │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -409,7 +419,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 d35f3c1f652c..1f7b72ba15ff 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 @@ -336,6 +336,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -366,7 +370,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE UNIQUE INDEX idx ON defaultdb.public.t (k) + │ │ Statement: removed secondary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) │ │ StatementID: 1 │ │ TableID: 104 │ │ @@ -376,6 +381,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 6 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) + │ │ StatementID: 1 │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -419,7 +429,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 a99777a4cc9a..08e064ce17a3 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 @@ -336,6 +336,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -366,7 +370,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE UNIQUE INDEX idx ON defaultdb.public.t (k) + │ │ Statement: removed secondary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) │ │ StatementID: 1 │ │ TableID: 104 │ │ @@ -376,6 +381,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 6 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) + │ │ StatementID: 1 │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -419,7 +429,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 8cbb6e78b3ae..aac9e02808c6 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 @@ -336,6 +336,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -366,7 +370,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE UNIQUE INDEX idx ON defaultdb.public.t (k) + │ │ Statement: removed secondary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) │ │ StatementID: 1 │ │ TableID: 104 │ │ @@ -376,6 +381,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 6 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) + │ │ StatementID: 1 │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -419,7 +429,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 bea5baf8a594..613c90f6a950 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 @@ -147,6 +147,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -191,7 +195,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 242ec182975f..2b20af01034e 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 @@ -181,7 +181,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -224,6 +224,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 50007170bede..e2eadb4ebbb5 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 @@ -181,7 +181,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -224,6 +224,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 34795d69245f..f18453ce02c7 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 @@ -143,7 +143,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -224,6 +224,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 e0c7f1e62abb..2f425cd24ceb 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 @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -234,6 +234,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 af76b284fb83..6306f36a9867 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 @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -234,6 +234,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 531d38c65a14..05e58050dfc2 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 @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -234,6 +234,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 3eb883b7d3cf..4834c4814732 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 @@ -217,7 +217,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -234,6 +234,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 c9a1008ae414..0aa6ef8c0533 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 @@ -306,7 +306,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ IndexID: 5 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: CREATE UNIQUE INDEX idx ON defaultdb.public.t (k) + │ │ Statement: removed secondary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) │ │ StatementID: 1 │ │ TableID: 104 │ │ @@ -316,6 +317,11 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 6 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ │ (k) + │ │ StatementID: 1 │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -356,6 +362,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Rollback: true + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -399,7 +409,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 8331ebc29369..d139f0f48e49 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 @@ -655,7 +655,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -664,6 +665,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -746,7 +750,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 a5f326674519..f65a98ce54c9 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 @@ -804,7 +804,7 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -837,7 +837,8 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -846,6 +847,9 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -854,6 +858,10 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ ├── • CreateGCJobForIndex │ IndexID: 6 + │ StatementForDropJob: + │ Statement: removed temporary index; CREATE UNIQUE INDEX idx ON defaultdb.public.t + │ (k) + │ StatementID: 1 │ TableID: 104 │ ├── • MakeIndexAbsent 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 88fe7d74410f..f6896f928372 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index @@ -540,6 +540,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 5 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -625,7 +627,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE t.public.test DROP COLUMN pi + │ Statement: removed primary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent 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 55551935fc34..141f37fa0fac 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 @@ -134,7 +134,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE t.public.test DROP COLUMN pi + │ Statement: removed primary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent @@ -151,6 +151,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent 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 29b1bb44455d..59f2c8ff1cac 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 @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE t.public.test DROP COLUMN pi + │ │ Statement: removed primary index; ALTER TABLE t.public.test DROP COLUMN pi │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -175,6 +175,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent 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 602e6d7ecdb5..70377d8da5a3 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 @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE t.public.test DROP COLUMN pi + │ │ Statement: removed primary index; ALTER TABLE t.public.test DROP COLUMN pi │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -175,6 +175,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent 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 7fb244eafd91..0d6f1907f2db 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 @@ -129,7 +129,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 4 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE t.public.test DROP COLUMN pi + │ │ Statement: removed primary index; ALTER TABLE t.public.test DROP COLUMN pi │ │ TableID: 106 │ │ │ ├── • MakeIndexAbsent @@ -175,6 +175,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent 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 5dfe4872feb4..f86515d8d268 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 @@ -168,7 +168,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE t.public.test DROP COLUMN pi + │ Statement: removed primary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent @@ -185,6 +185,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent 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 213d47c69777..ed558c6e20f7 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 @@ -168,7 +168,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE t.public.test DROP COLUMN pi + │ Statement: removed primary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent @@ -185,6 +185,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent 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 a4d0ac6830c9..07a968d1fda0 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 @@ -168,7 +168,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 4 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE t.public.test DROP COLUMN pi + │ Statement: removed primary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent @@ -185,6 +185,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 5 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE t.public.test DROP COLUMN pi │ TableID: 106 │ ├── • MakeIndexAbsent 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 439a333363a3..13643e0198ac 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index @@ -519,7 +519,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -528,6 +528,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -601,7 +603,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 46560a810e2f..f0829b10c694 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 @@ -123,7 +123,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent @@ -140,6 +140,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 75cdee6b5466..871d08a92699 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 @@ -124,7 +124,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -164,6 +164,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 b137b60d49ac..ac1d82d0e21d 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 @@ -124,7 +124,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -164,6 +164,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 e4b97b14cd3b..2d6d8b18fb7b 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 @@ -124,7 +124,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -164,6 +164,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 3c222e089c93..d091ecc6c782 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 @@ -157,7 +157,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent @@ -174,6 +174,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 a3bc726614c8..948afe410a33 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 @@ -157,7 +157,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent @@ -174,6 +174,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 055c99732876..ea1e7de1cc66 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 @@ -157,7 +157,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent @@ -174,6 +174,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j │ TableID: 104 │ ├── • MakeIndexAbsent 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 b613fdca1cc6..d194ad58c134 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 @@ -258,7 +258,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: - │ Statement: DROP INDEX defaultdb.public.t@idx CASCADE + │ Statement: removed secondary index; DROP INDEX defaultdb.public.t@idx CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 448e65ac9514..b08cabd82119 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 @@ -238,7 +238,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: - │ Statement: DROP INDEX defaultdb.public.t@idx CASCADE + │ Statement: removed secondary index; DROP INDEX defaultdb.public.t@idx CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 efa722dcddbb..784a7b34bce2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index @@ -145,7 +145,7 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; ├── • CreateGCJobForIndex │ IndexID: 2 │ StatementForDropJob: - │ Statement: DROP INDEX defaultdb.public.t@idx CASCADE + │ Statement: removed secondary index; DROP INDEX defaultdb.public.t@idx CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 09b1d424172b..7363d851b413 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 @@ -173,6 +173,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -202,7 +206,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 31f131744f2f..8be4baa68f3e 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 @@ -195,7 +195,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -266,6 +266,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 b583a0fe9dee..52d97b07848b 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 @@ -195,7 +195,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -266,6 +266,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 184c68c98a58..de8c9d543b8d 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 @@ -172,7 +172,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ │ IndexID: 3 │ │ StatementForDropJob: │ │ Rollback: true - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -266,6 +266,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 d1581e627717..8158f559d2eb 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 @@ -259,7 +259,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -276,6 +276,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 4caf5b0c04f1..15609b6aeb84 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 @@ -259,7 +259,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -276,6 +276,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 c489c3b10a05..95c034e2f9ef 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 @@ -259,7 +259,7 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ IndexID: 3 │ StatementForDropJob: │ Rollback: true - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent @@ -276,6 +276,10 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ ├── • CreateGCJobForIndex │ IndexID: 4 + │ StatementForDropJob: + │ Rollback: true + │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 8331ebc29369..d139f0f48e49 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 @@ -655,7 +655,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -664,6 +665,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -746,7 +750,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent 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 21a5be02d5c0..8aea45a0e5ec 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 @@ -544,7 +544,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ ├── • CreateGCJobForIndex │ │ IndexID: 2 │ │ StatementForDropJob: - │ │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ │ Statement: removed secondary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -553,6 +554,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ │ │ ├── • CreateGCJobForIndex │ │ IndexID: 4 + │ │ StatementForDropJob: + │ │ Statement: removed temporary index; ALTER TABLE defaultdb.public.t DROP COLUMN j + │ │ CASCADE │ │ TableID: 104 │ │ │ ├── • MakeIndexAbsent @@ -696,7 +700,7 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; ├── • CreateGCJobForIndex │ IndexID: 1 │ StatementForDropJob: - │ Statement: ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE + │ Statement: removed primary index; ALTER TABLE defaultdb.public.t DROP COLUMN j CASCADE │ TableID: 104 │ ├── • MakeIndexAbsent