Skip to content
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

Jump to bottom

[KYUUBI #6718] Table owner can not update/delete hudi tables they have… #6824

Closed
wants to merge 2 commits into from
+36 −3
Closed

[KYUUBI #6718] Table owner can not update/delete hudi tables they have… #6824

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63e9048
[Bug] [AUTHZ] Table owner can not update/delete hudi tables they have…
Nov 25, 2024
c9728ab
[Bug] [AUTHZ] Table owner can not update/delete hudi tables they have…
Nov 26, 2024
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
39 changes: 36 additions & 3 deletions ...ark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/serde/tableExtractors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,23 @@ object TableExtractor {
case _: Exception => None
}
}

/**
* Get table owner from LogicalRelation
* @param v a object contains a org.apache.spark.sql.execution.datasources.LogicalRelation
* @return owner
*/
def getLogicalRelationOwner(v: AnyRef): Option[String] = {
try {
val maybeCatalogTable = invokeAs[Option[CatalogTable]](v, "catalogTable")
val maybeOwner = maybeCatalogTable.flatMap { ct =>
Option(ct.owner).filter(_.nonEmpty)
}
maybeOwner
} catch {
case _: Exception => None
}
}
}

/**
Expand Down Expand Up @@ -295,11 +312,19 @@ class HudiDataSourceV2RelationTableExtractor extends TableExtractor {
override def apply(spark: SparkSession, v1: AnyRef): Option[Table] = {
invokeAs[LogicalPlan](v1, "table") match {
// Match multipartIdentifier with tableAlias
case SubqueryAlias(_, SubqueryAlias(identifier, _)) =>
case SubqueryAlias(_, SubqueryAlias(identifier, relation)) =>
lookupExtractor[StringTableExtractor].apply(spark, identifier.toString())
.map { table =>
val maybeOwner = TableExtractor.getLogicalRelationOwner(relation)
table.copy(owner = maybeOwner)
}
// Match multipartIdentifier without tableAlias
case SubqueryAlias(identifier, _) =>
case SubqueryAlias(identifier, relation) =>
lookupExtractor[StringTableExtractor].apply(spark, identifier.toString())
.map { table =>
val maybeOwner = TableExtractor.getLogicalRelationOwner(relation)
table.copy(owner = maybeOwner)
}
case _ => None
}
}
Expand All @@ -311,9 +336,17 @@ class HudiMergeIntoTargetTableExtractor extends TableExtractor {
// Match multipartIdentifier with tableAlias
case SubqueryAlias(_, SubqueryAlias(identifier, relation)) =>
lookupExtractor[StringTableExtractor].apply(spark, identifier.toString())
.map { table =>
val maybeOwner = TableExtractor.getLogicalRelationOwner(relation)
table.copy(owner = maybeOwner)
}
// Match multipartIdentifier without tableAlias
case SubqueryAlias(identifier, _) =>
case SubqueryAlias(identifier, relation) =>
lookupExtractor[StringTableExtractor].apply(spark, identifier.toString())
.map { table =>
val maybeOwner = TableExtractor.getLogicalRelationOwner(relation)
table.copy(owner = maybeOwner)
}
case _ => None
}
}
Expand Down
Loading