From 23758048b0739e7ee26634a935672005145e170d Mon Sep 17 00:00:00 2001 From: Xiang Gu Date: Mon, 24 Oct 2022 11:18:10 -0400 Subject: [PATCH 1/3] rules: some dep-rule changes This PR changed two dep-rules, both of which concerns the case when dropping a descriptor: - "descriptor drop right before dependent element removal": changed from SameStagePrecedence to Precedence. - "descriptor removal right before dependent element removal": removed Release note: None --- .../drop_database_multiregion_primary_region | 4 +- .../end_to_end/drop_table_multiregion | 4 +- .../drop_table_multiregion_primary_region | 4 +- .../drop_database_multiregion_primary_region | 130 +- .../testdata/explain/drop_table_multiregion | 73 +- .../drop_table_multiregion_primary_region | 58 +- .../drop_database_multiregion_primary_region | 268 ++-- .../explain_verbose/drop_table_multiregion | 290 ++-- .../drop_table_multiregion_primary_region | 218 ++- .../opt/exec/execbuilder/testdata/show_trace | 4 +- .../scplan/internal/rules/dep_drop_object.go | 16 +- .../scplan/internal/rules/testdata/deprules | 187 ++- .../scplan/testdata/alter_table_drop_column | 358 +++-- .../scplan/testdata/drop_database | 1198 +++++++---------- .../schemachanger/scplan/testdata/drop_index | 115 +- .../scplan/testdata/drop_owned_by | 437 +++--- .../schemachanger/scplan/testdata/drop_schema | 1016 ++++++-------- .../scplan/testdata/drop_sequence | 10 +- .../schemachanger/scplan/testdata/drop_table | 567 ++++---- .../schemachanger/scplan/testdata/drop_type | 26 +- .../schemachanger/scplan/testdata/drop_view | 877 ++++++------ .../testdata/end_to_end/drop_table | 4 +- .../schemachanger/testdata/explain/drop_table | 80 +- .../testdata/explain_verbose/drop_schema | 10 +- .../testdata/explain_verbose/drop_table | 342 +++-- 25 files changed, 2787 insertions(+), 3509 deletions(-) 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 cc95d12bdee3..c651d7eb3f67 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 @@ -90,7 +90,7 @@ add synthetic descriptor #108: version: "1" # end StatementPhase # begin PreCommitPhase -## PreCommitPhase stage 1 of 1 with 20 MutationType ops +## PreCommitPhase stage 1 of 1 with 23 MutationType ops delete database namespace entry {0 0 multi_region_test_db} -> 104 delete object namespace entry {104 106 crdb_internal_region} -> 105 delete schema namespace entry {104 0 public} -> 106 @@ -224,7 +224,7 @@ notified job registry to adopt jobs: [1] begin transaction #2 commit transaction #2 begin transaction #3 -## PostCommitNonRevertiblePhase stage 1 of 1 with 20 MutationType ops +## PostCommitNonRevertiblePhase stage 1 of 1 with 17 MutationType ops upsert descriptor #108 ... createAsOfTime: 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 0bc054273405..fc1f3cd9ce2c 100644 --- a/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion @@ -36,7 +36,7 @@ add synthetic descriptor #108: version: "1" # end StatementPhase # begin PreCommitPhase -## PreCommitPhase stage 1 of 1 with 11 MutationType ops +## PreCommitPhase stage 1 of 1 with 15 MutationType ops delete object namespace entry {104 106 table_regional_by_row} -> 108 upsert descriptor #105 type: @@ -110,7 +110,7 @@ notified job registry to adopt jobs: [1] begin transaction #2 commit transaction #2 begin transaction #3 -## PostCommitNonRevertiblePhase stage 1 of 1 with 10 MutationType ops +## PostCommitNonRevertiblePhase stage 1 of 1 with 6 MutationType ops upsert descriptor #105 type: arrayTypeId: 107 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 0ffe6ad3be4a..47f1257971c9 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 @@ -36,7 +36,7 @@ add synthetic descriptor #108: version: "1" # end StatementPhase # begin PreCommitPhase -## PreCommitPhase stage 1 of 1 with 7 MutationType ops +## PreCommitPhase stage 1 of 1 with 10 MutationType ops delete object namespace entry {104 106 table_regional_by_table} -> 108 upsert descriptor #105 type: @@ -95,7 +95,7 @@ notified job registry to adopt jobs: [1] begin transaction #2 commit transaction #2 begin transaction #3 -## PostCommitNonRevertiblePhase stage 1 of 1 with 8 MutationType ops +## PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops upsert descriptor #105 type: arrayTypeId: 107 diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region index bb9cfc08526d..8579f5db1036 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region @@ -29,59 +29,59 @@ Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 52 elements transitioning toward ABSENT - │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 104, Name: multi_region_test_db, ReferencedDescID: 0} - │ │ ├── PUBLIC → ABSENT Owner:{DescID: 104} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 104, Name: admin} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 104, Name: public} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 104, Name: root} - │ │ ├── TXN_DROPPED → DROPPED Database:{DescID: 104} - │ │ ├── PUBLIC → ABSENT DatabaseRoleSetting:{DescID: 104, Name: __placeholder_role_name__} - │ │ ├── PUBLIC → ABSENT DatabaseRegionConfig:{DescID: 104, ReferencedDescID: 105} - │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 106, Name: public, ReferencedDescID: 104} - │ │ ├── PUBLIC → ABSENT Owner:{DescID: 106} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 106, Name: admin} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 106, Name: public} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 106, Name: root} - │ │ ├── TXN_DROPPED → DROPPED Schema:{DescID: 106} - │ │ ├── PUBLIC → ABSENT SchemaParent:{DescID: 106, ReferencedDescID: 104} - │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 105, Name: crdb_internal_region, ReferencedDescID: 104} - │ │ ├── PUBLIC → ABSENT Owner:{DescID: 105} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105, Name: admin} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105, Name: public} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105, Name: root} - │ │ ├── TXN_DROPPED → DROPPED EnumType:{DescID: 105} - │ │ ├── PUBLIC → ABSENT EnumTypeValue:{DescID: 105, Name: us-east1} - │ │ ├── PUBLIC → ABSENT EnumTypeValue:{DescID: 105, Name: us-east2} - │ │ ├── PUBLIC → ABSENT EnumTypeValue:{DescID: 105, Name: us-east3} - │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 105, ReferencedDescID: 106} - │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107, Name: _crdb_internal_region, ReferencedDescID: 104} - │ │ ├── PUBLIC → ABSENT Owner:{DescID: 107} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: admin} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: public} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: root} - │ │ ├── TXN_DROPPED → DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} - │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 107, ReferencedDescID: 106} - │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 108, Name: table_regional_by_table, ReferencedDescID: 104} - │ │ ├── PUBLIC → ABSENT Owner:{DescID: 108} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: admin} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: root} - │ │ ├── TXN_DROPPED → DROPPED Table:{DescID: 108} - │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 108, ReferencedDescID: 106} - │ │ ├── PUBLIC → ABSENT TableLocalitySecondaryRegion:{DescID: 108, ReferencedDescID: 105} - │ │ ├── PUBLIC → ABSENT ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 1} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: a, ColumnID: 1} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 4294967295} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} - │ └── 20 Mutation operations + │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 104, Name: multi_region_test_db, ReferencedDescID: 0} + │ │ ├── PUBLIC → ABSENT Owner:{DescID: 104} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 104, Name: admin} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 104, Name: public} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 104, Name: root} + │ │ ├── TXN_DROPPED → DROPPED Database:{DescID: 104} + │ │ ├── PUBLIC → ABSENT DatabaseRoleSetting:{DescID: 104, Name: __placeholder_role_name__} + │ │ ├── PUBLIC → ABSENT DatabaseRegionConfig:{DescID: 104, ReferencedDescID: 105} + │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 106, Name: public, ReferencedDescID: 104} + │ │ ├── PUBLIC → ABSENT Owner:{DescID: 106} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 106, Name: admin} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 106, Name: public} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 106, Name: root} + │ │ ├── TXN_DROPPED → DROPPED Schema:{DescID: 106} + │ │ ├── PUBLIC → ABSENT SchemaParent:{DescID: 106, ReferencedDescID: 104} + │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 105, Name: crdb_internal_region, ReferencedDescID: 104} + │ │ ├── PUBLIC → ABSENT Owner:{DescID: 105} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105, Name: admin} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105, Name: public} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 105, Name: root} + │ │ ├── TXN_DROPPED → DROPPED EnumType:{DescID: 105} + │ │ ├── PUBLIC → ABSENT EnumTypeValue:{DescID: 105, Name: us-east1} + │ │ ├── PUBLIC → ABSENT EnumTypeValue:{DescID: 105, Name: us-east2} + │ │ ├── PUBLIC → ABSENT EnumTypeValue:{DescID: 105, Name: us-east3} + │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 105, ReferencedDescID: 106} + │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107, Name: _crdb_internal_region, ReferencedDescID: 104} + │ │ ├── PUBLIC → ABSENT Owner:{DescID: 107} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: admin} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: public} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: root} + │ │ ├── TXN_DROPPED → DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} + │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 107, ReferencedDescID: 106} + │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 108, Name: table_regional_by_table, ReferencedDescID: 104} + │ │ ├── PUBLIC → ABSENT Owner:{DescID: 108} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: admin} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: root} + │ │ ├── TXN_DROPPED → DROPPED Table:{DescID: 108} + │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 108, ReferencedDescID: 106} + │ │ ├── PUBLIC → ABSENT TableLocalitySecondaryRegion:{DescID: 108, ReferencedDescID: 105} + │ │ ├── PUBLIC → ABSENT ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 1} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: a, ColumnID: 1} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967295} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} + │ │ ├── VALIDATED → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} + │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} + │ └── 23 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":104} │ ├── RemoveDatabaseRoleSettings {"DatabaseID":104} │ ├── MarkDescriptorAsDropped {"DescriptorID":106} @@ -96,6 +96,9 @@ Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":105,"Name":"crdb_internal_re...","SchemaID":106}} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"_crdb_internal_r...","SchemaID":106}} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":108,"Name":"table_regional_b...","SchemaID":106}} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} │ ├── SetJobStateOnDescriptor {"DescriptorID":104,"Initialize":true} │ ├── SetJobStateOnDescriptor {"DescriptorID":105,"Initialize":true} │ ├── SetJobStateOnDescriptor {"DescriptorID":106,"Initialize":true} @@ -104,17 +107,13 @@ Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; │ └── CreateSchemaChangerJob {"NonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase - ├── 9 elements transitioning toward ABSENT - │ ├── DROPPED → ABSENT Database:{DescID: 104} - │ ├── DROPPED → ABSENT Schema:{DescID: 106} - │ ├── DROPPED → ABSENT EnumType:{DescID: 105} - │ ├── DROPPED → ABSENT AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} - │ ├── DROPPED → ABSENT Table:{DescID: 108} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 1} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967295} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967294} - │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - └── 20 Mutation operations + ├── 5 elements transitioning toward ABSENT + │ ├── DROPPED → ABSENT Database:{DescID: 104} + │ ├── DROPPED → ABSENT Schema:{DescID: 106} + │ ├── DROPPED → ABSENT EnumType:{DescID: 105} + │ ├── DROPPED → ABSENT AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} + │ └── DROPPED → ABSENT Table:{DescID: 108} + └── 17 Mutation operations ├── LogEvent {"TargetStatus":1} ├── CreateGCJobForDatabase {"DatabaseID":104} ├── DeleteDescriptor {"DescriptorID":104} @@ -126,9 +125,6 @@ Schema change plan for DROP DATABASE ‹multi_region_test_db› CASCADE; ├── DeleteDescriptor {"DescriptorID":107} ├── LogEvent {"TargetStatus":1} ├── CreateGCJobForTable {"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} ├── RemoveJobStateFromDescriptor {"DescriptorID":104} ├── RemoveJobStateFromDescriptor {"DescriptorID":105} ├── RemoveJobStateFromDescriptor {"DescriptorID":106} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion index 54e2a0dff4bd..a96a5ba765ba 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion @@ -22,60 +22,55 @@ Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹tab ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 26 elements transitioning toward ABSENT - │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 108, Name: table_regional_by_row, ReferencedDescID: 104} - │ │ ├── PUBLIC → ABSENT Owner:{DescID: 108} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: admin} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: root} - │ │ ├── TXN_DROPPED → DROPPED Table:{DescID: 108} - │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 108, ReferencedDescID: 106} - │ │ ├── PUBLIC → ABSENT TableLocalityRegionalByRow:{DescID: 108} - │ │ ├── PUBLIC → ABSENT ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 1} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: k, ColumnID: 1} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 2} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: crdb_region, ColumnID: 2} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnFamilyID: 0, ColumnID: 2} - │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnID: 2} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 4294967295} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 1} - │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - │ │ ├── PUBLIC → ABSENT IndexPartitioning:{DescID: 108, IndexID: 1} - │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_row_pkey, IndexID: 1} - │ └── 11 Mutation operations + │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 108, Name: table_regional_by_row, ReferencedDescID: 104} + │ │ ├── PUBLIC → ABSENT Owner:{DescID: 108} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: admin} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: root} + │ │ ├── TXN_DROPPED → DROPPED Table:{DescID: 108} + │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 108, ReferencedDescID: 106} + │ │ ├── PUBLIC → ABSENT TableLocalityRegionalByRow:{DescID: 108} + │ │ ├── PUBLIC → ABSENT ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 1} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: k, ColumnID: 1} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 2} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: crdb_region, ColumnID: 2} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnFamilyID: 0, ColumnID: 2} + │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnID: 2} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967295} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 1} + │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} + │ │ ├── VALIDATED → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} + │ │ ├── PUBLIC → ABSENT IndexPartitioning:{DescID: 108, IndexID: 1} + │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_row_pkey, IndexID: 1} + │ └── 15 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":108} │ ├── RemoveAllTableComments {"TableID":108} │ ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":108} │ ├── UpdateTableBackReferencesInTypes {"BackReferencedTableID":108} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":108,"Name":"table_regional_b...","SchemaID":106}} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} │ ├── RemoveDroppedColumnType {"ColumnID":2,"TableID":108} │ ├── UpdateTableBackReferencesInTypes {"BackReferencedTableID":108} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":108} │ ├── SetJobStateOnDescriptor {"DescriptorID":105,"Initialize":true} │ ├── SetJobStateOnDescriptor {"DescriptorID":107,"Initialize":true} │ ├── SetJobStateOnDescriptor {"DescriptorID":108,"Initialize":true} │ └── CreateSchemaChangerJob {"NonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase - ├── 6 elements transitioning toward ABSENT - │ ├── DROPPED → ABSENT Table:{DescID: 108} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 1} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 2} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967295} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967294} - │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - └── 10 Mutation operations + ├── 1 element transitioning toward ABSENT + │ └── DROPPED → ABSENT Table:{DescID: 108} + └── 6 Mutation operations ├── LogEvent {"TargetStatus":1} ├── CreateGCJobForTable {"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} ├── RemoveJobStateFromDescriptor {"DescriptorID":105} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} ├── RemoveJobStateFromDescriptor {"DescriptorID":108} diff --git a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region index 52775432f31a..d77912173633 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region +++ b/pkg/ccl/schemachangerccl/testdata/explain/drop_table_multiregion_primary_region @@ -21,48 +21,44 @@ Schema change plan for DROP TABLE ‹multi_region_test_db›.‹public›.‹tab ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 20 elements transitioning toward ABSENT - │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 108, Name: table_regional_by_table, ReferencedDescID: 104} - │ │ ├── PUBLIC → ABSENT Owner:{DescID: 108} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: admin} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: root} - │ │ ├── TXN_DROPPED → DROPPED Table:{DescID: 108} - │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 108, ReferencedDescID: 106} - │ │ ├── PUBLIC → ABSENT TableLocalitySecondaryRegion:{DescID: 108, ReferencedDescID: 105} - │ │ ├── PUBLIC → ABSENT ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 1} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: a, ColumnID: 1} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 4294967295} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 108, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} - │ └── 7 Mutation operations + │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 108, Name: table_regional_by_table, ReferencedDescID: 104} + │ │ ├── PUBLIC → ABSENT Owner:{DescID: 108} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: admin} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 108, Name: root} + │ │ ├── TXN_DROPPED → DROPPED Table:{DescID: 108} + │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 108, ReferencedDescID: 106} + │ │ ├── PUBLIC → ABSENT TableLocalitySecondaryRegion:{DescID: 108, ReferencedDescID: 105} + │ │ ├── PUBLIC → ABSENT ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 1} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: a, ColumnID: 1} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967295} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} + │ │ ├── VALIDATED → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} + │ │ └── PUBLIC → ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} + │ └── 10 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":108} │ ├── RemoveAllTableComments {"TableID":108} │ ├── RemoveBackReferenceInTypes {"BackReferencedDescriptorID":108} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":108,"Name":"table_regional_b...","SchemaID":106}} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} │ ├── SetJobStateOnDescriptor {"DescriptorID":105,"Initialize":true} │ ├── SetJobStateOnDescriptor {"DescriptorID":108,"Initialize":true} │ └── CreateSchemaChangerJob {"NonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase - ├── 5 elements transitioning toward ABSENT - │ ├── DROPPED → ABSENT Table:{DescID: 108} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 1} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967295} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 108, ColumnID: 4294967294} - │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - └── 8 Mutation operations + ├── 1 element transitioning toward ABSENT + │ └── DROPPED → ABSENT Table:{DescID: 108} + └── 5 Mutation operations ├── LogEvent {"TargetStatus":1} ├── CreateGCJobForTable {"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":108} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":108} ├── RemoveJobStateFromDescriptor {"DescriptorID":105} ├── RemoveJobStateFromDescriptor {"DescriptorID":108} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} 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 64e3ca0bc3a6..7e07b9461650 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 @@ -80,13 +80,13 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • Namespace:{DescID: 104, Name: multi_region_test_db, ReferencedDescID: 0} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} +│ │ │ └── • Precedence dependency from DROPPED Database:{DescID: 104} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 104} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} +│ │ │ ├── • Precedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -95,7 +95,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 104, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} +│ │ │ ├── • Precedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -104,7 +104,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 104, Name: public} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} +│ │ │ ├── • Precedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -113,7 +113,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 104, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} +│ │ │ ├── • Precedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -128,13 +128,13 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • DatabaseRoleSetting:{DescID: 104, Name: __placeholder_role_name__} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} +│ │ │ └── • Precedence dependency from DROPPED Database:{DescID: 104} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • DatabaseRegionConfig:{DescID: 104, ReferencedDescID: 105} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} +│ │ │ ├── • Precedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} @@ -146,13 +146,13 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ └── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 106} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ ├── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -161,7 +161,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 106, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ ├── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -170,7 +170,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 106, Name: public} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ ├── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -179,7 +179,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 106, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ ├── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -197,7 +197,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ └── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Namespace:{DescID: 105, Name: crdb_internal_region, ReferencedDescID: 104} @@ -206,13 +206,13 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ └── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 105} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ ├── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -221,7 +221,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 105, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ ├── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -230,7 +230,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 105, Name: public} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ ├── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -239,7 +239,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 105, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ ├── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -254,7 +254,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • EnumTypeValue:{DescID: 105, Name: us-east1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ ├── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -263,7 +263,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • EnumTypeValue:{DescID: 105, Name: us-east2} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ ├── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -272,7 +272,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • EnumTypeValue:{DescID: 105, Name: us-east3} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ ├── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -284,7 +284,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} +│ │ │ └── • Precedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Namespace:{DescID: 107, Name: _crdb_internal_region, ReferencedDescID: 104} @@ -293,13 +293,13 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} +│ │ │ └── • Precedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 107} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} +│ │ │ ├── • Precedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -308,7 +308,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 107, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} +│ │ │ ├── • Precedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -317,7 +317,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 107, Name: public} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} +│ │ │ ├── • Precedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -326,7 +326,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 107, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} +│ │ │ ├── • Precedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -344,7 +344,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} +│ │ │ └── • Precedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Namespace:{DescID: 108, Name: table_regional_by_table, ReferencedDescID: 104} @@ -353,13 +353,13 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED Database:{DescID: 104} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 108} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -368,7 +368,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 108, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -377,7 +377,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • UserPrivileges:{DescID: 108, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -395,7 +395,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • TableLocalitySecondaryRegion:{DescID: 108, ReferencedDescID: 105} @@ -404,20 +404,29 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ ├── • SameStagePrecedence dependency from DROPPED EnumType:{DescID: 105} │ │ │ │ rule: "descriptor drop right before removing dependent with attr ref" │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations │ │ │ rule: "skip element removal ops on descriptor drop" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 1} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: a, ColumnID: 1} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -425,7 +434,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • ColumnName:{DescID: 108, Name: a, ColumnID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} @@ -437,14 +446,20 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 4294967295} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -452,7 +467,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967295} @@ -464,14 +479,20 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967295} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 4294967294} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -479,7 +500,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} @@ -491,7 +512,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} @@ -500,7 +521,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ ├── • IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} @@ -514,18 +535,27 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ │ rule: "skip index-column removal ops on index removal" │ │ │ │ │ ├── • PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} -│ │ │ │ VALIDATED → DELETE_ONLY +│ │ │ │ VALIDATED → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" │ │ │ │ │ │ │ ├── • skip VALIDATED → WRITE_ONLY operations │ │ │ │ rule: "skip index removal ops on relation drop" │ │ │ │ -│ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations +│ │ │ ├── • skip WRITE_ONLY → DELETE_ONLY operations +│ │ │ │ rule: "skip index removal ops on relation drop" +│ │ │ │ +│ │ │ └── • skip DELETE_ONLY → ABSENT operations │ │ │ rule: "skip index removal ops on relation drop" │ │ │ │ │ └── • IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} │ │ │ PUBLIC → ABSENT │ │ │ -│ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Precedence dependency from VALIDATED PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} @@ -534,7 +564,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ └── • skip PUBLIC → ABSENT operations │ │ rule: "skip index dependents removal ops on relation drop" │ │ -│ └── • 20 Mutation operations +│ └── • 23 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped │ │ DescriptorID: 104 @@ -599,6 +629,42 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ Name: table_regional_by_table │ │ SchemaID: 106 │ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 1 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP DATABASE ‹multi_region_test_db› CASCADE +│ │ StatementTag: DROP DATABASE +│ │ TargetMetadata: +│ │ SourceElementID: 3 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 4294967295 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP DATABASE ‹multi_region_test_db› CASCADE +│ │ StatementTag: DROP DATABASE +│ │ TargetMetadata: +│ │ SourceElementID: 3 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 4294967294 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP DATABASE ‹multi_region_test_db› CASCADE +│ │ StatementTag: DROP DATABASE +│ │ TargetMetadata: +│ │ SourceElementID: 3 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ │ ├── • SetJobStateOnDescriptor │ │ DescriptorID: 104 │ │ Initialize: true @@ -630,7 +696,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ - 108 │ JobID: 1 │ NonCancelable: true -│ RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 14 MutationType ops +│ RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops │ pending │ Statements: │ - statement: DROP DATABASE multi_region_test_db CASCADE @@ -641,7 +707,7 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ └── • Stage 1 of 1 in PostCommitNonRevertiblePhase │ - ├── • 9 elements transitioning toward ABSENT + ├── • 5 elements transitioning toward ABSENT │ │ │ ├── • Database:{DescID: 104} │ │ │ DROPPED → ABSENT @@ -667,67 +733,13 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ │ └── • PreviousTransactionPrecedence dependency from DROPPED AliasType:{DescID: 107, ReferencedTypeIDs: [105 107]} │ │ rule: "descriptor DROPPED in transaction before removal" │ │ - │ ├── • Table:{DescID: 108} - │ │ │ DROPPED → ABSENT - │ │ │ - │ │ └── • PreviousTransactionPrecedence dependency from DROPPED Table:{DescID: 108} - │ │ rule: "descriptor DROPPED in transaction before removal" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 1} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: a, ColumnID: 1} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 4294967295} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 4294967294} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} - │ │ rule: "dependents removed before column" - │ │ - │ └── • PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - │ │ DELETE_ONLY → ABSENT - │ │ - │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ rule: "descriptor removal right before dependent element removal" + │ └── • Table:{DescID: 108} + │ │ DROPPED → ABSENT │ │ - │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ ├── • Precedence dependency from ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ └── • skip DELETE_ONLY → ABSENT operations - │ rule: "skip index removal ops on relation drop" + │ └── • PreviousTransactionPrecedence dependency from DROPPED Table:{DescID: 108} + │ rule: "descriptor DROPPED in transaction before removal" │ - └── • 20 Mutation operations + └── • 17 Mutation operations │ ├── • LogEvent │ Element: @@ -836,42 +848,6 @@ EXPLAIN (ddl, verbose) DROP DATABASE multi_region_test_db CASCADE; │ Statement: DROP DATABASE multi_region_test_db CASCADE │ TableID: 108 │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 1 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP DATABASE ‹multi_region_test_db› CASCADE - │ StatementTag: DROP DATABASE - │ TargetMetadata: - │ SourceElementID: 3 - │ SubWorkID: 1 - │ TableID: 108 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 4294967295 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP DATABASE ‹multi_region_test_db› CASCADE - │ StatementTag: DROP DATABASE - │ TargetMetadata: - │ SourceElementID: 3 - │ SubWorkID: 1 - │ TableID: 108 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 4294967294 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP DATABASE ‹multi_region_test_db› CASCADE - │ StatementTag: DROP DATABASE - │ TargetMetadata: - │ SourceElementID: 3 - │ SubWorkID: 1 - │ TableID: 108 - │ ├── • RemoveJobStateFromDescriptor │ DescriptorID: 104 │ JobID: 1 diff --git a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion index 5fc714d12568..57ce3b9a698c 100644 --- a/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion +++ b/pkg/ccl/schemachangerccl/testdata/explain_verbose/drop_table_multiregion @@ -62,13 +62,13 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • Namespace:{DescID: 108, Name: table_regional_by_row, ReferencedDescID: 104} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 108} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -77,7 +77,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • UserPrivileges:{DescID: 108, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -86,7 +86,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • UserPrivileges:{DescID: 108, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -101,26 +101,35 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ObjectParent:{DescID: 108, ReferencedDescID: 106} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • TableLocalityRegionalByRow:{DescID: 108} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations │ │ │ rule: "skip element removal ops on descriptor drop" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 1} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: k, ColumnID: 1} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -128,7 +137,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnName:{DescID: 108, Name: k, ColumnID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} @@ -140,14 +149,26 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 2} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: crdb_region, ColumnID: 2} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnFamilyID: 0, ColumnID: 2} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnDefaultExpression:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnID: 2} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 1} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -155,7 +176,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnName:{DescID: 108, Name: crdb_region, ColumnID: 2} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 2} @@ -167,7 +188,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnType:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnFamilyID: 0, ColumnID: 2} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 2} @@ -179,14 +200,20 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnDefaultExpression:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnID: 2} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 2} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 4294967295} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -194,7 +221,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967295} @@ -206,14 +233,20 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967295} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 4294967294} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -221,7 +254,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} @@ -233,7 +266,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} @@ -242,7 +275,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 2} @@ -258,7 +291,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} @@ -272,18 +305,33 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ │ rule: "skip index-column removal ops on index removal" │ │ │ │ │ ├── • PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} -│ │ │ │ VALIDATED → DELETE_ONLY +│ │ │ │ VALIDATED → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexPartitioning:{DescID: 108, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexName:{DescID: 108, Name: table_regional_by_row_pkey, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" │ │ │ │ │ │ │ ├── • skip VALIDATED → WRITE_ONLY operations │ │ │ │ rule: "skip index removal ops on relation drop" │ │ │ │ -│ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations +│ │ │ ├── • skip WRITE_ONLY → DELETE_ONLY operations +│ │ │ │ rule: "skip index removal ops on relation drop" +│ │ │ │ +│ │ │ └── • skip DELETE_ONLY → ABSENT operations │ │ │ rule: "skip index removal ops on relation drop" │ │ │ │ │ ├── • IndexPartitioning:{DescID: 108, IndexID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from VALIDATED PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} @@ -295,7 +343,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ └── • IndexName:{DescID: 108, Name: table_regional_by_row_pkey, IndexID: 1} │ │ │ PUBLIC → ABSENT │ │ │ -│ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Precedence dependency from VALIDATED PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} @@ -304,7 +352,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ └── • skip PUBLIC → ABSENT operations │ │ rule: "skip index dependents removal ops on relation drop" │ │ -│ └── • 11 Mutation operations +│ └── • 15 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped │ │ DescriptorID: 108 @@ -329,6 +377,18 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ Name: table_regional_by_row │ │ SchemaID: 106 │ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 1 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ │ ├── • RemoveDroppedColumnType │ │ ColumnID: 2 │ │ TableID: 108 @@ -339,6 +399,42 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ - 105 │ │ - 107 │ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 4294967295 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 4294967294 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 2 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ │ ├── • SetJobStateOnDescriptor │ │ DescriptorID: 105 │ │ Initialize: true @@ -360,7 +456,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ - 108 │ JobID: 1 │ NonCancelable: true -│ RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 6 MutationType ops pending +│ RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 2 MutationType ops pending │ Statements: │ - statement: DROP TABLE multi_region_test_db.public.table_regional_by_row │ redactedstatement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› @@ -370,93 +466,15 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ └── • Stage 1 of 1 in PostCommitNonRevertiblePhase │ - ├── • 6 elements transitioning toward ABSENT - │ │ - │ ├── • Table:{DescID: 108} - │ │ │ DROPPED → ABSENT - │ │ │ - │ │ └── • PreviousTransactionPrecedence dependency from DROPPED Table:{DescID: 108} - │ │ rule: "descriptor DROPPED in transaction before removal" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 1} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: k, ColumnID: 1} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 2} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: crdb_region, ColumnID: 2} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnFamilyID: 0, ColumnID: 2} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnDefaultExpression:{DescID: 108, ReferencedTypeIDs: [105 107], ColumnID: 2} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 1} - │ │ rule: "dependents removed before column" + ├── • 1 element transitioning toward ABSENT │ │ - │ ├── • Column:{DescID: 108, ColumnID: 4294967295} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 4294967294} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} - │ │ rule: "dependents removed before column" - │ │ - │ └── • PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - │ │ DELETE_ONLY → ABSENT - │ │ - │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ rule: "descriptor removal right before dependent element removal" - │ │ - │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ rule: "dependents removed before index" + │ └── • Table:{DescID: 108} + │ │ DROPPED → ABSENT │ │ - │ ├── • Precedence dependency from ABSENT IndexPartitioning:{DescID: 108, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ ├── • Precedence dependency from ABSENT IndexName:{DescID: 108, Name: table_regional_by_row_pkey, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ └── • skip DELETE_ONLY → ABSENT operations - │ rule: "skip index removal ops on relation drop" + │ └── • PreviousTransactionPrecedence dependency from DROPPED Table:{DescID: 108} + │ rule: "descriptor DROPPED in transaction before removal" │ - └── • 10 Mutation operations + └── • 6 Mutation operations │ ├── • LogEvent │ Element: @@ -477,54 +495,6 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ Statement: DROP TABLE multi_region_test_db.public.table_regional_by_row │ TableID: 108 │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 1 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 108 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 2 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 108 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 4294967295 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 108 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 4294967294 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_row› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 108 - │ ├── • RemoveJobStateFromDescriptor │ DescriptorID: 105 │ JobID: 1 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 8be12c3bc788..4f47154c6cec 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 @@ -56,13 +56,13 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • Namespace:{DescID: 108, Name: table_regional_by_table, ReferencedDescID: 104} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 108} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -71,7 +71,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • UserPrivileges:{DescID: 108, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -80,7 +80,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • UserPrivileges:{DescID: 108, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -95,26 +95,35 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ObjectParent:{DescID: 108, ReferencedDescID: 106} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • TableLocalitySecondaryRegion:{DescID: 108, ReferencedDescID: 105} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations │ │ │ rule: "skip element removal ops on descriptor drop" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 1} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: a, ColumnID: 1} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -122,7 +131,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnName:{DescID: 108, Name: a, ColumnID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} @@ -134,14 +143,20 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 4294967295} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -149,7 +164,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967295} @@ -161,14 +176,20 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967295} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 108, ColumnID: 4294967294} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -176,7 +197,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} @@ -188,7 +209,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 4294967294} @@ -197,7 +218,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ ├── • IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 108, ColumnID: 1} @@ -211,18 +232,27 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ │ rule: "skip index-column removal ops on index removal" │ │ │ │ │ ├── • PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} -│ │ │ │ VALIDATED → DELETE_ONLY +│ │ │ │ VALIDATED → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" │ │ │ │ │ │ │ ├── • skip VALIDATED → WRITE_ONLY operations │ │ │ │ rule: "skip index removal ops on relation drop" │ │ │ │ -│ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations +│ │ │ ├── • skip WRITE_ONLY → DELETE_ONLY operations +│ │ │ │ rule: "skip index removal ops on relation drop" +│ │ │ │ +│ │ │ └── • skip DELETE_ONLY → ABSENT operations │ │ │ rule: "skip index removal ops on relation drop" │ │ │ │ │ └── • IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} │ │ │ PUBLIC → ABSENT │ │ │ -│ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 108} +│ │ ├── • Precedence dependency from DROPPED Table:{DescID: 108} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Precedence dependency from VALIDATED PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} @@ -231,7 +261,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ └── • skip PUBLIC → ABSENT operations │ │ rule: "skip index dependents removal ops on relation drop" │ │ -│ └── • 7 Mutation operations +│ └── • 10 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped │ │ DescriptorID: 108 @@ -251,6 +281,45 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ │ Name: table_regional_by_table │ │ SchemaID: 106 │ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 1 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› +│ │ CASCADE +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 4294967295 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› +│ │ CASCADE +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 4294967294 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› +│ │ CASCADE +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 108 +│ │ │ ├── • SetJobStateOnDescriptor │ │ DescriptorID: 105 │ │ Initialize: true @@ -267,7 +336,7 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ - 108 │ JobID: 1 │ NonCancelable: true -│ RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops pending +│ RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 2 MutationType ops pending │ Statements: │ - statement: DROP TABLE multi_region_test_db.public.table_regional_by_table CASCADE │ redactedstatement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› @@ -278,69 +347,15 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ └── • Stage 1 of 1 in PostCommitNonRevertiblePhase │ - ├── • 5 elements transitioning toward ABSENT - │ │ - │ ├── • Table:{DescID: 108} - │ │ │ DROPPED → ABSENT - │ │ │ - │ │ └── • PreviousTransactionPrecedence dependency from DROPPED Table:{DescID: 108} - │ │ rule: "descriptor DROPPED in transaction before removal" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 1} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: a, ColumnID: 1} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 4294967295} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 108, ColumnID: 4294967294} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294} - │ │ rule: "dependents removed before column" + ├── • 1 element transitioning toward ABSENT │ │ - │ └── • PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1} - │ │ DELETE_ONLY → ABSENT + │ └── • Table:{DescID: 108} + │ │ DROPPED → ABSENT │ │ - │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 108} - │ │ rule: "descriptor removal right before dependent element removal" - │ │ - │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ ├── • Precedence dependency from ABSENT IndexName:{DescID: 108, Name: table_regional_by_table_pkey, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ └── • skip DELETE_ONLY → ABSENT operations - │ rule: "skip index removal ops on relation drop" + │ └── • PreviousTransactionPrecedence dependency from DROPPED Table:{DescID: 108} + │ rule: "descriptor DROPPED in transaction before removal" │ - └── • 8 Mutation operations + └── • 5 Mutation operations │ ├── • LogEvent │ Element: @@ -362,45 +377,6 @@ EXPLAIN (ddl, verbose) DROP TABLE multi_region_test_db.public.table_regional_by_ │ Statement: DROP TABLE multi_region_test_db.public.table_regional_by_table CASCADE │ TableID: 108 │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 1 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› - │ CASCADE - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 108 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 4294967295 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› - │ CASCADE - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 108 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 4294967294 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹multi_region_test_db›.‹public›.‹table_regional_by_table› - │ CASCADE - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 108 - │ ├── • RemoveJobStateFromDescriptor │ DescriptorID: 105 │ JobID: 1 diff --git a/pkg/sql/opt/exec/execbuilder/testdata/show_trace b/pkg/sql/opt/exec/execbuilder/testdata/show_trace index 14612c4f7a3f..e184c3118d0d 100644 --- a/pkg/sql/opt/exec/execbuilder/testdata/show_trace +++ b/pkg/sql/opt/exec/execbuilder/testdata/show_trace @@ -165,7 +165,7 @@ query TT $trace_query ---- sql query rows affected: 0 -commit sql txn Put /Table/3/1/109/2/1 -> table: parent_id:106 unexposed_parent_schema_id:107 columns: nullable:true hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > columns: nullable:true hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > columns: nullable:false default_expr:"unique_rowid()" hidden:true inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > next_column_id:4 families: next_family_id:1 primary_index: interleave:<> partitioning: type:FORWARD created_explicitly:false encoding_type:1 sharded: disabled:false geo_config:<> predicate:"" use_delete_preserving_encoding:false created_at_nanos:... constraint_id:1 not_visible:false > next_index_id:2 privileges: users: owner_proto:"root" version:2 > next_mutation_id:1 format_version:3 state:DROP offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DROPPED current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 target_ranks:7 target_ranks:8 target_ranks:9 target_ranks:10 target_ranks:11 target_ranks:12 target_ranks:13 target_ranks:14 target_ranks:15 target_ranks:16 target_ranks:17 target_ranks:18 target_ranks:19 target_ranks:20 target_ranks:21 target_ranks:22 target_ranks:23 target_ranks:24 target_ranks:25 target_ranks:26 target_ranks:27 relevant_statements: > authorization: > drop_time:... replacement_of: > audit_mode:DISABLED drop_job_id:0 create_query:"TABLE t.public.kv" create_as_of_time:<...> temporary:false partition_all_by:false exclude_data_from_backup:false next_constraint_id:2 import_start_wall_time:0 > +commit sql txn Put /Table/3/1/109/2/1 -> table: parent_id:106 unexposed_parent_schema_id:107 columns: nullable:true hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > columns: nullable:true hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > columns: nullable:false default_expr:"unique_rowid()" hidden:true inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > next_column_id:4 families: next_family_id:1 primary_index: interleave:<> partitioning: type:FORWARD created_explicitly:false encoding_type:1 sharded: disabled:false geo_config:<> predicate:"" use_delete_preserving_encoding:false created_at_nanos:... constraint_id:1 not_visible:false > next_index_id:2 privileges: users: owner_proto:"root" version:2 > next_mutation_id:1 format_version:3 state:DROP offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DROPPED current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 target_ranks:7 target_ranks:8 target_ranks:9 target_ranks:10 target_ranks:11 target_ranks:12 target_ranks:13 target_ranks:14 target_ranks:15 target_ranks:16 target_ranks:17 target_ranks:18 target_ranks:19 target_ranks:20 target_ranks:21 target_ranks:22 target_ranks:23 target_ranks:24 target_ranks:25 target_ranks:26 target_ranks:27 relevant_statements: > authorization: > drop_time:... replacement_of: > audit_mode:DISABLED drop_job_id:0 create_query:"TABLE t.public.kv" create_as_of_time:<...> temporary:false partition_all_by:false exclude_data_from_backup:false next_constraint_id:2 import_start_wall_time:0 > commit sql txn Del /NamespaceTable/30/1/106/107/"kv2"/4/1 statement ok @@ -206,7 +206,7 @@ query TT $trace_query ---- sql query rows affected: 0 -commit sql txn Put /Table/3/1/108/2/1 -> table: parent_id:106 unexposed_parent_schema_id:107 columns: nullable:false hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > columns: nullable:true hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > next_column_id:3 families: next_family_id:1 primary_index: interleave:<> partitioning: type:FORWARD created_explicitly:false encoding_type:1 sharded: disabled:false geo_config:<> predicate:"" use_delete_preserving_encoding:false created_at_nanos:... constraint_id:1 not_visible:false > next_index_id:4 privileges: users: owner_proto:"root" version:2 > next_mutation_id:3 format_version:3 state:DROP offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DROPPED current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DELETE_ONLY current_statuses:ABSENT target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 target_ranks:7 target_ranks:8 target_ranks:9 target_ranks:10 target_ranks:11 target_ranks:12 target_ranks:13 target_ranks:14 target_ranks:15 target_ranks:16 target_ranks:17 target_ranks:18 target_ranks:19 target_ranks:20 target_ranks:21 target_ranks:22 relevant_statements: > authorization: > drop_time:... replacement_of: > audit_mode:DISABLED drop_job_id:0 create_query:"" create_as_of_time:<...> temporary:false partition_all_by:false exclude_data_from_backup:false next_constraint_id:4 import_start_wall_time:0 > +commit sql txn Put /Table/3/1/108/2/1 -> table: parent_id:106 unexposed_parent_schema_id:107 columns: nullable:false hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > columns: nullable:true hidden:false inaccessible:false generated_as_identity_type:NOT_IDENTITY_COLUMN virtual:false pg_attribute_num:0 alter_column_type_in_progress:false system_column_kind:NONE > next_column_id:3 families: next_family_id:1 primary_index: interleave:<> partitioning: type:FORWARD created_explicitly:false encoding_type:1 sharded: disabled:false geo_config:<> predicate:"" use_delete_preserving_encoding:false created_at_nanos:... constraint_id:1 not_visible:false > next_index_id:4 privileges: users: owner_proto:"root" version:2 > next_mutation_id:3 format_version:3 state:DROP offline_reason:"" view_query:"" is_materialized_view:false refresh_view_required:false declarative_schema_changer_state:<...> > metadata:<...> target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > is_nullable:true > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > targets: > > metadata: target_status:ABSENT > targets: > metadata: target_status:ABSENT > current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:DROPPED current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT current_statuses:ABSENT target_ranks:0 target_ranks:1 target_ranks:2 target_ranks:3 target_ranks:4 target_ranks:5 target_ranks:6 target_ranks:7 target_ranks:8 target_ranks:9 target_ranks:10 target_ranks:11 target_ranks:12 target_ranks:13 target_ranks:14 target_ranks:15 target_ranks:16 target_ranks:17 target_ranks:18 target_ranks:19 target_ranks:20 target_ranks:21 target_ranks:22 relevant_statements: > authorization: > drop_time:... replacement_of: > audit_mode:DISABLED drop_job_id:0 create_query:"" create_as_of_time:<...> temporary:false partition_all_by:false exclude_data_from_backup:false next_constraint_id:4 import_start_wall_time:0 > commit sql txn Del /NamespaceTable/30/1/106/107/"kv"/4/1 # Check that session tracing does not inhibit the fast path for inserts & diff --git a/pkg/sql/schemachanger/scplan/internal/rules/dep_drop_object.go b/pkg/sql/schemachanger/scplan/internal/rules/dep_drop_object.go index 63708b4a2bc3..42eb179d7059 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/dep_drop_object.go +++ b/pkg/sql/schemachanger/scplan/internal/rules/dep_drop_object.go @@ -59,7 +59,7 @@ func init() { registerDepRule( "descriptor drop right before dependent element removal", - scgraph.SameStagePrecedence, + scgraph.Precedence, "descriptor", "dependent", func(from, to nodeVars) rel.Clauses { return rel.Clauses{ @@ -70,20 +70,6 @@ func init() { fromHasPublicStatusIfFromIsTableAndToIsRowLevelTTL(from.target, from.el, to.el), } }) - - registerDepRule( - "descriptor removal right before dependent element removal", - scgraph.SameStagePrecedence, - "descriptor", "idx-or-col", - func(from, to nodeVars) rel.Clauses { - return rel.Clauses{ - from.typeFilter(IsDescriptor), - to.typeFilter(isSubjectTo2VersionInvariant), - joinOnDescID(from, to, "desc-id"), - statusesToAbsent(from, scpb.Status_ABSENT, to, scpb.Status_ABSENT), - } - }, - ) } // These rules ensure that cross-referencing simple dependent elements reach diff --git a/pkg/sql/schemachanger/scplan/internal/rules/testdata/deprules b/pkg/sql/schemachanger/scplan/internal/rules/testdata/deprules index f7c6b756ff99..e130751d2148 100644 --- a/pkg/sql/schemachanger/scplan/internal/rules/testdata/deprules +++ b/pkg/sql/schemachanger/scplan/internal/rules/testdata/deprules @@ -1349,9 +1349,8 @@ deprules - $column[Type] = '*scpb.Column' - $dependent[Type] IN ['*scpb.ColumnName', '*scpb.ColumnType', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.SequenceOwner', '*scpb.ColumnComment', '*scpb.IndexColumn'] - joinOnColumnID($column, $dependent, $table-id, $col-id) - - $column-target[TargetStatus] = ABSENT - - $column-node[CurrentStatus] = WRITE_ONLY - - $dependent-target[TargetStatus] = TRANSIENT_ABSENT + - transient($column-target, $dependent-target) + - $column-node[CurrentStatus] = TRANSIENT_WRITE_ONLY - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($column, $column-target, $column-node) - joinTargetNode($dependent, $dependent-target, $dependent-node) @@ -1377,8 +1376,9 @@ deprules - $column[Type] = '*scpb.Column' - $dependent[Type] IN ['*scpb.ColumnName', '*scpb.ColumnType', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.SequenceOwner', '*scpb.ColumnComment', '*scpb.IndexColumn'] - joinOnColumnID($column, $dependent, $table-id, $col-id) - - transient($column-target, $dependent-target) - - $column-node[CurrentStatus] = TRANSIENT_WRITE_ONLY + - $column-target[TargetStatus] = ABSENT + - $column-node[CurrentStatus] = WRITE_ONLY + - $dependent-target[TargetStatus] = TRANSIENT_ABSENT - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($column, $column-target, $column-node) - joinTargetNode($dependent, $dependent-target, $dependent-node) @@ -1415,10 +1415,10 @@ deprules to: constraint-node query: - $dependent[Type] IN ['*scpb.ConstraintName', '*scpb.ConstraintComment'] - - $constraint[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] + - $constraint[Type] IN ['*scpb.UniqueWithoutIndexConstraint', '*scpb.CheckConstraint', '*scpb.ForeignKeyConstraint'] - joinOnConstraintID($dependent, $constraint, $table-id, $constraint-id) - transient($dependent-target, $constraint-target) - - $dependent-node[CurrentStatus] = TRANSIENT_VALIDATED + - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - $constraint-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($constraint, $constraint-target, $constraint-node) @@ -1428,12 +1428,12 @@ deprules to: constraint-node query: - $dependent[Type] IN ['*scpb.ConstraintName', '*scpb.ConstraintComment'] - - $constraint[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] + - $constraint[Type] IN ['*scpb.UniqueWithoutIndexConstraint', '*scpb.CheckConstraint', '*scpb.ForeignKeyConstraint'] - joinOnConstraintID($dependent, $constraint, $table-id, $constraint-id) - - $dependent-target[TargetStatus] = ABSENT - - $dependent-node[CurrentStatus] = VALIDATED - - $constraint-target[TargetStatus] = TRANSIENT_ABSENT - - $constraint-node[CurrentStatus] = TRANSIENT_ABSENT + - $dependent-target[TargetStatus] = TRANSIENT_ABSENT + - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT + - $constraint-target[TargetStatus] = ABSENT + - $constraint-node[CurrentStatus] = ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($constraint, $constraint-target, $constraint-node) - name: constraint dependent absent right before constraint @@ -1444,9 +1444,10 @@ deprules - $dependent[Type] IN ['*scpb.ConstraintName', '*scpb.ConstraintComment'] - $constraint[Type] IN ['*scpb.UniqueWithoutIndexConstraint', '*scpb.CheckConstraint', '*scpb.ForeignKeyConstraint'] - joinOnConstraintID($dependent, $constraint, $table-id, $constraint-id) - - toAbsent($dependent-target, $constraint-target) + - $dependent-target[TargetStatus] = ABSENT - $dependent-node[CurrentStatus] = ABSENT - - $constraint-node[CurrentStatus] = ABSENT + - $constraint-target[TargetStatus] = TRANSIENT_ABSENT + - $constraint-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($constraint, $constraint-target, $constraint-node) - name: constraint dependent absent right before constraint @@ -1457,9 +1458,9 @@ deprules - $dependent[Type] IN ['*scpb.ConstraintName', '*scpb.ConstraintComment'] - $constraint[Type] IN ['*scpb.UniqueWithoutIndexConstraint', '*scpb.CheckConstraint', '*scpb.ForeignKeyConstraint'] - joinOnConstraintID($dependent, $constraint, $table-id, $constraint-id) - - transient($dependent-target, $constraint-target) - - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - - $constraint-node[CurrentStatus] = TRANSIENT_ABSENT + - toAbsent($dependent-target, $constraint-target) + - $dependent-node[CurrentStatus] = ABSENT + - $constraint-node[CurrentStatus] = ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($constraint, $constraint-target, $constraint-node) - name: constraint dependent absent right before constraint @@ -1468,11 +1469,10 @@ deprules to: constraint-node query: - $dependent[Type] IN ['*scpb.ConstraintName', '*scpb.ConstraintComment'] - - $constraint[Type] IN ['*scpb.UniqueWithoutIndexConstraint', '*scpb.CheckConstraint', '*scpb.ForeignKeyConstraint'] + - $constraint[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnConstraintID($dependent, $constraint, $table-id, $constraint-id) - - $dependent-target[TargetStatus] = TRANSIENT_ABSENT - - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - - $constraint-target[TargetStatus] = ABSENT + - toAbsent($dependent-target, $constraint-target) + - $dependent-node[CurrentStatus] = VALIDATED - $constraint-node[CurrentStatus] = ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($constraint, $constraint-target, $constraint-node) @@ -1482,11 +1482,10 @@ deprules to: constraint-node query: - $dependent[Type] IN ['*scpb.ConstraintName', '*scpb.ConstraintComment'] - - $constraint[Type] IN ['*scpb.UniqueWithoutIndexConstraint', '*scpb.CheckConstraint', '*scpb.ForeignKeyConstraint'] + - $constraint[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnConstraintID($dependent, $constraint, $table-id, $constraint-id) - - $dependent-target[TargetStatus] = ABSENT - - $dependent-node[CurrentStatus] = ABSENT - - $constraint-target[TargetStatus] = TRANSIENT_ABSENT + - transient($dependent-target, $constraint-target) + - $dependent-node[CurrentStatus] = TRANSIENT_VALIDATED - $constraint-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($constraint, $constraint-target, $constraint-node) @@ -1498,8 +1497,9 @@ deprules - $dependent[Type] IN ['*scpb.ConstraintName', '*scpb.ConstraintComment'] - $constraint[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnConstraintID($dependent, $constraint, $table-id, $constraint-id) - - toAbsent($dependent-target, $constraint-target) - - $dependent-node[CurrentStatus] = VALIDATED + - $dependent-target[TargetStatus] = TRANSIENT_ABSENT + - $dependent-node[CurrentStatus] = TRANSIENT_VALIDATED + - $constraint-target[TargetStatus] = ABSENT - $constraint-node[CurrentStatus] = ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($constraint, $constraint-target, $constraint-node) @@ -1511,10 +1511,10 @@ deprules - $dependent[Type] IN ['*scpb.ConstraintName', '*scpb.ConstraintComment'] - $constraint[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnConstraintID($dependent, $constraint, $table-id, $constraint-id) - - $dependent-target[TargetStatus] = TRANSIENT_ABSENT - - $dependent-node[CurrentStatus] = TRANSIENT_VALIDATED - - $constraint-target[TargetStatus] = ABSENT - - $constraint-node[CurrentStatus] = ABSENT + - $dependent-target[TargetStatus] = ABSENT + - $dependent-node[CurrentStatus] = VALIDATED + - $constraint-target[TargetStatus] = TRANSIENT_ABSENT + - $constraint-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($constraint, $constraint-target, $constraint-node) - name: constraint dependent public right before constraint @@ -1538,9 +1538,10 @@ deprules - $dependent[Type] IN ['*scpb.ColumnName', '*scpb.ColumnType', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.SequenceOwner', '*scpb.ColumnComment', '*scpb.IndexColumn'] - $column[Type] = '*scpb.Column' - joinOnColumnID($dependent, $column, $table-id, $col-id) - - toAbsent($dependent-target, $column-target) + - $dependent-target[TargetStatus] = ABSENT - $dependent-node[CurrentStatus] = ABSENT - - $column-node[CurrentStatus] = ABSENT + - $column-target[TargetStatus] = TRANSIENT_ABSENT + - $column-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($column, $column-target, $column-node) - name: dependents removed before column @@ -1551,9 +1552,10 @@ deprules - $dependent[Type] IN ['*scpb.ColumnName', '*scpb.ColumnType', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.SequenceOwner', '*scpb.ColumnComment', '*scpb.IndexColumn'] - $column[Type] = '*scpb.Column' - joinOnColumnID($dependent, $column, $table-id, $col-id) - - transient($dependent-target, $column-target) + - $dependent-target[TargetStatus] = TRANSIENT_ABSENT - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - - $column-node[CurrentStatus] = TRANSIENT_ABSENT + - $column-target[TargetStatus] = ABSENT + - $column-node[CurrentStatus] = ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($column, $column-target, $column-node) - name: dependents removed before column @@ -1564,10 +1566,9 @@ deprules - $dependent[Type] IN ['*scpb.ColumnName', '*scpb.ColumnType', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.SequenceOwner', '*scpb.ColumnComment', '*scpb.IndexColumn'] - $column[Type] = '*scpb.Column' - joinOnColumnID($dependent, $column, $table-id, $col-id) - - $dependent-target[TargetStatus] = TRANSIENT_ABSENT + - transient($dependent-target, $column-target) - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - - $column-target[TargetStatus] = ABSENT - - $column-node[CurrentStatus] = ABSENT + - $column-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($column, $column-target, $column-node) - name: dependents removed before column @@ -1578,10 +1579,9 @@ deprules - $dependent[Type] IN ['*scpb.ColumnName', '*scpb.ColumnType', '*scpb.ColumnDefaultExpression', '*scpb.ColumnOnUpdateExpression', '*scpb.SequenceOwner', '*scpb.ColumnComment', '*scpb.IndexColumn'] - $column[Type] = '*scpb.Column' - joinOnColumnID($dependent, $column, $table-id, $col-id) - - $dependent-target[TargetStatus] = ABSENT + - toAbsent($dependent-target, $column-target) - $dependent-node[CurrentStatus] = ABSENT - - $column-target[TargetStatus] = TRANSIENT_ABSENT - - $column-node[CurrentStatus] = TRANSIENT_ABSENT + - $column-node[CurrentStatus] = ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($column, $column-target, $column-node) - name: dependents removed before index @@ -1592,9 +1592,9 @@ deprules - $dependent[Type] IN ['*scpb.IndexName', '*scpb.IndexPartitioning', '*scpb.SecondaryIndexPartial', '*scpb.IndexComment', '*scpb.IndexColumn'] - $index[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnIndexID($dependent, $index, $table-id, $index-id) - - transient($dependent-target, $index-target) - - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - - $index-node[CurrentStatus] = TRANSIENT_ABSENT + - toAbsent($dependent-target, $index-target) + - $dependent-node[CurrentStatus] = ABSENT + - $index-node[CurrentStatus] = ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($index, $index-target, $index-node) - name: dependents removed before index @@ -1605,9 +1605,10 @@ deprules - $dependent[Type] IN ['*scpb.IndexName', '*scpb.IndexPartitioning', '*scpb.SecondaryIndexPartial', '*scpb.IndexComment', '*scpb.IndexColumn'] - $index[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnIndexID($dependent, $index, $table-id, $index-id) - - toAbsent($dependent-target, $index-target) + - $dependent-target[TargetStatus] = ABSENT - $dependent-node[CurrentStatus] = ABSENT - - $index-node[CurrentStatus] = ABSENT + - $index-target[TargetStatus] = TRANSIENT_ABSENT + - $index-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($index, $index-target, $index-node) - name: dependents removed before index @@ -1632,9 +1633,8 @@ deprules - $dependent[Type] IN ['*scpb.IndexName', '*scpb.IndexPartitioning', '*scpb.SecondaryIndexPartial', '*scpb.IndexComment', '*scpb.IndexColumn'] - $index[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnIndexID($dependent, $index, $table-id, $index-id) - - $dependent-target[TargetStatus] = ABSENT - - $dependent-node[CurrentStatus] = ABSENT - - $index-target[TargetStatus] = TRANSIENT_ABSENT + - transient($dependent-target, $index-target) + - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - $index-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($dependent, $dependent-target, $dependent-node) - joinTargetNode($index, $index-target, $index-node) @@ -1666,7 +1666,7 @@ deprules - joinTargetNode($dropped, $dropped-target, $dropped-node) - name: descriptor drop right before dependent element removal from: descriptor-node - kind: SameStagePrecedence + kind: Precedence to: dependent-node query: - $descriptor[Type] IN ['*scpb.Database', '*scpb.Schema', '*scpb.View', '*scpb.Sequence', '*scpb.Table', '*scpb.EnumType', '*scpb.AliasType'] @@ -1721,19 +1721,6 @@ deprules - $referencing-via-type-node[CurrentStatus] = ABSENT - joinTargetNode($referenced-descriptor, $referenced-descriptor-target, $referenced-descriptor-node) - joinTargetNode($referencing-via-type, $referencing-via-type-target, $referencing-via-type-node) -- name: descriptor removal right before dependent element removal - from: descriptor-node - kind: SameStagePrecedence - to: idx-or-col-node - query: - - $descriptor[Type] IN ['*scpb.Database', '*scpb.Schema', '*scpb.View', '*scpb.Sequence', '*scpb.Table', '*scpb.EnumType', '*scpb.AliasType'] - - $idx-or-col[Type] IN ['*scpb.Column', '*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - - joinOnDescID($descriptor, $idx-or-col, $desc-id) - - toAbsent($descriptor-target, $idx-or-col-target) - - $descriptor-node[CurrentStatus] = ABSENT - - $idx-or-col-node[CurrentStatus] = ABSENT - - joinTargetNode($descriptor, $descriptor-target, $descriptor-node) - - joinTargetNode($idx-or-col, $idx-or-col-target, $idx-or-col-node) - name: ensure columns are in increasing order from: later-column-node kind: SameStagePrecedence @@ -1796,9 +1783,10 @@ deprules - $index[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - $dependent[Type] IN ['*scpb.IndexName', '*scpb.IndexPartitioning', '*scpb.SecondaryIndexPartial', '*scpb.IndexComment', '*scpb.IndexColumn'] - joinOnIndexID($index, $dependent, $table-id, $index-id) - - toAbsent($index-target, $dependent-target) + - $index-target[TargetStatus] = ABSENT - $index-node[CurrentStatus] = VALIDATED - - $dependent-node[CurrentStatus] = ABSENT + - $dependent-target[TargetStatus] = TRANSIENT_ABSENT + - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($dependent, $dependent-target, $dependent-node) - name: index no longer public before dependents @@ -1809,9 +1797,9 @@ deprules - $index[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - $dependent[Type] IN ['*scpb.IndexName', '*scpb.IndexPartitioning', '*scpb.SecondaryIndexPartial', '*scpb.IndexComment', '*scpb.IndexColumn'] - joinOnIndexID($index, $dependent, $table-id, $index-id) - - transient($index-target, $dependent-target) - - $index-node[CurrentStatus] = TRANSIENT_VALIDATED - - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT + - toAbsent($index-target, $dependent-target) + - $index-node[CurrentStatus] = VALIDATED + - $dependent-node[CurrentStatus] = ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($dependent, $dependent-target, $dependent-node) - name: index no longer public before dependents @@ -1822,9 +1810,8 @@ deprules - $index[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - $dependent[Type] IN ['*scpb.IndexName', '*scpb.IndexPartitioning', '*scpb.SecondaryIndexPartial', '*scpb.IndexComment', '*scpb.IndexColumn'] - joinOnIndexID($index, $dependent, $table-id, $index-id) - - $index-target[TargetStatus] = ABSENT - - $index-node[CurrentStatus] = VALIDATED - - $dependent-target[TargetStatus] = TRANSIENT_ABSENT + - transient($index-target, $dependent-target) + - $index-node[CurrentStatus] = TRANSIENT_VALIDATED - $dependent-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($dependent, $dependent-target, $dependent-node) @@ -1878,10 +1865,10 @@ deprules - columnInIndex($index-column, $index, $table-id, $column-id, $index-id) - joinOnColumnID($index-column, $column, $table-id, $column-id) - descriptorIsNotBeingDropped($index-column) - - $index-target[TargetStatus] = TRANSIENT_ABSENT - - $index-node[CurrentStatus] = TRANSIENT_ABSENT - - $column-target[TargetStatus] = ABSENT - - $column-node[CurrentStatus] = ABSENT + - $index-target[TargetStatus] = ABSENT + - $index-node[CurrentStatus] = ABSENT + - $column-target[TargetStatus] = TRANSIENT_ABSENT + - $column-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($column, $column-target, $column-node) - name: indexes containing column reach absent before column @@ -1894,10 +1881,10 @@ deprules - columnInIndex($index-column, $index, $table-id, $column-id, $index-id) - joinOnColumnID($index-column, $column, $table-id, $column-id) - descriptorIsNotBeingDropped($index-column) - - $index-target[TargetStatus] = ABSENT - - $index-node[CurrentStatus] = ABSENT - - $column-target[TargetStatus] = TRANSIENT_ABSENT - - $column-node[CurrentStatus] = TRANSIENT_ABSENT + - $index-target[TargetStatus] = TRANSIENT_ABSENT + - $index-node[CurrentStatus] = TRANSIENT_ABSENT + - $column-target[TargetStatus] = ABSENT + - $column-node[CurrentStatus] = ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($column, $column-target, $column-node) - name: indexes containing column reach absent before column @@ -1910,9 +1897,9 @@ deprules - columnInIndex($index-column, $index, $table-id, $column-id, $index-id) - joinOnColumnID($index-column, $column, $table-id, $column-id) - descriptorIsNotBeingDropped($index-column) - - transient($index-target, $column-target) - - $index-node[CurrentStatus] = TRANSIENT_ABSENT - - $column-node[CurrentStatus] = TRANSIENT_ABSENT + - toAbsent($index-target, $column-target) + - $index-node[CurrentStatus] = ABSENT + - $column-node[CurrentStatus] = ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($column, $column-target, $column-node) - name: indexes containing column reach absent before column @@ -1925,9 +1912,9 @@ deprules - columnInIndex($index-column, $index, $table-id, $column-id, $index-id) - joinOnColumnID($index-column, $column, $table-id, $column-id) - descriptorIsNotBeingDropped($index-column) - - toAbsent($index-target, $column-target) - - $index-node[CurrentStatus] = ABSENT - - $column-node[CurrentStatus] = ABSENT + - transient($index-target, $column-target) + - $index-node[CurrentStatus] = TRANSIENT_ABSENT + - $column-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($column, $column-target, $column-node) - name: old index absent before new index public when swapping with transient @@ -1959,8 +1946,9 @@ deprules - descriptorIsNotBeingDropped($partial-predicate) - $index[Type] = '*scpb.SecondaryIndex' - joinOnIndexID($partial-predicate, $index, $table-id, $index-id) - - transient($partial-predicate-target, $index-target) - - $partial-predicate-node[CurrentStatus] = TRANSIENT_ABSENT + - $partial-predicate-target[TargetStatus] = ABSENT + - $partial-predicate-node[CurrentStatus] = ABSENT + - $index-target[TargetStatus] = TRANSIENT_ABSENT - $index-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($partial-predicate, $partial-predicate-target, $partial-predicate-node) - joinTargetNode($index, $index-target, $index-node) @@ -1973,8 +1961,9 @@ deprules - descriptorIsNotBeingDropped($partial-predicate) - $index[Type] = '*scpb.SecondaryIndex' - joinOnIndexID($partial-predicate, $index, $table-id, $index-id) - - toAbsent($partial-predicate-target, $index-target) - - $partial-predicate-node[CurrentStatus] = ABSENT + - $partial-predicate-target[TargetStatus] = TRANSIENT_ABSENT + - $partial-predicate-node[CurrentStatus] = TRANSIENT_ABSENT + - $index-target[TargetStatus] = ABSENT - $index-node[CurrentStatus] = ABSENT - joinTargetNode($partial-predicate, $partial-predicate-target, $partial-predicate-node) - joinTargetNode($index, $index-target, $index-node) @@ -1987,10 +1976,9 @@ deprules - descriptorIsNotBeingDropped($partial-predicate) - $index[Type] = '*scpb.SecondaryIndex' - joinOnIndexID($partial-predicate, $index, $table-id, $index-id) - - $partial-predicate-target[TargetStatus] = TRANSIENT_ABSENT + - transient($partial-predicate-target, $index-target) - $partial-predicate-node[CurrentStatus] = TRANSIENT_ABSENT - - $index-target[TargetStatus] = ABSENT - - $index-node[CurrentStatus] = ABSENT + - $index-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($partial-predicate, $partial-predicate-target, $partial-predicate-node) - joinTargetNode($index, $index-target, $index-node) - name: partial predicate removed right before secondary index when not dropping relation @@ -2002,10 +1990,9 @@ deprules - descriptorIsNotBeingDropped($partial-predicate) - $index[Type] = '*scpb.SecondaryIndex' - joinOnIndexID($partial-predicate, $index, $table-id, $index-id) - - $partial-predicate-target[TargetStatus] = ABSENT + - toAbsent($partial-predicate-target, $index-target) - $partial-predicate-node[CurrentStatus] = ABSENT - - $index-target[TargetStatus] = TRANSIENT_ABSENT - - $index-node[CurrentStatus] = TRANSIENT_ABSENT + - $index-node[CurrentStatus] = ABSENT - joinTargetNode($partial-predicate, $partial-predicate-target, $partial-predicate-node) - joinTargetNode($index, $index-target, $index-node) - name: primary index swap @@ -2094,9 +2081,8 @@ deprules - $index[Type] = '*scpb.IndexColumn' - $index-column[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnIndexID($index, $index-column, $table-id, $index-id) - - $index-target[TargetStatus] = ABSENT - - $index-node[CurrentStatus] = DELETE_ONLY - - $index-column-target[TargetStatus] = TRANSIENT_ABSENT + - transient($index-target, $index-column-target) + - $index-node[CurrentStatus] = TRANSIENT_DELETE_ONLY - $index-column-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($index-column, $index-column-target, $index-column-node) @@ -2122,8 +2108,9 @@ deprules - $index[Type] = '*scpb.IndexColumn' - $index-column[Type] IN ['*scpb.PrimaryIndex', '*scpb.SecondaryIndex', '*scpb.TemporaryIndex'] - joinOnIndexID($index, $index-column, $table-id, $index-id) - - transient($index-target, $index-column-target) - - $index-node[CurrentStatus] = TRANSIENT_DELETE_ONLY + - $index-target[TargetStatus] = ABSENT + - $index-node[CurrentStatus] = DELETE_ONLY + - $index-column-target[TargetStatus] = TRANSIENT_ABSENT - $index-column-node[CurrentStatus] = TRANSIENT_ABSENT - joinTargetNode($index, $index-target, $index-node) - joinTargetNode($index-column, $index-column-target, $index-column-node) diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column index c9bafefd55c7..782ff6f09289 100644 --- a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column +++ b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column @@ -217,7 +217,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op *scop.ValidateIndex IndexID: 3 TableID: 107 -PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops +PostCommitNonRevertiblePhase stage 1 of 3 with 24 MutationType ops transitions: [[Column:{DescID: 107, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY [[IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT @@ -235,19 +235,19 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops [[UserPrivileges:{DescID: 108, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 108}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 108, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: k, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: v1, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ReferencedTypeIDs: [104 105], ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: v2, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[PrimaryIndex:{DescID: 107, IndexID: 3, ConstraintID: 3, TemporaryIndexID: 4, SourceIndexID: 1}, PUBLIC], VALIDATED] -> PUBLIC @@ -302,6 +302,61 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops DescriptorID: 108 Name: fooview SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: @@ -324,16 +379,11 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 19 MutationType ops *scop.UpdateSchemaChangerJob IsNonCancelable: true JobID: 1 -PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops +PostCommitNonRevertiblePhase stage 2 of 3 with 12 MutationType ops transitions: [[PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 2}, ABSENT], VALIDATED] -> DELETE_ONLY [[SecondaryIndex:{DescID: 107, IndexID: 2, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 108}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[TemporaryIndex:{DescID: 107, IndexID: 4, ConstraintID: 4, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: *scop.LogEvent @@ -386,61 +436,6 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 17 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v1› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 *scop.CreateGCJobForIndex IndexID: 4 StatementForDropJob: @@ -858,85 +853,65 @@ ALTER TABLE defaultdb.foo DROP COLUMN v1 CASCADE; to: [TemporaryIndex:{DescID: 107, IndexID: 4, ConstraintID: 4, SourceIndexID: 1}, TRANSIENT_DELETE_ONLY] kind: PreviousTransactionPrecedence rule: TemporaryIndex transitions to TRANSIENT_ABSENT uphold 2-version invariant: WRITE_ONLY->TRANSIENT_DELETE_ONLY -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: k, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: v1, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: v2, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ReferencedTypeIDs: [104 105], ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [Namespace:{DescID: 108, Name: fooview, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ObjectParent:{DescID: 108, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [Owner:{DescID: 108}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [View:{DescID: 108}, ABSENT] @@ -1165,7 +1140,7 @@ PostCommitPhase stage 7 of 7 with 1 ValidationType op *scop.ValidateIndex IndexID: 3 TableID: 107 -PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops +PostCommitNonRevertiblePhase stage 1 of 3 with 25 MutationType ops transitions: [[Column:{DescID: 107, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY [[IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT @@ -1183,19 +1158,19 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops [[UserPrivileges:{DescID: 108, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 108}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 108, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: k, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: v1, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ReferencedTypeIDs: [104 105], ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: v2, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[PrimaryIndex:{DescID: 107, IndexID: 3, ConstraintID: 3, TemporaryIndexID: 4, SourceIndexID: 1}, PUBLIC], VALIDATED] -> PUBLIC @@ -1250,6 +1225,61 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops DescriptorID: 108 Name: fooview SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE + StatementTag: ALTER TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 *scop.MakeValidatedPrimaryIndexPublic EventBase: Authorization: @@ -1274,16 +1304,11 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 20 MutationType ops *scop.UpdateSchemaChangerJob IsNonCancelable: true JobID: 1 -PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops +PostCommitNonRevertiblePhase stage 2 of 3 with 13 MutationType ops transitions: [[PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 2}, ABSENT], VALIDATED] -> DELETE_ONLY [[SecondaryIndex:{DescID: 107, IndexID: 2, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 108}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[TemporaryIndex:{DescID: 107, IndexID: 4, ConstraintID: 4, SourceIndexID: 1}, TRANSIENT_ABSENT], TRANSIENT_DELETE_ONLY] -> TRANSIENT_ABSENT ops: *scop.LogEvent @@ -1336,61 +1361,6 @@ PostCommitNonRevertiblePhase stage 2 of 3 with 18 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: ALTER TABLE ‹defaultdb›.public.‹foo› DROP COLUMN ‹v2› CASCADE - StatementTag: ALTER TABLE - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 *scop.CreateGCJobForIndex IndexID: 4 StatementForDropJob: @@ -1831,85 +1801,65 @@ ALTER TABLE defaultdb.foo DROP COLUMN v2 CASCADE; to: [TemporaryIndex:{DescID: 107, IndexID: 4, ConstraintID: 4, SourceIndexID: 1}, TRANSIENT_DELETE_ONLY] kind: PreviousTransactionPrecedence rule: TemporaryIndex transitions to TRANSIENT_ABSENT uphold 2-version invariant: WRITE_ONLY->TRANSIENT_DELETE_ONLY -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: k, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: v1, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: v2, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ReferencedTypeIDs: [104 105], ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [Namespace:{DescID: 108, Name: fooview, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ObjectParent:{DescID: 108, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [Owner:{DescID: 108}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [View:{DescID: 108}, ABSENT] diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_database b/pkg/sql/schemachanger/scplan/testdata/drop_database index d333ccfc61bc..e2e89f5a00d6 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_database +++ b/pkg/sql/schemachanger/scplan/testdata/drop_database @@ -96,7 +96,7 @@ StatementPhase stage 1 of 1 with 14 MutationType ops DescriptorID: 116 *scop.MarkDescriptorAsSyntheticallyDropped DescriptorID: 117 -PreCommitPhase stage 1 of 1 with 68 MutationType ops +PreCommitPhase stage 1 of 1 with 98 MutationType ops transitions: [[Namespace:{DescID: 104, Name: db1, ReferencedDescID: 0}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 104}, ABSENT], PUBLIC] -> ABSENT @@ -133,26 +133,26 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops [[Table:{DescID: 110}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 110, ReferencedDescID: 105}, ABSENT], PUBLIC] -> ABSENT [[ColumnFamily:{DescID: 110, Name: primary, ColumnFamilyID: 0}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: id, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: name, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: val, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 110, ColumnID: 3, ReferencedSequenceIDs: [107]}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 110, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 110, ColumnID: 2, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 110, ColumnID: 3, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT - [[PrimaryIndex:{DescID: 110, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY + [[PrimaryIndex:{DescID: 110, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 110, Name: t1_pkey, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 108, Name: sq1, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 108}, ABSENT], PUBLIC] -> ABSENT @@ -168,26 +168,26 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops [[ObjectParent:{DescID: 109, ReferencedDescID: 106}, ABSENT], PUBLIC] -> ABSENT [[TableComment:{DescID: 109, Comment: t1 is good}, ABSENT], PUBLIC] -> ABSENT [[ColumnFamily:{DescID: 109, Name: primary, ColumnFamilyID: 0}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: id, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: name, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: val, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 109, ColumnID: 3, ReferencedSequenceIDs: [108]}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 2, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 3, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT - [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY + [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 109, Name: t1_pkey, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 111, Name: v1, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 111}, ABSENT], PUBLIC] -> ABSENT @@ -195,13 +195,13 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops [[UserPrivileges:{DescID: 111, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 111}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 111, ReferencedDescID: 106}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: name, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 112, Name: v2, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT @@ -210,16 +210,16 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops [[UserPrivileges:{DescID: 112, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 112}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 112, ReferencedDescID: 106}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 112, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 112, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 112, Name: n1, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 112, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 112, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 112, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 112, Name: n2, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 112, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 112, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 112, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 112, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 112, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 112, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 112, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 112, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 112, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 113, Name: v3, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT @@ -228,16 +228,16 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops [[UserPrivileges:{DescID: 113, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 113}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 113, ReferencedDescID: 106}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: name, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: n1, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 114, Name: v4, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT @@ -246,16 +246,16 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops [[UserPrivileges:{DescID: 114, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 114}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 114, ReferencedDescID: 106}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: n2, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: n1, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 115, Name: typ, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT @@ -279,19 +279,19 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops [[UserPrivileges:{DescID: 117, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 117}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 117, ReferencedDescID: 106}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 117, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 117, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 117, Name: k, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 117, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 117, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 117, Name: n2, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 117, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 117, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 117, Name: n1, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 117, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 117, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 117, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 117, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 117, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 117, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: @@ -437,6 +437,50 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops DescriptorID: 110 Name: t1 SchemaID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 110 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 110 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 110 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 110 *scop.DrainDescriptorName Namespace: DatabaseID: 104 @@ -449,30 +493,239 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops DescriptorID: 109 Name: t1 SchemaID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 6 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 6 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 6 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 6 + SubWorkID: 1 + TableID: 109 *scop.DrainDescriptorName Namespace: DatabaseID: 104 DescriptorID: 111 Name: v1 SchemaID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 8 + SubWorkID: 1 + TableID: 111 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 8 + SubWorkID: 1 + TableID: 111 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 8 + SubWorkID: 1 + TableID: 111 *scop.DrainDescriptorName Namespace: DatabaseID: 104 DescriptorID: 112 Name: v2 SchemaID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 9 + SubWorkID: 1 + TableID: 112 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 9 + SubWorkID: 1 + TableID: 112 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 9 + SubWorkID: 1 + TableID: 112 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 9 + SubWorkID: 1 + TableID: 112 *scop.DrainDescriptorName Namespace: DatabaseID: 104 DescriptorID: 113 Name: v3 SchemaID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 10 + SubWorkID: 1 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 10 + SubWorkID: 1 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 10 + SubWorkID: 1 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 10 + SubWorkID: 1 + TableID: 113 *scop.DrainDescriptorName Namespace: DatabaseID: 104 DescriptorID: 114 Name: v4 SchemaID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 10 + SubWorkID: 1 + TableID: 114 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 10 + SubWorkID: 1 + TableID: 114 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 10 + SubWorkID: 1 + TableID: 114 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 10 + SubWorkID: 1 + TableID: 114 *scop.DrainDescriptorName Namespace: DatabaseID: 104 @@ -491,6 +744,83 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops DescriptorID: 117 Name: v5 SchemaID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 12 + SubWorkID: 1 + TableID: 117 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 12 + SubWorkID: 1 + TableID: 117 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 12 + SubWorkID: 1 + TableID: 117 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 12 + SubWorkID: 1 + TableID: 117 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 12 + SubWorkID: 1 + TableID: 117 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 110 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP DATABASE ‹db1› CASCADE + StatementTag: DROP DATABASE + TargetMetadata: + SourceElementID: 6 + SubWorkID: 1 + TableID: 109 *scop.SetJobStateOnDescriptor DescriptorID: 104 Initialize: true @@ -553,60 +883,28 @@ PreCommitPhase stage 1 of 1 with 68 MutationType ops - 117 JobID: 1 NonCancelable: true - RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 59 MutationType ops + RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 29 MutationType ops pending Statements: - statement: DROP DATABASE db1 CASCADE redactedstatement: DROP DATABASE ‹db1› CASCADE statementtag: DROP DATABASE -PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops +PostCommitNonRevertiblePhase stage 1 of 1 with 44 MutationType ops transitions: [[Database:{DescID: 104}, ABSENT], DROPPED] -> ABSENT [[Schema:{DescID: 105}, ABSENT], DROPPED] -> ABSENT [[Schema:{DescID: 106}, ABSENT], DROPPED] -> ABSENT [[Sequence:{DescID: 107}, ABSENT], DROPPED] -> ABSENT [[Table:{DescID: 110}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 110, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[PrimaryIndex:{DescID: 110, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT [[Sequence:{DescID: 108}, ABSENT], DROPPED] -> ABSENT [[Table:{DescID: 109}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 109, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 111}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 111, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 112}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 112, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 112, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 112, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 112, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 113}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 113, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 114}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 114, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 114, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 114, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 114, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[EnumType:{DescID: 115}, ABSENT], DROPPED] -> ABSENT [[AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, ABSENT], DROPPED] -> ABSENT [[View:{DescID: 117}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 117, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 117, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 117, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 117, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 117, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT ops: *scop.LogEvent Element: @@ -692,61 +990,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops StatementForDropJob: Statement: DROP DATABASE db1 CASCADE TableID: 110 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 110 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 110 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 110 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 110 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 110 *scop.LogEvent Element: Sequence: @@ -781,61 +1024,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops StatementForDropJob: Statement: DROP DATABASE db1 CASCADE TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 6 - SubWorkID: 1 - TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 6 - SubWorkID: 1 - TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 6 - SubWorkID: 1 - TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 6 - SubWorkID: 1 - TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 6 - SubWorkID: 1 - TableID: 109 *scop.LogEvent Element: View: @@ -857,39 +1045,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 8 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 8 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 8 - SubWorkID: 1 - TableID: 111 *scop.LogEvent Element: View: @@ -899,53 +1054,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops toId: 111 usesRelationIds: - 111 - viewId: 112 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 9 - SubWorkID: 1 - TargetStatus: 1 - *scop.DeleteDescriptor - DescriptorID: 112 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 9 - SubWorkID: 1 - TableID: 112 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 9 - SubWorkID: 1 - TableID: 112 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 9 - SubWorkID: 1 - TableID: 112 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 + viewId: 112 EventBase: Authorization: UserName: root @@ -954,7 +1063,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetMetadata: SourceElementID: 9 SubWorkID: 1 - TableID: 112 + TargetStatus: 1 + *scop.DeleteDescriptor + DescriptorID: 112 *scop.LogEvent Element: View: @@ -981,50 +1092,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 10 - SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 10 - SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 10 - SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 10 - SubWorkID: 1 - TableID: 113 *scop.LogEvent Element: View: @@ -1047,50 +1114,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 114 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 10 - SubWorkID: 1 - TableID: 114 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 10 - SubWorkID: 1 - TableID: 114 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 10 - SubWorkID: 1 - TableID: 114 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 10 - SubWorkID: 1 - TableID: 114 *scop.LogEvent Element: EnumType: @@ -1159,61 +1182,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 74 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 117 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 12 - SubWorkID: 1 - TableID: 117 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 12 - SubWorkID: 1 - TableID: 117 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 12 - SubWorkID: 1 - TableID: 117 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 12 - SubWorkID: 1 - TableID: 117 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP DATABASE ‹db1› CASCADE - StatementTag: DROP DATABASE - TargetMetadata: - SourceElementID: 12 - SubWorkID: 1 - TableID: 117 *scop.RemoveJobStateFromDescriptor DescriptorID: 104 JobID: 1 @@ -1284,27 +1252,27 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, DROPPED] to: [Namespace:{DescID: 116, Name: _typ, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, DROPPED] to: [ObjectParent:{DescID: 116, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, DROPPED] to: [Owner:{DescID: 116}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, DROPPED] to: [UserPrivileges:{DescID: 116, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, DROPPED] to: [UserPrivileges:{DescID: 116, Name: public}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, DROPPED] to: [UserPrivileges:{DescID: 116, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, TXN_DROPPED] to: [AliasType:{DescID: 116, ReferencedTypeIDs: [115 116]}, DROPPED] @@ -1844,15 +1812,15 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Database:{DescID: 104}, DROPPED] to: [DatabaseComment:{DescID: 104, Comment: db1 is good}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Database:{DescID: 104}, DROPPED] to: [DatabaseRoleSetting:{DescID: 104, Name: __placeholder_role_name__}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Database:{DescID: 104}, DROPPED] to: [Namespace:{DescID: 104, Name: db1, ReferencedDescID: 0}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Database:{DescID: 104}, DROPPED] to: [Namespace:{DescID: 105, Name: public, ReferencedDescID: 104}, ABSENT] @@ -1908,7 +1876,7 @@ DROP DATABASE db1 CASCADE rule: descriptor drop right before removing dependent with attr ref - from: [Database:{DescID: 104}, DROPPED] to: [Owner:{DescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Database:{DescID: 104}, DROPPED] to: [SchemaParent:{DescID: 105, ReferencedDescID: 104}, ABSENT] @@ -1920,15 +1888,15 @@ DROP DATABASE db1 CASCADE rule: descriptor drop right before removing dependent with attr ref - from: [Database:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Database:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: public}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Database:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Database:{DescID: 104}, TXN_DROPPED] to: [Database:{DescID: 104}, DROPPED] @@ -1940,31 +1908,31 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [EnumType:{DescID: 115}, DROPPED] to: [EnumTypeValue:{DescID: 115, Name: a}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 115}, DROPPED] to: [Namespace:{DescID: 115, Name: typ, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 115}, DROPPED] to: [ObjectParent:{DescID: 115, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 115}, DROPPED] to: [Owner:{DescID: 115}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 115}, DROPPED] to: [UserPrivileges:{DescID: 115, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 115}, DROPPED] to: [UserPrivileges:{DescID: 115, Name: public}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 115}, DROPPED] to: [UserPrivileges:{DescID: 115, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 115}, TXN_DROPPED] to: [EnumType:{DescID: 115}, DROPPED] @@ -2060,7 +2028,7 @@ DROP DATABASE db1 CASCADE rule: index no longer public before dependents - from: [Schema:{DescID: 105}, DROPPED] to: [Namespace:{DescID: 105, Name: public, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 105}, DROPPED] to: [ObjectParent:{DescID: 107, ReferencedDescID: 105}, ABSENT] @@ -2072,7 +2040,7 @@ DROP DATABASE db1 CASCADE rule: descriptor drop right before removing dependent with attr ref - from: [Schema:{DescID: 105}, DROPPED] to: [Owner:{DescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 105}, DROPPED] to: [Schema:{DescID: 105}, ABSENT] @@ -2080,19 +2048,19 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Schema:{DescID: 105}, DROPPED] to: [SchemaParent:{DescID: 105, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: public}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 105}, TXN_DROPPED] to: [Schema:{DescID: 105}, DROPPED] @@ -2100,7 +2068,7 @@ DROP DATABASE db1 CASCADE rule: descriptor TXN_DROPPED before DROPPED - from: [Schema:{DescID: 106}, DROPPED] to: [Namespace:{DescID: 106, Name: sc1, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 106}, DROPPED] to: [ObjectParent:{DescID: 108, ReferencedDescID: 106}, ABSENT] @@ -2140,7 +2108,7 @@ DROP DATABASE db1 CASCADE rule: descriptor drop right before removing dependent with attr ref - from: [Schema:{DescID: 106}, DROPPED] to: [Owner:{DescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 106}, DROPPED] to: [Schema:{DescID: 106}, ABSENT] @@ -2148,19 +2116,19 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Schema:{DescID: 106}, DROPPED] to: [SchemaComment:{DescID: 106, Comment: sc1 is good}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 106}, DROPPED] to: [SchemaParent:{DescID: 106, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 106}, DROPPED] to: [UserPrivileges:{DescID: 106, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 106}, DROPPED] to: [UserPrivileges:{DescID: 106, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 106}, TXN_DROPPED] to: [Schema:{DescID: 106}, DROPPED] @@ -2172,15 +2140,15 @@ DROP DATABASE db1 CASCADE rule: descriptor drop right before removing dependent with expr ref to sequence - from: [Sequence:{DescID: 107}, DROPPED] to: [Namespace:{DescID: 107, Name: sq1, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 107}, DROPPED] to: [ObjectParent:{DescID: 107, ReferencedDescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 107}, DROPPED] to: [Owner:{DescID: 107}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 107}, DROPPED] to: [Sequence:{DescID: 107}, ABSENT] @@ -2188,11 +2156,11 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Sequence:{DescID: 107}, DROPPED] to: [UserPrivileges:{DescID: 107, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 107}, DROPPED] to: [UserPrivileges:{DescID: 107, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 107}, TXN_DROPPED] to: [Sequence:{DescID: 107}, DROPPED] @@ -2204,15 +2172,15 @@ DROP DATABASE db1 CASCADE rule: descriptor drop right before removing dependent with expr ref to sequence - from: [Sequence:{DescID: 108}, DROPPED] to: [Namespace:{DescID: 108, Name: sq1, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 108}, DROPPED] to: [ObjectParent:{DescID: 108, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 108}, DROPPED] to: [Owner:{DescID: 108}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 108}, DROPPED] to: [Sequence:{DescID: 108}, ABSENT] @@ -2220,115 +2188,91 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Sequence:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 108}, TXN_DROPPED] to: [Sequence:{DescID: 108}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnDefaultExpression:{DescID: 109, ColumnID: 3, ReferencedSequenceIDs: [108]}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnFamily:{DescID: 109, Name: primary, ColumnFamilyID: 0}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: id, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: name, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: val, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 2, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 3, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexName:{DescID: 109, Name: t1_pkey, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [Namespace:{DescID: 109, Name: t1, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ObjectParent:{DescID: 109, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [Owner:{DescID: 109}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [Table:{DescID: 109}, ABSENT] @@ -2336,119 +2280,95 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Table:{DescID: 109}, DROPPED] to: [TableComment:{DescID: 109, Comment: t1 is good}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [UserPrivileges:{DescID: 109, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [UserPrivileges:{DescID: 109, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, TXN_DROPPED] to: [Table:{DescID: 109}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [Table:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 110}, ABSENT] - to: [PrimaryIndex:{DescID: 110, IndexID: 1, ConstraintID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnDefaultExpression:{DescID: 110, ColumnID: 3, ReferencedSequenceIDs: [107]}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnFamily:{DescID: 110, Name: primary, ColumnFamilyID: 0}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: id, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: name, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: val, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [IndexColumn:{DescID: 110, ColumnID: 1, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [IndexColumn:{DescID: 110, ColumnID: 2, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [IndexColumn:{DescID: 110, ColumnID: 3, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [IndexName:{DescID: 110, Name: t1_pkey, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [Namespace:{DescID: 110, Name: t1, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [ObjectParent:{DescID: 110, ReferencedDescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [Owner:{DescID: 110}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [Table:{DescID: 110}, ABSENT] @@ -2456,71 +2376,59 @@ DROP DATABASE db1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Table:{DescID: 110}, DROPPED] to: [UserPrivileges:{DescID: 110, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, DROPPED] to: [UserPrivileges:{DescID: 110, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 110}, TXN_DROPPED] to: [Table:{DescID: 110}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: name, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [Namespace:{DescID: 111, Name: v1, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ObjectParent:{DescID: 111, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [Owner:{DescID: 111}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [View:{DescID: 111}, ABSENT] @@ -2530,73 +2438,57 @@ DROP DATABASE db1 CASCADE to: [View:{DescID: 111}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 112}, ABSENT] - to: [Column:{DescID: 112, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 112}, ABSENT] - to: [Column:{DescID: 112, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 112}, ABSENT] - to: [Column:{DescID: 112, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 112}, ABSENT] - to: [Column:{DescID: 112, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ColumnName:{DescID: 112, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ColumnName:{DescID: 112, Name: n1, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ColumnName:{DescID: 112, Name: n2, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ColumnName:{DescID: 112, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ColumnType:{DescID: 112, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ColumnType:{DescID: 112, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ColumnType:{DescID: 112, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ColumnType:{DescID: 112, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [Namespace:{DescID: 112, Name: v2, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [ObjectParent:{DescID: 112, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [Owner:{DescID: 112}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [UserPrivileges:{DescID: 112, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [UserPrivileges:{DescID: 112, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 112}, DROPPED] to: [View:{DescID: 112}, ABSENT] @@ -2606,73 +2498,57 @@ DROP DATABASE db1 CASCADE to: [View:{DescID: 112}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: n1, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: name, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [Namespace:{DescID: 113, Name: v3, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ObjectParent:{DescID: 113, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [Owner:{DescID: 113}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [UserPrivileges:{DescID: 113, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [UserPrivileges:{DescID: 113, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [View:{DescID: 113}, ABSENT] @@ -2682,73 +2558,57 @@ DROP DATABASE db1 CASCADE to: [View:{DescID: 113}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 114}, ABSENT] - to: [Column:{DescID: 114, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 114}, ABSENT] - to: [Column:{DescID: 114, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 114}, ABSENT] - to: [Column:{DescID: 114, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 114}, ABSENT] - to: [Column:{DescID: 114, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ColumnName:{DescID: 114, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ColumnName:{DescID: 114, Name: n1, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ColumnName:{DescID: 114, Name: n2, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ColumnName:{DescID: 114, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [Namespace:{DescID: 114, Name: v4, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [ObjectParent:{DescID: 114, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [Owner:{DescID: 114}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [UserPrivileges:{DescID: 114, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [UserPrivileges:{DescID: 114, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 114}, DROPPED] to: [View:{DescID: 114}, ABSENT] @@ -2758,85 +2618,65 @@ DROP DATABASE db1 CASCADE to: [View:{DescID: 114}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 117}, ABSENT] - to: [Column:{DescID: 117, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 117}, ABSENT] - to: [Column:{DescID: 117, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 117}, ABSENT] - to: [Column:{DescID: 117, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 117}, ABSENT] - to: [Column:{DescID: 117, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 117}, ABSENT] - to: [Column:{DescID: 117, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnName:{DescID: 117, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnName:{DescID: 117, Name: k, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnName:{DescID: 117, Name: n1, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnName:{DescID: 117, Name: n2, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnName:{DescID: 117, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ColumnType:{DescID: 117, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [Namespace:{DescID: 117, Name: v5, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [ObjectParent:{DescID: 117, ReferencedDescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [Owner:{DescID: 117}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [UserPrivileges:{DescID: 117, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [UserPrivileges:{DescID: 117, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 117}, DROPPED] to: [View:{DescID: 117}, ABSENT] diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_index b/pkg/sql/schemachanger/scplan/testdata/drop_index index 6e80707dd438..ea8fb642d862 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_index +++ b/pkg/sql/schemachanger/scplan/testdata/drop_index @@ -612,7 +612,7 @@ StatementPhase stage 1 of 1 with 3 MutationType ops TableID: 104 *scop.MarkDescriptorAsSyntheticallyDropped DescriptorID: 105 -PreCommitPhase stage 1 of 1 with 7 MutationType ops +PreCommitPhase stage 1 of 1 with 10 MutationType ops transitions: [[IndexColumn:{DescID: 104, ColumnID: 2, IndexID: 8}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 104, ColumnID: 3, IndexID: 8}, ABSENT], PUBLIC] -> ABSENT @@ -622,13 +622,13 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops [[UserPrivileges:{DescID: 105, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 105}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 105, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: count, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: @@ -646,6 +646,39 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops DescriptorID: 105 Name: v SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx4› CASCADE + StatementTag: DROP INDEX + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx4› CASCADE + StatementTag: DROP INDEX + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx4› CASCADE + StatementTag: DROP INDEX + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 *scop.SetJobStateOnDescriptor DescriptorID: 104 Initialize: true @@ -660,18 +693,15 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops - 105 JobID: 1 NonCancelable: true - RunningStatus: PostCommitNonRevertiblePhase stage 1 of 2 with 6 MutationType ops pending + RunningStatus: PostCommitNonRevertiblePhase stage 1 of 2 with 3 MutationType ops pending Statements: - statement: DROP INDEX idx4 CASCADE redactedstatement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx4› CASCADE statementtag: DROP INDEX -PostCommitNonRevertiblePhase stage 1 of 2 with 8 MutationType ops +PostCommitNonRevertiblePhase stage 1 of 2 with 5 MutationType ops transitions: [[SecondaryIndex:{DescID: 104, IndexID: 8, ConstraintID: 3}, ABSENT], VALIDATED] -> DELETE_ONLY [[View:{DescID: 105}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 105, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT ops: *scop.LogEvent Element: @@ -695,39 +725,6 @@ PostCommitNonRevertiblePhase stage 1 of 2 with 8 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx4› CASCADE - StatementTag: DROP INDEX - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx4› CASCADE - StatementTag: DROP INDEX - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP INDEX ‹defaultdb›.public.‹t1›@‹idx4› CASCADE - StatementTag: DROP INDEX - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 *scop.MakeWriteOnlyIndexDeleteOnly IndexID: 8 TableID: 104 @@ -863,61 +860,49 @@ DROP INDEX idx4 CASCADE to: [SecondaryIndex:{DescID: 104, IndexID: 8, ConstraintID: 3}, WRITE_ONLY] kind: PreviousTransactionPrecedence rule: SecondaryIndex transitions to ABSENT uphold 2-version invariant: VALIDATED->WRITE_ONLY -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: count, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [Namespace:{DescID: 105, Name: v, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ObjectParent:{DescID: 105, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [Owner:{DescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [View:{DescID: 105}, ABSENT] diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_owned_by b/pkg/sql/schemachanger/scplan/testdata/drop_owned_by index b61930cca3ef..ca1a2d5f1a37 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_owned_by +++ b/pkg/sql/schemachanger/scplan/testdata/drop_owned_by @@ -66,7 +66,7 @@ StatementPhase stage 1 of 1 with 9 MutationType ops DescriptorID: 112 *scop.MarkDescriptorAsSyntheticallyDropped DescriptorID: 113 -PreCommitPhase stage 1 of 1 with 46 MutationType ops +PreCommitPhase stage 1 of 1 with 63 MutationType ops transitions: [[UserPrivileges:{DescID: 100, Name: r}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 105, Name: s, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -89,26 +89,26 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops [[Table:{DescID: 109}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 109, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT [[ColumnFamily:{DescID: 109, Name: primary, ColumnFamilyID: 0}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: id, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: name, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: val, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 109, ColumnID: 3, ReferencedSequenceIDs: [106]}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 2, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 3, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT - [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY + [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 109, Name: t_pkey, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 107, Name: sq, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 107}, ABSENT], PUBLIC] -> ABSENT @@ -123,26 +123,26 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops [[Table:{DescID: 108}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 108, ReferencedDescID: 105}, ABSENT], PUBLIC] -> ABSENT [[ColumnFamily:{DescID: 108, Name: primary, ColumnFamilyID: 0}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: id, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: name, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: val, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 108, ColumnID: 3, ReferencedSequenceIDs: [107]}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 108, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 108, ColumnID: 2, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 108, ColumnID: 3, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT - [[PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY + [[PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 108, Name: t_pkey, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 110, Name: v1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 110}, ABSENT], PUBLIC] -> ABSENT @@ -150,13 +150,13 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops [[UserPrivileges:{DescID: 110, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 110}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 110, ReferencedDescID: 105}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: name, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 111, Name: typ, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -180,16 +180,16 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops [[UserPrivileges:{DescID: 113, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 113}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 113, ReferencedDescID: 105}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: k, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: name, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: @@ -279,6 +279,50 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops DescriptorID: 109 Name: t SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 *scop.DrainDescriptorName Namespace: DatabaseID: 100 @@ -291,12 +335,89 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops DescriptorID: 108 Name: t SchemaID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 *scop.DrainDescriptorName Namespace: DatabaseID: 100 DescriptorID: 110 Name: v1 SchemaID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 110 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 110 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 110 *scop.DrainDescriptorName Namespace: DatabaseID: 100 @@ -315,6 +436,72 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops DescriptorID: 113 Name: v2 SchemaID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP OWNED BY r + StatementTag: DROP OWNED BY + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 108 *scop.SetJobStateOnDescriptor DescriptorID: 100 Initialize: true @@ -365,42 +552,23 @@ PreCommitPhase stage 1 of 1 with 46 MutationType ops - 113 JobID: 1 NonCancelable: true - RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 35 MutationType ops + RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 18 MutationType ops pending Statements: - statement: DROP OWNED BY r redactedstatement: DROP OWNED BY r statementtag: DROP OWNED BY -PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops +PostCommitNonRevertiblePhase stage 1 of 1 with 30 MutationType ops transitions: [[Schema:{DescID: 105}, ABSENT], DROPPED] -> ABSENT [[Sequence:{DescID: 106}, ABSENT], DROPPED] -> ABSENT [[Table:{DescID: 109}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 109, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT [[Sequence:{DescID: 107}, ABSENT], DROPPED] -> ABSENT [[Table:{DescID: 108}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[PrimaryIndex:{DescID: 108, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 110}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 110, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[EnumType:{DescID: 111}, ABSENT], DROPPED] -> ABSENT [[AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, ABSENT], DROPPED] -> ABSENT [[View:{DescID: 113}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 113, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT ops: *scop.LogEvent Element: @@ -451,61 +619,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops StatementForDropJob: Statement: DROP OWNED BY r TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 109 *scop.LogEvent Element: Sequence: @@ -540,61 +653,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops StatementForDropJob: Statement: DROP OWNED BY r TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 108 *scop.LogEvent Element: View: @@ -616,39 +674,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 110 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 110 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 110 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 110 *scop.LogEvent Element: EnumType: @@ -716,50 +741,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 47 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP OWNED BY r - StatementTag: DROP OWNED BY - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 113 *scop.RemoveJobStateFromDescriptor DescriptorID: 100 JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_schema b/pkg/sql/schemachanger/scplan/testdata/drop_schema index f35a3156a578..be962344f23c 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_schema +++ b/pkg/sql/schemachanger/scplan/testdata/drop_schema @@ -21,27 +21,27 @@ DROP SCHEMA defaultdb.SC1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, DROPPED] to: [Namespace:{DescID: 112, Name: _typ, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, DROPPED] to: [ObjectParent:{DescID: 112, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, DROPPED] to: [Owner:{DescID: 112}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, DROPPED] to: [UserPrivileges:{DescID: 112, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, DROPPED] to: [UserPrivileges:{DescID: 112, Name: public}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, DROPPED] to: [UserPrivileges:{DescID: 112, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, TXN_DROPPED] to: [AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, DROPPED] @@ -477,31 +477,31 @@ DROP SCHEMA defaultdb.SC1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [EnumType:{DescID: 111}, DROPPED] to: [EnumTypeValue:{DescID: 111, Name: a}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 111}, DROPPED] to: [Namespace:{DescID: 111, Name: typ, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 111}, DROPPED] to: [ObjectParent:{DescID: 111, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 111}, DROPPED] to: [Owner:{DescID: 111}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: public}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 111}, TXN_DROPPED] to: [EnumType:{DescID: 111}, DROPPED] @@ -553,7 +553,7 @@ DROP SCHEMA defaultdb.SC1 CASCADE rule: index no longer public before dependents - from: [Schema:{DescID: 104}, DROPPED] to: [Namespace:{DescID: 104, Name: sc1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 104}, DROPPED] to: [ObjectParent:{DescID: 105, ReferencedDescID: 104}, ABSENT] @@ -593,7 +593,7 @@ DROP SCHEMA defaultdb.SC1 CASCADE rule: descriptor drop right before removing dependent with attr ref - from: [Schema:{DescID: 104}, DROPPED] to: [Owner:{DescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 104}, DROPPED] to: [Schema:{DescID: 104}, ABSENT] @@ -601,19 +601,19 @@ DROP SCHEMA defaultdb.SC1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Schema:{DescID: 104}, DROPPED] to: [SchemaComment:{DescID: 104, Comment: sc1 is good schema}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 104}, DROPPED] to: [SchemaParent:{DescID: 104, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Schema:{DescID: 104}, TXN_DROPPED] to: [Schema:{DescID: 104}, DROPPED] @@ -625,15 +625,15 @@ DROP SCHEMA defaultdb.SC1 CASCADE rule: descriptor drop right before removing dependent with expr ref to sequence - from: [Sequence:{DescID: 105}, DROPPED] to: [Namespace:{DescID: 105, Name: sq1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 105}, DROPPED] to: [ObjectParent:{DescID: 105, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 105}, DROPPED] to: [Owner:{DescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 105}, DROPPED] to: [Sequence:{DescID: 105}, ABSENT] @@ -641,115 +641,91 @@ DROP SCHEMA defaultdb.SC1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Sequence:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 105}, TXN_DROPPED] to: [Sequence:{DescID: 105}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [Table:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 106}, ABSENT] - to: [PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnDefaultExpression:{DescID: 106, ColumnID: 3, ReferencedSequenceIDs: [105]}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnFamily:{DescID: 106, Name: primary, ColumnFamilyID: 0}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: id, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: name, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: val, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [IndexColumn:{DescID: 106, ColumnID: 3, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [IndexName:{DescID: 106, Name: t1_pkey, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [Namespace:{DescID: 106, Name: t1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [ObjectParent:{DescID: 106, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [Owner:{DescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [Table:{DescID: 106}, ABSENT] @@ -757,75 +733,63 @@ DROP SCHEMA defaultdb.SC1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Table:{DescID: 106}, DROPPED] to: [TableComment:{DescID: 106, Comment: t1 is good table}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [UserPrivileges:{DescID: 106, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, DROPPED] to: [UserPrivileges:{DescID: 106, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 106}, TXN_DROPPED] to: [Table:{DescID: 106}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 107}, ABSENT] - to: [Column:{DescID: 107, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 107}, ABSENT] - to: [Column:{DescID: 107, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 107}, ABSENT] - to: [Column:{DescID: 107, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnName:{DescID: 107, Name: name, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [Namespace:{DescID: 107, Name: v1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ObjectParent:{DescID: 107, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [Owner:{DescID: 107}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [UserPrivileges:{DescID: 107, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [UserPrivileges:{DescID: 107, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [View:{DescID: 107}, ABSENT] @@ -835,73 +799,57 @@ DROP SCHEMA defaultdb.SC1 CASCADE to: [View:{DescID: 107}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: n1, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: n2, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [Namespace:{DescID: 108, Name: v2, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ObjectParent:{DescID: 108, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [Owner:{DescID: 108}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [View:{DescID: 108}, ABSENT] @@ -911,73 +859,57 @@ DROP SCHEMA defaultdb.SC1 CASCADE to: [View:{DescID: 108}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: n1, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: name, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [Namespace:{DescID: 109, Name: v3, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [ObjectParent:{DescID: 109, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [Owner:{DescID: 109}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [UserPrivileges:{DescID: 109, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [UserPrivileges:{DescID: 109, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 109}, DROPPED] to: [View:{DescID: 109}, ABSENT] @@ -987,73 +919,57 @@ DROP SCHEMA defaultdb.SC1 CASCADE to: [View:{DescID: 109}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 110}, ABSENT] - to: [Column:{DescID: 110, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: n1, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: n2, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ColumnName:{DescID: 110, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [Namespace:{DescID: 110, Name: v4, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [ObjectParent:{DescID: 110, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [Owner:{DescID: 110}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [UserPrivileges:{DescID: 110, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [UserPrivileges:{DescID: 110, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 110}, DROPPED] to: [View:{DescID: 110}, ABSENT] @@ -1063,85 +979,65 @@ DROP SCHEMA defaultdb.SC1 CASCADE to: [View:{DescID: 110}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 113}, ABSENT] - to: [Column:{DescID: 113, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: k, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: n1, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: n2, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnName:{DescID: 113, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [Namespace:{DescID: 113, Name: v5, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [ObjectParent:{DescID: 113, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [Owner:{DescID: 113}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [UserPrivileges:{DescID: 113, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [UserPrivileges:{DescID: 113, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 113}, DROPPED] to: [View:{DescID: 113}, ABSENT] @@ -1214,7 +1110,7 @@ StatementPhase stage 1 of 1 with 10 MutationType ops DescriptorID: 112 *scop.MarkDescriptorAsSyntheticallyDropped DescriptorID: 113 -PreCommitPhase stage 1 of 1 with 49 MutationType ops +PreCommitPhase stage 1 of 1 with 74 MutationType ops transitions: [[Namespace:{DescID: 104, Name: sc1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 104}, ABSENT], PUBLIC] -> ABSENT @@ -1237,26 +1133,26 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops [[ObjectParent:{DescID: 106, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT [[TableComment:{DescID: 106, Comment: t1 is good table}, ABSENT], PUBLIC] -> ABSENT [[ColumnFamily:{DescID: 106, Name: primary, ColumnFamilyID: 0}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: id, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: name, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: val, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 106, ColumnID: 3, ReferencedSequenceIDs: [105]}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 106, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 106, ColumnID: 2, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 106, ColumnID: 3, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT - [[PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY + [[PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 106, Name: t1_pkey, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 107, Name: v1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 107}, ABSENT], PUBLIC] -> ABSENT @@ -1264,13 +1160,13 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops [[UserPrivileges:{DescID: 107, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 107}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 107, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 107, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 107, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 107, Name: name, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 107, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 107, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 107, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 107, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 108, Name: v2, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -1279,16 +1175,16 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops [[UserPrivileges:{DescID: 108, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 108}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 108, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: n1, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: n2, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 109, Name: v3, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -1297,16 +1193,16 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops [[UserPrivileges:{DescID: 109, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 109}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 109, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: name, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: n1, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 110, Name: v4, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -1315,16 +1211,16 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops [[UserPrivileges:{DescID: 110, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 110}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 110, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: n2, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: n1, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 110, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 110, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 111, Name: typ, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -1348,19 +1244,19 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops [[UserPrivileges:{DescID: 113, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 113}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 113, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: k, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: n2, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: n1, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 113, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 113, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: @@ -1455,192 +1351,6 @@ PreCommitPhase stage 1 of 1 with 49 MutationType ops DescriptorID: 106 Name: t1 SchemaID: 104 - *scop.DrainDescriptorName - Namespace: - DatabaseID: 100 - DescriptorID: 107 - Name: v1 - SchemaID: 104 - *scop.DrainDescriptorName - Namespace: - DatabaseID: 100 - DescriptorID: 108 - Name: v2 - SchemaID: 104 - *scop.DrainDescriptorName - Namespace: - DatabaseID: 100 - DescriptorID: 109 - Name: v3 - SchemaID: 104 - *scop.DrainDescriptorName - Namespace: - DatabaseID: 100 - DescriptorID: 110 - Name: v4 - SchemaID: 104 - *scop.DrainDescriptorName - Namespace: - DatabaseID: 100 - DescriptorID: 111 - Name: typ - SchemaID: 104 - *scop.DrainDescriptorName - Namespace: - DatabaseID: 100 - DescriptorID: 112 - Name: _typ - SchemaID: 104 - *scop.DrainDescriptorName - Namespace: - DatabaseID: 100 - DescriptorID: 113 - Name: v5 - SchemaID: 104 - *scop.SetJobStateOnDescriptor - DescriptorID: 100 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 104 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 105 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 106 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 107 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 108 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 109 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 110 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 111 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 112 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 113 - Initialize: true - *scop.CreateSchemaChangerJob - Authorization: - UserName: root - DescriptorIDs: - - 100 - - 104 - - 105 - - 106 - - 107 - - 108 - - 109 - - 110 - - 111 - - 112 - - 113 - JobID: 1 - NonCancelable: true - RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 45 MutationType ops - pending - Statements: - - statement: DROP SCHEMA defaultdb.sc1 CASCADE - redactedstatement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE - statementtag: DROP SCHEMA -PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops - transitions: - [[Schema:{DescID: 104}, ABSENT], DROPPED] -> ABSENT - [[Sequence:{DescID: 105}, ABSENT], DROPPED] -> ABSENT - [[Table:{DescID: 106}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 106, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 106, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 106, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 106, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 106, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[PrimaryIndex:{DescID: 106, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[View:{DescID: 107}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 107, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 107, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 107, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[View:{DescID: 108}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[View:{DescID: 109}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 109, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[View:{DescID: 110}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 110, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 110, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[EnumType:{DescID: 111}, ABSENT], DROPPED] -> ABSENT - [[AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, ABSENT], DROPPED] -> ABSENT - [[View:{DescID: 113}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 113, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 113, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - ops: - *scop.LogEvent - Element: - Schema: - schemaId: 104 - EventBase: - Authorization: - UserName: root - Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE - StatementTag: DROP SCHEMA - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TargetStatus: 1 - *scop.DeleteDescriptor - DescriptorID: 104 - *scop.LogEvent - Element: - Sequence: - sequenceId: 105 - EventBase: - Authorization: - UserName: root - Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE - StatementTag: DROP SCHEMA - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TargetStatus: 1 - *scop.CreateGCJobForTable - StatementForDropJob: - Statement: DROP SCHEMA defaultdb.sc1 CASCADE - TableID: 105 - *scop.LogEvent - Element: - Table: - tableId: 106 - EventBase: - Authorization: - UserName: root - Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE - StatementTag: DROP SCHEMA - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TargetStatus: 1 - *scop.CreateGCJobForTable - StatementForDropJob: - Statement: DROP SCHEMA defaultdb.sc1 CASCADE - TableID: 106 *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: @@ -1663,17 +1373,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE - StatementTag: DROP SCHEMA - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TableID: 106 *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: @@ -1696,27 +1395,12 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 2 SubWorkID: 1 TableID: 106 - *scop.LogEvent - Element: - View: - forwardReferences: - - columnIds: - - 2 - toId: 106 - usesRelationIds: - - 106 - viewId: 107 - EventBase: - Authorization: - UserName: root - Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE - StatementTag: DROP SCHEMA - TargetMetadata: - SourceElementID: 4 - SubWorkID: 1 - TargetStatus: 1 - *scop.DeleteDescriptor - DescriptorID: 107 + *scop.DrainDescriptorName + Namespace: + DatabaseID: 100 + DescriptorID: 107 + Name: v1 + SchemaID: 104 *scop.MakeDeleteOnlyColumnAbsent ColumnID: 1 EventBase: @@ -1750,16 +1434,14 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 4 SubWorkID: 1 TableID: 107 - *scop.LogEvent - Element: - View: - forwardReferences: - - columnIds: - - 1 - toId: 107 - usesRelationIds: - - 107 - viewId: 108 + *scop.DrainDescriptorName + Namespace: + DatabaseID: 100 + DescriptorID: 108 + Name: v2 + SchemaID: 104 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 EventBase: Authorization: UserName: root @@ -1768,11 +1450,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetMetadata: SourceElementID: 5 SubWorkID: 1 - TargetStatus: 1 - *scop.DeleteDescriptor - DescriptorID: 108 + TableID: 108 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 + ColumnID: 2 EventBase: Authorization: UserName: root @@ -1783,7 +1463,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SubWorkID: 1 TableID: 108 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 + ColumnID: 4294967295 EventBase: Authorization: UserName: root @@ -1794,7 +1474,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SubWorkID: 1 TableID: 108 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 + ColumnID: 4294967294 EventBase: Authorization: UserName: root @@ -1804,32 +1484,25 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 5 SubWorkID: 1 TableID: 108 + *scop.DrainDescriptorName + Namespace: + DatabaseID: 100 + DescriptorID: 109 + Name: v3 + SchemaID: 104 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 + ColumnID: 1 EventBase: Authorization: UserName: root Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 5 + SourceElementID: 6 SubWorkID: 1 - TableID: 108 - *scop.LogEvent - Element: - View: - forwardReferences: - - columnIds: - - 1 - toId: 107 - - columnIds: - - 1 - - 2 - toId: 108 - usesRelationIds: - - 107 - - 108 - viewId: 109 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 EventBase: Authorization: UserName: root @@ -1838,11 +1511,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetMetadata: SourceElementID: 6 SubWorkID: 1 - TargetStatus: 1 - *scop.DeleteDescriptor - DescriptorID: 109 + TableID: 109 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 + ColumnID: 4294967295 EventBase: Authorization: UserName: root @@ -1853,7 +1524,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SubWorkID: 1 TableID: 109 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 + ColumnID: 4294967294 EventBase: Authorization: UserName: root @@ -1863,8 +1534,14 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 109 + *scop.DrainDescriptorName + Namespace: + DatabaseID: 100 + DescriptorID: 110 + Name: v4 + SchemaID: 104 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 + ColumnID: 1 EventBase: Authorization: UserName: root @@ -1873,9 +1550,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetMetadata: SourceElementID: 6 SubWorkID: 1 - TableID: 109 + TableID: 110 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 + ColumnID: 2 EventBase: Authorization: UserName: root @@ -1884,18 +1561,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetMetadata: SourceElementID: 6 SubWorkID: 1 - TableID: 109 - *scop.LogEvent - Element: - View: - forwardReferences: - - columnIds: - - 1 - - 2 - toId: 108 - usesRelationIds: - - 108 - viewId: 110 + TableID: 110 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 EventBase: Authorization: UserName: root @@ -1904,11 +1572,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetMetadata: SourceElementID: 6 SubWorkID: 1 - TargetStatus: 1 - *scop.DeleteDescriptor - DescriptorID: 110 + TableID: 110 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 + ColumnID: 4294967294 EventBase: Authorization: UserName: root @@ -1918,6 +1584,35 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops SourceElementID: 6 SubWorkID: 1 TableID: 110 + *scop.DrainDescriptorName + Namespace: + DatabaseID: 100 + DescriptorID: 111 + Name: typ + SchemaID: 104 + *scop.DrainDescriptorName + Namespace: + DatabaseID: 100 + DescriptorID: 112 + Name: _typ + SchemaID: 104 + *scop.DrainDescriptorName + Namespace: + DatabaseID: 100 + DescriptorID: 113 + Name: v5 + SchemaID: 104 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE + StatementTag: DROP SCHEMA + TargetMetadata: + SourceElementID: 8 + SubWorkID: 1 + TableID: 113 *scop.MakeDeleteOnlyColumnAbsent ColumnID: 2 EventBase: @@ -1926,9 +1621,20 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 6 + SourceElementID: 8 SubWorkID: 1 - TableID: 110 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE + StatementTag: DROP SCHEMA + TargetMetadata: + SourceElementID: 8 + SubWorkID: 1 + TableID: 113 *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967295 EventBase: @@ -1937,9 +1643,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 6 + SourceElementID: 8 SubWorkID: 1 - TableID: 110 + TableID: 113 *scop.MakeDeleteOnlyColumnAbsent ColumnID: 4294967294 EventBase: @@ -1948,123 +1654,285 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 6 + SourceElementID: 8 SubWorkID: 1 - TableID: 110 + TableID: 113 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE + StatementTag: DROP SCHEMA + TargetMetadata: + SourceElementID: 2 + SubWorkID: 1 + TableID: 106 + *scop.SetJobStateOnDescriptor + DescriptorID: 100 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 104 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 105 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 106 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 107 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 108 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 109 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 110 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 111 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 112 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 113 + Initialize: true + *scop.CreateSchemaChangerJob + Authorization: + UserName: root + DescriptorIDs: + - 100 + - 104 + - 105 + - 106 + - 107 + - 108 + - 109 + - 110 + - 111 + - 112 + - 113 + JobID: 1 + NonCancelable: true + RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 20 MutationType ops + pending + Statements: + - statement: DROP SCHEMA defaultdb.sc1 CASCADE + redactedstatement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE + statementtag: DROP SCHEMA +PostCommitNonRevertiblePhase stage 1 of 1 with 32 MutationType ops + transitions: + [[Schema:{DescID: 104}, ABSENT], DROPPED] -> ABSENT + [[Sequence:{DescID: 105}, ABSENT], DROPPED] -> ABSENT + [[Table:{DescID: 106}, ABSENT], DROPPED] -> ABSENT + [[View:{DescID: 107}, ABSENT], DROPPED] -> ABSENT + [[View:{DescID: 108}, ABSENT], DROPPED] -> ABSENT + [[View:{DescID: 109}, ABSENT], DROPPED] -> ABSENT + [[View:{DescID: 110}, ABSENT], DROPPED] -> ABSENT + [[EnumType:{DescID: 111}, ABSENT], DROPPED] -> ABSENT + [[AliasType:{DescID: 112, ReferencedTypeIDs: [111 112]}, ABSENT], DROPPED] -> ABSENT + [[View:{DescID: 113}, ABSENT], DROPPED] -> ABSENT + ops: *scop.LogEvent Element: - EnumType: - arrayTypeId: 112 - typeId: 111 + Schema: + schemaId: 104 EventBase: Authorization: UserName: root Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 2 + SourceElementID: 1 SubWorkID: 1 TargetStatus: 1 *scop.DeleteDescriptor - DescriptorID: 111 + DescriptorID: 104 *scop.LogEvent Element: - AliasType: - closedTypeIds: - - 111 - - 112 - type: - arrayContents: - family: EnumFamily - oid: 100111 - udtMetadata: - arrayTypeOid: 100112 - arrayElemType: EnumFamily - family: ArrayFamily - oid: 100112 - typeId: 112 + Sequence: + sequenceId: 105 EventBase: Authorization: UserName: root Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 10 + SourceElementID: 2 + SubWorkID: 1 + TargetStatus: 1 + *scop.CreateGCJobForTable + StatementForDropJob: + Statement: DROP SCHEMA defaultdb.sc1 CASCADE + TableID: 105 + *scop.LogEvent + Element: + Table: + tableId: 106 + EventBase: + Authorization: + UserName: root + Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE + StatementTag: DROP SCHEMA + TargetMetadata: + SourceElementID: 2 + SubWorkID: 1 + TargetStatus: 1 + *scop.CreateGCJobForTable + StatementForDropJob: + Statement: DROP SCHEMA defaultdb.sc1 CASCADE + TableID: 106 + *scop.LogEvent + Element: + View: + forwardReferences: + - columnIds: + - 2 + toId: 106 + usesRelationIds: + - 106 + viewId: 107 + EventBase: + Authorization: + UserName: root + Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE + StatementTag: DROP SCHEMA + TargetMetadata: + SourceElementID: 4 SubWorkID: 1 TargetStatus: 1 *scop.DeleteDescriptor - DescriptorID: 112 + DescriptorID: 107 *scop.LogEvent Element: View: forwardReferences: - columnIds: - 1 - - 2 - toId: 110 + toId: 107 usesRelationIds: - - 110 - usesTypeIds: - - 111 - - 112 - viewId: 113 + - 107 + viewId: 108 EventBase: Authorization: UserName: root Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 8 + SourceElementID: 5 SubWorkID: 1 TargetStatus: 1 *scop.DeleteDescriptor - DescriptorID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 + DescriptorID: 108 + *scop.LogEvent + Element: + View: + forwardReferences: + - columnIds: + - 1 + toId: 107 + - columnIds: + - 1 + - 2 + toId: 108 + usesRelationIds: + - 107 + - 108 + viewId: 109 EventBase: Authorization: UserName: root Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 8 + SourceElementID: 6 SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 + TargetStatus: 1 + *scop.DeleteDescriptor + DescriptorID: 109 + *scop.LogEvent + Element: + View: + forwardReferences: + - columnIds: + - 1 + - 2 + toId: 108 + usesRelationIds: + - 108 + viewId: 110 EventBase: Authorization: UserName: root Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 8 + SourceElementID: 6 SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 + TargetStatus: 1 + *scop.DeleteDescriptor + DescriptorID: 110 + *scop.LogEvent + Element: + EnumType: + arrayTypeId: 112 + typeId: 111 EventBase: Authorization: UserName: root Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 8 + SourceElementID: 2 SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 + TargetStatus: 1 + *scop.DeleteDescriptor + DescriptorID: 111 + *scop.LogEvent + Element: + AliasType: + closedTypeIds: + - 111 + - 112 + type: + arrayContents: + family: EnumFamily + oid: 100111 + udtMetadata: + arrayTypeOid: 100112 + arrayElemType: EnumFamily + family: ArrayFamily + oid: 100112 + typeId: 112 EventBase: Authorization: UserName: root Statement: DROP SCHEMA ‹defaultdb›.‹sc1› CASCADE StatementTag: DROP SCHEMA TargetMetadata: - SourceElementID: 8 + SourceElementID: 10 SubWorkID: 1 - TableID: 113 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 + TargetStatus: 1 + *scop.DeleteDescriptor + DescriptorID: 112 + *scop.LogEvent + Element: + View: + forwardReferences: + - columnIds: + - 1 + - 2 + toId: 110 + usesRelationIds: + - 110 + usesTypeIds: + - 111 + - 112 + viewId: 113 EventBase: Authorization: UserName: root @@ -2073,7 +1941,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 57 MutationType ops TargetMetadata: SourceElementID: 8 SubWorkID: 1 - TableID: 113 + TargetStatus: 1 + *scop.DeleteDescriptor + DescriptorID: 113 *scop.RemoveJobStateFromDescriptor DescriptorID: 100 JobID: 1 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_sequence b/pkg/sql/schemachanger/scplan/testdata/drop_sequence index 7bb19bb856bc..6e260d1c6435 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_sequence +++ b/pkg/sql/schemachanger/scplan/testdata/drop_sequence @@ -201,15 +201,15 @@ DROP SEQUENCE defaultdb.SQ1 CASCADE rule: descriptor drop right before removing dependent with expr ref to sequence - from: [Sequence:{DescID: 104}, DROPPED] to: [Namespace:{DescID: 104, Name: sq1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 104}, DROPPED] to: [ObjectParent:{DescID: 104, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 104}, DROPPED] to: [Owner:{DescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 104}, DROPPED] to: [Sequence:{DescID: 104}, ABSENT] @@ -217,11 +217,11 @@ DROP SEQUENCE defaultdb.SQ1 CASCADE rule: descriptor DROPPED in transaction before removal - from: [Sequence:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 104}, TXN_DROPPED] to: [Sequence:{DescID: 104}, DROPPED] diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_table b/pkg/sql/schemachanger/scplan/testdata/drop_table index 488b062e8b8b..70ca632c1b71 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_table +++ b/pkg/sql/schemachanger/scplan/testdata/drop_table @@ -54,7 +54,7 @@ StatementPhase stage 1 of 1 with 3 MutationType ops DescriptorID: 110 *scop.MarkDescriptorAsSyntheticallyDropped DescriptorID: 111 -PreCommitPhase stage 1 of 1 with 32 MutationType ops +PreCommitPhase stage 1 of 1 with 43 MutationType ops transitions: [[Namespace:{DescID: 109, Name: shipments, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 109}, ABSENT], PUBLIC] -> ABSENT @@ -64,29 +64,29 @@ PreCommitPhase stage 1 of 1 with 32 MutationType ops [[ObjectParent:{DescID: 109, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT [[TableComment:{DescID: 109, Comment: shipment is important}, ABSENT], PUBLIC] -> ABSENT [[ColumnFamily:{DescID: 109, Name: primary, ColumnFamilyID: 0}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: tracking_number, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 109, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnComment:{DescID: 109, ColumnID: 1, Comment: tracking_number is a must}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: carrier, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[SequenceOwner:{DescID: 109, ColumnID: 2, ReferencedDescID: 110}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: status, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ReferencedTypeIDs: [107 108], ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: customer_id, ColumnID: 4}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 5}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 5}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: randcol, ColumnID: 5}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 5}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 109, ColumnID: 5, ReferencedSequenceIDs: [106]}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 109, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT @@ -94,14 +94,14 @@ PreCommitPhase stage 1 of 1 with 32 MutationType ops [[IndexColumn:{DescID: 109, ColumnID: 3, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 4, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 5, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT - [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY + [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 109, Name: shipments_pkey, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexComment:{DescID: 109, IndexID: 1, Comment: pkey is good}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 3, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 4, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT [[SecondaryIndexPartial:{DescID: 109, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT - [[SecondaryIndex:{DescID: 109, IndexID: 2, ConstraintID: 0}, ABSENT], VALIDATED] -> DELETE_ONLY + [[SecondaryIndex:{DescID: 109, IndexID: 2, ConstraintID: 0}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 109, Name: partialidx, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT [[ForeignKeyConstraint:{DescID: 109, ConstraintID: 2, ReferencedDescID: 104}, ABSENT], PUBLIC] -> ABSENT [[ConstraintName:{DescID: 109, Name: fk_customers, ConstraintID: 2}, ABSENT], PUBLIC] -> ABSENT @@ -120,16 +120,16 @@ PreCommitPhase stage 1 of 1 with 32 MutationType ops [[UserPrivileges:{DescID: 111, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 111}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 111, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: customer_id, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: carrier, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: @@ -188,6 +188,50 @@ PreCommitPhase stage 1 of 1 with 32 MutationType ops TableID: 109 *scop.RemoveOwnerBackReferenceInSequence SequenceID: 110 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE + StatementTag: DROP TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4 + EventBase: + Authorization: + UserName: root + Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE + StatementTag: DROP TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE + StatementTag: DROP TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE + StatementTag: DROP TABLE + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 109 *scop.RemoveForeignKeyBackReference OriginConstraintID: 2 OriginTableID: 109 @@ -214,121 +258,52 @@ PreCommitPhase stage 1 of 1 with 32 MutationType ops DescriptorID: 111 Name: v1 SchemaID: 101 - *scop.SetJobStateOnDescriptor - DescriptorID: 104 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 105 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 106 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 107 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 108 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 109 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 110 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 111 - Initialize: true - *scop.CreateSchemaChangerJob - Authorization: - UserName: root - DescriptorIDs: - - 104 - - 105 - - 106 - - 107 - - 108 - - 109 - - 110 - - 111 - JobID: 1 - NonCancelable: true - RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 17 MutationType ops - pending - Statements: - - statement: DROP TABLE defaultdb.shipments CASCADE - redactedstatement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE - statementtag: DROP TABLE -PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops - transitions: - [[Table:{DescID: 109}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 109, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 5}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 109, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[SecondaryIndex:{DescID: 109, IndexID: 2, ConstraintID: 0}, ABSENT], DELETE_ONLY] -> ABSENT - [[Sequence:{DescID: 110}, ABSENT], DROPPED] -> ABSENT - [[View:{DescID: 111}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 111, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - ops: - *scop.LogEvent - Element: - Table: - tableId: 109 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 EventBase: Authorization: UserName: root Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE StatementTag: DROP TABLE TargetMetadata: - SourceElementID: 1 + SourceElementID: 2 SubWorkID: 1 - TargetStatus: 1 - *scop.CreateGCJobForTable - StatementForDropJob: - Statement: DROP TABLE defaultdb.public.shipments CASCADE - TableID: 109 + TableID: 111 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 + ColumnID: 2 EventBase: Authorization: UserName: root Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE StatementTag: DROP TABLE TargetMetadata: - SourceElementID: 1 + SourceElementID: 2 SubWorkID: 1 - TableID: 109 + TableID: 111 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 + ColumnID: 4294967295 EventBase: Authorization: UserName: root Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE StatementTag: DROP TABLE TargetMetadata: - SourceElementID: 1 + SourceElementID: 2 SubWorkID: 1 - TableID: 109 + TableID: 111 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 + ColumnID: 4294967294 EventBase: Authorization: UserName: root Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE StatementTag: DROP TABLE TargetMetadata: - SourceElementID: 1 + SourceElementID: 2 SubWorkID: 1 - TableID: 109 + TableID: 111 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4 + ColumnID: 1 EventBase: Authorization: UserName: root @@ -350,7 +325,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SubWorkID: 1 TableID: 109 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 + ColumnID: 2 EventBase: Authorization: UserName: root @@ -360,8 +335,59 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 109 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 + *scop.SetJobStateOnDescriptor + DescriptorID: 104 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 105 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 106 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 107 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 108 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 109 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 110 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 111 + Initialize: true + *scop.CreateSchemaChangerJob + Authorization: + UserName: root + DescriptorIDs: + - 104 + - 105 + - 106 + - 107 + - 108 + - 109 + - 110 + - 111 + JobID: 1 + NonCancelable: true + RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 6 MutationType ops pending + Statements: + - statement: DROP TABLE defaultdb.shipments CASCADE + redactedstatement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE + statementtag: DROP TABLE +PostCommitNonRevertiblePhase stage 1 of 1 with 15 MutationType ops + transitions: + [[Table:{DescID: 109}, ABSENT], DROPPED] -> ABSENT + [[Sequence:{DescID: 110}, ABSENT], DROPPED] -> ABSENT + [[View:{DescID: 111}, ABSENT], DROPPED] -> ABSENT + ops: + *scop.LogEvent + Element: + Table: + tableId: 109 EventBase: Authorization: UserName: root @@ -370,6 +396,10 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops TargetMetadata: SourceElementID: 1 SubWorkID: 1 + TargetStatus: 1 + *scop.CreateGCJobForTable + StatementForDropJob: + Statement: DROP TABLE defaultdb.public.shipments CASCADE TableID: 109 *scop.LogEvent Element: @@ -410,50 +440,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 26 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE - StatementTag: DROP TABLE - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE - StatementTag: DROP TABLE - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE - StatementTag: DROP TABLE - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP TABLE ‹defaultdb›.public.‹shipments› CASCADE - StatementTag: DROP TABLE - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TableID: 111 *scop.RemoveJobStateFromDescriptor DescriptorID: 104 JobID: 1 @@ -880,15 +866,15 @@ DROP TABLE defaultdb.shipments CASCADE; rule: dependents removed before index - from: [Sequence:{DescID: 110}, DROPPED] to: [Namespace:{DescID: 110, Name: sq1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 110}, DROPPED] to: [ObjectParent:{DescID: 110, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 110}, DROPPED] to: [Owner:{DescID: 110}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 110}, DROPPED] to: [Sequence:{DescID: 110}, ABSENT] @@ -900,11 +886,11 @@ DROP TABLE defaultdb.shipments CASCADE; rule: descriptor drop right before removing dependent with attr ref - from: [Sequence:{DescID: 110}, DROPPED] to: [UserPrivileges:{DescID: 110, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 110}, DROPPED] to: [UserPrivileges:{DescID: 110, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Sequence:{DescID: 110}, TXN_DROPPED] to: [Sequence:{DescID: 110}, DROPPED] @@ -918,197 +904,161 @@ DROP TABLE defaultdb.shipments CASCADE; to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] kind: SameStagePrecedence rule: column type dependents removed right before column type -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 4}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [Column:{DescID: 109, ColumnID: 5}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [PrimaryIndex:{DescID: 109, IndexID: 1, ConstraintID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [Table:{DescID: 109}, ABSENT] - to: [SecondaryIndex:{DescID: 109, IndexID: 2, ConstraintID: 0}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnComment:{DescID: 109, ColumnID: 1, Comment: tracking_number is a must}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnDefaultExpression:{DescID: 109, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnDefaultExpression:{DescID: 109, ColumnID: 5, ReferencedSequenceIDs: [106]}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnFamily:{DescID: 109, Name: primary, ColumnFamilyID: 0}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: carrier, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: customer_id, ColumnID: 4}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: randcol, ColumnID: 5}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: status, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnName:{DescID: 109, Name: tracking_number, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 4}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ColumnFamilyID: 0, ColumnID: 5}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ColumnType:{DescID: 109, ReferencedTypeIDs: [107 108], ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ConstraintComment:{DescID: 109, ConstraintID: 2, Comment: customer is not god}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ConstraintName:{DescID: 109, Name: fk_customers, ConstraintID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ConstraintName:{DescID: 109, Name: fk_orders, ConstraintID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ForeignKeyConstraint:{DescID: 109, ConstraintID: 2, ReferencedDescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ForeignKeyConstraint:{DescID: 109, ConstraintID: 3, ReferencedDescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 1, IndexID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 2, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 3, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 3, IndexID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 4, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 4, IndexID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexColumn:{DescID: 109, ColumnID: 5, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexComment:{DescID: 109, IndexID: 1, Comment: pkey is good}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexName:{DescID: 109, Name: partialidx, IndexID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [IndexName:{DescID: 109, Name: shipments_pkey, IndexID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [Namespace:{DescID: 109, Name: shipments, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [ObjectParent:{DescID: 109, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [Owner:{DescID: 109}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [SecondaryIndexPartial:{DescID: 109, IndexID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [SequenceOwner:{DescID: 109, ColumnID: 2, ReferencedDescID: 110}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [Table:{DescID: 109}, ABSENT] @@ -1116,87 +1066,71 @@ DROP TABLE defaultdb.shipments CASCADE; rule: descriptor DROPPED in transaction before removal - from: [Table:{DescID: 109}, DROPPED] to: [TableComment:{DescID: 109, Comment: shipment is important}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [UserPrivileges:{DescID: 109, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, DROPPED] to: [UserPrivileges:{DescID: 109, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [Table:{DescID: 109}, TXN_DROPPED] to: [Table:{DescID: 109}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: carrier, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: customer_id, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [Namespace:{DescID: 111, Name: v1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ObjectParent:{DescID: 111, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [Owner:{DescID: 111}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [View:{DescID: 111}, ABSENT] @@ -1233,7 +1167,7 @@ StatementPhase stage 1 of 1 with 1 MutationType op ops: *scop.MarkDescriptorAsSyntheticallyDropped DescriptorID: 114 -PreCommitPhase stage 1 of 1 with 16 MutationType ops +PreCommitPhase stage 1 of 1 with 21 MutationType ops transitions: [[Namespace:{DescID: 114, Name: greeter, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 114}, ABSENT], PUBLIC] -> ABSENT @@ -1242,32 +1176,32 @@ PreCommitPhase stage 1 of 1 with 16 MutationType ops [[Table:{DescID: 114}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 114, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT [[ColumnFamily:{DescID: 114, Name: primary, ColumnFamilyID: 0}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: x, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 114, ReferencedTypeIDs: [112 113], ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: y, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ReferencedTypeIDs: [112 113], ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: rowid, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnDefaultExpression:{DescID: 114, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 114, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 114, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 114, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 114, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 114, ColumnID: 3, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 114, ColumnID: 1, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 114, ColumnID: 2, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT - [[PrimaryIndex:{DescID: 114, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> DELETE_ONLY + [[PrimaryIndex:{DescID: 114, IndexID: 1, ConstraintID: 1}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 114, Name: greeter_pkey, IndexID: 1}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 114, ColumnID: 2, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT [[IndexColumn:{DescID: 114, ColumnID: 3, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT [[SecondaryIndexPartial:{DescID: 114, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT - [[SecondaryIndex:{DescID: 114, IndexID: 2, ConstraintID: 0}, ABSENT], VALIDATED] -> DELETE_ONLY + [[SecondaryIndex:{DescID: 114, IndexID: 2, ConstraintID: 0}, ABSENT], VALIDATED] -> ABSENT [[IndexName:{DescID: 114, Name: i, IndexID: 2}, ABSENT], PUBLIC] -> ABSENT [[CheckConstraint:{DescID: 114, ReferencedTypeIDs: [112 113], ConstraintID: 2}, ABSENT], PUBLIC] -> ABSENT [[ConstraintName:{DescID: 114, Name: check, ConstraintID: 2}, ABSENT], PUBLIC] -> ABSENT @@ -1309,52 +1243,8 @@ PreCommitPhase stage 1 of 1 with 16 MutationType ops DescriptorID: 114 Name: greeter SchemaID: 101 - *scop.RemoveCheckConstraint - ConstraintID: 2 - TableID: 114 - *scop.UpdateTableBackReferencesInTypes - BackReferencedTableID: 114 - TypeIDs: - - 112 - - 113 - *scop.SetJobStateOnDescriptor - DescriptorID: 112 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 113 - Initialize: true - *scop.SetJobStateOnDescriptor - DescriptorID: 114 - Initialize: true - *scop.CreateSchemaChangerJob - Authorization: - UserName: root - DescriptorIDs: - - 112 - - 113 - - 114 - JobID: 1 - NonCancelable: true - RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 7 MutationType ops pending - Statements: - - statement: DROP TABLE defaultdb.greeter - redactedstatement: DROP TABLE ‹defaultdb›.public.‹greeter› - statementtag: DROP TABLE -PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops - transitions: - [[Table:{DescID: 114}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 114, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 114, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 114, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 114, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 114, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT - [[PrimaryIndex:{DescID: 114, IndexID: 1, ConstraintID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[SecondaryIndex:{DescID: 114, IndexID: 2, ConstraintID: 0}, ABSENT], DELETE_ONLY] -> ABSENT - ops: - *scop.LogEvent - Element: - Table: - tableId: 114 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 EventBase: Authorization: UserName: root @@ -1363,13 +1253,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops TargetMetadata: SourceElementID: 1 SubWorkID: 1 - TargetStatus: 1 - *scop.CreateGCJobForTable - StatementForDropJob: - Statement: DROP TABLE defaultdb.public.greeter TableID: 114 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 + ColumnID: 4294967295 EventBase: Authorization: UserName: root @@ -1380,7 +1266,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SubWorkID: 1 TableID: 114 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 + ColumnID: 4294967294 EventBase: Authorization: UserName: root @@ -1390,8 +1276,16 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 114 + *scop.RemoveCheckConstraint + ConstraintID: 2 + TableID: 114 + *scop.UpdateTableBackReferencesInTypes + BackReferencedTableID: 114 + TypeIDs: + - 112 + - 113 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 + ColumnID: 1 EventBase: Authorization: UserName: root @@ -1402,7 +1296,7 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SubWorkID: 1 TableID: 114 *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 + ColumnID: 3 EventBase: Authorization: UserName: root @@ -1412,8 +1306,37 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops SourceElementID: 1 SubWorkID: 1 TableID: 114 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 + *scop.SetJobStateOnDescriptor + DescriptorID: 112 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 113 + Initialize: true + *scop.SetJobStateOnDescriptor + DescriptorID: 114 + Initialize: true + *scop.CreateSchemaChangerJob + Authorization: + UserName: root + DescriptorIDs: + - 112 + - 113 + - 114 + JobID: 1 + NonCancelable: true + RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 2 MutationType ops pending + Statements: + - statement: DROP TABLE defaultdb.greeter + redactedstatement: DROP TABLE ‹defaultdb›.public.‹greeter› + statementtag: DROP TABLE +PostCommitNonRevertiblePhase stage 1 of 1 with 6 MutationType ops + transitions: + [[Table:{DescID: 114}, ABSENT], DROPPED] -> ABSENT + ops: + *scop.LogEvent + Element: + Table: + tableId: 114 EventBase: Authorization: UserName: root @@ -1422,6 +1345,10 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 11 MutationType ops TargetMetadata: SourceElementID: 1 SubWorkID: 1 + TargetStatus: 1 + *scop.CreateGCJobForTable + StatementForDropJob: + Statement: DROP TABLE defaultdb.public.greeter TableID: 114 *scop.RemoveJobStateFromDescriptor DescriptorID: 112 diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_type b/pkg/sql/schemachanger/scplan/testdata/drop_type index dfab80e9c1f9..1f99f65c0afa 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_type +++ b/pkg/sql/schemachanger/scplan/testdata/drop_type @@ -137,27 +137,27 @@ DROP TYPE defaultdb.typ rule: descriptor DROPPED in transaction before removal - from: [AliasType:{DescID: 105, ReferencedTypeIDs: [104 105]}, DROPPED] to: [Namespace:{DescID: 105, Name: _typ, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 105, ReferencedTypeIDs: [104 105]}, DROPPED] to: [ObjectParent:{DescID: 105, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 105, ReferencedTypeIDs: [104 105]}, DROPPED] to: [Owner:{DescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 105, ReferencedTypeIDs: [104 105]}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 105, ReferencedTypeIDs: [104 105]}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: public}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 105, ReferencedTypeIDs: [104 105]}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [AliasType:{DescID: 105, ReferencedTypeIDs: [104 105]}, TXN_DROPPED] to: [AliasType:{DescID: 105, ReferencedTypeIDs: [104 105]}, DROPPED] @@ -169,31 +169,31 @@ DROP TYPE defaultdb.typ rule: descriptor DROPPED in transaction before removal - from: [EnumType:{DescID: 104}, DROPPED] to: [EnumTypeValue:{DescID: 104, Name: a}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 104}, DROPPED] to: [Namespace:{DescID: 104, Name: typ, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 104}, DROPPED] to: [ObjectParent:{DescID: 104, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 104}, DROPPED] to: [Owner:{DescID: 104}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: public}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 104}, DROPPED] to: [UserPrivileges:{DescID: 104, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [EnumType:{DescID: 104}, TXN_DROPPED] to: [EnumType:{DescID: 104}, DROPPED] diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_view b/pkg/sql/schemachanger/scplan/testdata/drop_view index c9a51f33140e..3c73c0f6584a 100644 --- a/pkg/sql/schemachanger/scplan/testdata/drop_view +++ b/pkg/sql/schemachanger/scplan/testdata/drop_view @@ -15,7 +15,7 @@ StatementPhase stage 1 of 1 with 1 MutationType op ops: *scop.MarkDescriptorAsSyntheticallyDropped DescriptorID: 105 -PreCommitPhase stage 1 of 1 with 7 MutationType ops +PreCommitPhase stage 1 of 1 with 10 MutationType ops transitions: [[Namespace:{DescID: 105, Name: v1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 105}, ABSENT], PUBLIC] -> ABSENT @@ -23,13 +23,13 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops [[UserPrivileges:{DescID: 105, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 105}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 105, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: name, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: @@ -47,6 +47,39 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops DescriptorID: 105 Name: v1 SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 *scop.SetJobStateOnDescriptor DescriptorID: 104 Initialize: true @@ -61,17 +94,14 @@ PreCommitPhase stage 1 of 1 with 7 MutationType ops - 105 JobID: 1 NonCancelable: true - RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops pending + RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 2 MutationType ops pending Statements: - statement: DROP VIEW defaultdb.v1 redactedstatement: DROP VIEW ‹defaultdb›.public.‹v1› statementtag: DROP VIEW -PostCommitNonRevertiblePhase stage 1 of 1 with 8 MutationType ops +PostCommitNonRevertiblePhase stage 1 of 1 with 5 MutationType ops transitions: [[View:{DescID: 105}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 105, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT ops: *scop.LogEvent Element: @@ -94,39 +124,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 8 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 *scop.RemoveJobStateFromDescriptor DescriptorID: 104 JobID: 1 @@ -191,61 +188,49 @@ DROP VIEW defaultdb.v1 to: [Column:{DescID: 105, ColumnID: 4294967295}, ABSENT] kind: Precedence rule: dependents removed before column -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: name, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [Namespace:{DescID: 105, Name: v1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ObjectParent:{DescID: 105, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [Owner:{DescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [View:{DescID: 105}, ABSENT] @@ -305,7 +290,7 @@ StatementPhase stage 1 of 1 with 5 MutationType ops DescriptorID: 108 *scop.MarkDescriptorAsSyntheticallyDropped DescriptorID: 111 -PreCommitPhase stage 1 of 1 with 30 MutationType ops +PreCommitPhase stage 1 of 1 with 50 MutationType ops transitions: [[Namespace:{DescID: 105, Name: v1, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT [[Owner:{DescID: 105}, ABSENT], PUBLIC] -> ABSENT @@ -313,13 +298,13 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops [[UserPrivileges:{DescID: 105, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 105}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 105, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: name, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 105, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 106, Name: v2, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -328,16 +313,16 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops [[UserPrivileges:{DescID: 106, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 106}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 106, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: n1, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: n2, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 106, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 106, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 106, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 107, Name: v3, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -346,16 +331,16 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops [[UserPrivileges:{DescID: 107, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 107}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 107, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 107, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 107, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 107, Name: name, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 107, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 107, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 107, Name: n1, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 107, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 107, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 107, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 107, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 108, Name: v4, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -364,16 +349,16 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops [[UserPrivileges:{DescID: 108, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 108}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 108, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: n2, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: n1, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[Namespace:{DescID: 111, Name: v5, ReferencedDescID: 100}, ABSENT], PUBLIC] -> ABSENT @@ -382,19 +367,19 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops [[UserPrivileges:{DescID: 111, Name: root}, ABSENT], PUBLIC] -> ABSENT [[View:{DescID: 111}, ABSENT], TXN_DROPPED] -> DROPPED [[ObjectParent:{DescID: 111, ReferencedDescID: 101}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 1}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 1}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: k, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 1}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 2}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 2}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: n2, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 2}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 3}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 3}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: n1, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 3}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT], PUBLIC] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> DELETE_ONLY + [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], WRITE_ONLY] -> ABSENT [[ColumnName:{DescID: 111, Name: tableoid, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT [[ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT], PUBLIC] -> ABSENT ops: @@ -450,30 +435,250 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops DescriptorID: 105 Name: v1 SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 1 + SubWorkID: 1 + TableID: 105 *scop.DrainDescriptorName Namespace: DatabaseID: 100 DescriptorID: 106 Name: v2 SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 2 + SubWorkID: 1 + TableID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 2 + SubWorkID: 1 + TableID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 2 + SubWorkID: 1 + TableID: 106 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 2 + SubWorkID: 1 + TableID: 106 *scop.DrainDescriptorName Namespace: DatabaseID: 100 DescriptorID: 107 Name: v3 SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 107 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 107 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 107 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 107 *scop.DrainDescriptorName Namespace: DatabaseID: 100 DescriptorID: 108 Name: v4 SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 108 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 3 + SubWorkID: 1 + TableID: 108 *scop.DrainDescriptorName Namespace: DatabaseID: 100 DescriptorID: 111 Name: v5 SchemaID: 101 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 1 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 5 + SubWorkID: 1 + TableID: 111 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 2 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 5 + SubWorkID: 1 + TableID: 111 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 3 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 5 + SubWorkID: 1 + TableID: 111 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967295 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 5 + SubWorkID: 1 + TableID: 111 + *scop.MakeDeleteOnlyColumnAbsent + ColumnID: 4294967294 + EventBase: + Authorization: + UserName: root + Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE + StatementTag: DROP VIEW + TargetMetadata: + SourceElementID: 5 + SubWorkID: 1 + TableID: 111 *scop.SetJobStateOnDescriptor DescriptorID: 104 Initialize: true @@ -512,150 +717,51 @@ PreCommitPhase stage 1 of 1 with 30 MutationType ops - 111 JobID: 1 NonCancelable: true - RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 30 MutationType ops + RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 10 MutationType ops pending Statements: - statement: DROP VIEW defaultdb.v1 CASCADE redactedstatement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE statementtag: DROP VIEW -PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops +PostCommitNonRevertiblePhase stage 1 of 1 with 19 MutationType ops transitions: [[View:{DescID: 105}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 105, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 105, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 106}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 106, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 106, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 106, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 106, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 107}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 107, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 107, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 107, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 107, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 108}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 108, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 108, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT [[View:{DescID: 111}, ABSENT], DROPPED] -> ABSENT - [[Column:{DescID: 111, ColumnID: 1}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 2}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 3}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967295}, ABSENT], DELETE_ONLY] -> ABSENT - [[Column:{DescID: 111, ColumnID: 4294967294}, ABSENT], DELETE_ONLY] -> ABSENT ops: *scop.LogEvent Element: View: forwardReferences: - - columnIds: - - 2 - toId: 104 - usesRelationIds: - - 104 - viewId: 105 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TargetStatus: 1 - *scop.DeleteDescriptor - DescriptorID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 1 - SubWorkID: 1 - TableID: 105 - *scop.LogEvent - Element: - View: - forwardReferences: - - columnIds: - - 1 - toId: 105 - usesRelationIds: - - 105 - viewId: 106 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TargetStatus: 1 - *scop.DeleteDescriptor - DescriptorID: 106 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TableID: 106 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 2 - SubWorkID: 1 - TableID: 106 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 + - columnIds: + - 2 + toId: 104 + usesRelationIds: + - 104 + viewId: 105 EventBase: Authorization: UserName: root Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE StatementTag: DROP VIEW TargetMetadata: - SourceElementID: 2 + SourceElementID: 1 SubWorkID: 1 - TableID: 106 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 + TargetStatus: 1 + *scop.DeleteDescriptor + DescriptorID: 105 + *scop.LogEvent + Element: + View: + forwardReferences: + - columnIds: + - 1 + toId: 105 + usesRelationIds: + - 105 + viewId: 106 EventBase: Authorization: UserName: root @@ -664,7 +770,9 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetMetadata: SourceElementID: 2 SubWorkID: 1 - TableID: 106 + TargetStatus: 1 + *scop.DeleteDescriptor + DescriptorID: 106 *scop.LogEvent Element: View: @@ -691,50 +799,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 107 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 107 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 107 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 107 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 107 *scop.LogEvent Element: View: @@ -757,50 +821,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 108 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 3 - SubWorkID: 1 - TableID: 108 *scop.LogEvent Element: View: @@ -826,61 +846,6 @@ PostCommitNonRevertiblePhase stage 1 of 1 with 39 MutationType ops TargetStatus: 1 *scop.DeleteDescriptor DescriptorID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 1 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 5 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 2 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 5 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 3 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 5 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967295 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 5 - SubWorkID: 1 - TableID: 111 - *scop.MakeDeleteOnlyColumnAbsent - ColumnID: 4294967294 - EventBase: - Authorization: - UserName: root - Statement: DROP VIEW ‹defaultdb›.public.‹v1› CASCADE - StatementTag: DROP VIEW - TargetMetadata: - SourceElementID: 5 - SubWorkID: 1 - TableID: 111 *scop.RemoveJobStateFromDescriptor DescriptorID: 104 JobID: 1 @@ -1241,61 +1206,49 @@ DROP VIEW defaultdb.v1 CASCADE to: [Column:{DescID: 111, ColumnID: 4294967295}, ABSENT] kind: Precedence rule: dependents removed before column -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 105}, ABSENT] - to: [Column:{DescID: 105, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: name, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnName:{DescID: 105, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ColumnType:{DescID: 105, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [Namespace:{DescID: 105, Name: v1, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [ObjectParent:{DescID: 105, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [Owner:{DescID: 105}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [UserPrivileges:{DescID: 105, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 105}, DROPPED] to: [View:{DescID: 105}, ABSENT] @@ -1305,73 +1258,57 @@ DROP VIEW defaultdb.v1 CASCADE to: [View:{DescID: 105}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 106}, ABSENT] - to: [Column:{DescID: 106, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: n1, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: n2, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ColumnName:{DescID: 106, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ColumnType:{DescID: 106, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [Namespace:{DescID: 106, Name: v2, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [ObjectParent:{DescID: 106, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [Owner:{DescID: 106}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [UserPrivileges:{DescID: 106, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [UserPrivileges:{DescID: 106, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 106}, DROPPED] to: [View:{DescID: 106}, ABSENT] @@ -1381,73 +1318,57 @@ DROP VIEW defaultdb.v1 CASCADE to: [View:{DescID: 106}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 107}, ABSENT] - to: [Column:{DescID: 107, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 107}, ABSENT] - to: [Column:{DescID: 107, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 107}, ABSENT] - to: [Column:{DescID: 107, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 107}, ABSENT] - to: [Column:{DescID: 107, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnName:{DescID: 107, Name: n1, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnName:{DescID: 107, Name: name, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [Namespace:{DescID: 107, Name: v3, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [ObjectParent:{DescID: 107, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [Owner:{DescID: 107}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [UserPrivileges:{DescID: 107, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [UserPrivileges:{DescID: 107, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 107}, DROPPED] to: [View:{DescID: 107}, ABSENT] @@ -1457,73 +1378,57 @@ DROP VIEW defaultdb.v1 CASCADE to: [View:{DescID: 107}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 108}, ABSENT] - to: [Column:{DescID: 108, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: n1, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: n2, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnName:{DescID: 108, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ColumnType:{DescID: 108, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [Namespace:{DescID: 108, Name: v4, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [ObjectParent:{DescID: 108, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [Owner:{DescID: 108}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [UserPrivileges:{DescID: 108, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 108}, DROPPED] to: [View:{DescID: 108}, ABSENT] @@ -1533,85 +1438,65 @@ DROP VIEW defaultdb.v1 CASCADE to: [View:{DescID: 108}, DROPPED] kind: PreviousStagePrecedence rule: descriptor TXN_DROPPED before DROPPED -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal -- from: [View:{DescID: 111}, ABSENT] - to: [Column:{DescID: 111, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence - rule: descriptor removal right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: k, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: n1, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: n2, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnName:{DescID: 111, Name: tableoid, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 1}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 2}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 3}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967294}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ColumnType:{DescID: 111, ColumnFamilyID: 0, ColumnID: 4294967295}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [Namespace:{DescID: 111, Name: v5, ReferencedDescID: 100}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [ObjectParent:{DescID: 111, ReferencedDescID: 101}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [Owner:{DescID: 111}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: admin}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [UserPrivileges:{DescID: 111, Name: root}, ABSENT] - kind: SameStagePrecedence + kind: Precedence rule: descriptor drop right before dependent element removal - from: [View:{DescID: 111}, DROPPED] to: [View:{DescID: 111}, ABSENT] diff --git a/pkg/sql/schemachanger/testdata/end_to_end/drop_table b/pkg/sql/schemachanger/testdata/end_to_end/drop_table index 058837eebf91..1a4b62121649 100644 --- a/pkg/sql/schemachanger/testdata/end_to_end/drop_table +++ b/pkg/sql/schemachanger/testdata/end_to_end/drop_table @@ -37,7 +37,7 @@ add synthetic descriptor #107: version: "1" # end StatementPhase # begin PreCommitPhase -## PreCommitPhase stage 1 of 1 with 6 MutationType ops +## PreCommitPhase stage 1 of 1 with 11 MutationType ops delete object namespace entry {104 106 t} -> 107 upsert descriptor #107 ... @@ -75,7 +75,7 @@ notified job registry to adopt jobs: [1] begin transaction #2 commit transaction #2 begin transaction #3 -## PostCommitNonRevertiblePhase stage 1 of 1 with 9 MutationType ops +## PostCommitNonRevertiblePhase stage 1 of 1 with 4 MutationType ops upsert descriptor #107 ... createAsOfTime: diff --git a/pkg/sql/schemachanger/testdata/explain/drop_table b/pkg/sql/schemachanger/testdata/explain/drop_table index 1381b020df95..607ed926d0c1 100644 --- a/pkg/sql/schemachanger/testdata/explain/drop_table +++ b/pkg/sql/schemachanger/testdata/explain/drop_table @@ -23,58 +23,52 @@ Schema change plan for DROP TABLE ‹db›.‹sc›.‹t›; ├── PreCommitPhase │ └── Stage 1 of 1 in PreCommitPhase │ ├── 28 elements transitioning toward ABSENT - │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107, Name: t, ReferencedDescID: 104} - │ │ ├── PUBLIC → ABSENT Owner:{DescID: 107} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: admin} - │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: root} - │ │ ├── TXN_DROPPED → DROPPED Table:{DescID: 107} - │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 107, ReferencedDescID: 106} - │ │ ├── PUBLIC → ABSENT ColumnFamily:{DescID: 107, Name: primary, ColumnFamilyID: 0} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 107, ColumnID: 1} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: k, ColumnID: 1} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 107, ColumnID: 2} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: v, ColumnID: 2} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 2} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 107, ColumnID: 3} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: rowid, ColumnID: 3} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 3} - │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 107, ColumnID: 3} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 107, ColumnID: 4294967295} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295} - │ │ ├── WRITE_ONLY → DELETE_ONLY Column:{DescID: 107, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294} - │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 1} - │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1} - │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 1} - │ │ ├── VALIDATED → DELETE_ONLY PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} - │ │ └── PUBLIC → ABSENT IndexName:{DescID: 107, Name: t_pkey, IndexID: 1} - │ └── 6 Mutation operations + │ │ ├── PUBLIC → ABSENT Namespace:{DescID: 107, Name: t, ReferencedDescID: 104} + │ │ ├── PUBLIC → ABSENT Owner:{DescID: 107} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: admin} + │ │ ├── PUBLIC → ABSENT UserPrivileges:{DescID: 107, Name: root} + │ │ ├── TXN_DROPPED → DROPPED Table:{DescID: 107} + │ │ ├── PUBLIC → ABSENT ObjectParent:{DescID: 107, ReferencedDescID: 106} + │ │ ├── PUBLIC → ABSENT ColumnFamily:{DescID: 107, Name: primary, ColumnFamilyID: 0} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 1} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: k, ColumnID: 1} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 2} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: v, ColumnID: 2} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 2} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 3} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: rowid, ColumnID: 3} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 3} + │ │ ├── PUBLIC → ABSENT ColumnDefaultExpression:{DescID: 107, ColumnID: 3} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 4294967295} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295} + │ │ ├── WRITE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294} + │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 1} + │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1} + │ │ ├── PUBLIC → ABSENT IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 1} + │ │ ├── VALIDATED → ABSENT PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} + │ │ └── PUBLIC → ABSENT IndexName:{DescID: 107, Name: t_pkey, IndexID: 1} + │ └── 11 Mutation operations │ ├── MarkDescriptorAsDropped {"DescriptorID":107} │ ├── RemoveAllTableComments {"TableID":107} │ ├── RemoveColumnDefaultExpression {"ColumnID":3,"TableID":107} │ ├── DrainDescriptorName {"Namespace":{"DatabaseID":104,"DescriptorID":107,"Name":"t","SchemaID":106}} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":107} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":107} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":107} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":107} + │ ├── MakeDeleteOnlyColumnAbsent {"ColumnID":3,"TableID":107} │ ├── SetJobStateOnDescriptor {"DescriptorID":107,"Initialize":true} │ └── CreateSchemaChangerJob {"NonCancelable":true,"RunningStatus":"PostCommitNonRev..."} └── PostCommitNonRevertiblePhase └── Stage 1 of 1 in PostCommitNonRevertiblePhase - ├── 7 elements transitioning toward ABSENT - │ ├── DROPPED → ABSENT Table:{DescID: 107} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 1} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 2} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 3} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 4294967295} - │ ├── DELETE_ONLY → ABSENT Column:{DescID: 107, ColumnID: 4294967294} - │ └── DELETE_ONLY → ABSENT PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} - └── 9 Mutation operations + ├── 1 element transitioning toward ABSENT + │ └── DROPPED → ABSENT Table:{DescID: 107} + └── 4 Mutation operations ├── LogEvent {"TargetStatus":1} ├── CreateGCJobForTable {"TableID":107} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":1,"TableID":107} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":2,"TableID":107} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":3,"TableID":107} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967295,"TableID":107} - ├── MakeDeleteOnlyColumnAbsent {"ColumnID":4294967294,"TableID":107} ├── RemoveJobStateFromDescriptor {"DescriptorID":107} └── UpdateSchemaChangerJob {"IsNonCancelable":true,"RunningStatus":"all stages compl..."} diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema b/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema index bc4ecfabec7d..49a23cf513b4 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_schema @@ -30,13 +30,13 @@ EXPLAIN (ddl, verbose) DROP SCHEMA db.sc; │ │ ├── • Namespace:{DescID: 106, Name: sc, ReferencedDescID: 104} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ └── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 106} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ ├── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -45,7 +45,7 @@ EXPLAIN (ddl, verbose) DROP SCHEMA db.sc; │ │ ├── • UserPrivileges:{DescID: 106, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ ├── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -54,7 +54,7 @@ EXPLAIN (ddl, verbose) DROP SCHEMA db.sc; │ │ ├── • UserPrivileges:{DescID: 106, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ │ ├── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -69,7 +69,7 @@ EXPLAIN (ddl, verbose) DROP SCHEMA db.sc; │ │ └── • SchemaParent:{DescID: 106, ReferencedDescID: 104} │ │ │ PUBLIC → ABSENT │ │ │ -│ │ └── • SameStagePrecedence dependency from DROPPED Schema:{DescID: 106} +│ │ └── • Precedence dependency from DROPPED Schema:{DescID: 106} │ │ rule: "descriptor drop right before dependent element removal" │ │ │ └── • 6 Mutation operations diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_table b/pkg/sql/schemachanger/testdata/explain_verbose/drop_table index 4aee0e8e976c..603e61223163 100644 --- a/pkg/sql/schemachanger/testdata/explain_verbose/drop_table +++ b/pkg/sql/schemachanger/testdata/explain_verbose/drop_table @@ -68,13 +68,13 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • Namespace:{DescID: 107, Name: t, ReferencedDescID: 104} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Owner:{DescID: 107} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -83,7 +83,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • UserPrivileges:{DescID: 107, Name: admin} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -92,7 +92,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • UserPrivileges:{DescID: 107, Name: root} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations @@ -107,20 +107,29 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ObjectParent:{DescID: 107, ReferencedDescID: 106} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ └── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ └── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • ColumnFamily:{DescID: 107, Name: primary, ColumnFamilyID: 0} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • skip PUBLIC → ABSENT operations │ │ │ rule: "skip element removal ops on descriptor drop" │ │ │ │ │ ├── • Column:{DescID: 107, ColumnID: 1} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: k, ColumnID: 1} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -128,7 +137,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnName:{DescID: 107, Name: k, ColumnID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 1} @@ -140,14 +149,23 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 1} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 107, ColumnID: 2} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: v, ColumnID: 2} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 2} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 1} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -155,7 +173,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnName:{DescID: 107, Name: v, ColumnID: 2} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 2} @@ -167,14 +185,26 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 2} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 2} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 107, ColumnID: 3} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: rowid, ColumnID: 3} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 3} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnDefaultExpression:{DescID: 107, ColumnID: 3} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 1} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -182,7 +212,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnName:{DescID: 107, Name: rowid, ColumnID: 3} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 3} @@ -194,7 +224,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 3} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 3} @@ -206,14 +236,20 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnDefaultExpression:{DescID: 107, ColumnID: 3} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 3} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 107, ColumnID: 4294967295} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -221,7 +257,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 4294967295} @@ -233,14 +269,20 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 4294967295} │ │ │ rule: "column no longer public before dependents" │ │ │ │ │ ├── • Column:{DescID: 107, ColumnID: 4294967294} -│ │ │ │ WRITE_ONLY → DELETE_ONLY +│ │ │ │ WRITE_ONLY → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294} +│ │ │ │ rule: "dependents removed before column" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294} +│ │ │ │ rule: "dependents removed before column" │ │ │ │ │ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations │ │ │ rule: "skip column removal ops on relation drop" @@ -248,7 +290,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 4294967294} @@ -260,7 +302,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ └── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 4294967294} @@ -269,7 +311,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 3} @@ -285,7 +327,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 1} @@ -301,7 +343,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ ├── • IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 1} │ │ │ │ PUBLIC → ABSENT │ │ │ │ -│ │ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ │ │ ├── • Precedence dependency from WRITE_ONLY Column:{DescID: 107, ColumnID: 2} @@ -315,18 +357,33 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ │ rule: "skip index-column removal ops on index removal" │ │ │ │ │ ├── • PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} -│ │ │ │ VALIDATED → DELETE_ONLY +│ │ │ │ VALIDATED → ABSENT +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" +│ │ │ │ +│ │ │ ├── • Precedence dependency from ABSENT IndexName:{DescID: 107, Name: t_pkey, IndexID: 1} +│ │ │ │ rule: "dependents removed before index" │ │ │ │ │ │ │ ├── • skip VALIDATED → WRITE_ONLY operations │ │ │ │ rule: "skip index removal ops on relation drop" │ │ │ │ -│ │ │ └── • skip WRITE_ONLY → DELETE_ONLY operations +│ │ │ ├── • skip WRITE_ONLY → DELETE_ONLY operations +│ │ │ │ rule: "skip index removal ops on relation drop" +│ │ │ │ +│ │ │ └── • skip DELETE_ONLY → ABSENT operations │ │ │ rule: "skip index removal ops on relation drop" │ │ │ │ │ └── • IndexName:{DescID: 107, Name: t_pkey, IndexID: 1} │ │ │ PUBLIC → ABSENT │ │ │ -│ │ ├── • SameStagePrecedence dependency from DROPPED Table:{DescID: 107} +│ │ ├── • Precedence dependency from DROPPED Table:{DescID: 107} │ │ │ rule: "descriptor drop right before dependent element removal" │ │ │ │ │ ├── • Precedence dependency from VALIDATED PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} @@ -335,7 +392,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ └── • skip PUBLIC → ABSENT operations │ │ rule: "skip index dependents removal ops on relation drop" │ │ -│ └── • 6 Mutation operations +│ └── • 11 Mutation operations │ │ │ ├── • MarkDescriptorAsDropped │ │ DescriptorID: 107 @@ -354,6 +411,66 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ │ Name: t │ │ SchemaID: 106 │ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 1 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹db›.‹sc›.‹t› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 107 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 2 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹db›.‹sc›.‹t› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 107 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 4294967295 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹db›.‹sc›.‹t› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 107 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 4294967294 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹db›.‹sc›.‹t› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 107 +│ │ +│ ├── • MakeDeleteOnlyColumnAbsent +│ │ ColumnID: 3 +│ │ EventBase: +│ │ Authorization: +│ │ UserName: root +│ │ Statement: DROP TABLE ‹db›.‹sc›.‹t› +│ │ StatementTag: DROP TABLE +│ │ TargetMetadata: +│ │ SourceElementID: 1 +│ │ SubWorkID: 1 +│ │ TableID: 107 +│ │ │ ├── • SetJobStateOnDescriptor │ │ DescriptorID: 107 │ │ Initialize: true @@ -365,7 +482,7 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ - 107 │ JobID: 1 │ NonCancelable: true -│ RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 7 MutationType ops pending +│ RunningStatus: PostCommitNonRevertiblePhase stage 1 of 1 with 2 MutationType ops pending │ Statements: │ - statement: DROP TABLE db.sc.t │ redactedstatement: DROP TABLE ‹db›.‹sc›.‹t› @@ -375,108 +492,15 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ └── • Stage 1 of 1 in PostCommitNonRevertiblePhase │ - ├── • 7 elements transitioning toward ABSENT - │ │ - │ ├── • Table:{DescID: 107} - │ │ │ DROPPED → ABSENT - │ │ │ - │ │ └── • PreviousTransactionPrecedence dependency from DROPPED Table:{DescID: 107} - │ │ rule: "descriptor DROPPED in transaction before removal" - │ │ - │ ├── • Column:{DescID: 107, ColumnID: 1} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 107} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: k, ColumnID: 1} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 1} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 107, ColumnID: 2} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 107} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: v, ColumnID: 2} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 2} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 1} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 107, ColumnID: 3} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 107} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: rowid, ColumnID: 3} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 3} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnDefaultExpression:{DescID: 107, ColumnID: 3} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 1} - │ │ rule: "dependents removed before column" + ├── • 1 element transitioning toward ABSENT │ │ - │ ├── • Column:{DescID: 107, ColumnID: 4294967295} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 107} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: crdb_internal_mvcc_timestamp, ColumnID: 4294967295} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967295} - │ │ rule: "dependents removed before column" - │ │ - │ ├── • Column:{DescID: 107, ColumnID: 4294967294} - │ │ │ DELETE_ONLY → ABSENT - │ │ │ - │ │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 107} - │ │ │ rule: "descriptor removal right before dependent element removal" - │ │ │ - │ │ ├── • Precedence dependency from ABSENT ColumnName:{DescID: 107, Name: tableoid, ColumnID: 4294967294} - │ │ │ rule: "dependents removed before column" - │ │ │ - │ │ └── • Precedence dependency from ABSENT ColumnType:{DescID: 107, ColumnFamilyID: 0, ColumnID: 4294967294} - │ │ rule: "dependents removed before column" - │ │ - │ └── • PrimaryIndex:{DescID: 107, IndexID: 1, ConstraintID: 1} - │ │ DELETE_ONLY → ABSENT - │ │ - │ ├── • SameStagePrecedence dependency from ABSENT Table:{DescID: 107} - │ │ rule: "descriptor removal right before dependent element removal" - │ │ - │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 3, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 1, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ ├── • Precedence dependency from ABSENT IndexColumn:{DescID: 107, ColumnID: 2, IndexID: 1} - │ │ rule: "dependents removed before index" + │ └── • Table:{DescID: 107} + │ │ DROPPED → ABSENT │ │ - │ ├── • Precedence dependency from ABSENT IndexName:{DescID: 107, Name: t_pkey, IndexID: 1} - │ │ rule: "dependents removed before index" - │ │ - │ └── • skip DELETE_ONLY → ABSENT operations - │ rule: "skip index removal ops on relation drop" + │ └── • PreviousTransactionPrecedence dependency from DROPPED Table:{DescID: 107} + │ rule: "descriptor DROPPED in transaction before removal" │ - └── • 9 Mutation operations + └── • 4 Mutation operations │ ├── • LogEvent │ Element: @@ -497,66 +521,6 @@ EXPLAIN (ddl, verbose) DROP TABLE db.sc.t; │ Statement: DROP TABLE db.sc.t │ TableID: 107 │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 1 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹db›.‹sc›.‹t› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 107 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 2 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹db›.‹sc›.‹t› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 107 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 3 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹db›.‹sc›.‹t› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 107 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 4294967295 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹db›.‹sc›.‹t› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 107 - │ - ├── • MakeDeleteOnlyColumnAbsent - │ ColumnID: 4294967294 - │ EventBase: - │ Authorization: - │ UserName: root - │ Statement: DROP TABLE ‹db›.‹sc›.‹t› - │ StatementTag: DROP TABLE - │ TargetMetadata: - │ SourceElementID: 1 - │ SubWorkID: 1 - │ TableID: 107 - │ ├── • RemoveJobStateFromDescriptor │ DescriptorID: 107 │ JobID: 1 From 8bd6ec0465e589fc1ba438672e6e94d6aa6d3bc5 Mon Sep 17 00:00:00 2001 From: Andrew Werner Date: Mon, 24 Oct 2022 22:56:23 -0400 Subject: [PATCH 2/3] dbdesc: don't validate multi-region enum if not mr database I saw building the error as 2.8% of CPU time in a profile. Release note: None --- pkg/sql/catalog/dbdesc/database_desc.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/sql/catalog/dbdesc/database_desc.go b/pkg/sql/catalog/dbdesc/database_desc.go index 240b92cf9c3f..6fa69e5cfb96 100644 --- a/pkg/sql/catalog/dbdesc/database_desc.go +++ b/pkg/sql/catalog/dbdesc/database_desc.go @@ -290,6 +290,9 @@ func (desc *immutable) ValidateForwardReferences( vea catalog.ValidationErrorAccumulator, vdg catalog.ValidationDescGetter, ) { // Check multi-region enum type. + if !desc.IsMultiRegion() { + return + } if enumID, err := desc.MultiRegionEnumID(); err == nil { report := func(err error) { vea.Report(errors.Wrap(err, "multi-region enum")) From aa6400bb6fe35bd067611e92e8ca03e0810f34e3 Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Tue, 25 Oct 2022 12:14:55 -0500 Subject: [PATCH 3/3] bazci: fix call into `find` Otherwise we get error messages like this: ``` find: paths must precede expression: `EMERGENCY_BALLAST' ``` Release note: None --- pkg/cmd/bazci/bazci.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/bazci/bazci.go b/pkg/cmd/bazci/bazci.go index d288ac6da3bd..29d2fac3429f 100644 --- a/pkg/cmd/bazci/bazci.go +++ b/pkg/cmd/bazci/bazci.go @@ -485,8 +485,8 @@ func createTarball(goTestJSONOutputFilePath string) error { // EMERGENCY_BALLAST filename. func removeEmergencyBallasts() { findCmdArgs := []string{ - "-name", artifactsDir, + "-name", "EMERGENCY_BALLAST", "-delete", }