Repository: spark Updated Branches: refs/heads/master c5443560b -> 08dc89361
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 <[email protected]> Closes #12701 from blazy2k9/master. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/08dc8936 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/08dc8936 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/08dc8936 Branch: refs/heads/master Commit: 08dc89361d4d78cfb5153b708bc563e34390cfc0 Parents: c544356 Author: Victor Chima <[email protected]> Authored: Wed Apr 27 16:52:34 2016 +0100 Committer: Sean Owen <[email protected]> Committed: Wed Apr 27 16:52:34 2016 +0100 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/SparkConf.scala | 3 ++- .../main/scala/org/apache/spark/serializer/KryoSerializer.scala | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/08dc8936/core/src/main/scala/org/apache/spark/SparkConf.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala index 4384a06..e671a3e 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(",")) http://git-wip-us.apache.org/repos/asf/spark/blob/08dc8936/core/src/main/scala/org/apache/spark/serializer/KryoSerializer.scala ---------------------------------------------------------------------- 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 918ae37..1fba552 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 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
