From 311b988fdb9fde53bd02ee955dfb141990845584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=20Anast=C3=A1cio?= Date: Wed, 7 Aug 2024 22:26:27 -0300 Subject: [PATCH] Fix overwrite when filtering all the data --- pyiceberg/table/__init__.py | 4 ++- tests/integration/test_writes/test_writes.py | 27 +++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/pyiceberg/table/__init__.py b/pyiceberg/table/__init__.py index bb39933ace..6d47cdbda5 100644 --- a/pyiceberg/table/__init__.py +++ b/pyiceberg/table/__init__.py @@ -593,7 +593,9 @@ def delete(self, delete_filter: Union[str, BooleanExpression], snapshot_properti filtered_df = df.filter(preserve_row_filter) # Only rewrite if there are records being deleted - if len(df) != len(filtered_df): + if len(filtered_df) == 0: + replaced_files.append((original_file.file, [])) + elif len(df) != len(filtered_df): replaced_files.append(( original_file.file, list( diff --git a/tests/integration/test_writes/test_writes.py b/tests/integration/test_writes/test_writes.py index 3aaafa85fe..58458ef5f0 100644 --- a/tests/integration/test_writes/test_writes.py +++ b/tests/integration/test_writes/test_writes.py @@ -38,12 +38,13 @@ from pyiceberg.catalog.rest import RestCatalog from pyiceberg.catalog.sql import SqlCatalog from pyiceberg.exceptions import NoSuchTableError +from pyiceberg.expressions import In from pyiceberg.io.pyarrow import _dataframe_to_data_files from pyiceberg.partitioning import PartitionField, PartitionSpec from pyiceberg.schema import Schema from pyiceberg.table import TableProperties from pyiceberg.transforms import IdentityTransform -from pyiceberg.types import IntegerType, LongType, NestedField +from pyiceberg.types import IntegerType, LongType, NestedField, StringType from utils import _create_table @@ -1295,3 +1296,27 @@ def test_rest_catalog_with_empty_catalog_name_append_data(session_catalog: Catal ) tbl = _create_table(test_catalog, identifier, data=[]) tbl.append(arrow_table_with_null) + + +@pytest.mark.integration +def test_overrite_all_data_with_filter(session_catalog: Catalog) -> None: + schema = Schema( + NestedField(1, "id", StringType(), required=True), + NestedField(2, "name", StringType(), required=False), + identifier_field_ids=[1], + ) + + data = pa.Table.from_pylist( + [ + {"id": "1", "name": "Amsterdam"}, + {"id": "2", "name": "San Francisco"}, + {"id": "3", "name": "Drachten"}, + ], + schema=schema.as_arrow(), + ) + + identifier = "default.test_overwrite_all_data_with_filter" + tbl = _create_table(session_catalog, identifier, data=[data], schema=schema) + tbl.overwrite(data, In("id", ["1", "2", "3"])) + + assert len(tbl.scan().to_arrow()) == 3