Merge pull request #43 from Tubular/fix/enable-setting-override

FIX make it possible to override spark.sql.catalogImplementation
tubular · Jun 2, 2017 · c892c7e · c892c7e
2 parents ba137da + 4370a95
commit c892c7e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.0.4
+* Make it possible to override default value of spark.sql.catalogImplementation
+
 ## 2.0.3
 * Add KafkaWatcher to facilitate testing of writing to Kafka
 * Fix a few minor pyflakes warnings and typos

diff --git a/sparkly/__init__.py b/sparkly/__init__.py
@@ -19,4 +19,4 @@
 assert SparklySession
 
 
-__version__ = '2.0.3'
+__version__ = '2.0.4'
diff --git a/sparkly/session.py b/sparkly/session.py
@@ -74,8 +74,8 @@ def __init__(self, additional_options=None):
 
         # Init SparkContext
         spark_conf = SparkConf()
-        spark_conf.setAll(self._setup_options(additional_options))
         spark_conf.set('spark.sql.catalogImplementation', 'hive')
+        spark_conf.setAll(self._setup_options(additional_options))
         spark_context = SparkContext(conf=spark_conf)
 
         # Init HiveContext