schemachanger: remove deprecated SecondaryIndexPartial element

This element was deprecated in 64f20d8
and a migration was added so it's no longer referenced anywhere.

We can safely remove all existing usages in the code, since that
migration occurred in v23.1.

Release note: None

Author: rafiss

pkg/cli/testdata/declarative-rules/deprules

@@ -151,8 +151,11 @@ func redactElement(element scpb.Element) error {
 		e.PhysicalRepresentation = []byte("_")
 	case *scpb.IndexPartitioning:
 		redactPartitioning(&e.PartitioningDescriptor)
-	case *scpb.SecondaryIndexPartial:
-		return redactExpr(&e.Expression.Expr)
+	case *scpb.SecondaryIndex:
+		if e.EmbeddedExpr != nil {
+			return redactExpr(&e.EmbeddedExpr.Expr)
+		}
+		return nil
 	case *scpb.CheckConstraint:
 		return redactExpr(&e.Expression.Expr)
 	case *scpb.ColumnDefaultExpression:

pkg/sql/catalog/redact/redact.go

@@ -1016,16 +1016,6 @@ func shouldCreateUniqueIndexOnOldPrimaryKeyColumns(
 }
 
 func isIndexPartial(b BuildCtx, tableID catid.DescID, indexID catid.IndexID) (ret bool) {
-	scpb.ForEachSecondaryIndexPartial(b.QueryByID(tableID), func(
-		current scpb.Status, target scpb.TargetStatus, e *scpb.SecondaryIndexPartial,
-	) {
-		if e.IndexID == indexID {
-			ret = true
-		}
-	})
-	if ret {
-		return ret
-	}
 	scpb.ForEachSecondaryIndex(b.QueryByID(tableID), func(
 		current scpb.Status, target scpb.TargetStatus, e *scpb.SecondaryIndex,
 	) {

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_alter_primary_key.go

@@ -330,8 +330,6 @@ func walkColumnDependencies(
 				sequenceDeps.Add(elt.SequenceID)
 			case *scpb.SecondaryIndex:
 				indexDeps.Add(elt.IndexID)
-			case *scpb.SecondaryIndexPartial:
-				indexDeps.Add(elt.IndexID)
 			case *scpb.IndexColumn:
 				indexDeps.Add(elt.IndexID)
 			case *scpb.ForeignKeyConstraint:
@@ -434,10 +432,6 @@ func panicIfColReferencedInPredicate(
 			if elt.EmbeddedExpr != nil && contains(elt.EmbeddedExpr.ReferencedColumnIDs, col.ColumnID) {
 				violatingIndex = elt.IndexID
 			}
-		case *scpb.SecondaryIndexPartial:
-			if contains(elt.ReferencedColumnIDs, col.ColumnID) {
-				violatingIndex = elt.IndexID
-			}
 		case *scpb.UniqueWithoutIndexConstraint:
 			if elt.Predicate != nil && contains(elt.Predicate.ReferencedColumnIDs, col.ColumnID) {
 				violatingUWI = elt.ConstraintID

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/alter_table_drop_column.go

@@ -519,11 +519,11 @@ func isIndexUniqueAndCanServeFK(
 	}
 
 	isPartial := false
-	scpb.ForEachSecondaryIndexPartial(b.QueryByID(ie.TableID), func(
-		current scpb.Status, target scpb.TargetStatus, sipe *scpb.SecondaryIndexPartial,
+	scpb.ForEachSecondaryIndex(b.QueryByID(ie.TableID), func(
+		current scpb.Status, target scpb.TargetStatus, sie *scpb.SecondaryIndex,
 	) {
-		if sipe.TableID == ie.TableID && sipe.IndexID == ie.IndexID {
-			isPartial = true
+		if sie.TableID == ie.TableID && sie.IndexID == ie.IndexID {
+			isPartial = sie.EmbeddedExpr != nil
 		}
 	})
 	if isPartial {

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/drop_index.go

@@ -239,7 +239,7 @@ func dropCascadeDescriptor(b BuildCtx, id catid.DescID) {
 			dropCascadeDescriptor(next, t.TableID)
 		case *scpb.PolicyDeps:
 			dropCascadeDescriptor(next, t.TableID)
-		case *scpb.Column, *scpb.ColumnType, *scpb.SecondaryIndexPartial:
+		case *scpb.Column, *scpb.ColumnType:
 			// These only have type references.
 			break
 		case *scpb.Namespace, *scpb.Function, *scpb.SecondaryIndex, *scpb.PrimaryIndex,
@@ -545,7 +545,6 @@ type indexSpec struct {
 	temporary *scpb.TemporaryIndex
 
 	name          *scpb.IndexName
-	partial       *scpb.SecondaryIndexPartial
 	partitioning  *scpb.IndexPartitioning
 	columns       []*scpb.IndexColumn
 	idxComment    *scpb.IndexComment
@@ -602,9 +601,6 @@ func (s *indexSpec) apply(fn func(e scpb.Element)) {
 	if s.name != nil {
 		fn(s.name)
 	}
-	if s.partial != nil {
-		fn(s.partial)
-	}
 	if s.partitioning != nil {
 		fn(s.partitioning)
 	}
@@ -642,9 +638,6 @@ func (s *indexSpec) clone() (c indexSpec) {
 	if s.name != nil {
 		c.name = protoutil.Clone(s.name).(*scpb.IndexName)
 	}
-	if s.partial != nil {
-		c.partial = protoutil.Clone(s.partial).(*scpb.SecondaryIndexPartial)
-	}
 	if s.partitioning != nil {
 		c.partitioning = protoutil.Clone(s.partitioning).(*scpb.IndexPartitioning)
 	}
@@ -852,7 +845,6 @@ func makeIndexSpec(b BuildCtx, tableID catid.DescID, indexID catid.IndexID) (s i
 			tableID, indexID, s.primary != nil, s.secondary != nil, s.temporary != nil))
 	}
 	_, _, s.name = scpb.FindIndexName(idxElts)
-	_, _, s.partial = scpb.FindSecondaryIndexPartial(idxElts)
 	_, _, s.partitioning = scpb.FindIndexPartitioning(idxElts)
 	scpb.ForEachIndexColumn(idxElts, func(_ scpb.Status, _ scpb.TargetStatus, ic *scpb.IndexColumn) {
 		s.columns = append(s.columns, ic)
@@ -904,9 +896,6 @@ func makeTempIndexSpec(src indexSpec) indexSpec {
 	if newTempSpec.partitioning != nil {
 		newTempSpec.partitioning.IndexID = tempID
 	}
-	if newTempSpec.partial != nil {
-		newTempSpec.partial.IndexID = tempID
-	}
 	for _, ic := range newTempSpec.columns {
 		ic.IndexID = tempID
 	}
@@ -1008,9 +997,6 @@ func makeSwapIndexSpec(
 		if in.name != nil {
 			in.name.IndexID = inID
 		}
-		if in.partial != nil {
-			in.partial.IndexID = inID
-		}
 		if in.partitioning != nil {
 			in.partitioning.IndexID = inID
 		}

pkg/sql/schemachanger/scbuild/internal/scbuildstmt/helpers.go

@@ -98,15 +98,15 @@ func TestElementCollection(t *testing.T) {
 	t.Run("predicates", func(t *testing.T) {
 		require.False(t, c.IsEmpty())
 		require.False(t, c.FilterSchema().IsEmpty())
-		require.True(t, c.FilterSecondaryIndexPartial().IsEmpty())
+		require.True(t, c.FilterSecondaryIndex().IsEmpty())
 
 		require.False(t, c.IsSingleton())
 		require.True(t, c.FilterSchema().IsSingleton())
-		require.False(t, c.FilterSecondaryIndexPartial().IsSingleton())
+		require.False(t, c.FilterSecondaryIndex().IsSingleton())
 
 		require.True(t, c.IsMany())
 		require.False(t, c.FilterSchema().IsMany())
-		require.False(t, c.FilterSecondaryIndexPartial().IsMany())
+		require.False(t, c.FilterSecondaryIndex().IsMany())
 	})
 	t.Run("assertions", func(t *testing.T) {
 		e, err := recoverFromPanic(c.MustGetZeroOrOneElement)
@@ -123,10 +123,10 @@ func TestElementCollection(t *testing.T) {
 		require.NoError(t, err)
 		require.NotNil(t, e)
 
-		e, err = recoverFromPanic(c.FilterSecondaryIndexPartial().MustGetZeroOrOneElement)
+		e, err = recoverFromPanic(c.FilterSecondaryIndex().MustGetZeroOrOneElement)
 		require.NoError(t, err)
 		require.Nil(t, e)
-		e, err = recoverFromPanic(c.FilterSecondaryIndexPartial().MustGetOneElement)
+		e, err = recoverFromPanic(c.FilterSecondaryIndex().MustGetOneElement)
 		require.Error(t, err)
 		require.Nil(t, e)
 	})

pkg/sql/schemachanger/scpb/element_collection_test.go

@@ -115,7 +115,6 @@ message ElementProto {
     // Index elements.
     IndexName index_name = 40 [(gogoproto.moretags) = "parent:\"PrimaryIndex, SecondaryIndex\""];
     IndexPartitioning index_partitioning = 41 [(gogoproto.moretags) = "parent:\"PrimaryIndex, SecondaryIndex\""];
-    SecondaryIndexPartial secondary_index_partial = 42 [(gogoproto.moretags) = "parent:\"SecondaryIndex\""];
     IndexComment index_comment = 43 [(gogoproto.moretags) = "parent:\"PrimaryIndex, SecondaryIndex\""];
     IndexColumn index_column = 44 [(gogoproto.moretags) = "parent:\"PrimaryIndex, SecondaryIndex, TemporaryIndex, Column\""];
     IndexData index_data = 45 [(gogoproto.customname) = "IndexData", (gogoproto.moretags) = "parent:\"PrimaryIndex, SecondaryIndex, TemporaryIndex\""];
@@ -180,6 +179,9 @@ message ElementProto {
 
     // Next element group start id: 250
   }
+
+  // Reserved for the now-removed SecondaryIndexPartial element.
+  reserved 42;
 }
 
 // TypeT is a wrapper for a types.T which contains its user-defined type ID
@@ -358,13 +360,6 @@ message TemporaryIndex {
   Expression expr = 3 [(gogoproto.nullable) = true];
 }
 
-message SecondaryIndexPartial {
-  uint32 table_id = 1 [(gogoproto.customname) = "TableID", (gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/sql/sem/catid.DescID"];
-  uint32 index_id = 2 [(gogoproto.customname) = "IndexID", (gogoproto.casttype) = "github.com/cockroachdb/cockroach/pkg/sql/sem/catid.IndexID"];
-  Expression embedded_expr = 3 [(gogoproto.nullable) = false, (gogoproto.embed) = true];
-  reserved 10;
-}
-
 // SchemaParent models the schema to parent database relationship.
 // Every schema has a parent, so there is a 1:1 relationship between
 // the Schema and the SchemaParent relationship. This is modeled as a separate

pkg/sql/schemachanger/scpb/elements.proto

@@ -16,7 +16,7 @@ import (
 // HasDeprecatedElements returns if the target contains any element or fields
 // marked for deprecation.
 func HasDeprecatedElements(version clusterversion.ClusterVersion, target Target) bool {
-	return target.GetSecondaryIndexPartial() != nil
+	return false
 }
 
 // migrateDeprecatedFields will check if any of the deprecated fields are being
@@ -82,16 +82,9 @@ func migrateDeprecatedFields(
 func migrateTargetElement(targets []Target, idx int) {
 	targetToMigrate := targets[idx]
 	switch t := targetToMigrate.Element().(type) {
-	case *SecondaryIndexPartial:
-		for _, target := range targets {
-			if secondaryIndex := target.GetSecondaryIndex(); secondaryIndex != nil &&
-				secondaryIndex.TableID == t.TableID &&
-				secondaryIndex.IndexID == t.IndexID &&
-				target.TargetStatus == targetToMigrate.TargetStatus {
-				secondaryIndex.EmbeddedExpr = &t.Expression
-				break
-			}
-		}
+	default:
+		// No-op case to defeat unused linter when there are no elements to migrate.
+		_ = t.element
 	}
 }