Reject source-id next to source-ids, matching main

Author: moomindani

pyiceberg/transforms.py

@@ -1087,14 +1087,15 @@ def map_source_ids_onto_source_id(cls, data: Any) -> Any:
         if not isinstance(data, dict) or "source-ids" not in data:
             return data
 
+        if "source-id" in data:
+            raise ValueError("source-id and source-ids are mutually exclusive")
+
         source_ids = data["source-ids"]
         if not isinstance(source_ids, list):
             return data
         if len(source_ids) == 0:
             raise ValueError("Empty source-ids is not allowed")
 
-        # The spec writes only one of the two keys, so a source-id next to source-ids comes
-        # from a non-conformant writer; source-ids is the one that carries the arity
         data["source-id"] = source_ids[0]
         if len(source_ids) == 1:
             data.pop("source-ids", None)

tests/table/test_partitioning.py

@@ -389,48 +389,6 @@ def test_deserialize_partition_field_multi_arg_requires_transform() -> None:
         PartitionField.model_validate_json(json_partition_spec)
 
 
-def test_deserialize_partition_field_both_source_id_and_source_ids_multi_arg() -> None:
-    import json as json_lib
-
-    from pyiceberg.transforms import UnknownTransform
-
-    # a non-conformant writer emitted both keys; source-ids carries the arity, so it wins
-    json_partition_spec = (
-        """{"source-id": 9, "source-ids": [1, 2], "field-id": 1000, "transform": "bucket[4]", "name": "multi_bucket"}"""
-    )
-    field = PartitionField.model_validate_json(json_partition_spec)
-
-    assert isinstance(field.transform, UnknownTransform)
-    assert field.source_id == 1
-    assert field.source_ids == [1, 2]
-
-    serialized = json_lib.loads(field.model_dump_json())
-    assert serialized["source-ids"] == [1, 2]
-    assert "source-id" not in serialized
-
-
-def test_deserialize_partition_field_both_source_id_and_source_ids_single_arg() -> None:
-    import json as json_lib
-
-    json_partition_spec = (
-        """{"source-id": 9, "source-ids": [1], "field-id": 1000, "transform": "truncate[19]", "name": "str_truncate"}"""
-    )
-    field = PartitionField.model_validate_json(json_partition_spec)
-
-    assert field.source_id == 1
-    assert field.source_ids is None
-
-    serialized = json_lib.loads(field.model_dump_json())
-    assert serialized["source-id"] == 1
-    assert "source-ids" not in serialized
-
-
-def test_deserialize_partition_field_empty_source_ids_rejected_next_to_source_id() -> None:
-    json_partition_spec = """{"source-id": 1, "source-ids": [], "field-id": 1000, "transform": "identity", "name": "x"}"""
-    with pytest.raises(Exception, match="Empty source-ids is not allowed"):
-        PartitionField.model_validate_json(json_partition_spec)
-
-
 def test_partition_field_transform_arguments() -> None:
     single = PartitionField(source_id=1, field_id=1000, transform=TruncateTransform(width=19), name="str_truncate")
     assert single.transform_arguments == [1]

tests/table/test_sorting.py

@@ -208,34 +208,6 @@ def test_deserialize_sort_field_multi_arg_requires_transform() -> None:
         SortField.model_validate_json(payload)
 
 
-def test_deserialize_sort_field_both_source_id_and_source_ids_multi_arg() -> None:
-    from pyiceberg.transforms import UnknownTransform
-
-    # a non-conformant writer emitted both keys; source-ids carries the arity, so it wins
-    payload = '{"source-id":9,"source-ids":[19,20],"transform":"bucket[4]","direction":"asc","null-order":"nulls-first"}'
-    field = SortField.model_validate_json(payload)
-
-    assert isinstance(field.transform, UnknownTransform)
-    assert field.source_id == 19
-    assert field.source_ids == [19, 20]
-
-    serialized = json.loads(field.model_dump_json())
-    assert serialized["source-ids"] == [19, 20]
-    assert "source-id" not in serialized
-
-
-def test_deserialize_sort_field_both_source_id_and_source_ids_single_arg() -> None:
-    payload = '{"source-id":9,"source-ids":[19],"transform":"identity","direction":"asc","null-order":"nulls-first"}'
-    field = SortField.model_validate_json(payload)
-
-    assert field.source_id == 19
-    assert field.source_ids is None
-
-    serialized = json.loads(field.model_dump_json())
-    assert serialized["source-id"] == 19
-    assert "source-ids" not in serialized
-
-
 def test_sort_field_transform_arguments() -> None:
     single = SortField(source_id=19, transform=BucketTransform(num_buckets=4), null_order=NullOrder.NULLS_FIRST)
     assert single.transform_arguments == [19]