Skip to content

[KYUUBI #6263] Use HiveConf.getConfVars or Hive conf names directly #6827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Madhukar525722 wants to merge 1 commit into from
Closed

[KYUUBI #6263] Use HiveConf.getConfVars or Hive conf names directly #6827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...extension-spark-3-3/src/test/scala/org/apache/spark/sql/KyuubiSparkSQLExtensionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ trait KyuubiSparkSQLExtensionTest extends QueryTest
.set("spark.hadoop.hive.exec.dynamic.partition.mode", "nonstrict")
.set("spark.hadoop.hive.metastore.client.capability.check", "false")
.set(
ConfVars.METASTORECONNECTURLKEY.varname,
"javax.jdo.option.ConnectionURL",
s"jdbc:derby:;databaseName=$metastorePath;create=true")
.set(StaticSQLConf.WAREHOUSE_PATH, warehousePath)
.set("spark.ui.enabled", "false")
Expand Down
2 changes: 1 addition & 1 deletion ...extension-spark-3-4/src/test/scala/org/apache/spark/sql/KyuubiSparkSQLExtensionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ trait KyuubiSparkSQLExtensionTest extends QueryTest
.set("spark.hadoop.hive.exec.dynamic.partition.mode", "nonstrict")
.set("spark.hadoop.hive.metastore.client.capability.check", "false")
.set(
ConfVars.METASTORECONNECTURLKEY.varname,
"javax.jdo.option.ConnectionURL",
s"jdbc:derby:;databaseName=$metastorePath;create=true")
.set(StaticSQLConf.WAREHOUSE_PATH, warehousePath)
.set("spark.ui.enabled", "false")
Expand Down
2 changes: 1 addition & 1 deletion ...extension-spark-3-5/src/test/scala/org/apache/spark/sql/KyuubiSparkSQLExtensionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ trait KyuubiSparkSQLExtensionTest extends QueryTest
.set("spark.hadoop.hive.exec.dynamic.partition.mode", "nonstrict")
.set("spark.hadoop.hive.metastore.client.capability.check", "false")
.set(
ConfVars.METASTORECONNECTURLKEY.varname,
"javax.jdo.option.ConnectionURL",
s"jdbc:derby:;databaseName=$metastorePath;create=true")
.set(StaticSQLConf.WAREHOUSE_PATH, warehousePath)
.set("spark.ui.enabled", "false")
Expand Down
4 changes: 2 additions & 2 deletions ...tor-hive/src/main/scala/org/apache/kyuubi/spark/connector/hive/write/HiveBatchWrite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ class HiveBatchWrite(

if (overwrite && table.tableType == CatalogTableType.EXTERNAL) {
val numWrittenParts = writtenParts.size
val maxDynamicPartitionsKey = HiveConf.ConfVars.DYNAMICPARTITIONMAXPARTS.varname
val maxDynamicPartitionsKey = "hive.exec.dynamic.partition.max.partitions"
val maxDynamicPartitions = hadoopConf.getInt(
maxDynamicPartitionsKey,
HiveConf.ConfVars.DYNAMICPARTITIONMAXPARTS.defaultIntVal)
HiveConf.getInt("hive.exec.dynamic.partition.max.partitions"))
if (numWrittenParts > maxDynamicPartitions) {
throw KyuubiHiveConnectorException(
s"Number of dynamic partitions created is $numWrittenParts, " +
Expand Down
3 changes: 1 addition & 2 deletions ...kyuubi-spark-lineage/src/test/scala/org/apache/spark/sql/SparkListenerExtensionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.apache.spark.sql

import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.spark.SparkConf
import org.apache.spark.sql.internal.StaticSQLConf
import org.apache.spark.util.Utils
Expand All @@ -35,7 +34,7 @@ trait SparkListenerExtensionTest {
.master("local")
.config("spark.ui.enabled", "false")
.config(
ConfVars.METASTORECONNECTURLKEY.varname,
"javax.jdo.option.ConnectionURL",
s"jdbc:derby:;databaseName=$metastorePath;create=true")
.config("spark.sql.catalogImplementation", catalogImpl)
.config(StaticSQLConf.WAREHOUSE_PATH.key, warehousePath)
Expand Down
5 changes: 3 additions & 2 deletions ...-engine/src/main/scala/org/apache/kyuubi/engine/hive/operation/HiveOperationManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.kyuubi.engine.hive.operation

import java.util.List

import org.apache.hadoop.hive.conf.HiveConf.ConfVars
import org.apache.hadoop.hive.conf.HiveConf

import org.apache.kyuubi.config.KyuubiConf._
import org.apache.kyuubi.engine.hive.session.HiveSessionImpl
Expand Down Expand Up @@ -162,6 +162,7 @@ class HiveOperationManager() extends OperationManager("HiveOperationManager") {
override def getQueryId(operation: Operation): String = {
val hiveOperation = operation.asInstanceOf[HiveOperation]
val internalHiveOperation = hiveOperation.internalHiveOperation
internalHiveOperation.getParentSession.getHiveConf.getVar(ConfVars.HIVEQUERYID)
internalHiveOperation.getParentSession.getHiveConf.getVar(
HiveConf.getConfVars("hive.query.id"))
}
}
Loading