Fix some bugs in union resolution #3583
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
quodlibetor
approved these changes
Jul 11, 2020
| @@ -556,24 +556,21 @@ impl<'a> SchemaResolver<'a> { | |||
| SchemaPieceRefOrNamed::Piece(SchemaPiece::Union(w_inner)), | |||
| SchemaPieceRefOrNamed::Piece(SchemaPiece::Union(r_inner)), | |||
| ) => { | |||
| // TODO (brennan) - can we avoid cloning this? | |||
| let w2r = self.writer_to_reader_names.clone(); | |||
| let permutation = w_inner | |||
There was a problem hiding this comment.
I know that this permutation is described in the comment above, but possibly having a simple comment like // Some(val) iff piece is resolvable in both reader and writer, else None would help me understand this logic.
src/avro/src/reader.rs
Outdated
Comment on lines
753
to
754
| // This could have just been a "?", except that we need to clean up | ||
| // the placeholder values that were added above. |
There was a problem hiding this comment.
micronit TIOLI: this could just be // clean the placeholder values that were added above
quodlibetor
approved these changes
Jul 11, 2020
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.
First bug (reader.rs lines 559-576): In Union-Union resolution, we filter out non-matching unions schemas, instead of writing "None" into the permutation.
This is probably just because I was trying to be too clever and write everything in terms of hard-to-understand iterator chaining, and a "flat_map" crept in there that doesn't semantically make sense. In this PR we replace the complicated and wrong code with simpler and correct code
Second bug (reader.rs line 753): If resolution of any branch of a union fails, we return early from this function, but the error is caught and handled above (to allow other branches to possibly succeed). Thus, before returning, we need to put the resolver back into a consistent state.
This change is