Skip to content

Commit ab75eb7

Browse files
committed
fix(table): validate snapshot sequence numbers on v3 tables
The check that rejects a snapshot whose sequence number is not greater than the table's last sequence number only ran for format version 2. Java applies it to every format version after 1.
1 parent 7d51e52 commit ab75eb7

2 files changed

Lines changed: 21 additions & 1 deletion

File tree

‎pyiceberg/table/update/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ def _(update: AddSnapshotUpdate, base_metadata: TableMetadata, context: _TableMe
435435
elif base_metadata.snapshot_by_id(update.snapshot.snapshot_id) is not None:
436436
raise ValueError(f"Snapshot with id {update.snapshot.snapshot_id} already exists")
437437
elif (
438-
base_metadata.format_version == 2
438+
base_metadata.format_version >= 2
439439
and update.snapshot.sequence_number is not None
440440
and update.snapshot.sequence_number <= base_metadata.last_sequence_number
441441
and update.snapshot.parent_snapshot_id is not None

‎tests/table/test_init.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,6 +1966,26 @@ def test_add_snapshot_update_fails_with_smaller_first_row_id(table_v3: Table) ->
19661966
update_table_metadata(table_v3.metadata, (AddSnapshotUpdate(snapshot=new_snapshot),))
19671967

19681968

1969+
@pytest.mark.parametrize("table", [lf("table_v2"), lf("table_v3")])
1970+
def test_add_snapshot_update_fails_with_stale_sequence_number(table: Table) -> None:
1971+
new_snapshot = Snapshot(
1972+
snapshot_id=25,
1973+
parent_snapshot_id=3055729675574597004,
1974+
sequence_number=table.metadata.last_sequence_number,
1975+
timestamp_ms=1602638593590,
1976+
manifest_list="s3:/a/b/c.avro",
1977+
summary=Summary(Operation.APPEND),
1978+
schema_id=1,
1979+
first_row_id=2,
1980+
)
1981+
1982+
with pytest.raises(
1983+
ValueError,
1984+
match="Cannot add snapshot with sequence number 34 older than last sequence number 34",
1985+
):
1986+
update_table_metadata(table.metadata, (AddSnapshotUpdate(snapshot=new_snapshot),))
1987+
1988+
19691989
def test_add_snapshot_update_updates_next_row_id(table_v3: Table) -> None:
19701990
new_snapshot = Snapshot(
19711991
snapshot_id=25,

0 commit comments

Comments
 (0)