diff options
| author | Victor Chima <blazy2k9@gmail.com> | 2016-04-27 16:52:34 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2016-04-27 16:52:34 +0100 |
| commit | 08dc89361d4d78cfb5153b708bc563e34390cfc0 (patch) | |
| tree | a0fce72e0b33828c8bbd5d005ce3b44c9ae06706 /core | |
| parent | c5443560b7784473555e930a1ae65bf814ac27e5 (diff) | |
| download | spark-08dc89361d4d78cfb5153b708bc563e34390cfc0.tar.gz spark-08dc89361d4d78cfb5153b708bc563e34390cfc0.tar.bz2 spark-08dc89361d4d78cfb5153b708bc563e34390cfc0.zip | |
Unintentional white spaces in kryo classes configuration parameters
## What changes were proposed in this pull request?
Pruned off white spaces present in the user provided comma separated list of classes for **spark.kryo.classesToRegister** and **spark.kryo.registrator**.
## How was this patch tested?
Manual tests
Author: Victor Chima <blazy2k9@gmail.com>
Closes #12701 from blazy2k9/master.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkConf.scala | 3 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala index 4384a06bd7..e671a3e95a 100644 --- a/core/src/main/scala/org/apache/spark/SparkConf.scala +++ b/core/src/main/scala/org/apache/spark/SparkConf.scala @@ -191,7 +191,8 @@ class SparkConf(loadDefaults: Boolean) extends Cloneable with Logging { */ def registerKryoClasses(classes: Array[Class[_]]): SparkConf = { val allClassNames = new LinkedHashSet[String]() - allClassNames ++= get("spark.kryo.classesToRegister", "").split(',').filter(!_.isEmpty) + allClassNames ++= get("spark.kryo.classesToRegister", "").split(',').map(_.trim) + .filter(!_.isEmpty) allClassNames ++= classes.map(_.getName) set("spark.kryo.classesToRegister", allClassNames.mkString(",")) diff --git a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala index 918ae376f6..1fba552f70 100644 --- a/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala +++ b/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala @@ -71,10 +71,10 @@ class KryoSerializer(conf: SparkConf) private val referenceTracking = conf.getBoolean("spark.kryo.referenceTracking", true) private val registrationRequired = conf.getBoolean("spark.kryo.registrationRequired", false) private val userRegistrators = conf.get("spark.kryo.registrator", "") - .split(',') + .split(',').map(_.trim) .filter(!_.isEmpty) private val classesToRegister = conf.get("spark.kryo.classesToRegister", "") - .split(',') + .split(',').map(_.trim) .filter(!_.isEmpty) private val avroSchemas = conf.getAvroSchema |