Merge #156875

156875: sql: remove deprecated element status r=bghal a=bghal

Any uses of this status are long gone (22.2)

Epic: none

Release note: None


Co-authored-by: Brendan Gerrity <[email protected]>

Author: craig[bot]

pkg/sql/schemachanger/scpb/migration.go

@@ -109,22 +109,6 @@ func migrateTargetElement(targets []Target, idx int) {
 	}
 }
 
-// migrateStatuses used to migrate individual statuses and generate
-// new current and target statuses.
-func migrateStatuses(
-	currentStatus Status, targetStatus Status,
-) (newCurrentStatus Status, newTargetStatus Status, updated bool) {
-	// Target state of TXN_DROPPED has been removed, so push plans further along.
-	// Note: No version is required for this transition, since it will be valid
-	// for all releases.
-	if targetStatus == Status_ABSENT && currentStatus == Status_TXN_DROPPED {
-		return Status_PUBLIC, targetStatus, true
-	} else if targetStatus == Status_PUBLIC && currentStatus == Status_TXN_DROPPED {
-		return Status_ABSENT, targetStatus, true
-	}
-	return currentStatus, targetStatus, false
-}
-
 // MigrateCurrentState migrates a current state by upgrading elements based
 // on the current version number.
 func MigrateCurrentState(version clusterversion.ClusterVersion, state *CurrentState) bool {
@@ -140,12 +124,6 @@ func MigrateCurrentState(version clusterversion.ClusterVersion, state *CurrentSt
 			migrateTargetElement(state.Targets, idx)
 			targetsToRemove[idx] = struct{}{}
 		}
-		current, targetStatus, update := migrateStatuses(state.Current[idx], target.TargetStatus)
-		if update {
-			state.Current[idx] = current
-			target.TargetStatus = targetStatus
-			updated = true
-		}
 	}
 	if !updated {
 		return updated
@@ -213,12 +191,6 @@ func MigrateDescriptorState(
 				newIndexes[descID] = nil
 			}
 		}
-		current, targetStatus, update := migrateStatuses(state.CurrentStatuses[idx], target.TargetStatus)
-		if update {
-			state.CurrentStatuses[idx] = current
-			target.TargetStatus = targetStatus
-			updated = true
-		}
 		if migrated, newTargets := migrateDeprecatedFields(version, target); migrated {
 			updated = true
 			for i := range newTargets {

pkg/sql/schemachanger/scpb/scpb.proto

@@ -35,9 +35,7 @@ enum Status {
 
   // Intermediate states on the descriptor dropping path.
   DROPPED = 5;
-  // TXN_DROPPED only exists to service the 22.2 rule set.
-  // Deprecated.
-  TXN_DROPPED = 4 [deprecated = true];
+  reserved 4;
 
   // Intermediate states on the column and index dropping and adding paths.
   // WRITE_ONLY is also used on constraint adding and dropping paths.