aboutsummaryrefslogtreecommitdiff
path: root/sql/hive
diff options
context:
space:
mode:
authorCheng Lian <lian@databricks.com>2015-09-26 19:08:55 -0700
committerCheng Lian <lian@databricks.com>2015-09-26 19:08:55 -0700
commit6f94d56a95e8c3a410a8d0c6a24ccca043227ba9 (patch)
tree78c3dc4253db226fc04a9d8d7cf1af15d54d8d0f /sql/hive
parent6fcee906d2afb5d5c3c49e0a669637a87e82b910 (diff)
downloadspark-6f94d56a95e8c3a410a8d0c6a24ccca043227ba9.tar.gz
spark-6f94d56a95e8c3a410a8d0c6a24ccca043227ba9.tar.bz2
spark-6f94d56a95e8c3a410a8d0c6a24ccca043227ba9.zip
[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 <lian@databricks.com> Closes #8925 from liancheng/spark-10845/hive-version-conf.
Diffstat (limited to 'sql/hive')
-rw-r--r--sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala5
1 files changed, 5 insertions, 0 deletions
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 c12a734863..c75025e79a 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"""