Skip to content

Commit 450e78c

Browse files
committed
fix: keep last_updated_ms from preceding the latest metadata-log entry
1 parent e3564a5 commit 450e78c

2 files changed

Lines changed: 21 additions & 4 deletions

File tree

‎pyiceberg/table/update/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,11 +746,11 @@ def update_table_metadata(
746746
for update in updates:
747747
new_metadata = _apply_table_update(update, new_metadata, context)
748748

749-
# Update last_updated_ms if it was not updated by update operations
749+
# last_updated_ms must not precede the base's, which becomes the latest metadata-log entry
750750
if context.has_changes():
751751
if metadata_location:
752752
new_metadata = _update_table_metadata_log(new_metadata, metadata_location, base_metadata.last_updated_ms)
753-
if base_metadata.last_updated_ms == new_metadata.last_updated_ms:
753+
if new_metadata.last_updated_ms <= base_metadata.last_updated_ms:
754754
new_metadata = new_metadata.model_copy(update={"last_updated_ms": datetime_to_millis(datetime.now().astimezone())})
755755

756756
# Check correctness of partition spec, and sort order

‎tests/table/test_init.py‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ def test_update_metadata_with_multiple_updates(table_v1: Table) -> None:
12521252
snapshot_id=25,
12531253
parent_snapshot_id=19,
12541254
sequence_number=200,
1255-
timestamp_ms=1602638573590,
1255+
timestamp_ms=1602638593590,
12561256
manifest_list="s3:/a/b/c.avro",
12571257
summary=Summary(Operation.APPEND),
12581258
schema_id=3,
@@ -1295,7 +1295,7 @@ def test_update_metadata_with_multiple_updates(table_v1: Table) -> None:
12951295
assert len(new_metadata.snapshot_log) == 1
12961296
assert new_metadata.snapshot_log[0].snapshot_id == 25
12971297
assert new_metadata.current_snapshot_id == 25
1298-
assert new_metadata.last_updated_ms == 1602638573590
1298+
assert new_metadata.last_updated_ms == 1602638593590
12991299
assert new_metadata.refs["main"] == SnapshotRef(
13001300
snapshot_id=25,
13011301
snapshot_ref_type="branch",
@@ -1683,6 +1683,23 @@ def test_update_metadata_log(table_v2: Table) -> None:
16831683
assert len(new_metadata.metadata_log) == 2
16841684

16851685

1686+
def test_update_metadata_last_updated_ms_not_before_metadata_log(table_v2: Table) -> None:
1687+
stale_snapshot = Snapshot(
1688+
snapshot_id=25,
1689+
parent_snapshot_id=19,
1690+
sequence_number=200,
1691+
timestamp_ms=table_v2.metadata.last_updated_ms - 61_000,
1692+
manifest_list="s3:/a/b/c.avro",
1693+
summary=Summary(Operation.APPEND),
1694+
schema_id=3,
1695+
)
1696+
1697+
new_metadata = update_table_metadata(
1698+
table_v2.metadata, (AddSnapshotUpdate(snapshot=stale_snapshot),), False, table_v2.metadata_location
1699+
)
1700+
assert new_metadata.last_updated_ms > new_metadata.metadata_log[-1].timestamp_ms
1701+
1702+
16861703
def test_update_metadata_log_overflow(table_v2: Table) -> None:
16871704
metadata_log = [
16881705
MetadataLogEntry(

0 commit comments

Comments
 (0)