Handle default warehouse path in SQLConf

apache · Dec 15, 2016 · 1d0d1d2 · 1d0d1d2
1 parent 2583410
commit 1d0d1d2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/core/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -819,7 +819,13 @@ private[sql] class SQLConf extends Serializable with CatalystConf with Logging {
 
   def variableSubstituteDepth: Int = getConf(VARIABLE_SUBSTITUTE_DEPTH)
 
-  def warehousePath: String = new Path(getConf(StaticSQLConf.DEFAULT_WAREHOUSE_PATH)).toString
+  def warehousePath: String = {
+    if (contains(StaticSQLConf.WAREHOUSE_PATH.key)) {
+      new Path(getConf(StaticSQLConf.WAREHOUSE_PATH).get).toString
+    } else {
+      new Path(getConf(StaticSQLConf.DEFAULT_WAREHOUSE_PATH)).toString
+    }
+  }
 
   def ignoreCorruptFiles: Boolean = getConf(IGNORE_CORRUPT_FILES)