Skip to content

Commit

Permalink
Merge #90544 #90594 #90633
Browse files Browse the repository at this point in the history 
90544: rules: some dep-rule changes r=Xiang-Gu a=Xiang-Gu

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


Epic: None
Release note: None

90594: dbdesc: don't validate multi-region enum if not mr database r=ajwerner a=ajwerner

I saw building the error as 2.8% of CPU time in a profile.

Epic: CRDB-20865
    
Release note: None



90633: bazci: fix call into `find` r=healthy-pod a=rickystewart

Otherwise we get error messages like this:

```
find: paths must precede expression: `EMERGENCY_BALLAST'
```

Release note: None
Epic: None

Co-authored-by: Xiang Gu <[email protected]>
Co-authored-by: Andrew Werner <[email protected]>
Co-authored-by: Ricky Stewart <[email protected]>
  • Loading branch information
@Xiang-Gu @ajwerner @rickystewart
4 people committed Oct 25, 2022
4 parents 66beb98 + 2375804 + 8bd6ec0 + aa6400b commit 655bde2
Show file tree
Hide file tree
Showing 27 changed files with 2,791 additions and 3,510 deletions.
4 changes: 2 additions & 2 deletions pkg/ccl/schemachangerccl/testdata/end_to_end/drop_database_multiregion_primary_region
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/ccl/schemachangerccl/testdata/end_to_end/drop_table_multiregion_primary_region
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
130 changes: 63 additions & 67 deletions pkg/ccl/schemachangerccl/testdata/explain/drop_database_multiregion_primary_region
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand All @@ -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}
Expand Down
Loading

0 comments on commit 655bde2

Please sign in to comment.