From 20ddf5fddf40b543edc61d6e4687988489dea64c Mon Sep 17 00:00:00 2001 From: Andrew Or Date: Thu, 24 Mar 2016 22:59:35 -0700 Subject: [SPARK-14014][SQL] Integrate session catalog (attempt #2) ## What changes were proposed in this pull request? This reopens #11836, which was merged but promptly reverted because it introduced flaky Hive tests. ## How was this patch tested? See `CatalogTestCases`, `SessionCatalogSuite` and `HiveContextSuite`. Author: Andrew Or Closes #11938 from andrewor14/session-catalog-again. --- .../org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/hive-thriftserver/src/main') diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala index 7fe31b0025..57693284b0 100644 --- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala +++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLCLIDriver.scala @@ -150,7 +150,8 @@ private[hive] object SparkSQLCLIDriver extends Logging { } if (sessionState.database != null) { - SparkSQLEnv.hiveContext.runSqlHive(s"USE ${sessionState.database}") + SparkSQLEnv.hiveContext.sessionState.catalog.setCurrentDatabase( + s"${sessionState.database}") } // Execute -i init files (always in silent mode) -- cgit v1.2.3