diff options
author | Andrew Or <andrew@databricks.com> | 2016-03-23 22:21:15 -0700 |
---|---|---|
committer | Andrew Or <andrew@databricks.com> | 2016-03-23 22:21:15 -0700 |
commit | c44d140cae99d0b880e6d25f158125ad3adc6a05 (patch) | |
tree | 7f0e5324e67efeff2cccf661cd27a21c3618098c /sql/hive-thriftserver/src | |
parent | cf823bead18c5be86b36da59b4bbf935c4804d04 (diff) | |
download | spark-c44d140cae99d0b880e6d25f158125ad3adc6a05.tar.gz spark-c44d140cae99d0b880e6d25f158125ad3adc6a05.tar.bz2 spark-c44d140cae99d0b880e6d25f158125ad3adc6a05.zip |
Revert "[SPARK-14014][SQL] Replace existing catalog with SessionCatalog"
This reverts commit 5dfc01976bb0d72489620b4f32cc12d620bb6260.
Diffstat (limited to 'sql/hive-thriftserver/src')
2 files changed, 5 insertions, 3 deletions
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 57693284b0..7fe31b0025 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,8 +150,7 @@ private[hive] object SparkSQLCLIDriver extends Logging { } if (sessionState.database != null) { - SparkSQLEnv.hiveContext.sessionState.catalog.setCurrentDatabase( - s"${sessionState.database}") + SparkSQLEnv.hiveContext.runSqlHive(s"USE ${sessionState.database}") } // Execute -i init files (always in silent mode) diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala index 8e1ebe2937..032965d0d9 100644 --- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala +++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/CliSuite.scala @@ -193,7 +193,10 @@ class CliSuite extends SparkFunSuite with BeforeAndAfterAll with Logging { ) runCliWithin(2.minute, Seq("--database", "hive_test_db", "-e", "SHOW TABLES;"))( - "" -> "hive_test" + "" + -> "OK", + "" + -> "hive_test" ) } |