Skip to content

Commit e61ee95

Browse files
committed
sql: remove deprecated element status
Any uses of this status are long gone (22.2) Epic: none Release note: None
1 parent 02c7429 commit e61ee95

File tree

2 files changed

+1
-31
lines changed

2 files changed

+1
-31
lines changed

pkg/sql/schemachanger/scpb/migration.go

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -88,22 +88,6 @@ func migrateTargetElement(targets []Target, idx int) {
8888
}
8989
}
9090

91-
// migrateStatuses used to migrate individual statuses and generate
92-
// new current and target statuses.
93-
func migrateStatuses(
94-
currentStatus Status, targetStatus Status,
95-
) (newCurrentStatus Status, newTargetStatus Status, updated bool) {
96-
// Target state of TXN_DROPPED has been removed, so push plans further along.
97-
// Note: No version is required for this transition, since it will be valid
98-
// for all releases.
99-
if targetStatus == Status_ABSENT && currentStatus == Status_TXN_DROPPED {
100-
return Status_PUBLIC, targetStatus, true
101-
} else if targetStatus == Status_PUBLIC && currentStatus == Status_TXN_DROPPED {
102-
return Status_ABSENT, targetStatus, true
103-
}
104-
return currentStatus, targetStatus, false
105-
}
106-
10791
// MigrateCurrentState migrates a current state by upgrading elements based
10892
// on the current version number.
10993
func MigrateCurrentState(version clusterversion.ClusterVersion, state *CurrentState) bool {
@@ -119,12 +103,6 @@ func MigrateCurrentState(version clusterversion.ClusterVersion, state *CurrentSt
119103
migrateTargetElement(state.Targets, idx)
120104
targetsToRemove[idx] = struct{}{}
121105
}
122-
current, targetStatus, update := migrateStatuses(state.Current[idx], target.TargetStatus)
123-
if update {
124-
state.Current[idx] = current
125-
target.TargetStatus = targetStatus
126-
updated = true
127-
}
128106
}
129107
if !updated {
130108
return updated
@@ -192,12 +170,6 @@ func MigrateDescriptorState(
192170
newIndexes[descID] = nil
193171
}
194172
}
195-
current, targetStatus, update := migrateStatuses(state.CurrentStatuses[idx], target.TargetStatus)
196-
if update {
197-
state.CurrentStatuses[idx] = current
198-
target.TargetStatus = targetStatus
199-
updated = true
200-
}
201173
if migrated, newTargets := migrateDeprecatedFields(version, target); migrated {
202174
updated = true
203175
for i := range newTargets {

pkg/sql/schemachanger/scpb/scpb.proto

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ enum Status {
3535

3636
// Intermediate states on the descriptor dropping path.
3737
DROPPED = 5;
38-
// TXN_DROPPED only exists to service the 22.2 rule set.
39-
// Deprecated.
40-
TXN_DROPPED = 4 [deprecated = true];
38+
reserved 4;
4139

4240
// Intermediate states on the column and index dropping and adding paths.
4341
// WRITE_ONLY is also used on constraint adding and dropping paths.

0 commit comments

Comments
 (0)