Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pyiceberg/table/update/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ def remove_field(self, name: str) -> UpdateSpec:
def rename_field(self, name: str, new_name: str) -> UpdateSpec:
existing_field = self._name_to_field.get(new_name)
if existing_field and isinstance(existing_field.transform, VoidTransform):
return self.rename_field(name, name + "_" + str(existing_field.field_id))
# free the name by renaming the void field, then apply the requested rename
self.rename_field(existing_field.name, existing_field.name + "_" + str(existing_field.field_id))
added = self._name_to_added_field.get(name)
if added:
raise ValueError("Cannot rename recently added partitions")
Expand Down
71 changes: 71 additions & 0 deletions tests/table/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -1664,6 +1664,77 @@ def test_update_spec_remove_and_add_field_with_same_name(table_v1: Table, table_
)


def test_update_spec_rename_onto_removed_partition_field_name(catalog: Catalog) -> None:
catalog.create_namespace("default")
schema = Schema(
NestedField(1, "x", IntegerType(), required=False),
NestedField(2, "y", IntegerType(), required=False),
)
spec = PartitionSpec(PartitionField(source_id=1, field_id=1000, transform=IdentityTransform(), name="x"))
table = catalog.create_table(
"default.rename_onto_removed", schema=schema, partition_spec=spec, properties={"format-version": "1"}
)
table.update_spec().add_field("y", BucketTransform(16), "y_shard").commit()
table.update_spec().remove_field("y_shard").commit()
table.update_spec().rename_field("x", "y_shard").commit()

assert catalog.load_table("default.rename_onto_removed").spec().fields == (
PartitionField(source_id=1, field_id=1000, transform=IdentityTransform(), name="y_shard"),
PartitionField(source_id=2, field_id=1001, transform=VoidTransform(), name="y_shard_1001"),
)


def test_update_spec_rename_onto_explicit_void_partition_field_name(table_v2: Table) -> None:
txn = table_v2.transaction()
txn.update_spec().add_field("y", VoidTransform(), "y_shard").commit()
txn.update_spec().rename_field("x", "y_shard").commit()

assert txn.table_metadata.spec().fields == (
PartitionField(source_id=1, field_id=1000, transform=IdentityTransform(), name="y_shard"),
PartitionField(source_id=2, field_id=1001, transform=VoidTransform(), name="y_shard_1001"),
)


def test_update_spec_rename_to_unused_partition_field_name(table_v2: Table) -> None:
txn = table_v2.transaction()
txn.update_spec().rename_field("x", "x_shard").commit()

assert txn.table_metadata.spec().fields == (
PartitionField(source_id=1, field_id=1000, transform=IdentityTransform(), name="x_shard"),
)


def test_update_spec_rename_onto_void_rejects_removal_in_same_update(table_v1: Table, table_v2: Table) -> None:
for table in (table_v1, table_v2):
txn = table.transaction()
txn.update_spec().add_field("y", VoidTransform(), "y_shard").commit()

with pytest.raises(ValueError, match="^Cannot delete and rename partition field y_shard$"):
txn.update_spec().remove_field("y_shard").rename_field("x", "y_shard").commit()

with pytest.raises(ValueError, match="^Cannot rename and delete field y_shard$"):
txn.update_spec().rename_field("x", "y_shard").remove_field("y_shard").commit()


def test_update_spec_cascades_void_name_collisions(table_v2: Table) -> None:
for add_field in (False, True):
txn = table_v2.transaction()
txn.update_spec().add_field("y", VoidTransform(), "y_shard").add_field("z", VoidTransform(), "y_shard_1001").commit()

expected: tuple[PartitionField, ...] = (
PartitionField(source_id=1, field_id=1000, transform=IdentityTransform(), name="x" if add_field else "y_shard"),
PartitionField(source_id=2, field_id=1001, transform=VoidTransform(), name="y_shard_1001"),
PartitionField(source_id=3, field_id=1002, transform=VoidTransform(), name="y_shard_1001_1002"),
)
if add_field:
txn.update_spec().add_field("y", BucketTransform(16), "y_shard").commit()
expected += (PartitionField(source_id=2, field_id=1003, transform=BucketTransform(16), name="y_shard"),)
else:
txn.update_spec().rename_field("x", "y_shard").commit()

assert txn.table_metadata.spec().fields == expected


def test_assert_default_spec_id(table_v2: Table) -> None:
base_metadata = table_v2.metadata
AssertDefaultSpecId(default_spec_id=base_metadata.default_spec_id).validate(base_metadata)
Expand Down
Loading