clusterversion, *: prefix version keys below 25.2 with TODO_Delete_

Epic: REL-2848

Release note: None

Author: iskettaneh

pkg/clusterversion/cockroach_versions.go

@@ -223,13 +223,13 @@ const (
 	// V25_1 is CockroachDB v25.1. It's used for all v25.1.x patch releases.
 	V25_1
 
-	V25_2_Start
+	TODO_Delete_V25_2_Start
 
-	V25_2_AddSqlActivityFlushJob
+	TODO_Delete_V25_2_AddSqlActivityFlushJob
 
-	V25_2_SetUiDefaultTimezoneSetting
+	TODO_Delete_V25_2_SetUiDefaultTimezoneSetting
 
-	V25_2_AddUsernameToStmtDiagRequest
+	TODO_Delete_V25_2_AddUsernameToStmtDiagRequest
 
 	// V25_2 is CockroachDB v25.2. It's used for all v25.2.x patch releases.
 	V25_2
@@ -289,10 +289,10 @@ var versionTable = [numKeys]roachpb.Version{
 	V25_1: {Major: 25, Minor: 1, Internal: 0},
 
 	// v25.2 versions. Internal versions must be even.
-	V25_2_Start:                        {Major: 25, Minor: 1, Internal: 2},
-	V25_2_AddSqlActivityFlushJob:       {Major: 25, Minor: 1, Internal: 4},
-	V25_2_SetUiDefaultTimezoneSetting:  {Major: 25, Minor: 1, Internal: 6},
-	V25_2_AddUsernameToStmtDiagRequest: {Major: 25, Minor: 1, Internal: 8},
+	TODO_Delete_V25_2_Start:                        {Major: 25, Minor: 1, Internal: 2},
+	TODO_Delete_V25_2_AddSqlActivityFlushJob:       {Major: 25, Minor: 1, Internal: 4},
+	TODO_Delete_V25_2_SetUiDefaultTimezoneSetting:  {Major: 25, Minor: 1, Internal: 6},
+	TODO_Delete_V25_2_AddUsernameToStmtDiagRequest: {Major: 25, Minor: 1, Internal: 8},
 
 	V25_2: {Major: 25, Minor: 2, Internal: 0},
 

pkg/sql/stmtdiagnostics/statement_diagnostics.go

@@ -306,7 +306,7 @@ func (r *Registry) insertRequestInternal(
 	redacted bool,
 	username string,
 ) (RequestID, error) {
-	if username != "" && !r.st.Version.IsActive(ctx, clusterversion.V25_2_AddUsernameToStmtDiagRequest) {
+	if username != "" && !r.st.Version.IsActive(ctx, clusterversion.TODO_Delete_V25_2_AddUsernameToStmtDiagRequest) {
 		// Setting username is only supported after 25.2 version migrations have
 		// completed.
 		//
@@ -690,7 +690,7 @@ func (r *Registry) InsertStatementDiagnostics(
 // updates r.mu.requests accordingly.
 func (r *Registry) pollRequests(ctx context.Context) error {
 	var rows []tree.Datums
-	isUsernameSet := r.st.Version.IsActive(ctx, clusterversion.V25_2_AddUsernameToStmtDiagRequest)
+	isUsernameSet := r.st.Version.IsActive(ctx, clusterversion.TODO_Delete_V25_2_AddUsernameToStmtDiagRequest)
 
 	// Loop until we run the query without straddling an epoch increment.
 	for {

pkg/upgrade/upgrades/upgrades.go

@@ -91,27 +91,27 @@ var upgrades = []upgradebase.Upgrade{
 		upgrade.RestoreActionNotRequired("cluster restore does not restore jobs tables"),
 	),
 
-	newFirstUpgrade(clusterversion.V25_2_Start.Version()),
+	newFirstUpgrade(clusterversion.TODO_Delete_V25_2_Start.Version()),
 
 	upgrade.NewTenantUpgrade(
 		"add new sql activity flush job",
-		clusterversion.V25_2_AddSqlActivityFlushJob.Version(),
+		clusterversion.TODO_Delete_V25_2_AddSqlActivityFlushJob.Version(),
 		upgrade.NoPrecondition,
 		addSqlActivityFlushJob,
 		upgrade.RestoreActionNotRequired("cluster restore does not restore this job"),
 	),
 
 	upgrade.NewTenantUpgrade(
 		"set new ui.default_timezone setting to ui.display_timezone value",
-		clusterversion.V25_2_SetUiDefaultTimezoneSetting.Version(),
+		clusterversion.TODO_Delete_V25_2_SetUiDefaultTimezoneSetting.Version(),
 		upgrade.NoPrecondition,
 		setUiDefaultTimezone,
 		upgrade.RestoreActionNotRequired("cluster restore does not restore this setting"),
 	),
 
 	upgrade.NewTenantUpgrade(
 		"add 'username' column to stmt diagnostics requests table",
-		clusterversion.V25_2_AddUsernameToStmtDiagRequest.Version(),
+		clusterversion.TODO_Delete_V25_2_AddUsernameToStmtDiagRequest.Version(),
 		upgrade.NoPrecondition,
 		stmtDiagAddUsernameMigration,
 		upgrade.RestoreActionNotRequired("cluster restore does not restore the new column"),

pkg/upgrade/upgrades/v25_2_correct_user_for_stmt_diagnostics_test.go

@@ -88,7 +88,7 @@ func TestStmtDiagAddUsernameMigration(t *testing.T) {
 	upgrades.Upgrade(
 		t,
 		sqlDB,
-		clusterversion.V25_2_AddUsernameToStmtDiagRequest,
+		clusterversion.TODO_Delete_V25_2_AddUsernameToStmtDiagRequest,
 		nil,   /* done */
 		false, /* expectError */
 	)

pkg/upgrade/upgrades/v25_2_set_ui_default_timezone_test.go

@@ -55,7 +55,7 @@ func TestSetUiDefaultTimezone(t *testing.T) {
 		// cast to lower case because enum setting type sets all setting values to lower case
 		require.Equal(t, strings.ToLower(val), displayTimezoneVal)
 
-		upgrades.Upgrade(t, sqlDB, clusterversion.V25_2_SetUiDefaultTimezoneSetting, nil, false)
+		upgrades.Upgrade(t, sqlDB, clusterversion.TODO_Delete_V25_2_SetUiDefaultTimezoneSetting, nil, false)
 
 		runner.QueryRow(t, "SHOW cluster setting ui.default_timezone").Scan(&defaultTimezoneVal)
 		require.Equal(t, strings.ToLower(val), defaultTimezoneVal)
@@ -73,7 +73,7 @@ func TestSetUiDefaultTimezone(t *testing.T) {
 		runner.QueryRow(t, "SHOW cluster setting ui.display_timezone").Scan(&displayTimezoneVal)
 		require.Equal(t, strings.ToLower(uisettings.DisplayTimezone.DefaultString()), displayTimezoneVal)
 
-		upgrades.Upgrade(t, sqlDB, clusterversion.V25_2_SetUiDefaultTimezoneSetting, nil, false)
+		upgrades.Upgrade(t, sqlDB, clusterversion.TODO_Delete_V25_2_SetUiDefaultTimezoneSetting, nil, false)
 		runner.QueryRow(t, "SHOW cluster setting ui.default_timezone").Scan(&defaultTimezoneVal)
 		// Since ui.display_timezone has not been set, `ui.default_timezone` should
 		// still be the default value.