From 026b23eddf7767c7622378b774aa6e6087730fdf Mon Sep 17 00:00:00 2001 From: Faizan Qazi Date: Wed, 28 Sep 2022 15:46:35 +0000 Subject: [PATCH] sql/schemachanger: avoid constructing state for complete jobs Previously, there were scenarios where after all stages were complete we could attempt to reconstruct the state either due to transaction retries or crashes before the job status was marked as succeeded. This would lead to us attempting to look up descriptors that may potentially be fully removed when attempting to resume the job again. To address this, this patch will use remove all descriptors IDs once the last stage has been executed from the job. Release note: None --- .../testdata/end_to_end/create_index | 2 ++ .../drop_database_multiregion_primary_region | 2 ++ .../testdata/end_to_end/drop_table_multiregion | 2 ++ .../drop_table_multiregion_primary_region | 2 ++ .../testdata/explain_verbose/create_index | 2 ++ .../create_index.rollback_1_of_7 | 2 ++ .../create_index.rollback_2_of_7 | 2 ++ .../create_index.rollback_3_of_7 | 2 ++ .../create_index.rollback_4_of_7 | 2 ++ .../create_index.rollback_5_of_7 | 2 ++ .../create_index.rollback_6_of_7 | 2 ++ .../create_index.rollback_7_of_7 | 2 ++ .../drop_database_multiregion_primary_region | 6 ++++++ .../explain_verbose/drop_table_multiregion | 4 ++++ .../drop_table_multiregion_primary_region | 3 +++ pkg/sql/drop_test.go | 16 ++++++---------- pkg/sql/schemachanger/scjob/job.go | 5 +++++ .../scplan/internal/scstage/build.go | 4 ++++ .../scplan/testdata/alter_table_add_column | 17 +++++++++++++++++ .../testdata/alter_table_alter_primary_key | 2 ++ .../scplan/testdata/alter_table_drop_column | 9 +++++++++ .../schemachanger/scplan/testdata/create_index | 4 ++++ .../schemachanger/scplan/testdata/drop_database | 15 +++++++++++++++ .../schemachanger/scplan/testdata/drop_index | 8 ++++++++ .../schemachanger/scplan/testdata/drop_owned_by | 12 ++++++++++++ .../schemachanger/scplan/testdata/drop_schema | 12 ++++++++++++ .../schemachanger/scplan/testdata/drop_sequence | 6 ++++++ .../schemachanger/scplan/testdata/drop_table | 13 +++++++++++++ pkg/sql/schemachanger/scplan/testdata/drop_type | 3 +++ pkg/sql/schemachanger/scplan/testdata/drop_view | 12 ++++++++++++ .../testdata/end_to_end/add_column | 2 ++ .../testdata/end_to_end/add_column_default_seq | 2 ++ .../testdata/end_to_end/add_column_no_default | 1 + .../alter_table_add_primary_key_drop_rowid | 2 ++ .../alter_table_alter_primary_key_drop_rowid | 2 ++ .../alter_table_alter_primary_key_vanilla | 2 ++ .../testdata/end_to_end/create_index | 2 ++ .../testdata/end_to_end/drop_column_basic | 2 ++ .../end_to_end/drop_column_computed_index | 2 ++ ...drop_column_create_index_separate_statements | 2 ++ .../end_to_end/drop_column_unique_index | 2 ++ .../testdata/end_to_end/drop_column_with_index | 2 ++ .../end_to_end/drop_index_hash_sharded_index | 2 ++ .../drop_index_partial_expression_index | 2 ++ .../end_to_end/drop_index_vanilla_index | 2 ++ .../drop_multiple_columns_separate_statements | 2 ++ .../testdata/end_to_end/drop_schema | 2 ++ .../testdata/end_to_end/drop_table | 2 ++ .../testdata/explain_verbose/add_column | 2 ++ .../explain_verbose/add_column.rollback_1_of_7 | 2 ++ .../explain_verbose/add_column.rollback_2_of_7 | 2 ++ .../explain_verbose/add_column.rollback_3_of_7 | 2 ++ .../explain_verbose/add_column.rollback_4_of_7 | 2 ++ .../explain_verbose/add_column.rollback_5_of_7 | 2 ++ .../explain_verbose/add_column.rollback_6_of_7 | 2 ++ .../explain_verbose/add_column.rollback_7_of_7 | 2 ++ .../explain_verbose/add_column_default_seq | 3 +++ .../add_column_default_seq.rollback_1_of_7 | 3 +++ .../add_column_default_seq.rollback_2_of_7 | 3 +++ .../add_column_default_seq.rollback_3_of_7 | 3 +++ .../add_column_default_seq.rollback_4_of_7 | 3 +++ .../add_column_default_seq.rollback_5_of_7 | 3 +++ .../add_column_default_seq.rollback_6_of_7 | 3 +++ .../add_column_default_seq.rollback_7_of_7 | 3 +++ .../explain_verbose/add_column_no_default | 2 ++ .../add_column_no_default.rollback_1_of_2 | 2 ++ .../add_column_no_default.rollback_2_of_2 | 2 ++ .../alter_table_add_primary_key_drop_rowid | 2 ++ ...add_primary_key_drop_rowid.rollback_10_of_15 | 2 ++ ...add_primary_key_drop_rowid.rollback_11_of_15 | 2 ++ ...add_primary_key_drop_rowid.rollback_12_of_15 | 2 ++ ...add_primary_key_drop_rowid.rollback_13_of_15 | 2 ++ ...add_primary_key_drop_rowid.rollback_14_of_15 | 2 ++ ...add_primary_key_drop_rowid.rollback_15_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_1_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_2_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_3_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_4_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_5_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_6_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_7_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_8_of_15 | 2 ++ ..._add_primary_key_drop_rowid.rollback_9_of_15 | 2 ++ .../alter_table_alter_primary_key_drop_rowid | 2 ++ ...ter_primary_key_drop_rowid.rollback_10_of_15 | 2 ++ ...ter_primary_key_drop_rowid.rollback_11_of_15 | 2 ++ ...ter_primary_key_drop_rowid.rollback_12_of_15 | 2 ++ ...ter_primary_key_drop_rowid.rollback_13_of_15 | 2 ++ ...ter_primary_key_drop_rowid.rollback_14_of_15 | 2 ++ ...ter_primary_key_drop_rowid.rollback_15_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_1_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_2_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_3_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_4_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_5_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_6_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_7_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_8_of_15 | 2 ++ ...lter_primary_key_drop_rowid.rollback_9_of_15 | 2 ++ .../alter_table_alter_primary_key_vanilla | 2 ++ ...le_alter_primary_key_vanilla.rollback_1_of_7 | 2 ++ ...le_alter_primary_key_vanilla.rollback_2_of_7 | 2 ++ ...le_alter_primary_key_vanilla.rollback_3_of_7 | 2 ++ ...le_alter_primary_key_vanilla.rollback_4_of_7 | 2 ++ ...le_alter_primary_key_vanilla.rollback_5_of_7 | 2 ++ ...le_alter_primary_key_vanilla.rollback_6_of_7 | 2 ++ ...le_alter_primary_key_vanilla.rollback_7_of_7 | 2 ++ .../testdata/explain_verbose/create_index | 2 ++ .../create_index.rollback_1_of_7 | 2 ++ .../create_index.rollback_2_of_7 | 2 ++ .../create_index.rollback_3_of_7 | 2 ++ .../create_index.rollback_4_of_7 | 2 ++ .../create_index.rollback_5_of_7 | 2 ++ .../create_index.rollback_6_of_7 | 2 ++ .../create_index.rollback_7_of_7 | 2 ++ .../testdata/explain_verbose/drop_column_basic | 2 ++ .../drop_column_basic.rollback_1_of_7 | 2 ++ .../drop_column_basic.rollback_2_of_7 | 2 ++ .../drop_column_basic.rollback_3_of_7 | 2 ++ .../drop_column_basic.rollback_4_of_7 | 2 ++ .../drop_column_basic.rollback_5_of_7 | 2 ++ .../drop_column_basic.rollback_6_of_7 | 2 ++ .../drop_column_basic.rollback_7_of_7 | 2 ++ .../explain_verbose/drop_column_computed_index | 2 ++ .../drop_column_computed_index.rollback_1_of_7 | 2 ++ .../drop_column_computed_index.rollback_2_of_7 | 2 ++ .../drop_column_computed_index.rollback_3_of_7 | 2 ++ .../drop_column_computed_index.rollback_4_of_7 | 2 ++ .../drop_column_computed_index.rollback_5_of_7 | 2 ++ .../drop_column_computed_index.rollback_6_of_7 | 2 ++ .../drop_column_computed_index.rollback_7_of_7 | 2 ++ ..._index_separate_statements.rollback_10_of_15 | 2 ++ ..._index_separate_statements.rollback_11_of_15 | 2 ++ ..._index_separate_statements.rollback_12_of_15 | 2 ++ ..._index_separate_statements.rollback_13_of_15 | 2 ++ ..._index_separate_statements.rollback_14_of_15 | 2 ++ ..._index_separate_statements.rollback_15_of_15 | 2 ++ ...e_index_separate_statements.rollback_1_of_15 | 2 ++ ...e_index_separate_statements.rollback_2_of_15 | 2 ++ ...e_index_separate_statements.rollback_3_of_15 | 2 ++ ...e_index_separate_statements.rollback_4_of_15 | 2 ++ ...e_index_separate_statements.rollback_5_of_15 | 2 ++ ...e_index_separate_statements.rollback_6_of_15 | 2 ++ ...e_index_separate_statements.rollback_7_of_15 | 2 ++ ...e_index_separate_statements.rollback_8_of_15 | 2 ++ ...e_index_separate_statements.rollback_9_of_15 | 2 ++ ...e_index_separate_statements.statement_1_of_2 | 2 ++ ...e_index_separate_statements.statement_2_of_2 | 2 ++ .../explain_verbose/drop_column_unique_index | 2 ++ .../drop_column_unique_index.rollback_1_of_7 | 2 ++ .../drop_column_unique_index.rollback_2_of_7 | 2 ++ .../drop_column_unique_index.rollback_3_of_7 | 2 ++ .../drop_column_unique_index.rollback_4_of_7 | 2 ++ .../drop_column_unique_index.rollback_5_of_7 | 2 ++ .../drop_column_unique_index.rollback_6_of_7 | 2 ++ .../drop_column_unique_index.rollback_7_of_7 | 2 ++ .../explain_verbose/drop_column_with_index | 2 ++ .../drop_column_with_index.rollback_1_of_7 | 2 ++ .../drop_column_with_index.rollback_2_of_7 | 2 ++ .../drop_column_with_index.rollback_3_of_7 | 2 ++ .../drop_column_with_index.rollback_4_of_7 | 2 ++ .../drop_column_with_index.rollback_5_of_7 | 2 ++ .../drop_column_with_index.rollback_6_of_7 | 2 ++ .../drop_column_with_index.rollback_7_of_7 | 2 ++ .../drop_index_hash_sharded_index | 2 ++ .../drop_index_partial_expression_index | 2 ++ .../explain_verbose/drop_index_vanilla_index | 2 ++ ..._columns_separate_statements.rollback_1_of_7 | 2 ++ ..._columns_separate_statements.rollback_2_of_7 | 2 ++ ..._columns_separate_statements.rollback_3_of_7 | 2 ++ ..._columns_separate_statements.rollback_4_of_7 | 2 ++ ..._columns_separate_statements.rollback_5_of_7 | 2 ++ ..._columns_separate_statements.rollback_6_of_7 | 2 ++ ..._columns_separate_statements.rollback_7_of_7 | 2 ++ ...columns_separate_statements.statement_1_of_2 | 2 ++ ...columns_separate_statements.statement_2_of_2 | 2 ++ .../testdata/explain_verbose/drop_schema | 3 +++ .../testdata/explain_verbose/drop_table | 2 ++ 178 files changed, 469 insertions(+), 10 deletions(-) diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index index 40c4aa10bad1..4ded8e6849bf 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index @@ -388,6 +388,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #11 notified job registry to adopt jobs: [2] # end PostCommitPhase diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_database_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_database_multiregion_primary_region index aebbc172ee47..cc95d12bdee3 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_database_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_database_multiregion_primary_region @@ -256,6 +256,8 @@ write *eventpb.DropDatabase to event log: DROP DATABASE ‹multi_region_test_db create job #2 (non-cancelable: true): "GC for DROP DATABASE multi_region_test_db CASCADE" descriptor IDs: [108 104] update progress of schema change job #1: "all stages completed" +set schema change job #1 to non-cancellable +updated schema change job #1 descriptor IDs to [] commit transaction #3 notified job registry to adopt jobs: [2] # end PostCommitPhase diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion b/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion index 5addd13bf3af..0bc054273405 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion @@ -167,6 +167,8 @@ write *eventpb.DropTable to event log: DROP TABLE ‹multi_region_test_db›.‹ create job #2 (non-cancelable: true): "GC for DROP TABLE multi_region_test_db.public.table_regional_by_row" descriptor IDs: [108] update progress of schema change job #1: "all stages completed" +set schema change job #1 to non-cancellable +updated schema change job #1 descriptor IDs to [] commit transaction #3 notified job registry to adopt jobs: [2] # end PostCommitPhase diff --git a/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion_primary_region index 13a97c343a00..0ffe6ad3be4a 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion_primary_region @@ -139,6 +139,8 @@ write *eventpb.DropTable to event log: DROP TABLE ‹multi_region_test_db›.‹ create job #2 (non-cancelable: true): "GC for DROP TABLE multi_region_test_db.public.table_regional_by_table CASCADE" descriptor IDs: [108] update progress of schema change job #1: "all stages completed" +set schema change job #1 to non-cancellable +updated schema change job #1 descriptor IDs to [] commit transaction #3 notified job registry to adopt jobs: [2] # end PostCommitPhase diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index index 38a87b1f3dcf..e06612a1bc15 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index @@ -435,6 +435,8 @@ EXPLAIN (ddl, verbose) CREATE INDEX id1 │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 dc0739f24a76..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 @@ -146,6 +146,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 26bcb4c61b3a..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 @@ -170,6 +170,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 a990ae6d0a8d..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 @@ -170,6 +170,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 29b5c0828236..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 @@ -170,6 +170,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 4a439281312d..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 @@ -180,6 +180,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 a9c39073e249..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 @@ -180,6 +180,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 73a9afe03a67..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 @@ -180,6 +180,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region index cab30fbb70f4..64e3ca0bc3a6 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_database_multiregion_primary_region @@ -893,6 +893,12 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 106 + - 107 + - 108 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion index 334184b742c9..5fc714d12568 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion @@ -538,6 +538,10 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 105 + - 107 + - 108 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region index db8539dd3e3a..8be12c3bc788 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion_primary_region @@ -410,6 +410,9 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 105 + - 108 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/sql/drop_test.go b/pkg/sql/drop_test.go index 9b98bb8b22d8..5f08dd817add 100644 --- a/pkg/sql/drop_test.go +++ b/pkg/sql/drop_test.go @@ -212,11 +212,9 @@ INSERT INTO t.kv VALUES ('c', 'e'), ('a', 'c'), ('b', 'd'); // TODO (lucy): Maybe this test API should use an offset starting // from the most recent job instead. if err := jobutils.VerifySystemJob(t, sqlRun, 0, jobspb.TypeNewSchemaChange, jobs.StatusSucceeded, jobs.Record{ - Username: username.RootUserName(), - Description: "DROP DATABASE t CASCADE", - DescriptorIDs: descpb.IDs{ - tbDesc.GetID(), dbDesc.GetID(), dbDesc.GetSchemaID(tree.PublicSchema), - }, + Username: username.RootUserName(), + Description: "DROP DATABASE t CASCADE", + DescriptorIDs: nil, }); err != nil { t.Fatal(err) } @@ -647,11 +645,9 @@ func TestDropTable(t *testing.T) { sqlRun := sqlutils.MakeSQLRunner(sqlDB) if err := jobutils.VerifySystemJob(t, sqlRun, 0, jobspb.TypeNewSchemaChange, jobs.StatusSucceeded, jobs.Record{ - Username: username.RootUserName(), - Description: `DROP TABLE t.public.kv`, - DescriptorIDs: descpb.IDs{ - tableDesc.GetID(), - }, + Username: username.RootUserName(), + Description: `DROP TABLE t.public.kv`, + DescriptorIDs: nil, }); err != nil { t.Fatal(err) } diff --git a/pkg/sql/schemachanger/scjob/job.go b/pkg/sql/schemachanger/scjob/job.go index d8107588a8a1..95b067fd8fc8 100644 --- a/pkg/sql/schemachanger/scjob/job.go +++ b/pkg/sql/schemachanger/scjob/job.go @@ -97,6 +97,11 @@ func (n *newSchemaChangeResumer) run(ctx context.Context, execCtxI interface{}) execCtx.ExtendedEvalContext().Tracing.KVTracingEnabled(), ) + // If there are no descriptors left, then we can short circuit here. + if len(payload.DescriptorIDs) == 0 { + return nil + } + err := scrun.RunSchemaChangesInJob( ctx, execCfg.DeclarativeSchemaChangerTestingKnobs, diff --git a/pkg/sql/schemachanger/scplan/internal/scstage/build.go b/pkg/sql/schemachanger/scplan/internal/scstage/build.go index 8c1594799be6..cc9634f8e1af 100644 --- a/pkg/sql/schemachanger/scplan/internal/scstage/build.go +++ b/pkg/sql/schemachanger/scplan/internal/scstage/build.go @@ -583,6 +583,10 @@ func (bc buildContext) updateJobProgressOp( var toRemove catalog.DescriptorIDSet if next != nil { toRemove = descIDsPresentBefore.Difference(descIDsPresentAfter) + } else { + // If the next stage is nil, simply remove al the descriptors, we are + // done processing + toRemove = descIDsPresentBefore } return &scop.UpdateSchemaChangerJob{ JobID: bc.scJobID, diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column index 4370bafa0eb7..27be531b1382 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_add_column @@ -128,6 +128,10 @@ PostCommitPhase stage 2 of 2 with 6 MutationType ops DescriptorID: 106 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 106 IsNonCancelable: true JobID: 1 @@ -414,6 +418,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -780,6 +786,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -1064,6 +1072,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -1247,6 +1257,9 @@ PostCommitPhase stage 2 of 2 with 7 MutationType ops DescriptorID: 107 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 107 IsNonCancelable: true JobID: 1 @@ -1567,6 +1580,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops DescriptorID: 108 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 108 IsNonCancelable: true JobID: 1 @@ -1988,6 +2003,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 8 MutationType ops DescriptorID: 109 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 109 IsNonCancelable: true JobID: 1 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 27b4753b6f39..a8496a5f2981 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key @@ -471,6 +471,8 @@ PostCommitNonRevertiblePhase stage 4 of 4 with 6 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column index e96a79df82c5..d144d492bd20 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column @@ -516,6 +516,10 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 9 MutationType ops DescriptorID: 107 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 107 IsNonCancelable: true JobID: 1 @@ -1468,6 +1472,11 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 10 MutationType ops DescriptorID: 107 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 106 + - 107 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/create_index b/pkg/sql/schemachanger/scplan/testdata/create_index index fe536b1a67bc..82e8f7559019 100644 --- a/pkg/sql/schemachanger/scplan/testdata/create_index +++ b/pkg/sql/schemachanger/scplan/testdata/create_index @@ -180,6 +180,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -478,6 +480,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_database b/pkg/sql/schemachanger/scplan/testdata/drop_database index 87259208b88e..d333ccfc61bc 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_database +++ b/pkg/sql/schemachanger/scplan/testdata/drop_database @@ -1257,6 +1257,21 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops DescriptorID: 117 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 106 + - 107 + - 108 + - 109 + - 110 + - 111 + - 112 + - 113 + - 114 + - 115 + - 116 + - 117 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_index b/pkg/sql/schemachanger/scplan/testdata/drop_index index c4cc0a2439a8..6e80707dd438 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_index +++ b/pkg/sql/schemachanger/scplan/testdata/drop_index @@ -90,6 +90,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 5 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -257,6 +259,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 7 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -486,6 +490,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 6 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -765,6 +771,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 5 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_owned_by b/pkg/sql/schemachanger/scplan/testdata/drop_owned_by index aff8c5ec3956..b61930cca3ef 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_owned_by +++ b/pkg/sql/schemachanger/scplan/testdata/drop_owned_by @@ -794,5 +794,17 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops DescriptorID: 113 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 100 + - 104 + - 105 + - 106 + - 107 + - 108 + - 109 + - 110 + - 111 + - 112 + - 113 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_schema b/pkg/sql/schemachanger/scplan/testdata/drop_schema index e4f0e92cafd5..f35a3156a578 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_schema +++ b/pkg/sql/schemachanger/scplan/testdata/drop_schema @@ -2108,5 +2108,17 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops DescriptorID: 113 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 100 + - 104 + - 105 + - 106 + - 107 + - 108 + - 109 + - 110 + - 111 + - 112 + - 113 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_sequence b/pkg/sql/schemachanger/scplan/testdata/drop_sequence index 71decd2ae833..7bb19bb856bc 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_sequence +++ b/pkg/sql/schemachanger/scplan/testdata/drop_sequence @@ -70,6 +70,8 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -178,6 +180,10 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 6 MutationType ops DescriptorID: 106 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 106 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_table b/pkg/sql/schemachanger/scplan/testdata/drop_table index 201052f07f2a..488b062e8b8b 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_table +++ b/pkg/sql/schemachanger/scplan/testdata/drop_table @@ -479,6 +479,15 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops DescriptorID: 111 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 106 + - 107 + - 108 + - 109 + - 110 + - 111 IsNonCancelable: true JobID: 1 @@ -1424,5 +1433,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops DescriptorID: 114 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 112 + - 113 + - 114 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_type b/pkg/sql/schemachanger/scplan/testdata/drop_type index 39db21dac8e6..dfab80e9c1f9 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_type +++ b/pkg/sql/schemachanger/scplan/testdata/drop_type @@ -122,6 +122,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 7 MutationType ops DescriptorID: 105 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_view b/pkg/sql/schemachanger/scplan/testdata/drop_view index db0ef1c0df15..c9a51f33140e 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_view +++ b/pkg/sql/schemachanger/scplan/testdata/drop_view @@ -134,6 +134,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 8 MutationType ops DescriptorID: 105 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 IsNonCancelable: true JobID: 1 @@ -903,6 +906,15 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops DescriptorID: 111 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 106 + - 107 + - 108 + - 109 + - 110 + - 111 IsNonCancelable: true JobID: 1 diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column b/pkg/sql/schemachanger/testdata/end_to_end/add_column index 891e55d3c40e..5b294e3aca3d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column @@ -476,6 +476,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #12 notified job registry to adopt jobs: [3] # end PostCommitPhase 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 83a6a3c339de..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 @@ -570,6 +570,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #12 notified job registry to adopt jobs: [3] # end PostCommitPhase diff --git a/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default b/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default index 7e4477c93d35..663cdb06b649 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column_no_default @@ -175,5 +175,6 @@ write *eventpb.FinishSchemaChange to event log adding table for stats refresh: 106 update progress of schema change job #1: "all stages completed" set schema change job #1 to non-cancellable +updated schema change job #1 descriptor IDs to [] commit transaction #4 # end PostCommitPhase 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 154ea42e0164..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 @@ -783,6 +783,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #21 notified job registry to adopt jobs: [3] # end PostCommitPhase 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 814eaf39bb44..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 @@ -785,6 +785,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #21 notified job registry to adopt jobs: [3] # end PostCommitPhase 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 46dc92a0fc13..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 @@ -592,6 +592,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #12 notified job registry to adopt jobs: [3] # end PostCommitPhase diff --git a/pkg/sql/schemachanger/testdata/end_to_end/create_index b/pkg/sql/schemachanger/testdata/end_to_end/create_index index 3d6330286825..1d596b0125c8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index @@ -334,6 +334,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #11 notified job registry to adopt jobs: [2] # end PostCommitPhase 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 a13a1949c86c..217fe2f1b6d2 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic @@ -464,6 +464,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #12 notified job registry to adopt jobs: [3] # end PostCommitPhase 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 6164e7de51dc..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 @@ -580,6 +580,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #12 notified job registry to adopt jobs: [3] # end PostCommitPhase 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 f1a53db152f6..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 @@ -875,6 +875,8 @@ write *eventpb.DropIndex to event log: ALTER TABLE ‹defaultdb›.‹public›. 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 +updated schema change job #1 descriptor IDs to [] commit transaction #19 notified job registry to adopt jobs: [2] # end PostCommitPhase 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 3db650511cce..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 @@ -495,6 +495,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #12 notified job registry to adopt jobs: [3] # end PostCommitPhase 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 200aa0790d18..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 @@ -550,6 +550,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #12 notified job registry to adopt jobs: [3] # end PostCommitPhase 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 cc6ee0acc7f1..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 @@ -272,6 +272,8 @@ write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›. 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 +updated schema change job #1 descriptor IDs to [] commit transaction #4 notified job registry to adopt jobs: [2] # end PostCommitPhase 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 8bee8ed31667..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 @@ -227,6 +227,8 @@ write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›. 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 +updated schema change job #1 descriptor IDs to [] commit transaction #4 notified job registry to adopt jobs: [2] # end PostCommitPhase 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 33d5dbeb6338..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 @@ -178,6 +178,8 @@ write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›. 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 +updated schema change job #1 descriptor IDs to [] commit transaction #4 notified job registry to adopt jobs: [2] # end PostCommitPhase 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 d1ed35ecaa2b..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 @@ -724,6 +724,8 @@ write *eventpb.FinishSchemaChange to event log 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 +updated schema change job #1 descriptor IDs to [] commit transaction #12 notified job registry to adopt jobs: [3] # end PostCommitPhase diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_schema b/pkg/sql/schemachanger/testdata/end_to_end/drop_schema index bec7a1a47239..5623a6d211ce 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_schema +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_schema @@ -96,6 +96,8 @@ upsert descriptor #104 delete descriptor #106 write *eventpb.DropSchema to event log: DROP SCHEMA ‹db›.‹sc› update progress of schema change job #1: "all stages completed" +set schema change job #1 to non-cancellable +updated schema change job #1 descriptor IDs to [] commit transaction #3 # end PostCommitPhase diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_table b/pkg/sql/schemachanger/testdata/end_to_end/drop_table index a9a63521b163..058837eebf91 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_table +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_table @@ -103,6 +103,8 @@ write *eventpb.DropTable to event log: DROP TABLE ‹db›.‹sc›.‹t› create job #2 (non-cancelable: true): "GC for DROP TABLE db.sc.t" descriptor IDs: [107] update progress of schema change job #1: "all stages completed" +set schema change job #1 to non-cancellable +updated schema change job #1 descriptor IDs to [] commit transaction #3 notified job registry to adopt jobs: [2] # end PostCommitPhase diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column b/pkg/sql/schemachanger/testdata/explain_verbose/add_column index 109ae9fcc9f9..75805890fd5a 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column @@ -623,6 +623,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT NOT NULL DEFAU │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 14900d95f0b8..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 @@ -163,6 +163,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 67fbc8b780e5..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 @@ -212,6 +212,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 863d66658f5a..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 @@ -212,6 +212,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 59cf360ada28..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 @@ -212,6 +212,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 339813880f6e..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 @@ -222,6 +222,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 156a155aeaa6..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 @@ -222,6 +222,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 90ef02b39102..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 @@ -222,6 +222,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 25fd251521d5..3ffbdf72ec17 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq @@ -658,6 +658,9 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN l INT NOT NULL DEFAU │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 b60b702176df..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 @@ -173,6 +173,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 c2c87bca1a95..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 @@ -225,6 +225,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 bb2db16a0762..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 @@ -225,6 +225,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 abf0524004fe..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 @@ -225,6 +225,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 625060e45e8a..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 @@ -235,6 +235,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 b1dddaec9ef8..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 @@ -235,6 +235,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 e92c2cf52b03..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 @@ -235,6 +235,9 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default index d748e0acd459..cd91d9021c1c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default @@ -173,6 +173,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE db.public.tbl ADD COLUMN j INT; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_2 index d2ee6bb100d0..cb93cf38bbaf 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_1_of_2 @@ -69,6 +69,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 2; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_2_of_2 b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_2_of_2 index 18cbc088758e..2079985a74ac 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_2_of_2 +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_no_default.rollback_2_of_2 @@ -102,6 +102,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 2; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 a3403f6a2c4f..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 @@ -1008,6 +1008,8 @@ EXPLAIN (ddl, verbose) alter table t add primary key (a); │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 cc2d7f3dc4ff..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 @@ -335,6 +335,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 18aecac11264..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 @@ -335,6 +335,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 07e6a145176b..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 @@ -335,6 +335,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 aa2b5a58f962..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 @@ -345,6 +345,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 f33cb2360d89..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 @@ -345,6 +345,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d85f88eadcc3..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 @@ -345,6 +345,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 b6cb01445e89..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 @@ -184,6 +184,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 28d742ec5271..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 @@ -208,6 +208,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 0398228266e4..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 @@ -208,6 +208,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 8983f445a7ad..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 @@ -208,6 +208,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 3fd8f7d423aa..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 @@ -218,6 +218,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 f456ef873b8c..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 @@ -218,6 +218,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 09b67a0dc74b..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 @@ -218,6 +218,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 58baef826616..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 @@ -218,6 +218,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 948a1861bf37..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 @@ -325,6 +325,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d8417c7a424b..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 @@ -1015,6 +1015,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (a); │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 35df97a5a27c..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 @@ -335,6 +335,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 73089affe6ff..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 @@ -335,6 +335,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 482bfa1033bb..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 @@ -335,6 +335,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 646ad321b9f8..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 @@ -345,6 +345,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 44398aa0a399..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 @@ -345,6 +345,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 b17b8ff3cee6..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 @@ -345,6 +345,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 047dba8e507e..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 @@ -184,6 +184,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 fd8b758e5ed4..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 @@ -208,6 +208,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 7904a7e0cb7d..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 @@ -208,6 +208,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d517a442e825..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 @@ -208,6 +208,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 65e0ae0e6d67..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 @@ -218,6 +218,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 5fb7f89298af..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 @@ -218,6 +218,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 0470a020cc0f..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 @@ -218,6 +218,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 5737b66e05b8..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 @@ -218,6 +218,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d2d0044bec12..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 @@ -325,6 +325,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 183a5ba8a478..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 @@ -708,6 +708,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t ALTER PRIMARY KEY USING COLUMNS (j); │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 cf5a7a833a06..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 @@ -197,6 +197,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 30601c621408..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 @@ -231,6 +231,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 2b9231bce10a..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 @@ -231,6 +231,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 b9fc3a214476..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 @@ -231,6 +231,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 589f07d401f0..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 @@ -251,6 +251,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 aeab3a076bbf..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 @@ -251,6 +251,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 40ef94a7d163..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 @@ -251,6 +251,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/create_index b/pkg/sql/schemachanger/testdata/explain_verbose/create_index index 261c4325dcee..b4b034200fa4 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index @@ -353,6 +353,8 @@ EXPLAIN (ddl, verbose) CREATE INDEX idx1 ON t (v) WHERE (v = 'a'); │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 1fb7d00dc106..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 @@ -113,6 +113,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d5ea85e00c66..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 @@ -137,6 +137,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 01a931c342be..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 @@ -137,6 +137,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 784ca3347c35..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 @@ -137,6 +137,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 1e8955045bcf..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 @@ -147,6 +147,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 167900063b4f..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 @@ -147,6 +147,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 b60011bb697a..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 @@ -147,6 +147,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic index ea1c081a31c7..0a9c5cccfa9e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic @@ -534,6 +534,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 34a7b9301cff..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 @@ -123,6 +123,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 826063993c14..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 @@ -147,6 +147,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 cb6a19c3beac..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 @@ -147,6 +147,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 b6f3cc9892bc..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 @@ -147,6 +147,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 4a234e3cba27..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 @@ -157,6 +157,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 4880c8953c47..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 @@ -157,6 +157,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 6602c293f68f..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 @@ -157,6 +157,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 955d67f76196..7ab990f553f3 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index @@ -716,6 +716,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 5cec0213acc9..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 @@ -193,6 +193,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 56c6a6c93961..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 @@ -217,6 +217,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 077db95b2081..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 @@ -217,6 +217,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 8215753076e2..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 @@ -217,6 +217,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d4f7577894dd..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 @@ -227,6 +227,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 935ddf5f2a46..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 @@ -227,6 +227,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 a65986ef9c69..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 @@ -227,6 +227,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d642b70f3044..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 @@ -439,6 +439,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 10 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 b67626671dad..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 @@ -439,6 +439,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 11 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 14e350cf56a8..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 @@ -439,6 +439,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 12 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 7776edb2076d..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 @@ -449,6 +449,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 13 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 9c00e63419ce..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 @@ -449,6 +449,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 14 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 57d7dcd9d583..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 @@ -449,6 +449,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 15 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 2898836f3a32..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 @@ -215,6 +215,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 728229767ad6..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 @@ -239,6 +239,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 2c85f669b6c3..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 @@ -239,6 +239,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 21ddb422da15..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 @@ -239,6 +239,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d2ec60441108..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 @@ -249,6 +249,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 51772aa36fda..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 @@ -249,6 +249,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 a5d7cebe1b1c..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 @@ -249,6 +249,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 6e7699f22a13..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 @@ -249,6 +249,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 8 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 6fa56887c5e4..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 @@ -429,6 +429,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 9 of 15; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 14580d62813d..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 @@ -782,6 +782,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 7e19f8912028..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 @@ -897,6 +897,8 @@ EXPLAIN (ddl, verbose) CREATE UNIQUE INDEX idx ON t(k); │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 c76758062884..f6896f928372 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index @@ -663,6 +663,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t.test DROP pi; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 55b7e7dc44a0..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 @@ -165,6 +165,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 1a9c7435720f..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 @@ -189,6 +189,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 e693a09e0e40..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 @@ -189,6 +189,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 c5a58160dd73..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 @@ -189,6 +189,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 7e59b753ac04..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 @@ -199,6 +199,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 3388c4caf7b1..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 @@ -199,6 +199,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 0b5d359de162..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 @@ -199,6 +199,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 ef683d7416c0..13643e0198ac 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index @@ -635,6 +635,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 4f9ef9ac794a..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 @@ -154,6 +154,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 7a7e82a4e733..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 @@ -178,6 +178,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 e562321f3369..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 @@ -178,6 +178,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 c66f732b1856..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 @@ -178,6 +178,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 018c4b6792e5..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 @@ -188,6 +188,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 62ad67c78a41..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 @@ -188,6 +188,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 78edac666e29..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 @@ -188,6 +188,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 f9f106a10bb5..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 @@ -282,6 +282,8 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 a3c3466ae0c9..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 @@ -262,6 +262,8 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 a5faeeeea893..784a7b34bce2 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_vanilla_index @@ -157,6 +157,8 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 7c8bb7e041bb..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 @@ -257,6 +257,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 1 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 d75417a13267..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 @@ -281,6 +281,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 2 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 f8941f718296..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 @@ -281,6 +281,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 3 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 aa99e3dbdbd6..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 @@ -281,6 +281,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 4 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 48b9bcb097e1..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 @@ -291,6 +291,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 5 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 a5aaa1f4cf53..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 @@ -291,6 +291,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 6 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 2cfa32bcdc04..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 @@ -291,6 +291,8 @@ EXPLAIN (ddl, verbose) rollback at post-commit stage 7 of 7; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 14580d62813d..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 @@ -782,6 +782,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN j CASCADE; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed 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 0958c12be3ce..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 @@ -753,6 +753,8 @@ EXPLAIN (ddl, verbose) ALTER TABLE t DROP COLUMN k CASCADE; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema b/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema index 98677c5d4128..bc4ecfabec7d 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema @@ -150,6 +150,9 @@ EXPLAIN (ddl, verbose) DROP SCHEMA db.sc; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 106 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_table b/pkg/sql/schemachanger/testdata/explain_verbose/drop_table index 40dfc4842067..4aee0e8e976c 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_table +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_table @@ -562,6 +562,8 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ JobID: 1 │ └── • UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 107 IsNonCancelable: true JobID: 1 RunningStatus: all stages completed