ORC-562:Don't wrap readerSchema in acidSchema, if readerSchema is alr… #442
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
omalley
requested changes
Oct 29, 2019
| @@ -87,7 +87,8 @@ public SchemaEvolution(TypeDescription fileSchema, | |||
| this.fileSchema = fileSchema; | |||
| this.isAcid = checkAcidSchema(fileSchema); | |||
| this.includeAcidColumns = options.getIncludeAcidColumns(); | |||
| this.readerColumnOffset = isAcid ? acidEventFieldNames.size() : 0; | |||
| this.readerColumnOffset = (isAcid && readerSchema != null && checkAcidSchema(readerSchema)) || !isAcid | |||
There was a problem hiding this comment.
I'd suggest keeping the checkAcidSchema(readerSchema) rather than calling it multiple times. This expression needs to be simplified.
| @@ -87,7 +87,8 @@ public SchemaEvolution(TypeDescription fileSchema, | |||
| this.fileSchema = fileSchema; | |||
| this.isAcid = checkAcidSchema(fileSchema); | |||
| this.includeAcidColumns = options.getIncludeAcidColumns(); | |||
| this.readerColumnOffset = isAcid ? acidEventFieldNames.size() : 0; | |||
| this.readerColumnOffset = (isAcid && readerSchema != null && checkAcidSchema(readerSchema)) || !isAcid | |||
| ? 0 : acidEventFieldNames.size(); | |||
| if (readerSchema != null) { | |||
| if (isAcid) { | |||
There was a problem hiding this comment.
You probably want to cut out here with if (isAcid && !isReaderAcid) rather than change addEventSchema.
|
@omalley I changed the implementation and added new test. |
omalley
pushed a commit
that referenced
this pull request
Nov 5, 2019
…eady acid Fixes #442 Signed-off-by: Owen O'Malley <omalley@apache.org>
|
I've committed this. |
abstractdog
pushed a commit
to abstractdog/orc
that referenced
this pull request
Nov 6, 2019
…eady acid Fixes apache#442 Signed-off-by: Owen O'Malley <omalley@apache.org>
mustafaiman
pushed a commit
to mustafaiman/orc
that referenced
this pull request
Nov 18, 2019
…hema is already acid Fixes apache#442 Signed-off-by: Owen O'Malley <omalley@apache.org> (cherry picked from commit 2db32a8) Change-Id: Icfc548d19b0d0cc62b3e0e90ea164c791ece0a94
stiga-huang
pushed a commit
to stiga-huang/orc
that referenced
this pull request
Jan 18, 2020
…eady acid Fixes apache#442 Signed-off-by: Owen O'Malley <omalley@apache.org>
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.
…eady acid