[BRANCH-1.1][SPARK-2652] change the default spark.serializer in pyspark back to Kryo

mengxr · mengxr · commit 11798d00f586 · 2014-11-10T22:21:14.000-08:00
This reverts #2916 . We shouldn't change the default settings in a minor release. JoshRosen davies Author: Xiangrui Meng <meng@databricks.com> Closes #3187 from mengxr/SPARK-2652-1.1 and squashes the following commits: 372166b [Xiangrui Meng] change the default spark.serializer in pyspark back to Kryo
diff --git a/python/pyspark/context.py b/python/pyspark/context.py
@@ -40,6 +40,7 @@
 # These are special default configs for PySpark, they will overwrite
 # the default ones for Spark if they are not configured by user.
 DEFAULT_CONFIGS = {
+    "spark.serializer": "org.apache.spark.serializer.KryoSerializer",
     "spark.serializer.objectStreamReset": 100,
     "spark.rdd.compress": True,
 }

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`# These are special default configs for PySpark, they will overwrite`
`41`	`41`	`# the default ones for Spark if they are not configured by user.`
`42`	`42`	`DEFAULT_CONFIGS = {`
	`43`	`+ "spark.serializer": "org.apache.spark.serializer.KryoSerializer",`
`43`	`44`	`"spark.serializer.objectStreamReset": 100,`
`44`	`45`	`"spark.rdd.compress": True,`
`45`	`46`	`}`