Fix merge conflicts

Author: Fokko

pyiceberg/table/__init__.py

@@ -476,7 +476,7 @@ def delete(self, delete_filter: Union[str, BooleanExpression], snapshot_properti
             self.table_metadata.properties.get(TableProperties.DELETE_MODE, TableProperties.DELETE_MODE_COPY_ON_WRITE)
             == TableProperties.DELETE_MODE_MERGE_ON_READ
         ):
-            raise NotImplementedError("Merge on read is not yet supported")
+            warnings.warn("Merge on read is not yet supported, falling back to copy-on-write")
 
         if isinstance(delete_filter, str):
             delete_filter = _parse_row_filter(delete_filter)
@@ -1443,7 +1443,6 @@ def overwrite(
         with self.transaction() as tx:
             tx.overwrite(df=df, overwrite_filter=overwrite_filter, snapshot_properties=snapshot_properties)
 
-<<<<<<< HEAD
     def delete(
         self, delete_filter: Union[BooleanExpression, str] = ALWAYS_TRUE, snapshot_properties: Dict[str, str] = EMPTY_DICT
     ) -> None:
@@ -1457,10 +1456,7 @@ def delete(
         with self.transaction() as tx:
             tx.delete(delete_filter=delete_filter, snapshot_properties=snapshot_properties)
 
-    def add_files(self, file_paths: List[str]) -> None:
-=======
     def add_files(self, file_paths: List[str], snapshot_properties: Dict[str, str] = EMPTY_DICT) -> None:
->>>>>>> aa361d1485f4a914bc0bbc2e574becaec9a773ac
         """
         Shorthand API for adding files as data files to the table.
 

tests/integration/test_deletes.py

@@ -333,7 +333,7 @@ def test_delete_overwrite(session_catalog: RestCatalog) -> None:
     assert [snapshot.summary.operation for snapshot in tbl.snapshots()] == [
         Operation.APPEND,
         Operation.OVERWRITE,
-        Operation.OVERWRITE,
+        Operation.APPEND,
     ]
 
     assert tbl.scan().to_arrow()['ints'] == [[3, 4], [1]]

tests/integration/test_writes/test_writes.py

@@ -36,17 +36,12 @@
 from pyiceberg.catalog.hive import HiveCatalog
 from pyiceberg.catalog.sql import SqlCatalog
 from pyiceberg.exceptions import NoSuchTableError
-<<<<<<< HEAD
 from pyiceberg.io.pyarrow import _dataframe_to_data_files
-from pyiceberg.table import TableProperties
-=======
 from pyiceberg.partitioning import PartitionField, PartitionSpec
 from pyiceberg.schema import Schema
-from pyiceberg.table import TableProperties, _dataframe_to_data_files
+from pyiceberg.table import TableProperties
 from pyiceberg.transforms import IdentityTransform
 from pyiceberg.types import IntegerType, NestedField
-from tests.conftest import TEST_DATA_WITH_NULL
->>>>>>> aa361d1485f4a914bc0bbc2e574becaec9a773ac
 from utils import _create_table
 
 
@@ -194,7 +189,7 @@ def test_summaries(spark: SparkSession, session_catalog: Catalog, arrow_table_wi
     ).collect()
 
     operations = [row.operation for row in rows]
-    assert operations == ['append', 'append', 'delete', 'overwrite']
+    assert operations == ['append', 'append', 'delete', 'append']
 
     summaries = [row.summary for row in rows]
 
@@ -269,9 +264,9 @@ def test_data_files(spark: SparkSession, session_catalog: Catalog, arrow_table_w
     """
     ).collect()
 
-    assert [row.added_data_files_count for row in rows] == [1, 0, 1, 0, 1, 1]
-    assert [row.existing_data_files_count for row in rows] == [0, 0, 0, 0, 0, 0]
-    assert [row.deleted_data_files_count for row in rows] == [0, 1, 0, 1, 0, 0]
+    assert [row.added_data_files_count for row in rows] == [1, 0, 1, 1, 1]
+    assert [row.existing_data_files_count for row in rows] == [0, 0, 0, 0, 0]
+    assert [row.deleted_data_files_count for row in rows] == [0, 1, 0, 0, 0]
 
 
 @pytest.mark.integration
@@ -522,7 +517,7 @@ def test_summaries_with_only_nulls(
     ).collect()
 
     operations = [row.operation for row in rows]
-    assert operations == ['append', 'append', 'delete', 'overwrite']
+    assert operations == ['append', 'append', 'delete', 'append']
 
     summaries = [row.summary for row in rows]
 
@@ -788,7 +783,7 @@ def test_inspect_snapshots(
     assert df['parent_id'][0].as_py() is None
     assert df['parent_id'][1:].to_pylist() == df['snapshot_id'][:-1].to_pylist()
 
-    assert [operation.as_py() for operation in df['operation']] == ['append', 'delete', 'overwrite', 'append']
+    assert [operation.as_py() for operation in df['operation']] == ['append', 'delete', 'append', 'append']
 
     for manifest_list in df['manifest_list']:
         assert manifest_list.as_py().startswith("s3://")