Repository: spark Updated Branches: refs/heads/branch-1.1 d313be8f9 -> 11798d00f
[BRANCH-1.1][SPARK-2652] change the default spark.serializer in pyspark back to Kryo This reverts #2916 . We shouldn't change the default settings in a minor release. JoshRosen davies Author: Xiangrui Meng <[email protected]> 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 Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/11798d00 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/11798d00 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/11798d00 Branch: refs/heads/branch-1.1 Commit: 11798d00f586d0edfaac1e8f35273679c3012a9d Parents: d313be8 Author: Xiangrui Meng <[email protected]> Authored: Mon Nov 10 22:21:14 2014 -0800 Committer: Xiangrui Meng <[email protected]> Committed: Mon Nov 10 22:21:14 2014 -0800 ---------------------------------------------------------------------- python/pyspark/context.py | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/11798d00/python/pyspark/context.py ---------------------------------------------------------------------- diff --git a/python/pyspark/context.py b/python/pyspark/context.py index 357626e..82f76de 100644 --- a/python/pyspark/context.py +++ b/python/pyspark/context.py @@ -40,6 +40,7 @@ from py4j.java_collections import ListConverter # 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, } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
