From 2ddd5d08b133a792f6f6ca2a7b77557c2467e5e7 Mon Sep 17 00:00:00 2001 From: Bryan Cutler Date: Fri, 20 May 2016 15:59:27 -0700 Subject: [PATCH 1/2] fixed shell context initialization when HiveConf not present --- python/pyspark/shell.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index ef46d3065e5e8..21df4284a77bf 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -44,9 +44,9 @@ .enableHiveSupport()\ .getOrCreate() except py4j.protocol.Py4JError: - spark = SparkSession(sc) + spark = SparkSession(SparkContext.getOrCreate()) except TypeError: - spark = SparkSession(sc) + spark = SparkSession(SparkContext.getOrCreate()) sc = spark.sparkContext atexit.register(lambda: sc.stop()) From 015c2448b6e07ff6ed7a1951b0f74f488e13edff Mon Sep 17 00:00:00 2001 From: Bryan Cutler Date: Fri, 20 May 2016 16:19:43 -0700 Subject: [PATCH 2/2] use builder instead to create SparkSession --- python/pyspark/shell.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index 21df4284a77bf..ac5ce87a3f0fd 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -44,9 +44,9 @@ .enableHiveSupport()\ .getOrCreate() except py4j.protocol.Py4JError: - spark = SparkSession(SparkContext.getOrCreate()) + spark = SparkSession.builder.getOrCreate() except TypeError: - spark = SparkSession(SparkContext.getOrCreate()) + spark = SparkSession.builder.getOrCreate() sc = spark.sparkContext atexit.register(lambda: sc.stop())