Skip to content

Fix downgrading of schema #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fokko merged 5 commits into from
Dec 4, 2023
Merged

Fix downgrading of schema #176

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83dc916
Fix downgrading of schema
Fokko Dec 3, 2023
a11a718
Merge branch 'main' of github.com:apache/iceberg-python into fd-fix-d…
Fokko Dec 3, 2023
a165ba7
Fix comparison
Fokko Dec 3, 2023
e854829
Add suggestion
Fokko Dec 4, 2023
ea28e96
Remove double assignment
Fokko Dec 4, 2023
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
21 changes: 15 additions & 6 deletions pyiceberg/table/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,13 +1412,22 @@ def commit(self) -> None:
"""Apply the pending changes and commit."""
new_schema = self._apply()

if new_schema != self._schema:
last_column_id = max(self._table.metadata.last_column_id, new_schema.highest_field_id)
updates = (
AddSchemaUpdate(schema=new_schema, last_column_id=last_column_id),
SetCurrentSchemaUpdate(schema_id=-1),
)
existing_schema_id: Optional[int] = None
for schema in self._table.metadata.schemas:
if new_schema == schema:
existing_schema_id = schema.schema_id
Copy link
Copy Markdown
Contributor

@HonahX HonahX Dec 3, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Shall we add a break here? Or may be:

existing_schema_id = next(
        (schema.schema_id for schema in self.schemas if schema == new_schema), None)

Copy link
Copy Markdown
Contributor Author

@Fokko Fokko Dec 4, 2023

Choose a reason for hiding this comment

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

Oh, your suggestion is beautiful, thanks!


# Check if it is different current schema ID
if existing_schema_id != self._table.schema().schema_id:
requirements = (AssertCurrentSchemaId(current_schema_id=self._schema.schema_id),)
if existing_schema_id is None:
last_column_id = max(self._table.metadata.last_column_id, new_schema.highest_field_id)
updates = (
AddSchemaUpdate(schema=new_schema, last_column_id=last_column_id),
SetCurrentSchemaUpdate(schema_id=-1),
)
else:
updates = (SetCurrentSchemaUpdate(schema_id=existing_schema_id),) # type: ignore

if self._transaction is not None:
self._transaction._append_updates(*updates) # pylint: disable=W0212
Expand Down
28 changes: 28 additions & 0 deletions tests/test_integration_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,34 @@ def test_no_changes_empty_commit(simple_table: Table, table_schema_simple: Schem
assert simple_table.schema() == table_schema_simple


@pytest.mark.integration
def test_revert_changes(simple_table: Table, table_schema_simple: Schema) -> None:
with simple_table.update_schema() as update:
update.add_column(path="data", field_type=IntegerType(), required=False)

with simple_table.update_schema(allow_incompatible_changes=True) as update:
update.delete_column(path="data")

assert simple_table.schemas() == {
0: Schema(
NestedField(field_id=1, name='foo', field_type=StringType(), required=False),
NestedField(field_id=2, name='bar', field_type=IntegerType(), required=True),
NestedField(field_id=3, name='baz', field_type=BooleanType(), required=False),
schema_id=0,
identifier_field_ids=[2],
),
1: Schema(
NestedField(field_id=1, name='foo', field_type=StringType(), required=False),
NestedField(field_id=2, name='bar', field_type=IntegerType(), required=True),
NestedField(field_id=3, name='baz', field_type=BooleanType(), required=False),
NestedField(field_id=4, name='data', field_type=IntegerType(), required=False),
schema_id=1,
identifier_field_ids=[2],
),
}
assert simple_table.schema().schema_id == 0


@pytest.mark.integration
def test_delete_field(simple_table: Table) -> None:
with simple_table.update_schema() as schema_update:
Expand Down