upgrades: reorganize files

In this commit we rename files implementing permanent upgrades to start with `permanent_` and files implementing 23.2 upgrades to start with `v23_2_`. This will make it easier to remove deprecated upgrades later. Informs: cockroachdb#112629 Release note: None
RaduBerinde · Nov 14, 2023 · dcada42 · dcada42
1 parent 0d44995
commit dcada42
Show file tree

Hide file tree

Showing 21 changed files with 20 additions and 20 deletions.
diff --git a/pkg/upgrade/upgrades/BUILD.bazel b/pkg/upgrade/upgrades/BUILD.bazel
@@ -3,22 +3,22 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "upgrades",
     srcs = [
-        "create_auto_config_runner_job.go",
-        "create_jobs_metrics_polling_job.go",
-        "create_region_liveness.go",
         "descriptor_utils.go",
-        "ensure_sql_schema_telemetry_schedule.go",
         "first_upgrade.go",
-        "grant_execute_to_public.go",
-        "key_visualizer_migration.go",
-        "mvcc_statistics_migration.go",
+        "permanent_create_auto_config_runner_job.go",
+        "permanent_create_jobs_metrics_polling_job.go",
+        "permanent_ensure_sql_schema_telemetry_schedule.go",
+        "permanent_key_visualizer_migration.go",
+        "permanent_mvcc_statistics_migration.go",
+        "permanent_sql_stats_ttl.go",
+        "permanent_system_activity_update_job.go",
         "permanent_upgrades.go",
-        "plan_gist_stmt_diagnostics_requests.go",
         "schema_changes.go",
-        "sql_stats_ttl.go",
-        "system_activity_update_job.go",
-        "system_exec_insights.go",
         "upgrades.go",
+        "v23_2_create_region_liveness.go",
+        "v23_2_grant_execute_to_public.go",
+        "v23_2_plan_gist_stmt_diagnostics_requests.go",
+        "v23_2_system_exec_insights.go",
     ],
     importpath = "github.com/cockroachdb/cockroach/pkg/upgrade/upgrades",
     visibility = ["//visibility:public"],
