[SPARK-20125][SQL] Dataset of type option of map does not work #17454
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
|
cc @liancheng |
|
Test build #75307 has finished for PR 17454 at commit
|
|
LGTM, merging to master and branch-2.1. Thanks! |
|
This PR conflicts with branch-2.1, trying to resolve manually while merging. |
asfgit
pushed a commit
that referenced
this pull request
Mar 28, 2017
When we build the deserializer expression for map type, we will use `StaticInvoke` to call `ArrayBasedMapData.toScalaMap`, and declare the return type as `scala.collection.immutable.Map`. If the map is inside an Option, we will wrap this `StaticInvoke` with `WrapOption`, which requires the input to be `scala.collect.Map`. Ideally this should be fine, as `scala.collection.immutable.Map` extends `scala.collect.Map`, but our `ObjectType` is too strict about this, this PR fixes it. new regression test Author: Wenchen Fan <wenchen@databricks.com> Closes #17454 from cloud-fan/map. (cherry picked from commit d4fac41) Signed-off-by: Cheng Lian <lian@databricks.com>
|
OK, resolved the conflict manually and merged to branch-2.1. |
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.
What changes were proposed in this pull request?
When we build the deserializer expression for map type, we will use
StaticInvoketo callArrayBasedMapData.toScalaMap, and declare the return type asscala.collection.immutable.Map. If the map is inside an Option, we will wrap thisStaticInvokewithWrapOption, which requires the input to bescala.collect.Map. Ideally this should be fine, asscala.collection.immutable.Mapextendsscala.collect.Map, but ourObjectTypeis too strict about this, this PR fixes it.How was this patch tested?
new regression test