rdblue commented on code in PR #6525:
URL: https://github.com/apache/iceberg/pull/6525#discussion_r1068439057
##########
python/pyiceberg/avro/reader.py:
##########
@@ -238,41 +249,50 @@ def skip(self, decoder: BinaryDecoder) -> None:
return self.option.skip(decoder)
-class StructProtocolReader(Reader):
- create_struct: Callable[[], StructProtocol]
- fields: Tuple[Tuple[Optional[int], Reader], ...]
+class StructReader(Reader):
+ field_readers: Tuple[Tuple[Optional[int], Reader], ...]
+ create_struct: Type[StructProtocol]
+ struct: Optional[StructType]
- def __init__(self, fields: Tuple[Tuple[Optional[int], Reader], ...],
create_struct: Callable[[], StructProtocol]):
- self.create_struct = create_struct
- self.fields = fields
-
- def create_or_reuse(self, reuse: Optional[StructProtocol]) ->
StructProtocol:
- if reuse:
- return reuse
- else:
- return self.create_struct()
+ def __init__(
+ self,
+ field_readers: Tuple[Tuple[Optional[int], Reader], ...],
+ create_struct: Optional[Type[StructProtocol]] = None,
+ struct: Optional[StructType] = None,
+ ):
+ self.field_readers = field_readers
+ self.create_struct = create_struct or Record
+ self.struct = struct
def read(self, decoder: BinaryDecoder) -> Any:
- struct = self.create_or_reuse(None)
+ struct = self.create_struct(self.struct)
+ if not isinstance(struct, StructProtocol):
+ raise ValueError(f"Expected struct to implement StructProtocol:
{struct}")
- for (pos, field) in self.fields:
+ for (pos, field) in self.field_readers:
if pos is not None:
- struct.set(pos, field.read(decoder)) # later: pass reuse in
here
+ struct[pos] = field.read(decoder)
Review Comment:
Can you add the TODO comment back?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
