diff options
| author | Xiangrui Meng <meng@databricks.com> | 2014-11-10 22:21:14 -0800 |
|---|---|---|
| committer | Xiangrui Meng <meng@databricks.com> | 2014-11-10 22:21:14 -0800 |
| commit | 11798d00f586d0edfaac1e8f35273679c3012a9d (patch) | |
| tree | 7542a091968dfaf815d165cdccefb5bda4bd17cd /python | |
| parent | d313be8f968807578d45331a016f3fd4e2fbe985 (diff) | |
| download | spark-11798d00f586d0edfaac1e8f35273679c3012a9d.tar.gz spark-11798d00f586d0edfaac1e8f35273679c3012a9d.tar.bz2 spark-11798d00f586d0edfaac1e8f35273679c3012a9d.zip | |
[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 <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
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/context.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/python/pyspark/context.py b/python/pyspark/context.py index 357626edc9..82f76de31a 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, } |