diff options
| author | Reynold Xin <rxin@databricks.com> | 2016-04-29 01:14:02 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2016-04-29 01:14:02 -0700 |
| commit | 054f991c4350af1350af7a4109ee77f4a34822f0 (patch) | |
| tree | ec40f69f6dae5ed63c7247027f47f0b2da9d49c7 /sql/catalyst/src | |
| parent | 2057cbcb0bc9d5a4fb66006c42457a556d0bb277 (diff) | |
| download | spark-054f991c4350af1350af7a4109ee77f4a34822f0.tar.gz spark-054f991c4350af1350af7a4109ee77f4a34822f0.tar.bz2 spark-054f991c4350af1350af7a4109ee77f4a34822f0.zip | |
[SPARK-14994][SQL] Remove execution hive from HiveSessionState
## What changes were proposed in this pull request?
This patch removes executionHive from HiveSessionState and HiveSharedState.
## How was this patch tested?
Updated test cases.
Author: Reynold Xin <rxin@databricks.com>
Author: Yin Huai <yhuai@databricks.com>
Closes #12770 from rxin/SPARK-14994.
Diffstat (limited to 'sql/catalyst/src')
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystConf.scala | 5 | ||||
| -rw-r--r-- | sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystConf.scala index 179dab11a2..4df100c2a8 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystConf.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/CatalystConf.scala @@ -34,6 +34,8 @@ trait CatalystConf { def runSQLonFile: Boolean + def warehousePath: String + /** * Returns the [[Resolver]] for the current configuration, which can be used to determine if two * identifiers are equal. @@ -52,5 +54,6 @@ case class SimpleCatalystConf( optimizerMaxIterations: Int = 100, optimizerInSetConversionThreshold: Int = 10, maxCaseBranchesForCodegen: Int = 20, - runSQLonFile: Boolean = true) + runSQLonFile: Boolean = true, + warehousePath: String = "/user/hive/warehouse") extends CatalystConf diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala index d7fd54308a..b06f24bc48 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala @@ -125,7 +125,7 @@ class SessionCatalog( } def getDefaultDBPath(db: String): String = { - System.getProperty("java.io.tmpdir") + File.separator + db + ".db" + new Path(new Path(conf.warehousePath), db + ".db").toString } // ---------------------------------------------------------------------------- |