Conflicts

Author: Fokko

pyiceberg/avro/file.py

@@ -284,14 +284,9 @@ def _write_header(self) -> None:
             codec = "deflate"
 
         json_schema = json.dumps(AvroSchemaConversion().iceberg_to_avro(self.file_schema, schema_name=self.schema_name))
-<<<<<<< Updated upstream
-        meta = {**self.metadata, _SCHEMA_KEY: json_schema, _CODEC_KEY: "null"}
+
+        meta = {**self.metadata, _SCHEMA_KEY: json_schema, AVRO_CODEC_KEY: codec}
         header = AvroFileHeader(MAGIC, meta, self.sync_bytes)
-=======
-        header = AvroFileHeader(
-            magic=MAGIC, meta={**self.metadata, _SCHEMA_KEY: json_schema, AVRO_CODEC_KEY: codec}, sync=self.sync_bytes
-        )
->>>>>>> Stashed changes
         construct_writer(META_SCHEMA).write(self.encoder, header)
 
     def compression_codec(self) -> Optional[Type[Codec]]:

pyiceberg/manifest.py

@@ -799,7 +799,6 @@ class ManifestWriter(ABC):
     _deleted_rows: int
     _min_sequence_number: Optional[int]
     _partitions: List[Record]
-    _reused_entry_wrapper: ManifestEntry
     _compression: AvroCompressionCodec
 
     def __init__(
@@ -824,11 +823,7 @@ def __init__(
         self._deleted_rows = 0
         self._min_sequence_number = None
         self._partitions = []
-<<<<<<< Updated upstream
-=======
-        self._reused_entry_wrapper = ManifestEntry()
         self._compression = avro_compression
->>>>>>> Stashed changes
 
     def __enter__(self) -> ManifestWriter:
         """Open the writer."""

pyiceberg/serializers.py

@@ -19,15 +19,13 @@
 import codecs
 import gzip
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Callable
+from typing import Callable
 
 from pyiceberg.io import InputFile, InputStream, OutputFile
+from pyiceberg.table.metadata import TableMetadata, TableMetadataUtil
 from pyiceberg.typedef import UTF8
 from pyiceberg.utils.config import Config
 
-if TYPE_CHECKING:
-    from pyiceberg.table.metadata import TableMetadata
-
 GZIP = "gzip"
 
 
@@ -81,7 +79,7 @@ class FromByteStream:
     @staticmethod
     def table_metadata(
         byte_stream: InputStream, encoding: str = UTF8, compression: Compressor = NOOP_COMPRESSOR
-    ) -> "TableMetadata":
+    ) -> TableMetadata:
         """Instantiate a TableMetadata object from a byte stream.
 
         Args:
@@ -94,16 +92,14 @@ def table_metadata(
             json_bytes = reader(byte_stream)
             metadata = json_bytes.read()
 
-        from pyiceberg.table.metadata import TableMetadataUtil
-
         return TableMetadataUtil.parse_raw(metadata)
 
 
 class FromInputFile:
     """A collection of methods that deserialize InputFiles into Iceberg objects."""
 
     @staticmethod
-    def table_metadata(input_file: InputFile, encoding: str = UTF8) -> "TableMetadata":
+    def table_metadata(input_file: InputFile, encoding: str = UTF8) -> TableMetadata:
         """Create a TableMetadata instance from an input file.
 
         Args:
@@ -124,7 +120,7 @@ class ToOutputFile:
     """A collection of methods that serialize Iceberg objects into files given an OutputFile instance."""
 
     @staticmethod
-    def table_metadata(metadata: "TableMetadata", output_file: OutputFile, overwrite: bool = False) -> None:
+    def table_metadata(metadata: TableMetadata, output_file: OutputFile, overwrite: bool = False) -> None:
         """Write a TableMetadata instance to an output file.
 
         Args: