diff options
| author | Liang-Chi Hsieh <viirya@gmail.com> | 2015-04-11 14:50:50 -0700 |
|---|---|---|
| committer | Michael Armbrust <michael@databricks.com> | 2015-04-11 14:50:50 -0700 |
| commit | 198cf2a3fa9babb5e8b7b44da0471b63b9f3ec04 (patch) | |
| tree | 9186a7e22020ebb76ca27dfa70077148051d3765 /sql | |
| parent | 3ceb810aa8e69bc4abb69cbe713a624cb351cb35 (diff) | |
| download | spark-198cf2a3fa9babb5e8b7b44da0471b63b9f3ec04.tar.gz spark-198cf2a3fa9babb5e8b7b44da0471b63b9f3ec04.tar.bz2 spark-198cf2a3fa9babb5e8b7b44da0471b63b9f3ec04.zip | |
[SPARK-6858][SQL] Register Java HashMap for SparkSqlSerializer
Since now kyro serializer is used for `GeneralHashedRelation` whether kyro is enabled or not, it is better to register Java `HashMap` in `SparkSqlSerializer`.
Author: Liang-Chi Hsieh <viirya@gmail.com>
Closes #5465 from viirya/register_hashmap and squashes the following commits:
9062601 [Liang-Chi Hsieh] Register Java HashMap for SparkSqlSerializer.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlSerializer.scala | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlSerializer.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlSerializer.scala index 347e2f4a1a..914f387dec 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlSerializer.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/SparkSqlSerializer.scala @@ -18,6 +18,7 @@ package org.apache.spark.sql.execution import java.nio.ByteBuffer +import java.util.{HashMap => JavaHashMap} import org.apache.spark.sql.types.Decimal @@ -54,6 +55,7 @@ private[sql] class SparkSqlSerializer(conf: SparkConf) extends KryoSerializer(co kryo.register(classOf[org.apache.spark.util.collection.OpenHashSet[_]], new OpenHashSetSerializer) kryo.register(classOf[Decimal]) + kryo.register(classOf[JavaHashMap[_, _]]) kryo.setReferences(false) kryo |