diff options
| author | Andrew Ray <ray.andrew@gmail.com> | 2016-12-13 15:49:22 +0800 |
|---|---|---|
| committer | Wenchen Fan <wenchen@databricks.com> | 2016-12-13 15:49:22 +0800 |
| commit | 46d30ac4846b3ec94426cc482c42cff72ebd6d92 (patch) | |
| tree | a550dd247c5bb0b0d2cb8f404cce8bcea701630b /sql/catalyst/src | |
| parent | 2aa16d03db79a642cbe21f387441c34fc51a8236 (diff) | |
| download | spark-46d30ac4846b3ec94426cc482c42cff72ebd6d92.tar.gz spark-46d30ac4846b3ec94426cc482c42cff72ebd6d92.tar.bz2 spark-46d30ac4846b3ec94426cc482c42cff72ebd6d92.zip | |
[SPARK-18717][SQL] Make code generation for Scala Map work with immutable.Map also
## What changes were proposed in this pull request?
Fixes compile errors in generated code when user has case class with a `scala.collections.immutable.Map` instead of a `scala.collections.Map`. Since ArrayBasedMapData.toScalaMap returns the immutable version we can make it work with both.
## How was this patch tested?
Additional unit tests.
Author: Andrew Ray <ray.andrew@gmail.com>
Closes #16161 from aray/fix-map-codegen.
Diffstat (limited to 'sql/catalyst/src')
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala index 6e20096901..ad218cf88d 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/ScalaReflection.scala @@ -342,7 +342,7 @@ object ScalaReflection extends ScalaReflection { StaticInvoke( ArrayBasedMapData.getClass, - ObjectType(classOf[Map[_, _]]), + ObjectType(classOf[scala.collection.immutable.Map[_, _]]), "toScalaMap", keyData :: valueData :: Nil) |