Skip to content

[KYUUBI #5707][AUTHZ] Support merge into path-based table for Delta Lake in Authz #5708

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
zml1206 wants to merge 2 commits into from
Closed

[KYUUBI #5707][AUTHZ] Support merge into path-based table for Delta Lake in Authz #5708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
679f735
Support merge into path-based table for Delta Lake in Authz
zml1206 Nov 16, 2023
45ab4d4
fix
zml1206 Nov 16, 2023
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 extensions/spark/kyuubi-spark-authz/src/main/resources/table_command_spec.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2198,7 +2198,11 @@
"fieldName" : "source",
"fieldExtractor" : "LogicalPlanQueryExtractor"
} ],
"uriDescs" : [ ]
"uriDescs" : [ {
"fieldName" : "target",
"fieldExtractor" : "SubqueryAliasURIExtractor",
"isInput" : false
} ]
}, {
"classname" : "org.apache.spark.sql.delta.commands.OptimizeTableCommand",
"tableDescs" : [ {
Expand Down
10 changes: 7 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 @@ -257,11 +257,15 @@ class ResolvedIdentifierTableExtractor extends TableExtractor {
class SubqueryAliasTableExtractor extends TableExtractor {
override def apply(spark: SparkSession, v1: AnyRef): Option[Table] = {
v1.asInstanceOf[SubqueryAlias] match {
case SubqueryAlias(_, SubqueryAlias(identifier, _))
if !isPathIdentifier(identifier.name, spark) =>
lookupExtractor[StringTableExtractor].apply(spark, identifier.toString())
case SubqueryAlias(_, SubqueryAlias(identifier, _)) =>
if (isPathIdentifier(identifier.name, spark)) {
None
} else {
lookupExtractor[StringTableExtractor].apply(spark, identifier.toString())
}
case SubqueryAlias(identifier, _) if !isPathIdentifier(identifier.name, spark) =>
lookupExtractor[StringTableExtractor].apply(spark, identifier.toString())
case _ => None
}
}
}
Expand Down
10 changes: 7 additions & 3 deletions ...spark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/serde/uriExtractors.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,15 @@ class IdentifierURIExtractor extends URIExtractor {

class SubqueryAliasURIExtractor extends URIExtractor {
override def apply(spark: SparkSession, v1: AnyRef): Seq[Uri] = v1 match {
case SubqueryAlias(_, SubqueryAlias(identifier, _))
if isPathIdentifier(identifier.name, spark) =>
Seq(identifier.name).map(Uri)
case SubqueryAlias(_, SubqueryAlias(identifier, _)) =>
if (isPathIdentifier(identifier.name, spark)) {
Seq(identifier.name).map(Uri)
} else {
Nil
}
case SubqueryAlias(identifier, _) if isPathIdentifier(identifier.name, spark) =>
Seq(identifier.name).map(Uri)
case _ => Nil
}
}

Expand Down
7 changes: 1 addition & 6 deletions ...i-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/gen/DeltaCommands.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,8 @@ object DeltaCommands extends CommandSpecs[TableCommandSpec] {

val MergeIntoCommand = {
val cmd = "org.apache.spark.sql.delta.commands.MergeIntoCommand"
val actionTypeDesc = ActionTypeDesc(actionType = Some(UPDATE))
val tableDesc = TableDesc(
"target",
classOf[SubqueryAliasTableExtractor],
actionTypeDesc = Some(actionTypeDesc))
val queryDesc = QueryDesc("source")
TableCommandSpec(cmd, Seq(tableDesc), queryDescs = Seq(queryDesc))
DeleteCommand.copy(classname = cmd, queryDescs = Seq(queryDesc))
}

val OptimizeTableCommand = {
Expand Down
45 changes: 45 additions & 0 deletions ...a/org/apache/kyuubi/plugin/spark/authz/ranger/DeltaCatalogRangerSparkExtensionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,51 @@ class DeltaCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite {
}
}
}

test("merge into path-based table") {
withSingleCallEnabled {
withCleanTmpResources(Seq(
(s"$namespace1.$table2", "table"),
(s"$namespace1", "database"))) {
doAs(admin, sql(s"CREATE DATABASE IF NOT EXISTS $namespace1"))
doAs(admin, sql(createTableSql(namespace1, table2)))
withTempDir(path => {
doAs(admin, sql(createPathBasedTableSql(path)))
val mergeIntoSql =
s"""
|MERGE INTO delta.`$path` AS target
|USING $namespace1.$table2 AS source
|ON target.id = source.id
|WHEN MATCHED THEN
| UPDATE SET
| id = source.id,
| name = source.name,
| gender = source.gender,
| birthDate = source.birthDate
|WHEN NOT MATCHED
| THEN INSERT (
| id,
| name,
| gender,
| birthDate
| )
| VALUES (
| source.id,
| source.name,
| source.gender,
| source.birthDate
| )
|""".stripMargin
interceptContains[AccessControlException](
doAs(someone, sql(mergeIntoSql)))(
s"does not have [select] privilege on [$namespace1/$table2/id," +
s"$namespace1/$table2/name,$namespace1/$table2/gender," +
s"$namespace1/$table2/birthDate], [write] privilege on [[$path, $path/]]")
doAs(admin, sql(mergeIntoSql))
})
}
}
}
}

object DeltaCatalogRangerSparkExtensionSuite {
Expand Down