Fokko commented on code in PR #40:
URL: https://github.com/apache/iceberg-python/pull/40#discussion_r1350771798
##########
pyiceberg/avro/resolver.py:
##########
@@ -233,7 +255,107 @@ def skip(self, decoder: BinaryDecoder) -> None:
pass
-class SchemaResolver(PrimitiveWithPartnerVisitor[IcebergType, Reader]):
+class WriteSchemaResolver(PrimitiveWithPartnerVisitor[IcebergType, Writer]):
+ def schema(self, schema: Schema, expected_schema: Optional[IcebergType],
result: Writer) -> Writer:
+ return result
+
+ def struct(self, struct: StructType, provided_struct:
Optional[IcebergType], field_writers: List[Writer]) -> Writer:
+ if not isinstance(provided_struct, StructType):
+ raise ResolveError(f"File/write schema are not aligned for struct,
got {provided_struct}")
+
+ provided_struct_positions: Dict[int, int] = {field.field_id: pos for
pos, field in enumerate(provided_struct.fields)}
+
+ results: List[Tuple[Optional[int], Writer]] = []
+ iter(field_writers)
+
+ for pos, write_field in enumerate(struct.fields):
+ if write_field.field_id in provided_struct_positions:
+
results.append((provided_struct_positions[write_field.field_id],
field_writers[pos]))
+ else:
+ # There is a default value
+ if isinstance(write_field, NestedField) and
write_field.write_default is not None:
+ # The field is not in the record, but there is a write
default value
+ default_writer = DefaultWriter(
+ writer=visit(write_field.field_type,
CONSTRUCT_WRITER_VISITOR), value=write_field.write_default
Review Comment:
Thanks, we can do that quite easily by saying that it only accepts an `L`
that we already have in Typedef:
```python
# Represents the literal value
L = TypeVar("L", str, bool, int, float, bytes, UUID, Decimal, covariant=True)
# and in the nested-field:
write_default: Optional[L] = Field(alias="write-default", default=None,
repr=False)
```
I've also added a test:
```python
with pytest.raises(pydantic_core.ValidationError) as exc_info:
_ = NestedField(
1,
"field",
StringType(),
required=True,
write_default=(1, "a", True)
)
assert "validation errors for NestedField" in str(exc_info.value)
```
--
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]