@@ -66,22 +66,22 @@ go_test(
     size = "large",
     srcs = [
         "builtins_test.go",
-        "create_jobs_metrics_polling_job_test.go",
-        "create_region_liveness_test.go",
         "descriptor_utils_test.go",
-        "ensure_sql_schema_telemetry_schedule_test.go",
         "first_upgrade_test.go",
-        "grant_execute_to_public_test.go",
         "helpers_test.go",
         "main_test.go",
-        "mvcc_statistics_migration_test.go",
-        "plan_gist_stmt_diagnostics_requests_test.go",
+        "permanent_create_jobs_metrics_polling_job_test.go",
+        "permanent_ensure_sql_schema_telemetry_schedule_test.go",
+        "permanent_mvcc_statistics_migration_test.go",
+        "permanent_sql_stats_ttl_test.go",
+        "permanent_system_activity_update_job_test.go",
         "schema_changes_external_test.go",
         "schema_changes_helpers_test.go",
-        "sql_stats_ttl_test.go",
-        "system_activity_update_job_test.go",
-        "system_exec_insights_test.go",
         "upgrades_test.go",
+        "v23_2_create_region_liveness_test.go",
+        "v23_2_grant_execute_to_public_test.go",
+        "v23_2_plan_gist_stmt_diagnostics_requests_test.go",
+        "v23_2_system_exec_insights_test.go",
     ],
     data = glob(["testdata/**"]),
     embed = [":upgrades"],

diff --git a/...upgrades/create_auto_config_runner_job.go → ...ermanent_create_auto_config_runner_job.go b/...upgrades/create_auto_config_runner_job.go → ...ermanent_create_auto_config_runner_job.go
diff --git a/...grades/create_jobs_metrics_polling_job.go → ...manent_create_jobs_metrics_polling_job.go b/...grades/create_jobs_metrics_polling_job.go → ...manent_create_jobs_metrics_polling_job.go
diff --git a/...s/create_jobs_metrics_polling_job_test.go → ...t_create_jobs_metrics_polling_job_test.go b/...s/create_jobs_metrics_polling_job_test.go → ...t_create_jobs_metrics_polling_job_test.go
diff --git a/...s/ensure_sql_schema_telemetry_schedule.go → ...t_ensure_sql_schema_telemetry_schedule.go b/...s/ensure_sql_schema_telemetry_schedule.go → ...t_ensure_sql_schema_telemetry_schedule.go
diff --git a/...ure_sql_schema_telemetry_schedule_test.go → ...ure_sql_schema_telemetry_schedule_test.go b/...ure_sql_schema_telemetry_schedule_test.go → ...ure_sql_schema_telemetry_schedule_test.go
diff --git a/...rade/upgrades/key_visualizer_migration.go → ...des/permanent_key_visualizer_migration.go b/...rade/upgrades/key_visualizer_migration.go → ...des/permanent_key_visualizer_migration.go
diff --git a/...ade/upgrades/mvcc_statistics_migration.go → ...es/permanent_mvcc_statistics_migration.go b/...ade/upgrades/mvcc_statistics_migration.go → ...es/permanent_mvcc_statistics_migration.go
diff --git a/...pgrades/mvcc_statistics_migration_test.go → ...rmanent_mvcc_statistics_migration_test.go b/...pgrades/mvcc_statistics_migration_test.go → ...rmanent_mvcc_statistics_migration_test.go
diff --git a/pkg/upgrade/upgrades/sql_stats_ttl.go → ...grade/upgrades/permanent_sql_stats_ttl.go b/pkg/upgrade/upgrades/sql_stats_ttl.go → ...grade/upgrades/permanent_sql_stats_ttl.go
diff --git a/pkg/upgrade/upgrades/sql_stats_ttl_test.go → .../upgrades/permanent_sql_stats_ttl_test.go b/pkg/upgrade/upgrades/sql_stats_ttl_test.go → .../upgrades/permanent_sql_stats_ttl_test.go
diff --git a/...de/upgrades/system_activity_update_job.go → ...s/permanent_system_activity_update_job.go b/...de/upgrades/system_activity_update_job.go → ...s/permanent_system_activity_update_job.go
diff --git a/...grades/system_activity_update_job_test.go → ...manent_system_activity_update_job_test.go b/...grades/system_activity_update_job_test.go → ...manent_system_activity_update_job_test.go
diff --git a/...pgrade/upgrades/create_region_liveness.go → .../upgrades/v23_2_create_region_liveness.go b/...pgrade/upgrades/create_region_liveness.go → .../upgrades/v23_2_create_region_liveness.go
diff --git a/...e/upgrades/create_region_liveness_test.go → ...ades/v23_2_create_region_liveness_test.go b/...e/upgrades/create_region_liveness_test.go → ...ades/v23_2_create_region_liveness_test.go
diff --git a/...grade/upgrades/grant_execute_to_public.go → ...upgrades/v23_2_grant_execute_to_public.go b/...grade/upgrades/grant_execute_to_public.go → ...upgrades/v23_2_grant_execute_to_public.go
diff --git a/.../upgrades/grant_execute_to_public_test.go → ...des/v23_2_grant_execute_to_public_test.go b/.../upgrades/grant_execute_to_public_test.go → ...des/v23_2_grant_execute_to_public_test.go
diff --git a/...es/plan_gist_stmt_diagnostics_requests.go → ..._2_plan_gist_stmt_diagnostics_requests.go b/...es/plan_gist_stmt_diagnostics_requests.go → ..._2_plan_gist_stmt_diagnostics_requests.go
diff --git a/...an_gist_stmt_diagnostics_requests_test.go → ...an_gist_stmt_diagnostics_requests_test.go b/...an_gist_stmt_diagnostics_requests_test.go → ...an_gist_stmt_diagnostics_requests_test.go
diff --git a/pkg/upgrade/upgrades/system_exec_insights.go → ...de/upgrades/v23_2_system_exec_insights.go b/pkg/upgrade/upgrades/system_exec_insights.go → ...de/upgrades/v23_2_system_exec_insights.go
diff --git a/...ade/upgrades/system_exec_insights_test.go → ...grades/v23_2_system_exec_insights_test.go b/...ade/upgrades/system_exec_insights_test.go → ...grades/v23_2_system_exec_insights_test.go