Skip to content
Merged
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
2 changes: 1 addition & 1 deletion pyiceberg/table/update/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ def _add_new_field(
return PartitionSpec(*partition_fields, spec_id=new_spec_id)

def _partition_field(self, transform_key: tuple[int, Transform[Any, Any]], name: str | None) -> PartitionField:
if self._transaction.table_metadata.format_version == 2:
if self._transaction.table_metadata.format_version >= 2:

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like we need to follow up and fix a number of these in the code base

source_id, transform = transform_key
historical_fields = []
for spec in self._transaction.table_metadata.specs().values():
Expand Down
24 changes: 24 additions & 0 deletions tests/table/test_init.py
Original file line number Diff line number Diff line change
Expand Up @@ -1454,6 +1454,30 @@ def test_last_assigned_partition_id(table_v2: Table) -> None:
AssertLastAssignedPartitionId(last_assigned_partition_id=1).validate(base_metadata)


@pytest.mark.parametrize("table", [lf("table_v2"), lf("table_v3")])
def test_update_spec_reuses_removed_partition_field_id(table: Table) -> None:
txn = table.transaction()
txn.update_spec().remove_field("x").add_field("y", BucketTransform(16), "y_bucket").commit()
txn.update_spec().add_identity("x").commit()

assert txn.table_metadata.spec().fields == (
PartitionField(source_id=2, field_id=1001, transform=BucketTransform(16), name="y_bucket"),
PartitionField(source_id=1, field_id=1000, transform=IdentityTransform(), name="x"),
)
assert txn.table_metadata.last_partition_id == 1001


@pytest.mark.parametrize("table", [lf("table_v2"), lf("table_v3")])
def test_update_spec_remove_and_add_same_field_reuses_id(table: Table) -> None:
txn = table.transaction()
txn.update_spec().remove_field("x").add_identity("x").commit()

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


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