sql/schemachanger: rename RemoveViewBackReferencesInRelations

This should work for both view and function, so renaming it to RemoveBackReferencesInRelations. Release note: None
cockroachdb · Jan 27, 2023 · 468b907 · 468b907
1 parent 9eee6ac
commit 468b907
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 65 deletions.
diff --git a/pkg/sql/schemachanger/scexec/scmutationexec/references.go b/pkg/sql/schemachanger/scexec/scmutationexec/references.go
@@ -294,19 +294,19 @@ func updateBackReferencesInSequences(
 	return nil
 }
 
-func (i *immediateVisitor) RemoveViewBackReferencesInRelations(
-	ctx context.Context, op scop.RemoveViewBackReferencesInRelations,
+func (m *immediateVisitor) RemoveBackReferencesInRelations(
+	ctx context.Context, op scop.RemoveBackReferencesInRelations,
 ) error {
 	for _, relationID := range op.RelationIDs {
-		if err := removeViewBackReferencesInRelation(ctx, i, relationID, op.BackReferencedViewID); err != nil {
+		if err := removeViewBackReferencesInRelation(ctx, m, relationID, op.BackReferencedID); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
 func removeViewBackReferencesInRelation(
-	ctx context.Context, m *immediateVisitor, relationID, viewID descpb.ID,
+	ctx context.Context, m *immediateVisitor, relationID, backReferencedID descpb.ID,
 ) error {
 	tbl, err := m.checkOutTable(ctx, relationID)
 	if err != nil || tbl.Dropped() {
@@ -315,7 +315,7 @@ func removeViewBackReferencesInRelation(
 	}
 	var newBackRefs []descpb.TableDescriptor_Reference
 	for _, by := range tbl.DependedOnBy {
-		if by.ID != viewID {
+		if by.ID != backReferencedID {
 			newBackRefs = append(newBackRefs, by)
 		}
 	}

diff --git a/pkg/sql/schemachanger/scop/immediate_mutation.go b/pkg/sql/schemachanger/scop/immediate_mutation.go
@@ -447,12 +447,12 @@ type UpdateBackReferencesInSequences struct {
 	SequenceIDs            []descpb.ID
 }
 
-// RemoveViewBackReferencesInRelations removes back references to a view in
+// RemoveBackReferencesInRelations removes back references to a view in
 // the specified tables, views or sequences.
-type RemoveViewBackReferencesInRelations struct {
+type RemoveBackReferencesInRelations struct {
 	immediateMutationOp
-	BackReferencedViewID descpb.ID
-	RelationIDs          []descpb.ID
+	BackReferencedID descpb.ID
+	RelationIDs      []descpb.ID
 }
 
 // SetColumnName renames a column.

diff --git a/pkg/sql/schemachanger/scop/immediate_mutation_visitor_generated.go b/pkg/sql/schemachanger/scop/immediate_mutation_visitor_generated.go
diff --git a/pkg/sql/schemachanger/scplan/internal/opgen/opgen_view.go b/pkg/sql/schemachanger/scplan/internal/opgen/opgen_view.go
@@ -51,13 +51,13 @@ func init() {
 						TypeIDs:                    this.UsesTypeIDs,
 					}
 				}),
-				emit(func(this *scpb.View) *scop.RemoveViewBackReferencesInRelations {
+				emit(func(this *scpb.View) *scop.RemoveBackReferencesInRelations {
 					if len(this.UsesRelationIDs) == 0 {
 						return nil
 					}
-					return &scop.RemoveViewBackReferencesInRelations{
-						BackReferencedViewID: this.ViewID,
-						RelationIDs:          this.UsesRelationIDs,
+					return &scop.RemoveBackReferencesInRelations{
+						BackReferencedID: this.ViewID,
+						RelationIDs:      this.UsesRelationIDs,
 					}
 				}),
 			),

diff --git a/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column b/pkg/sql/schemachanger/scplan/testdata/alter_table_drop_column
@@ -387,8 +387,8 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 24 MutationType ops
       BackReferencedDescriptorID: 108
       TypeIDs:
       - 104
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 108
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 108
       RelationIDs:
       - 107
     *scop.RemoveDroppedColumnType
@@ -1376,8 +1376,8 @@ PostCommitNonRevertiblePhase stage 1 of 3 with 25 MutationType ops
       BackReferencedDescriptorID: 108
       TypeIDs:
       - 104
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 108
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 108
       RelationIDs:
       - 107
     *scop.RemoveDroppedColumnType

diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_database b/pkg/sql/schemachanger/scplan/testdata/drop_database
@@ -830,27 +830,27 @@ PreCommitPhase stage 2 of 2 with 89 MutationType ops
       - 108
     *scop.MarkDescriptorAsDropped
       DescriptorID: 111
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 111
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 111
       RelationIDs:
       - 109
     *scop.MarkDescriptorAsDropped
       DescriptorID: 112
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 112
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 112
       RelationIDs:
       - 111
     *scop.MarkDescriptorAsDropped
       DescriptorID: 113
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 113
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 113
       RelationIDs:
       - 111
       - 112
     *scop.MarkDescriptorAsDropped
       DescriptorID: 114
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 114
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 114
       RelationIDs:
       - 112
     *scop.MarkDescriptorAsDropped
@@ -864,8 +864,8 @@ PreCommitPhase stage 2 of 2 with 89 MutationType ops
       TypeIDs:
       - 115
       - 116
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 117
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 117
       RelationIDs:
       - 114
     *scop.DrainDescriptorName

diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_index b/pkg/sql/schemachanger/scplan/testdata/drop_index
@@ -702,8 +702,8 @@ PreCommitPhase stage 2 of 2 with 10 MutationType ops
   ops:
     *scop.MarkDescriptorAsDropped
       DescriptorID: 105
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 105
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 105
       RelationIDs:
       - 104
     *scop.MakePublicSecondaryIndexWriteOnly
@@ -1070,8 +1070,8 @@ PreCommitPhase stage 2 of 2 with 12 MutationType ops
   ops:
     *scop.MarkDescriptorAsDropped
       DescriptorID: 107
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 107
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 107
       RelationIDs:
       - 106
     *scop.RemoveColumnDefaultExpression

diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_owned_by b/pkg/sql/schemachanger/scplan/testdata/drop_owned_by
@@ -548,8 +548,8 @@ PreCommitPhase stage 2 of 2 with 57 MutationType ops
       - 107
     *scop.MarkDescriptorAsDropped
       DescriptorID: 110
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 110
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 110
       RelationIDs:
       - 108
     *scop.MarkDescriptorAsDropped
@@ -563,8 +563,8 @@ PreCommitPhase stage 2 of 2 with 57 MutationType ops
       TypeIDs:
       - 111
       - 112
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 113
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 113
       RelationIDs:
       - 110
     *scop.DrainDescriptorName

diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_schema b/pkg/sql/schemachanger/scplan/testdata/drop_schema
@@ -1728,27 +1728,27 @@ PreCommitPhase stage 2 of 2 with 68 MutationType ops
       - 105
     *scop.MarkDescriptorAsDropped
       DescriptorID: 107
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 107
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 107
       RelationIDs:
       - 106
     *scop.MarkDescriptorAsDropped
       DescriptorID: 108
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 108
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 108
       RelationIDs:
       - 107
     *scop.MarkDescriptorAsDropped
       DescriptorID: 109
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 109
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 109
       RelationIDs:
       - 107
       - 108
     *scop.MarkDescriptorAsDropped
       DescriptorID: 110
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 110
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 110
       RelationIDs:
       - 108
     *scop.MarkDescriptorAsDropped
@@ -1762,8 +1762,8 @@ PreCommitPhase stage 2 of 2 with 68 MutationType ops
       TypeIDs:
       - 111
       - 112
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 113
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 113
       RelationIDs:
       - 110
     *scop.DrainDescriptorName

diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_table b/pkg/sql/schemachanger/scplan/testdata/drop_table
@@ -371,8 +371,8 @@ PreCommitPhase stage 2 of 2 with 43 MutationType ops
       DescriptorID: 110
     *scop.MarkDescriptorAsDropped
       DescriptorID: 111
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 111
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 111
       RelationIDs:
       - 109
     *scop.DrainDescriptorName

diff --git a/pkg/sql/schemachanger/scplan/testdata/drop_view b/pkg/sql/schemachanger/scplan/testdata/drop_view
@@ -76,8 +76,8 @@ PreCommitPhase stage 2 of 2 with 9 MutationType ops
   ops:
     *scop.MarkDescriptorAsDropped
       DescriptorID: 105
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 105
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 105
       RelationIDs:
       - 104
     *scop.DrainDescriptorName
@@ -605,27 +605,27 @@ PreCommitPhase stage 2 of 2 with 45 MutationType ops
   ops:
     *scop.MarkDescriptorAsDropped
       DescriptorID: 105
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 105
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 105
       RelationIDs:
       - 104
     *scop.MarkDescriptorAsDropped
       DescriptorID: 106
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 106
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 106
       RelationIDs:
       - 105
     *scop.MarkDescriptorAsDropped
       DescriptorID: 107
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 107
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 107
       RelationIDs:
       - 105
       - 106
     *scop.MarkDescriptorAsDropped
       DescriptorID: 108
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 108
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 108
       RelationIDs:
       - 106
     *scop.MarkDescriptorAsDropped
@@ -635,8 +635,8 @@ PreCommitPhase stage 2 of 2 with 45 MutationType ops
       TypeIDs:
       - 109
       - 110
-    *scop.RemoveViewBackReferencesInRelations
-      BackReferencedViewID: 111
+    *scop.RemoveBackReferencesInRelations
+      BackReferencedID: 111
       RelationIDs:
       - 108
     *scop.DrainDescriptorName

diff --git a/pkg/sql/schemachanger/testdata/explain/drop_index_with_materialized_view_dep b/pkg/sql/schemachanger/testdata/explain/drop_index_with_materialized_view_dep
@@ -107,7 +107,7 @@ Schema change plan for DROP INDEX ‹defaultdb›.‹public›.‹v2›@‹idx
  │         │    └── PUBLIC → ABSENT    IndexName:{DescID: 106, Name: v3_pkey, IndexID: 1}
  │         └── 12 Mutation operations
  │              ├── MarkDescriptorAsDropped {"DescriptorID":106}
- │              ├── RemoveViewBackReferencesInRelations {"BackReferencedViewID":106}
+ │              ├── RemoveBackReferencesInRelations {"BackReferencedID":106}
  │              ├── RemoveColumnDefaultExpression {"ColumnID":2,"TableID":106}
  │              ├── MakePublicSecondaryIndexWriteOnly {"IndexID":2,"TableID":105}
  │              ├── DrainDescriptorName {"Namespace":{"DatabaseID":100,"DescriptorID":106,"Name":"v3","SchemaID":101}}

diff --git a/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_with_materialized_view_dep b/pkg/sql/schemachanger/testdata/explain_verbose/drop_index_with_materialized_view_dep
@@ -730,8 +730,8 @@ EXPLAIN (ddl, verbose) DROP INDEX idx CASCADE;
 │           ├── • MarkDescriptorAsDropped
 │           │     DescriptorID: 106
 │           │
-│           ├── • RemoveViewBackReferencesInRelations
-│           │     BackReferencedViewID: 106
+│           ├── • RemoveBackReferencesInRelations
+│           │     BackReferencedID: 106
 │           │     RelationIDs:
 │           │     - 105
 │           │