Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion dev/kyuubi-codecov/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,11 @@
<artifactId>kyuubi-spark-connector-hive_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
<!-- TODO: support authz -->
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-spark-authz_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kyuubi</groupId>
<artifactId>kyuubi-spark-lineage_${scala.binary.version}</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ org.apache.kyuubi.plugin.spark.authz.serde.DataSourceV2RelationTableExtractor
org.apache.kyuubi.plugin.spark.authz.serde.ExpressionSeqTableExtractor
org.apache.kyuubi.plugin.spark.authz.serde.HudiCallProcedureInputTableExtractor
org.apache.kyuubi.plugin.spark.authz.serde.HudiCallProcedureOutputTableExtractor
org.apache.kyuubi.plugin.spark.authz.serde.HudiCatalogTableTableExtractor
org.apache.kyuubi.plugin.spark.authz.serde.HudiDataSourceV2RelationTableExtractor
org.apache.kyuubi.plugin.spark.authz.serde.HudiMergeIntoTargetTableExtractor
org.apache.kyuubi.plugin.spark.authz.serde.IdentifierTableExtractor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,27 @@
"opType" : "QUERY",
"queryDescs" : [ ],
"uriDescs" : [ ]
}, {
"classname" : "org.apache.spark.sql.catalyst.plans.logical.DeleteFromTableWithFilters",
"tableDescs" : [ {
"fieldName" : "table",
"fieldExtractor" : "DataSourceV2RelationTableExtractor",
"columnDesc" : null,
"actionTypeDesc" : {
"fieldName" : null,
"fieldExtractor" : null,
"actionType" : "UPDATE",
"comment" : ""
},
"tableTypeDesc" : null,
"catalogDesc" : null,
"isInput" : false,
"setCurrentDatabaseIfMissing" : false,
"comment" : ""
} ],
"opType" : "QUERY",
"queryDescs" : [ ],
"uriDescs" : [ ]
}, {
"classname" : "org.apache.spark.sql.catalyst.plans.logical.DescribeRelation",
"tableDescs" : [ {
Expand Down Expand Up @@ -2328,8 +2349,8 @@
}, {
"classname" : "org.apache.spark.sql.hudi.command.DeleteHoodieTableCommand",
"tableDescs" : [ {
"fieldName" : "dft",
"fieldExtractor" : "HudiDataSourceV2RelationTableExtractor",
"fieldName" : "catalogTable",
"fieldExtractor" : "HudiCatalogTableTableExtractor",
"columnDesc" : null,
"actionTypeDesc" : {
"fieldName" : null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,15 @@ class TableTableExtractor extends TableExtractor {
}
}

/**
* org.apache.spark.sql.catalyst.catalog.HoodieCatalogTable
*/
class HudiCatalogTableTableExtractor extends TableExtractor {
override def apply(spark: SparkSession, v1: AnyRef): Option[Table] = {
lookupExtractor[CatalogTableTableExtractor].apply(spark, invokeAs[CatalogTable](v1, "table"))
}
}

class HudiDataSourceV2RelationTableExtractor extends TableExtractor {
override def apply(spark: SparkSession, v1: AnyRef): Option[Table] = {
invokeAs[LogicalPlan](v1, "table") match {
Expand Down
6 changes: 2 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
<hive.archive.download.skip>false</hive.archive.download.skip>
<httpclient.version>4.5.14</httpclient.version>
<httpcore.version>4.4.16</httpcore.version>
<hudi.version>1.0.1</hudi.version>
<hudi.version>1.1.1</hudi.version>
<hudi.artifact>hudi-spark${spark.binary.version}-bundle_${scala.binary.version}</hudi.artifact>
<iceberg.version>1.10.0</iceberg.version>
<iceberg.artifact>iceberg-spark-runtime-${spark.binary.version}_${scala.binary.version}</iceberg.artifact>
Expand Down Expand Up @@ -2048,13 +2048,11 @@
<antlr4.version>4.13.1</antlr4.version>
<delta.version>4.0.0</delta.version>
<delta.artifact>delta-spark_${scala.binary.version}</delta.artifact>
<!-- TODO: update once Hudi support Spark 4.0 -->
<hudi.artifact>hudi-spark3.5-bundle_${scala.binary.version}</hudi.artifact>
<!-- TODO: update once Paimon support Spark 4.0.
paimon-spark-3.5 contains Scala 2.12 classes cause conflicts with Scala 2.13 -->
<paimon.artifact>paimon-common</paimon.artifact>
<!-- Exclude SparkLocalClusterTest due to Scala 2.13.17 changes serialVersionUID of scala.collection.immutable.ArraySeq -->
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.SparkLocalClusterTest</maven.plugin.scalatest.exclude.tags>
<maven.plugin.scalatest.exclude.tags>org.scalatest.tags.Slow,org.apache.kyuubi.tags.PaimonTest,org.apache.kyuubi.tags.SparkLocalClusterTest</maven.plugin.scalatest.exclude.tags>
<spark.archive.name>spark-${spark.version}-bin-hadoop3.tgz</spark.archive.name>
</properties>
</profile>
Expand Down
Loading