Fixing a scala compilation problem #1855
Merged
Conversation
This file contains hidden or 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
|
Specifically, this was failing on the 7.17 branch: |
jbaiera
approved these changes
Jan 6, 2022
| case Some(None) => false | ||
| case Some(_) => true | ||
| case None => true | ||
| case _ => false |
There was a problem hiding this comment.
Is the catch all needed here? This confused me for a second
| @@ -61,7 +61,14 @@ class ScalaValueWriter(writeUnknownTypes: Boolean = false) extends JdkValueWrite | |||
| generator.writeBeginObject() | |||
| for ((k, v) <- m) { | |||
| if (shouldKeep(parentField, k.toString)) { | |||
| if (v != None && v!= null && v != () || hasWriteNullValues) { | |||
| val nonEmptyValue = Option(v) match { | |||
There was a problem hiding this comment.
Suggested change
| val nonEmptyValue = Option(v) match { | |
| val hasValue = Option(v) match { |
Can we swap the variable name? nonEmptyValue=false reads weird in my head
| case None => true | ||
| case _ => false | ||
| } | ||
| if (nonEmptyValue || hasWriteNullValues) { |
There was a problem hiding this comment.
Suggested change
| if (nonEmptyValue || hasWriteNullValues) { | |
| if (hasValue || hasWriteNullValues) { |
If applying above suggestion
|
Relates #1478 |
masseyke
added a commit
to masseyke/elasticsearch-hadoop
that referenced
this pull request
Jan 6, 2022
Fixing a scala compilation problem that happened with certain scala compilers.
masseyke
added a commit
to masseyke/elasticsearch-hadoop
that referenced
this pull request
Jan 6, 2022
Fixing a scala compilation problem that happened with certain scala compilers.
masseyke
added a commit
that referenced
this pull request
Jan 6, 2022
masseyke
added a commit
that referenced
this pull request
Jan 6, 2022
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.
The code in ScalaValueWriter::doWriteScala was not compiling on the 7.17 branch. The problem is that the () reference to Unit was confusing the compiler. This commit makes the reference to Unit more explicit, and adds a test to make sure that Unit is being handled as expected.