-
Notifications
You must be signed in to change notification settings - Fork 933
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.
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
[KYUUBI #5529][AUTHZ] Support create table command for Delta Lake #5530
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
23f6b81
Support create table command for Delta Lake
zml1206 b2a9543
update ut
zml1206 facd8f7
fix show databases ut
zml1206 10138d8
Merge branch 'master' into KYUUBI-5529
zml1206 fb4223b
fix check spec json files
zml1206 036154b
Merge branch 'master' into KYUUBI-5529
bowenliang123 c025230
resolve conflicts
bowenliang123 f12ff8f
Merge branch 'master' into KYUUBI-5529
zml1206 b8ed2a4
update
zml1206 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...i-spark-authz/src/test/scala/org/apache/kyuubi/plugin/spark/authz/gen/DeltaCommands.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.kyuubi.plugin.spark.authz.gen | ||
|
||
import org.apache.kyuubi.plugin.spark.authz.OperationType._ | ||
import org.apache.kyuubi.plugin.spark.authz.serde._ | ||
|
||
object DeltaCommands extends CommandSpecs[TableCommandSpec] { | ||
|
||
val CreateDeltaTableCommand = { | ||
val cmd = "org.apache.spark.sql.delta.commands.CreateDeltaTableCommand" | ||
val tableDesc = TableDesc("table", classOf[CatalogTableTableExtractor]) | ||
TableCommandSpec(cmd, Seq(tableDesc), CREATETABLE) | ||
} | ||
|
||
override def specs: Seq[TableCommandSpec] = Seq( | ||
CreateDeltaTableCommand) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
...a/org/apache/kyuubi/plugin/spark/authz/ranger/DeltaCatalogRangerSparkExtensionSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.kyuubi.plugin.spark.authz.ranger | ||
|
||
import org.scalatest.Outcome | ||
|
||
import org.apache.kyuubi.Utils | ||
import org.apache.kyuubi.plugin.spark.authz.AccessControlException | ||
import org.apache.kyuubi.plugin.spark.authz.RangerTestNamespace._ | ||
import org.apache.kyuubi.plugin.spark.authz.RangerTestUsers._ | ||
import org.apache.kyuubi.tags.DeltaTest | ||
import org.apache.kyuubi.util.AssertionUtils._ | ||
|
||
/** | ||
* Tests for RangerSparkExtensionSuite on Delta Lake | ||
*/ | ||
@DeltaTest | ||
class DeltaCatalogRangerSparkExtensionSuite extends RangerSparkExtensionSuite { | ||
override protected val catalogImpl: String = "hive" | ||
|
||
val namespace1 = deltaNamespace | ||
val table1 = "table1_delta" | ||
val table2 = "table2_delta" | ||
|
||
override def withFixture(test: NoArgTest): Outcome = { | ||
test() | ||
} | ||
|
||
override def beforeAll(): Unit = { | ||
spark.conf.set( | ||
s"spark.sql.catalog.$sparkCatalog", | ||
"org.apache.spark.sql.delta.catalog.DeltaCatalog") | ||
spark.conf.set( | ||
s"spark.sql.catalog.$sparkCatalog.warehouse", | ||
Utils.createTempDir("delta-hadoop").toString) | ||
super.beforeAll() | ||
} | ||
|
||
override def afterAll(): Unit = { | ||
super.afterAll() | ||
spark.sessionState.catalog.reset() | ||
spark.sessionState.conf.clear() | ||
} | ||
|
||
test("create table") { | ||
withCleanTmpResources(Seq( | ||
(s"$namespace1.$table1", "table"), | ||
(s"$namespace1.$table2", "table"), | ||
(s"$namespace1", "database"))) { | ||
doAs(admin, sql(s"CREATE DATABASE IF NOT EXISTS $namespace1")) | ||
val createNonPartitionTableSql = | ||
s""" | ||
|CREATE TABLE IF NOT EXISTS $namespace1.$table1 ( | ||
| id INT, | ||
| firstName STRING, | ||
| middleName STRING, | ||
| lastName STRING, | ||
| gender STRING, | ||
| birthDate TIMESTAMP, | ||
| ssn STRING, | ||
| salary INT | ||
|) USING DELTA | ||
|""".stripMargin | ||
interceptContains[AccessControlException] { | ||
doAs(someone, sql(createNonPartitionTableSql)) | ||
}(s"does not have [create] privilege on [$namespace1/$table1]") | ||
doAs(admin, createNonPartitionTableSql) | ||
|
||
val createPartitionTableSql = | ||
s""" | ||
|CREATE TABLE IF NOT EXISTS $namespace1.$table2 ( | ||
| id INT, | ||
| firstName STRING, | ||
| middleName STRING, | ||
| lastName STRING, | ||
| gender STRING, | ||
| birthDate TIMESTAMP, | ||
| ssn STRING, | ||
| salary INT | ||
|) | ||
|USING DELTA | ||
|PARTITIONED BY (gender) | ||
|""".stripMargin | ||
interceptContains[AccessControlException] { | ||
doAs(someone, sql(createPartitionTableSql)) | ||
}(s"does not have [create] privilege on [$namespace1/$table2]") | ||
doAs(admin, createPartitionTableSql) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
} | ||
} | ||
|
||
test("create or replace table") { | ||
withCleanTmpResources( | ||
Seq((s"$namespace1.$table1", "table"), (s"$namespace1", "database"))) { | ||
val createOrReplaceTableSql = | ||
s""" | ||
|CREATE OR REPLACE TABLE $namespace1.$table1 ( | ||
| id INT, | ||
| firstName STRING, | ||
| middleName STRING, | ||
| lastName STRING, | ||
| gender STRING, | ||
| birthDate TIMESTAMP, | ||
| ssn STRING, | ||
| salary INT | ||
|) USING DELTA | ||
|""".stripMargin | ||
interceptContains[AccessControlException] { | ||
doAs(someone, sql(createOrReplaceTableSql)) | ||
}(s"does not have [create] privilege on [$namespace1/$table1]") | ||
doAs(admin, createOrReplaceTableSql) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ditto |
||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @zml1206, this line has an issue that it does not trigger a sql operation.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I'll fix it right away, thanks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix in #5597