schemachanger: port over MR zone config helpers

Some precursor work to remove RBR fallbacks for ADD COLUMN. Epic: CRDB-31282 Informs: #80545 Release note: None
cockroachdb · Feb 12, 2025 · 82b34b9 · 82b34b9
1 parent b696d6a
commit 82b34b9
Show file tree

Hide file tree

Showing 7 changed files with 586 additions and 375 deletions.
diff --git a/pkg/sql/BUILD.bazel b/pkg/sql/BUILD.bazel
@@ -864,6 +864,7 @@ go_test(
         "//pkg/sql/privilege",
         "//pkg/sql/querycache",
         "//pkg/sql/randgen",
+        "//pkg/sql/regions",
         "//pkg/sql/row",
         "//pkg/sql/rowenc",
         "//pkg/sql/rowenc/keyside",

diff --git a/pkg/sql/region_util.go b/pkg/sql/region_util.go
diff --git a/pkg/sql/region_util_test.go b/pkg/sql/region_util_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/multiregion"
+	"github.com/cockroachdb/cockroach/pkg/sql/regions"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/gogo/protobuf/proto"
@@ -1899,7 +1900,7 @@ func TestZoneConfigForMultiRegionPartition(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
-			zc, err := zoneConfigForMultiRegionPartition(tc.region, tc.regionConfig)
+			zc, err := regions.ZoneConfigForMultiRegionPartition(tc.region, tc.regionConfig)
 			require.NoError(t, err)
 			require.Equal(t, tc.expected, zc)
 		})

diff --git a/pkg/sql/regions/BUILD.bazel b/pkg/sql/regions/BUILD.bazel
@@ -6,15 +6,18 @@ go_library(
         "cached_db_regions.go",
         "db_regions.go",
         "region_provider.go",
+        "region_util.go",
     ],
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/regions",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/config/zonepb",
         "//pkg/keys",
         "//pkg/kv",
         "//pkg/roachpb",
         "//pkg/server/serverpb",
         "//pkg/sql/catalog",
+        "//pkg/sql/catalog/catpb",
         "//pkg/sql/catalog/descpb",
         "//pkg/sql/catalog/descs",
         "//pkg/sql/catalog/lease",