Skip to content

Commit bc21310

Browse files
committed
update
1 parent 52ca367 commit bc21310

File tree

4 files changed

+19
-24
lines changed

4 files changed

+19
-24
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1815,12 +1815,7 @@
18151815
"fieldName" : "table",
18161816
"fieldExtractor" : "ArrayBufferTableExtractor",
18171817
"columnDesc" : null,
1818-
"actionTypeDesc" : {
1819-
"fieldName" : null,
1820-
"fieldExtractor" : null,
1821-
"actionType" : "UPDATE",
1822-
"comment" : ""
1823-
},
1818+
"actionTypeDesc" : null,
18241819
"tableTypeDesc" : null,
18251820
"catalogDesc" : null,
18261821
"isInput" : false,

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ class ExpressionSeqTableExtractor extends TableExtractor {
189189
*/
190190
class ArrayBufferTableExtractor extends TableExtractor {
191191
override def apply(spark: SparkSession, v1: AnyRef): Option[Table] = {
192-
// Iceberg will transform table to ArrayBuffer
193-
val expressions = v1.asInstanceOf[Seq[Expression]]
192+
// Iceberg will transform table to ArrayBuffer[String]
193+
val expressions = v1.asInstanceOf[Seq[String]]
194194
val maybeTable = expressions.length match {
195-
case 1 => Table(None, None, expressions.head.toString(), None)
196-
case 2 => Table(None, Some(expressions.head.toString()), expressions(1).toString(), None)
195+
case 1 => Table(None, None, expressions.head, None)
196+
case 2 => Table(None, Some(expressions.head), expressions(1), None)
197197
case 3 => Table(
198-
Some(expressions.head.toString()),
199-
Some(expressions(1).toString()),
200-
expressions(2).toString(),
198+
Some(expressions.head),
199+
Some(expressions(1)),
200+
expressions(2),
201201
None)
202202
}
203203
Option(maybeTable)

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ object IcebergCommands extends CommandSpecs[TableCommandSpec] {
6060

6161
val AddPartitionFiled = {
6262
val cmd = "org.apache.spark.sql.catalyst.plans.logical.AddPartitionField"
63-
val actionTypeDesc = ActionTypeDesc(actionType = Some(UPDATE))
6463
val tableDesc =
6564
TableDesc(
6665
"table",
6766
classOf[ArrayBufferTableExtractor],
68-
actionTypeDesc = Some(actionTypeDesc),
6967
comment = "Iceberg")
7068
TableCommandSpec(cmd, Seq(tableDesc), opType = OperationType.ALTERTABLE_PROPERTIES)
7169
}

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -381,14 +381,16 @@ class IcebergCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite
381381

382382
test("ALTER TABLE ADD PARTITION FIELD for Iceberg") {
383383
val table = s"$catalogV2.$namespace1.partitioned_table"
384-
doAs(
385-
admin,
386-
sql(
387-
s"CREATE TABLE $table (id int, name string, city string) USING iceberg PARTITIONED BY (city)"))
388-
val addPartitionSql = s"ALTER TABLE $table ADD PARTITION FIELD id"
389-
interceptEndsWith[AccessControlException] {
390-
doAs(someone, sql(addPartitionSql))
391-
}(s"does not have [alter] privilege on [$namespace1/partitioned_table]")
392-
doAs(someone, sql(addPartitionSql))
384+
withCleanTmpResources(Seq((table, "table"))) {
385+
doAs(
386+
admin,
387+
sql(
388+
s"CREATE TABLE $table (id int, name string, city string) USING iceberg PARTITIONED BY (city)"))
389+
val addPartitionSql = s"ALTER TABLE $table ADD PARTITION FIELD id"
390+
interceptEndsWith[AccessControlException] {
391+
doAs(someone, sql(addPartitionSql))
392+
}(s"does not have [alter] privilege on [$namespace1/partitioned_table]")
393+
doAs(admin, sql(addPartitionSql))
394+
}
393395
}
394396
}

0 commit comments

Comments
 (0)