update

Author: davidyuan1223

extensions/spark/kyuubi-spark-authz/src/main/resources/META-INF/services/org.apache.kyuubi.plugin.spark.authz.serde.TableExtractor

@@ -19,6 +19,7 @@ org.apache.kyuubi.plugin.spark.authz.serde.CatalogTableOptionTableExtractor
 org.apache.kyuubi.plugin.spark.authz.serde.CatalogTableTableExtractor
 org.apache.kyuubi.plugin.spark.authz.serde.DataSourceV2RelationTableExtractor
 org.apache.kyuubi.plugin.spark.authz.serde.ExpressionSeqTableExtractor
+org.apache.kyuubi.plugin.spark.authz.serde.ArrayBufferTableExtractor
 org.apache.kyuubi.plugin.spark.authz.serde.HudiCallProcedureInputTableExtractor
 org.apache.kyuubi.plugin.spark.authz.serde.HudiCallProcedureOutputTableExtractor
 org.apache.kyuubi.plugin.spark.authz.serde.HudiDataSourceV2RelationTableExtractor

extensions/spark/kyuubi-spark-authz/src/main/resources/table_command_spec.json

@@ -1809,6 +1809,27 @@
     "isInput" : false,
     "comment" : ""
   } ]
+}, {
+  "classname" : "org.apache.spark.sql.catalyst.plans.logical.AddPartitionField",
+  "tableDescs" : [ {
+    "fieldName" : "table",
+    "fieldExtractor" : "ArrayBufferTableExtractor",
+    "columnDesc" : null,
+    "actionTypeDesc" : {
+      "fieldName" : null,
+      "fieldExtractor" : null,
+      "actionType" : "UPDATE",
+      "comment" : ""
+    },
+    "tableTypeDesc" : null,
+    "catalogDesc" : null,
+    "isInput" : false,
+    "setCurrentDatabaseIfMissing" : false,
+    "comment" : "Iceberg"
+  } ],
+  "opType" : "ALTERTABLE_PROPERTIES",
+  "queryDescs" : [ ],
+  "uriDescs" : [ ]
 }, {
   "classname" : "org.apache.spark.sql.catalyst.plans.logical.Call",
   "tableDescs" : [ {

extensions/spark/kyuubi-spark-authz/src/main/scala/org/apache/kyuubi/plugin/spark/authz/serde/tableExtractors.scala

@@ -184,6 +184,26 @@ class ExpressionSeqTableExtractor extends TableExtractor {
   }
 }
 
+/**
+ * org.apache.spark.sql.catalyst.plans.logical.AddPartitionField
+ */
+class ArrayBufferTableExtractor extends TableExtractor {
+  override def apply(spark: SparkSession, v1: AnyRef): Option[Table] = {
+    // Iceberg will transform table to ArrayBuffer
+    val expressions = v1.asInstanceOf[Seq[Expression]]
+    val maybeTable = expressions.length match {
+      case 1 => Table(None, None, expressions.head.toString(), None)
+      case 2 => Table(None, Some(expressions.head.toString()), expressions(1).toString(), None)
+      case 3 => Table(
+          Some(expressions.head.toString()),
+          Some(expressions(1).toString()),
+          expressions(2).toString(),
+          None)
+    }
+    Option(maybeTable)
+  }
+}
+
 /**
  * org.apache.spark.sql.execution.datasources.v2.DataSourceV2Relation
  */

extensions/spark/kyuubi-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/gen/IcebergCommands.scala

@@ -58,11 +58,24 @@ object IcebergCommands extends CommandSpecs[TableCommandSpec] {
     TableCommandSpec(cmd, Seq(td), opType = OperationType.ALTERTABLE_PROPERTIES)
   }
 
+  val AddPartitionFiled = {
+    val cmd = "org.apache.spark.sql.catalyst.plans.logical.AddPartitionField"
+    val actionTypeDesc = ActionTypeDesc(actionType = Some(UPDATE))
+    val tableDesc =
+      TableDesc(
+        "table",
+        classOf[ArrayBufferTableExtractor],
+        actionTypeDesc = Some(actionTypeDesc),
+        comment = "Iceberg")
+    TableCommandSpec(cmd, Seq(tableDesc), opType = OperationType.ALTERTABLE_PROPERTIES)
+  }
+
   override def specs: Seq[TableCommandSpec] = Seq(
     CallProcedure,
     DeleteFromIcebergTable,
     UpdateIcebergTable,
     MergeIntoIcebergTable,
+    AddPartitionFiled,
     MergeIntoIcebergTable.copy(classname =
       "org.apache.spark.sql.catalyst.plans.logical.UnresolvedMergeIntoIcebergTable"))
 }

extensions/spark/kyuubi-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/ranger/IcebergCatalogRangerSparkExtensionSuite.scala

@@ -378,4 +378,17 @@ class IcebergCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite
       doAs(admin, sql(callSetCurrentSnapshot))
     }
   }
+
+  test("ALTER TABLE ADD PARTITION FIELD for Iceberg") {
+    val table = s"$catalogV2.$namespace1.partitioned_table"
+    doAs(
+      admin,
+      sql(
+        s"CREATE TABLE $table (id int, name string, city string) USING iceberg PARTITIONED BY (city)"))
+    val addPartitionSql = s"ALTER TABLE $table ADD PARTITION FIELD id"
+    interceptEndsWith[AccessControlException] {
+      doAs(someone, sql(addPartitionSql))
+    }(s"does not have [alter] privilege on [$namespace1/partitioned_table]")
+    doAs(someone, sql(addPartitionSql))
+  }
 }