Map AvroSchema to Arrow (#4886) #5009
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tustvold
commented
Oct 30, 2023
| @@ -27,6 +27,8 @@ mod schema; | |||
|
|
|||
| mod compression; | |||
|
|
|||
| mod codec; | |||
There was a problem hiding this comment.
This is all kept crate-private to allow us to revisit this design as things evolve
tustvold
commented
Oct 30, 2023
Comment on lines
-97
to
-98
| #[serde(borrow)] | ||
| Union(Vec<Schema<'a>>), |
There was a problem hiding this comment.
This was a mistake, Unions are encoded at a higher-level
tustvold
commented
Oct 30, 2023
| /// To accommodate this we special case two-variant unions where one of the | ||
| /// variants is the null type, and use this to derive arrow's notion of nullability | ||
| #[derive(Debug, Copy, Clone)] | ||
| enum Nulls { |
There was a problem hiding this comment.
This whole setup is rather annoying, but necessary to provide a reasonable API
tustvold
commented
Oct 30, 2023
arrow-avro/src/codec.rs
Outdated
| // https://avro.apache.org/docs/1.11.1/specification/#logical-types | ||
| match (t.attributes.logical_type, &mut meta.codec) { | ||
| (Some("decimal"), c @ Codec::Fixed(_)) => { | ||
| return Err(ArrowError::NotYetImplemented(format!( |
There was a problem hiding this comment.
I don't intend to support decimals in a first version of this crate
crepererum
reviewed
Nov 1, 2023
arrow-avro/src/codec.rs
Outdated
Comment on lines
141
to
161
| #[derive(Debug, Default)] | ||
| struct Resolver<'a> { | ||
| map: HashMap<(&'a str, &'a str), AvroField>, | ||
| } | ||
|
|
||
| impl<'a> Resolver<'a> { | ||
| fn register(&mut self, name: &'a str, namespace: Option<&'a str>, schema: AvroField) { | ||
| self.map.insert((name, namespace.unwrap_or("")), schema); | ||
| } | ||
|
|
||
| fn resolve(&self, name: &str, namespace: Option<&'a str>) -> Result<AvroField, ArrowError> { | ||
| let (namespace, name) = name | ||
| .rsplit_once('.') | ||
| .unwrap_or_else(|| (namespace.unwrap_or(""), name)); | ||
|
|
||
| self.map | ||
| .get(&(namespace, name)) | ||
| .ok_or_else(|| ArrowError::ParseError(format!("Failed to resolve {namespace}.{name}"))) | ||
| .cloned() | ||
| } | ||
| } |
There was a problem hiding this comment.
This could use some docstrings. For once: what's a namespace and why is the top-level namespace item?
|
Looks good to me overall. Btw does it even matter which position the null union is in (0,1), I guess you're keeping it to map correctly to the input. |
crepererum
approved these changes
Jan 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Part of #4886
Rationale for this change
The logic to map an avro schema to arrow is not entirely straightforward, this PR adds the logic necessary to perform this transformation.
What changes are included in this PR?
Are there any user-facing changes?