From faf0c69802d780663adc5863397c0791508bc509 Mon Sep 17 00:00:00 2001 From: Faizan Qazi Date: Wed, 28 Sep 2022 11:46:35 -0400 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 61826239c3a0..01e49ac1bd10 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/create_index @@ -424,6 +424,8 @@ write *eventpb.FinishSchemaChange to event log create job #2 (non-cancelable: true): "GC for " 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 db078d859bc2..4d543062ab7e 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 @@ -255,6 +255,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 69d8ce43f764..b86c3c0b6749 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion @@ -201,6 +201,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 af721f5c5c9c..58df263b125f 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 @@ -163,6 +163,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 115c42766804..af3280f0030d 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/create_index @@ -432,6 +432,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 6576e5ae337b..0e42d3f66a49 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 @@ -142,6 +142,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 255104acb9f6..b597ecb3f3f1 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 @@ -166,6 +166,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 32785b7643f6..fb9c81265616 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 @@ -166,6 +166,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 d14794be4734..47d67cef7e75 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 @@ -166,6 +166,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 f1803acc34a8..2bc8a3198157 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 @@ -176,6 +176,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 ce2307df5096..83a2a06d2b4c 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 @@ -176,6 +176,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 6740df88e67a..1f346fa16535 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 @@ -176,6 +176,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 07a019790d5e..567d04e0cc1f 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 @@ -410,6 +414,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -772,6 +778,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -1052,6 +1060,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -1235,6 +1245,9 @@ PostCommitPhase stage 2 of 2 with 7 MutationType ops DescriptorID: 107 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 107 IsNonCancelable: true JobID: 1 @@ -1548,6 +1561,8 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 4 MutationType ops DescriptorID: 108 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 108 IsNonCancelable: true JobID: 1 @@ -1962,6 +1977,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 646c07dc45bb..7bfb90bf9e6a 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_alter_primary_key @@ -463,6 +463,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 98c7b1b36f8b..edbc0c92ac0f 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column @@ -511,6 +511,10 @@ PostCommitNonRevertiblePhase stage 3 of 3 with 9 MutationType ops DescriptorID: 107 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 + - 105 + - 107 IsNonCancelable: true JobID: 1 @@ -1458,6 +1462,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 1eff84f5b685..ba8182bc983c 100644 --- a/pkg/sql/schemachanger/scplan/testdata/create_index +++ b/pkg/sql/schemachanger/scplan/testdata/create_index @@ -177,6 +177,8 @@ PostCommitNonRevertiblePhase stage 2 of 2 with 4 MutationType ops DescriptorID: 104 JobID: 1 *scop.UpdateSchemaChangerJob + DescriptorIDsToRemove: + - 104 IsNonCancelable: true JobID: 1 @@ -472,6 +474,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 e79a1914ebcc..d1e3944f3873 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 04c51d81152e..fc266cd4804d 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/add_column +++ b/pkg/sql/schemachanger/testdata/end_to_end/add_column @@ -519,6 +519,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for ALTER TABLE db.public.tbl ADD COLUMN j INT8 NOT NULL DEFAULT 42" 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 9103a25af50e..5e1e29b4e416 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 @@ -673,6 +673,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for ALTER TABLE db.public.tbl ADD COLUMN l INT8 NOT NULL DEFAULT nextval('db.public.sq1')" 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 419eb390112d..63f027e770a1 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 @@ -184,5 +184,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 1e93abc20057..d45e94600c65 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 @@ -879,6 +879,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for 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 b4c8f6f24b3b..8d292bdd4960 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 @@ -881,6 +881,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (a)" 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 8de318794184..2781f19181e8 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 @@ -634,6 +634,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for ALTER TABLE defaultdb.public.t ALTER PRIMARY KEY USING COLUMNS (j)" 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 8d54ef7a3fb1..58aa346d25a8 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/create_index +++ b/pkg/sql/schemachanger/testdata/end_to_end/create_index @@ -370,6 +370,8 @@ write *eventpb.FinishSchemaChange to event log create job #2 (non-cancelable: true): "GC for " 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 c6894d888391..d00dd561c6a1 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_column_basic @@ -512,6 +512,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for 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 1d5874cc6681..300c066676e7 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 @@ -629,6 +629,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for 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 ea226a075349..a547d4d6d491 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 @@ -951,6 +951,8 @@ write *eventpb.DropIndex to event log: ALTER TABLE ‹defaultdb›.‹public›. create job #2 (non-cancelable: true): "GC for 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 #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 0d5a693b41a4..c5e19621f053 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 @@ -545,6 +545,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for 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 22cfb788c0a7..99b9b01f6b89 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 @@ -595,6 +595,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for 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 53877c5ad4fd..17a4aaa6a675 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 @@ -280,6 +280,8 @@ write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›. create job #2 (non-cancelable: true): "GC for 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 85df741c68e4..1593fbd4930a 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 @@ -236,6 +236,8 @@ write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›. create job #2 (non-cancelable: true): "GC for 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 262f097e935c..0a5c6f80d0db 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 @@ -187,6 +187,8 @@ write *eventpb.DropIndex to event log: DROP INDEX ‹defaultdb›.‹public›. create job #2 (non-cancelable: true): "GC for 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 49654b76d084..979e443ed744 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 @@ -768,6 +768,8 @@ write *eventpb.FinishSchemaChange to event log create job #3 (non-cancelable: true): "GC for 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 cd2399c9beab..4acd02a62b0a 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_schema +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_schema @@ -101,6 +101,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 77eaf8923e51..a4d2856efadc 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_table +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_table @@ -111,6 +111,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 9e0054be5ec3..5ec385b3aa48 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column @@ -619,6 +619,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 5203357cfe5e..d79dedfaf40d 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 @@ -158,6 +158,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 7de3b022492c..5d63d2f4a3ad 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 @@ -207,6 +207,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 51f0f8a6a20a..3d0678797e98 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 @@ -207,6 +207,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 89f7c56d7070..daff38021888 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 @@ -207,6 +207,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 7f429289378e..1a3039fc7d62 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 @@ -217,6 +217,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 e734ac3532ee..55c0611cc9a6 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 @@ -217,6 +217,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 668a27d76b6e..be8c7e5e5095 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 @@ -217,6 +217,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 ddb775c76e3c..12c417f0961e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq +++ b/pkg/sql/schemachanger/testdata/explain_verbose/add_column_default_seq @@ -654,6 +654,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 963d43e2e4ed..dbcb8159b129 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 @@ -168,6 +168,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 d9c83e0875e2..c8571f9e8a15 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 @@ -220,6 +220,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 fdecbef98eec..3932355e1399 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 @@ -220,6 +220,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 ddab2b5d044d..1235b17f9dc4 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 @@ -220,6 +220,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 d41eafd3e86f..53c829b8e285 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 @@ -230,6 +230,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 7a33f54b2ce8..488d69c6e9e0 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 @@ -230,6 +230,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 a0e49fee848f..c68c10189fd9 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 @@ -230,6 +230,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 a39474980314..489ae22c99c9 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 @@ -1000,6 +1000,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 4c7b25b2e268..04dd9c864636 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 @@ -325,6 +325,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 1d473061e1c6..b1c7c9d92896 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 @@ -325,6 +325,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 6dc3113dd137..090efca6a318 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 @@ -325,6 +325,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 58e0846fb510..753ec14070a7 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 @@ -335,6 +335,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 08e751b7678d..3898e23b9430 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 @@ -335,6 +335,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 ee44f0915bfc..a14e22817532 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 @@ -335,6 +335,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 6b1b961dfc19..9a3a36fc1fac 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 @@ -178,6 +178,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 3b7f529caa0c..eec5a3029b99 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 @@ -202,6 +202,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 3e49b833491c..8d8493fab3d2 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 @@ -202,6 +202,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 643117b26155..b7fdf5b5d62b 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 @@ -202,6 +202,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 0b12063a7943..d4fd035ccc7a 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 @@ -212,6 +212,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 f2c646fa00c5..138d523060a8 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 @@ -212,6 +212,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 5f4b72b33114..d378775d258e 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 @@ -212,6 +212,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 d68c13ed9371..1fede701916f 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 @@ -212,6 +212,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 0ef9bdba2080..53a3df0e0591 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 @@ -315,6 +315,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 6b18dae649f2..7df6e55c78ab 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 @@ -1007,6 +1007,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 c827c4fa98ba..b705177a28c8 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 @@ -325,6 +325,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 c27f5a56301a..cc59b7a3a264 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 @@ -325,6 +325,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 0baaebd0cddd..343f2c02a399 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 @@ -325,6 +325,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 2ef649427920..acc8a76e54ea 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 @@ -335,6 +335,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 a1ecad9cde4d..254df91b944b 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 @@ -335,6 +335,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 3907538a3db5..97f33d5827e0 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 @@ -335,6 +335,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 fce71c9ebd55..47366497ba53 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 @@ -178,6 +178,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 21508bff2e65..8429c02adacb 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 @@ -202,6 +202,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 c50a09bb6bb6..3c6ce1c17624 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 @@ -202,6 +202,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 34563f9219bd..9f3c67517d2a 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 @@ -202,6 +202,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 d6b8df73bdbc..7857299e12fa 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 @@ -212,6 +212,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 f77a86224aa0..1b78ff8b495e 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 @@ -212,6 +212,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 85acb2f62971..e3a03e40755c 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 @@ -212,6 +212,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 dc28cad3556c..a8c7d661cf01 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 @@ -212,6 +212,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 605991761dbe..3fa2551d5971 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 @@ -315,6 +315,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 305ece90297d..3db02c5ae650 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 @@ -701,6 +701,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 e4407bca8e1b..01983eebc55e 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 @@ -187,6 +187,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 1deb26f2577d..4a5824781463 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 @@ -221,6 +221,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 ebdbccebd966..6c3e1dc513aa 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 @@ -221,6 +221,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 c800985d8a4c..ddb5987e81dc 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 @@ -221,6 +221,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 c4c030afe245..a1b6cab04320 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 @@ -241,6 +241,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 4016b68bab09..4b6f8d7a507b 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 @@ -241,6 +241,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 927cb14c993f..67474d9fdb0d 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 @@ -241,6 +241,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 eea7de5ad320..0d63f933ecd4 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/create_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/create_index @@ -350,6 +350,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 86cabaec0ba6..3eca05fa4b53 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 @@ -108,6 +108,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 7489570ccefa..df5cd426db93 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 @@ -132,6 +132,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 c6acd3d900ee..b5293b128a37 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 @@ -132,6 +132,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 beaa18b5d977..f2f02c3141d0 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 @@ -132,6 +132,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 54d274470666..6dd66086d464 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 @@ -142,6 +142,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 9ddd54ae9bfe..071ca5461865 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 @@ -142,6 +142,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 f543c045ceaf..3d2c4c61ba3b 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 @@ -142,6 +142,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 5a1355443e0d..7b662c9b5a4e 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_basic @@ -532,6 +532,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 c3b81437366b..02c767b4b309 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 @@ -120,6 +120,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 720bd7aa69b0..69914673b9a1 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 @@ -144,6 +144,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 24abffe9040d..b4f730f3b019 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 @@ -144,6 +144,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 91d15a2b8457..790d78cc1b36 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 @@ -144,6 +144,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 d2293056097e..542018adfee0 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 @@ -154,6 +154,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 19d7170dd6dc..5f395ea2fd97 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 @@ -154,6 +154,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 24c5fb2d8e11..2053bd703b78 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 @@ -154,6 +154,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 211c38be1462..479786921ec5 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_computed_index @@ -712,6 +712,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 1a64b34d22b8..a16e8afd6fe1 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 @@ -189,6 +189,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 ff18edd9f868..9de2ed9c691d 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 @@ -213,6 +213,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 8780e63182d2..1e97983a8436 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 @@ -213,6 +213,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 75305f85074c..b14e5abb67dc 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 @@ -213,6 +213,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 f5c008a9b8c9..36d2aaf2afd4 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 @@ -223,6 +223,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 f2aef503eea4..f06abea2c23f 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 @@ -223,6 +223,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 5557b9fe4010..9c60398f0e69 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 @@ -223,6 +223,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 a0f1ddbb1454..851dc389f584 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 @@ -429,6 +429,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 c0eaee2a9066..93c0df0ad017 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 @@ -429,6 +429,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 73d67d8a171a..01e3e85737ea 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 @@ -429,6 +429,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 541fe9166177..d35f3c1f652c 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 @@ -439,6 +439,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 4f97701c3fee..a99777a4cc9a 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 @@ -439,6 +439,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 e20ed5ab0262..8cbb6e78b3ae 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 @@ -439,6 +439,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 bb76f5950c8c..bea5baf8a594 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 @@ -211,6 +211,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 dc2b7fa6c9e9..242ec182975f 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 @@ -235,6 +235,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 17e59e8eeba8..50007170bede 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 @@ -235,6 +235,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 dadb92dfa36f..34795d69245f 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 @@ -235,6 +235,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 249edd36155d..e0c7f1e62abb 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 @@ -245,6 +245,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 02b9ed6e89fb..af76b284fb83 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 @@ -245,6 +245,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 6a36eeeb9e49..531d38c65a14 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 @@ -245,6 +245,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 8044afb414be..3eb883b7d3cf 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 @@ -245,6 +245,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 7d0b1e228184..c9a1008ae414 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 @@ -419,6 +419,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 f709fd531b1c..8331ebc29369 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 @@ -778,6 +778,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 ffdbe5230385..a5f326674519 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 @@ -889,6 +889,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 e349221ff49f..88fe7d74410f 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_unique_index @@ -661,6 +661,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 f7bbecc3592c..55551935fc34 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 @@ -162,6 +162,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 7bc5c26c5bd5..29b1bb44455d 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 @@ -186,6 +186,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 5cc425ddcd64..602e6d7ecdb5 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 @@ -186,6 +186,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 4c03715f610e..7fb244eafd91 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 @@ -186,6 +186,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 f0be2556bc39..5dfe4872feb4 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 @@ -196,6 +196,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 d5b85e3a1b5c..213d47c69777 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 @@ -196,6 +196,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 742f9e6beefa..a4d0ac6830c9 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 @@ -196,6 +196,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 be692fb4230f..439a333363a3 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_column_with_index @@ -633,6 +633,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 89b69a62a863..46560a810e2f 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 @@ -151,6 +151,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 864b60de5b25..75cdee6b5466 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 @@ -175,6 +175,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 7742727afb0b..b137b60d49ac 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 @@ -175,6 +175,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 444f52a52df2..e4b97b14cd3b 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 @@ -175,6 +175,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 0948e5ac9a39..3c222e089c93 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 @@ -185,6 +185,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 9fc07b92f272..a3bc726614c8 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 @@ -185,6 +185,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 3d25f638fa4f..055c99732876 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 @@ -185,6 +185,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 f02413822d0b..b613fdca1cc6 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 366f957d65ac..448e65ac9514 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 2dfb0ddfd0b6..efa722dcddbb 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 493ab48cafb9..09b1d424172b 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 @@ -253,6 +253,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 ab6fdf17af3d..31f131744f2f 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 @@ -277,6 +277,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 392724ee59e3..b583a0fe9dee 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 @@ -277,6 +277,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 e7751a1ddf26..184c68c98a58 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 @@ -277,6 +277,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 696da1167f4d..d1581e627717 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 @@ -287,6 +287,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 239839e33769..4caf5b0c04f1 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 @@ -287,6 +287,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 cb92e2656f3e..c489c3b10a05 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 @@ -287,6 +287,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 f709fd531b1c..8331ebc29369 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 @@ -778,6 +778,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 e5d4e43418b0..21a5be02d5c0 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 @@ -749,6 +749,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