deltacat 1.1.36__py3-none-any.whl → 2.0__py3-none-any.whl

deltacat/tests/compute/compact_partition_multiple_rounds_test_cases.py

@@ -15,7 +15,7 @@ from deltacat.exceptions import ValidationError
 
 from deltacat.storage import (
     DeltaType,
-    DeleteParameters,
+    EntryParams,
 )
 
 from deltacat.compute.compactor.model.compactor_version import CompactorVersion
@@ -36,15 +36,15 @@ class MultipleRoundsTestCaseParams:
     Args:
         primary_keys: Set[str] - argument for the primary_keys parameter in compact_partition. Also needed for table/delta creation
         sort_keys: List[SortKey] - argument for the sort_keys parameter in compact_partition. Also needed for table/delta creation
-        partition_keys_param: List[PartitionKey] - argument for the partition_keys parameter. Needed for table/delta creation
-        partition_values_param: List[Optional[str]] - argument for the partition_valued parameter. Needed for table/delta creation
+        partition_keys: List[PartitionKey] - argument for the partition_keys parameter. Needed for table/delta creation
+        partition_values: List[Optional[str]] - argument for the partition_valued parameter. Needed for table/delta creation
         input_deltas: List[pa.Array] - argument required for delta creation during compact_partition test setup. Actual incoming deltas expressed as a PyArrow array (https://arrow.apache.org/docs/python/generated/pyarrow.array.html)
         expected_terminal_compact_partition_result: pa.Table - expected PyArrow table after compaction (i.e,. the state of the table after applying all row UPDATES/DELETES/INSERTS)
         expected_terminal_exception: BaseException - expected exception during compaction
         expected_terminal_exception_message: Optional[str] - expected exception message if present.
         do_create_placement_group: bool - toggles whether to create a placement group (https://docs.ray.io/en/latest/ray-core/scheduling/placement-group.html) or not
         records_per_compacted_file: int - argument for the records_per_compacted_file parameter in compact_partition
-        hash_bucket_count_param: int - argument for the hash_bucket_count parameter in compact_partition
+        hash_bucket_count: int - argument for the hash_bucket_count parameter in compact_partition
         read_kwargs_provider: Optional[ReadKwargsProvider] - argument for read_kwargs_provider parameter in compact_partition. If None then no ReadKwargsProvider is provided to compact_partition_params
         drop_duplicates: bool - argument for drop_duplicates parameter in compact_partition. Only recognized by compactor v2.
         skip_enabled_compact_partition_drivers: List[CompactorVersion] - skip whatever enabled_compact_partition_drivers are included in this list
@@ -57,7 +57,7 @@ class MultipleRoundsTestCaseParams:
     sort_keys: List[Optional[SortKey]]
     partition_keys: Optional[List[PartitionKey]]
     partition_values: List[Optional[str]]
-    input_deltas: Union[List[pa.Array], DeltaType, DeleteParameters]
+    input_deltas: Union[List[pa.Array], DeltaType]
     expected_terminal_compact_partition_result: pa.Table
     expected_terminal_exception: BaseException
     expected_terminal_exception_message: str
@@ -83,8 +83,8 @@ MULTIPLE_ROUNDS_TEST_CASES = {
     "1-multiple-rounds-sanity": MultipleRoundsTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -177,8 +177,8 @@ MULTIPLE_ROUNDS_TEST_CASES = {
     "2-multiple-rounds-unique-values": MultipleRoundsTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -270,8 +270,8 @@ MULTIPLE_ROUNDS_TEST_CASES = {
     "3-num-rounds-greater-than-deltas-count": MultipleRoundsTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -364,8 +364,8 @@ MULTIPLE_ROUNDS_TEST_CASES = {
     "4-multiple-rounds-hb-count-equals-1": MultipleRoundsTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -458,8 +458,8 @@ MULTIPLE_ROUNDS_TEST_CASES = {
     "5-multiple-rounds-only-supports-rebase": MultipleRoundsTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -553,8 +553,8 @@ MULTIPLE_ROUNDS_TEST_CASES = {
     "6-multiple-rounds-test-pgm": MultipleRoundsTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -690,7 +690,7 @@ MULTIPLE_ROUNDS_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(equality_field_locators=["pk_col_1", "col_1"]),
             ),
         ],
         rebase_expected_compact_partition_result=pa.Table.from_arrays(
@@ -758,7 +758,7 @@ MULTIPLE_ROUNDS_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(equality_field_locators=["pk_col_1", "col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -766,7 +766,7 @@ MULTIPLE_ROUNDS_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(equality_field_locators=["pk_col_1", "col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -897,7 +897,7 @@ MULTIPLE_ROUNDS_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(["pk_col_1", "col_1"]),
             ),
         ],
         rebase_expected_compact_partition_result=pa.Table.from_arrays(

deltacat/tests/compute/compact_partition_rebase_test_cases.py

@@ -41,8 +41,8 @@ REBASE_TEST_CASES = {
     "1-rebase-sanity": RebaseCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -87,8 +87,8 @@ REBASE_TEST_CASES = {
     "2-rebase-with-null-pk": RebaseCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -133,7 +133,7 @@ REBASE_TEST_CASES = {
     "3-rebase-with-null-two-pk": RebaseCompactionTestCaseParams(
         primary_keys={"pk_col_1", "pk_col_2"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
+            SortKey.of(key=["sk_col_1"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -307,7 +307,7 @@ REBASE_TEST_CASES = {
     "7-rebase-drop-duplicates-false": RebaseCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
+            SortKey.of(key=["sk_col_1"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],

deltacat/tests/compute/compact_partition_rebase_then_incremental_test_cases.py

@@ -17,6 +17,7 @@ from dataclasses import dataclass
 
 from deltacat.storage import (
     DeltaType,
+    EntryParams,
 )
 from deltacat.types.media import ContentType
 
@@ -38,7 +39,6 @@ from deltacat.tests.compute.compact_partition_test_cases import (
     ZERO_VALUED_PRIMARY_KEY,
     EMPTY_UTSV_PATH,
 )
-from deltacat.storage import DeleteParameters
 from deltacat.exceptions import ValidationError
 
 
@@ -53,7 +53,7 @@ class RebaseThenIncrementalCompactionTestCaseParams(BaseCompactorTestCase):
         rebase_expected_compact_partition_result: pa.Table - expected table after rebase compaction runs. An output that is asserted on in Rebase then Incremental unit tests
     """
 
-    incremental_deltas: List[Tuple[pa.Table, DeltaType, Optional[DeleteParameters]]]
+    incremental_deltas: List[Tuple[pa.Table, DeltaType, Optional[EntryParams]]]
     rebase_expected_compact_partition_result: pa.Table
 
 
@@ -61,8 +61,8 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "1-rebase-then-incremental-sanity": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -122,7 +122,7 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "2-rebase-then-incremental-pk-multi": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1", "pk_col_2"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
+            SortKey.of(key=["sk_col_1"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -303,7 +303,7 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "5-rebase-then-incremental-partial-deltas-on-incremental-deltas-2": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
+            SortKey.of(key=["sk_col_1"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -359,8 +359,8 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "6-rebase-then-incremental-hash-bucket-GT-records-per-compacted-file-v2-only": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("day", PartitionKeyType.TIMESTAMP)],
         partition_values=["2022-01-01T00:00:00.000Z"],
@@ -420,7 +420,7 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "7-rebase-then-incremental-no-pk-compactor-v2-only": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys=ZERO_VALUED_PRIMARY_KEY,
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
+            SortKey.of(key=["sk_col_1"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -529,8 +529,8 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "9-rebase-then-incremental-single-hash-bucket": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -590,7 +590,7 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "10-rebase-then-incremental-drop-duplicates-false-on-incremental-v2-only": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
+            SortKey.of(key=["sk_col_1"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -646,8 +646,8 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "11-rebase-then-empty-incremental-delta": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -693,8 +693,8 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "12-rebase-then-incremental-hash-bucket-single": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -754,8 +754,8 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "13-rebase-then-empty-incremental-delta-hash-bucket-single": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -801,8 +801,8 @@ REBASE_THEN_INCREMENTAL_TEST_CASES = {
     "14-rebase-then-incremental-with-null-pk": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -900,7 +900,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(["pk_col_1", "col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -908,7 +908,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -916,7 +916,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -924,7 +924,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -932,7 +932,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(["pk_col_1", "col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -940,7 +940,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -991,7 +991,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             )
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1043,7 +1043,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             )
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1099,7 +1099,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             )
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1186,7 +1186,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1257,7 +1257,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1317,7 +1317,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1382,7 +1382,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -1393,7 +1393,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -1414,7 +1414,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1474,7 +1474,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1539,7 +1539,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -1681,7 +1681,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     ),
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1741,7 +1741,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1790,7 +1790,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -1800,7 +1800,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["pk_col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1"]),
+                EntryParams.of(["pk_col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -1834,8 +1834,8 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
     "28-rebase-then-incremental-delete-type-delta-hash-bucket-single": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys={"pk_col_1"},
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
-            SortKey.of(key_name="sk_col_2"),
+            SortKey.of(key=["sk_col_1"]),
+            SortKey.of(key=["sk_col_2"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -1880,7 +1880,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -1890,7 +1890,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -1900,7 +1900,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["sk_col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["sk_col_1"]),
+                EntryParams.of(["sk_col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -1925,7 +1925,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
     "29-rebase-then-incremental-delete-type-delta-no-pk-compactor": RebaseThenIncrementalCompactionTestCaseParams(
         primary_keys=ZERO_VALUED_PRIMARY_KEY,
         sort_keys=[
-            SortKey.of(key_name="sk_col_1"),
+            SortKey.of(key=["sk_col_1"]),
         ],
         partition_keys=[PartitionKey.of("region_id", PartitionKeyType.INT)],
         partition_values=["1"],
@@ -1953,7 +1953,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -1974,7 +1974,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["sk_col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["sk_col_1"]),
+                EntryParams.of(["sk_col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -2024,7 +2024,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(["pk_col_1", "col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(
@@ -2082,7 +2082,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(["pk_col_1", "col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -2090,7 +2090,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["pk_col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1"]),
+                EntryParams.of(["pk_col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -2098,7 +2098,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -2106,7 +2106,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -2114,7 +2114,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["pk_col_1", "col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["pk_col_1", "col_1"]),
+                EntryParams.of(["pk_col_1", "col_1"]),
             ),
             (
                 pa.Table.from_arrays(
@@ -2122,7 +2122,7 @@ REBASE_THEN_INCREMENTAL_DELETE_DELTA_TYPE_TEST_CASES = {
                     names=["col_1"],
                 ),
                 DeltaType.DELETE,
-                DeleteParameters.of(["col_1"]),
+                EntryParams.of(["col_1"]),
             ),
         ],
         expected_terminal_compact_partition_result=pa.Table.from_arrays(