You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2015/10/14 21:19:51 UTC
spark git commit: [SPARK-10845] [SQL] Makes spark.sql.hive.version a
SQLConfEntry
Repository: spark
Updated Branches:
refs/heads/branch-1.5 ad5bf0efb -> f36624983
[SPARK-10845] [SQL] Makes spark.sql.hive.version a SQLConfEntry
When refactoring SQL options from plain strings to the strongly typed `SQLConfEntry`, `spark.sql.hive.version` wasn't migrated, and doesn't show up in the result of `SET -v`, as `SET -v` only shows public `SQLConfEntry` instances. This affects compatibility with Simba ODBC driver.
This PR migrates this SQL option as a `SQLConfEntry` to fix this issue.
Author: Cheng Lian <li...@databricks.com>
Closes #8925 from liancheng/spark-10845/hive-version-conf.
(cherry picked from commit 6f94d56a95e8c3a410a8d0c6a24ccca043227ba9)
Signed-off-by: Reynold Xin <rx...@databricks.com>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f3662498
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f3662498
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f3662498
Branch: refs/heads/branch-1.5
Commit: f36624983caf5c3196e4efa8b490337ee43b9e28
Parents: ad5bf0e
Author: Cheng Lian <li...@databricks.com>
Authored: Sat Sep 26 19:08:55 2015 -0700
Committer: Reynold Xin <rx...@databricks.com>
Committed: Wed Oct 14 12:19:42 2015 -0700
----------------------------------------------------------------------
.../hive/thriftserver/HiveThriftServer2.scala | 1 -
.../thriftserver/HiveThriftServer2Suites.scala | 27 ++++++++++++++++++++
.../org/apache/spark/sql/hive/HiveContext.scala | 5 ++++
3 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/f3662498/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
----------------------------------------------------------------------
diff --git a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
index a0643ce..a4fd0c3 100644
--- a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
+++ b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2.scala
@@ -55,7 +55,6 @@ object HiveThriftServer2 extends Logging {
@DeveloperApi
def startWithContext(sqlContext: HiveContext): Unit = {
val server = new HiveThriftServer2(sqlContext)
- sqlContext.setConf("spark.sql.hive.version", HiveContext.hiveExecutionVersion)
server.init(sqlContext.hiveconf)
server.start()
listener = new HiveThriftServer2Listener(server, sqlContext.conf)
http://git-wip-us.apache.org/repos/asf/spark/blob/f3662498/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala
----------------------------------------------------------------------
diff --git a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala
index b72249b..19b2f24 100644
--- a/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala
+++ b/sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/HiveThriftServer2Suites.scala
@@ -21,6 +21,7 @@ import java.io.File
import java.net.URL
import java.sql.{Date, DriverManager, SQLException, Statement}
+import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.ExecutionContext.Implicits.global
import scala.concurrent.duration._
@@ -431,6 +432,32 @@ class HiveThriftBinaryServerSuite extends HiveThriftJdbcTest {
}
)
}
+
+ test("Checks Hive version via SET -v") {
+ withJdbcStatement { statement =>
+ val resultSet = statement.executeQuery("SET -v")
+
+ val conf = mutable.Map.empty[String, String]
+ while (resultSet.next()) {
+ conf += resultSet.getString(1) -> resultSet.getString(2)
+ }
+
+ assert(conf.get("spark.sql.hive.version") === Some("1.2.1"))
+ }
+ }
+
+ test("Checks Hive version via SET") {
+ withJdbcStatement { statement =>
+ val resultSet = statement.executeQuery("SET")
+
+ val conf = mutable.Map.empty[String, String]
+ while (resultSet.next()) {
+ conf += resultSet.getString(1) -> resultSet.getString(2)
+ }
+
+ assert(conf.get("spark.sql.hive.version") === Some("1.2.1"))
+ }
+ }
}
class HiveThriftHttpServerSuite extends HiveThriftJdbcTest {
http://git-wip-us.apache.org/repos/asf/spark/blob/f3662498/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
----------------------------------------------------------------------
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
index 0ea9252..5dc3d81 100644
--- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
+++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
@@ -610,6 +610,11 @@ private[hive] object HiveContext {
doc = "Version of the Hive metastore. Available options are " +
s"<code>0.12.0</code> through <code>$hiveExecutionVersion</code>.")
+ val HIVE_EXECUTION_VERSION = stringConf(
+ key = "spark.sql.hive.version",
+ defaultValue = Some(hiveExecutionVersion),
+ doc = "Version of Hive used internally by Spark SQL.")
+
val HIVE_METASTORE_JARS = stringConf("spark.sql.hive.metastore.jars",
defaultValue = Some("builtin"),
doc = s"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org