[SPARK-24360][SQL] Support Hive 3.1 metastore #23694
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,6 +40,7 @@ import org.apache.hadoop.hive.serde.serdeConstants | |
|
|
||
| import org.apache.spark.internal.Logging | ||
| import org.apache.spark.sql.AnalysisException | ||
| import org.apache.spark.sql.SparkSession | ||
| import org.apache.spark.sql.catalyst.FunctionIdentifier | ||
| import org.apache.spark.sql.catalyst.analysis.NoSuchPermanentFunctionException | ||
| import org.apache.spark.sql.catalyst.catalog.{CatalogFunction, CatalogTablePartition, CatalogUtils, FunctionResource, FunctionResourceType} | ||
|
|
@@ -1179,3 +1180,128 @@ private[client] class Shim_v2_1 extends Shim_v2_0 { | |
| private[client] class Shim_v2_2 extends Shim_v2_1 | ||
|
|
||
| private[client] class Shim_v2_3 extends Shim_v2_1 | ||
|
|
||
| private[client] class Shim_v3_1 extends Shim_v2_3 { | ||
| // Spark supports only non-ACID operations | ||
| protected lazy val isAcidIUDoperation = JBoolean.FALSE | ||
|
There was a problem hiding this comment. @dongjoon-hyun, isn't it There was a problem hiding this comment. Historically, In Hive code, else if(!isAcidIUDoperation && isFullAcidTable) {
destPath = fixFullAcidPathForLoadData(loadFileType, destPath, txnId, stmtId, tbl);
}And yes for your last question. We don't know the future of Hive. So, for the different parameter name, we had better handle differently. That was my logic. |
||
|
|
||
| // Writer ID can be 0 for non-ACID operations | ||
| protected lazy val writeIdInLoadTableOrPartition: JLong = 0L | ||
|
|
||
| // Statement ID | ||
| protected lazy val stmtIdInLoadTableOrPartition: JInteger = 0 | ||
|
|
||
| protected lazy val listBucketingLevel: JInteger = 0 | ||
|
|
||
| private lazy val clazzLoadFileType = getClass.getClassLoader.loadClass( | ||
| "org.apache.hadoop.hive.ql.plan.LoadTableDesc$LoadFileType") | ||
|
|
||
| private lazy val loadPartitionMethod = | ||
| findMethod( | ||
| classOf[Hive], | ||
| "loadPartition", | ||
| classOf[Path], | ||
| classOf[Table], | ||
| classOf[JMap[String, String]], | ||
| clazzLoadFileType, | ||
| JBoolean.TYPE, | ||
| JBoolean.TYPE, | ||
| JBoolean.TYPE, | ||
| JBoolean.TYPE, | ||
| JBoolean.TYPE, | ||
| classOf[JLong], | ||
| JInteger.TYPE, | ||
| JBoolean.TYPE) | ||
| private lazy val loadTableMethod = | ||
| findMethod( | ||
| classOf[Hive], | ||
| "loadTable", | ||
| classOf[Path], | ||
| classOf[String], | ||
| clazzLoadFileType, | ||
| JBoolean.TYPE, | ||
| JBoolean.TYPE, | ||
| JBoolean.TYPE, | ||
| JBoolean.TYPE, | ||
| classOf[JLong], | ||
| JInteger.TYPE, | ||
| JBoolean.TYPE) | ||
| private lazy val loadDynamicPartitionsMethod = | ||
| findMethod( | ||
| classOf[Hive], | ||
| "loadDynamicPartitions", | ||
| classOf[Path], | ||
| classOf[String], | ||
| classOf[JMap[String, String]], | ||
| clazzLoadFileType, | ||
| JInteger.TYPE, | ||
| JInteger.TYPE, | ||
| JBoolean.TYPE, | ||
| JLong.TYPE, | ||
| JInteger.TYPE, | ||
| JBoolean.TYPE, | ||
| classOf[AcidUtils.Operation], | ||
| JBoolean.TYPE) | ||
|
|
||
| override def loadPartition( | ||
|
|
||
| hive: Hive, | ||
| loadPath: Path, | ||
| tableName: String, | ||
| partSpec: JMap[String, String], | ||
| replace: Boolean, | ||
| inheritTableSpecs: Boolean, | ||
| isSkewedStoreAsSubdir: Boolean, | ||
| isSrcLocal: Boolean): Unit = { | ||
| val session = SparkSession.getActiveSession | ||
| assert(session.nonEmpty) | ||
| val database = session.get.sessionState.catalog.getCurrentDatabase | ||
| val table = hive.getTable(database, tableName) | ||
| val loadFileType = if (replace) { | ||
|
|
||
| clazzLoadFileType.getEnumConstants.find(_.toString.equalsIgnoreCase("REPLACE_ALL")) | ||
| } else { | ||
| clazzLoadFileType.getEnumConstants.find(_.toString.equalsIgnoreCase("KEEP_EXISTING")) | ||
| } | ||
| assert(loadFileType.isDefined) | ||
| loadPartitionMethod.invoke(hive, loadPath, table, partSpec, loadFileType.get, | ||
| inheritTableSpecs: JBoolean, isSkewedStoreAsSubdir: JBoolean, | ||
| isSrcLocal: JBoolean, isAcid, hasFollowingStatsTask, | ||
| writeIdInLoadTableOrPartition, stmtIdInLoadTableOrPartition, replace: JBoolean) | ||
| } | ||
|
|
||
| override def loadTable( | ||
|
|
||
| hive: Hive, | ||
| loadPath: Path, | ||
| tableName: String, | ||
| replace: Boolean, | ||
| isSrcLocal: Boolean): Unit = { | ||
| val loadFileType = if (replace) { | ||
| clazzLoadFileType.getEnumConstants.find(_.toString.equalsIgnoreCase("REPLACE_ALL")) | ||
| } else { | ||
| clazzLoadFileType.getEnumConstants.find(_.toString.equalsIgnoreCase("KEEP_EXISTING")) | ||
| } | ||
| assert(loadFileType.isDefined) | ||
| loadTableMethod.invoke(hive, loadPath, tableName, loadFileType.get, isSrcLocal: JBoolean, | ||
|
|
||
| isSkewedStoreAsSubdir, isAcidIUDoperation, hasFollowingStatsTask, | ||
| writeIdInLoadTableOrPartition, stmtIdInLoadTableOrPartition: JInteger, replace: JBoolean) | ||
| } | ||
|
|
||
| override def loadDynamicPartitions( | ||
|
|
||
| hive: Hive, | ||
| loadPath: Path, | ||
| tableName: String, | ||
| partSpec: JMap[String, String], | ||
| replace: Boolean, | ||
| numDP: Int, | ||
| listBucketingEnabled: Boolean): Unit = { | ||
| val loadFileType = if (replace) { | ||
| clazzLoadFileType.getEnumConstants.find(_.toString.equalsIgnoreCase("REPLACE_ALL")) | ||
| } else { | ||
| clazzLoadFileType.getEnumConstants.find(_.toString.equalsIgnoreCase("KEEP_EXISTING")) | ||
| } | ||
| assert(loadFileType.isDefined) | ||
| loadDynamicPartitionsMethod.invoke(hive, loadPath, tableName, partSpec, loadFileType.get, | ||
|
|
||
| numDP: JInteger, listBucketingLevel, isAcid, writeIdInLoadTableOrPartition, | ||
| stmtIdInLoadTableOrPartition, hasFollowingStatsTask, AcidUtils.Operation.NOT_ACID, | ||
| replace: JBoolean) | ||
| } | ||
|
There was a problem hiding this comment. @dongjoon-hyun, not a big deal but how about adding There was a problem hiding this comment. It's possible, but it doesn't help much. As we see here,
There was a problem hiding this comment. Yea, I noticed it. I am leaving this comment orthogonally just as a sanity check. |
||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's fine if the signatures are matched and the tests pass. Let me double check them within tomorrow.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!