Merge cockroachdb#103023 cockroachdb#103325

103023: opt: copy ordering choice columns r=mgartner a=mgartner #### opt: copy ordering choice columns This commit fixes a long-standing bug in `OrderingChoice.Copy` in which the `Group` columns were not being copied. As far as we now, this has caused no user-facing bugs, but it does not follow `Copy`'s description that the new `OrderingChoice` has a "private" version of the ordering column slice, and column sets shared between `OrderingChoice`s could lead to future bugs. Epic: None Release note: None #### opt: fix typo in comment Release note: None 103325: allocator2: structural normalization of SpanConfig r=kvoli a=sumeerbhola The structural normalization is invoked as part of the normalization step. Also includes unit testing of all the normalization code. Informs cockroachdb#103320 Epic: CRDB-25222 Release note: None Co-authored-by: Marcus Gartner <[email protected]> Co-authored-by: sumeerbhola <[email protected]>
srosenberg · May 17, 2023 · f16976e · f16976e
3 parents b02f647 + 9d8acd4 + db74c89
commit f16976e
Show file tree

Hide file tree

Showing 7 changed files with 917 additions and 21 deletions.
diff --git a/pkg/kv/kvserver/allocator/allocator2/BUILD.bazel b/pkg/kv/kvserver/allocator/allocator2/BUILD.bazel
@@ -27,8 +27,13 @@ go_test(
         "memo_helper_test.go",
     ],
     args = ["-test.timeout=295s"],
+    data = glob(["testdata/**"]),
     embed = [":allocator2"],
-    deps = ["@com_github_stretchr_testify//require"],
+    deps = [
+        "//pkg/roachpb",
+        "@com_github_cockroachdb_datadriven//:datadriven",
+        "@com_github_stretchr_testify//require",
+    ],
 )
 
 get_x_data(name = "get_x_data")