forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-48668][SQL] Support ALTER NAMESPACE ... UNSET PROPERTIES in v2
- Loading branch information
1 parent
714699b
commit 12f8f71
Showing
15 changed files
with
388 additions
and
8 deletions.
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
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
50 changes: 50 additions & 0 deletions
50
...ala/org/apache/spark/sql/execution/datasources/v2/AlterNamespaceUnsetPropertiesExec.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,50 @@ | ||
| /* | ||
| * 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.spark.sql.execution.datasources.v2 | ||
|
|
||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.expressions.Attribute | ||
| import org.apache.spark.sql.connector.catalog.{NamespaceChange, SupportsNamespaces} | ||
| import org.apache.spark.sql.errors.QueryCompilationErrors | ||
|
|
||
| /** | ||
| * Physical plan node for unsetting properties of namespace. | ||
| */ | ||
| case class AlterNamespaceUnsetPropertiesExec( | ||
| catalog: SupportsNamespaces, | ||
| namespace: Seq[String], | ||
| propKeys: Seq[String], | ||
| ifExists: Boolean) extends LeafV2CommandExec { | ||
| override protected def run(): Seq[InternalRow] = { | ||
| if (!ifExists) { | ||
| val ns = catalog.loadNamespaceMetadata(namespace.toArray) | ||
| val nonexistentKeys = propKeys.filter(key => !ns.containsKey(key)) | ||
| if (nonexistentKeys.nonEmpty) { | ||
| throw QueryCompilationErrors.unsetNonExistentPropertiesError( | ||
| nonexistentKeys, namespace) | ||
| } | ||
| } | ||
| val changes = propKeys.map { | ||
| NamespaceChange.removeProperty | ||
| } | ||
| catalog.alterNamespace(namespace.toArray, changes: _*) | ||
| Seq.empty | ||
| } | ||
|
|
||
| override def output: Seq[Attribute] = Seq.empty | ||
| } |
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
57 changes: 57 additions & 0 deletions
57
...ala/org/apache/spark/sql/execution/command/AlterNamespaceUnsetPropertiesParserSuite.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,57 @@ | ||
| /* | ||
| * 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.spark.sql.execution.command | ||
|
|
||
| import org.apache.spark.sql.catalyst.analysis.{AnalysisTest, UnresolvedNamespace} | ||
| import org.apache.spark.sql.catalyst.parser.CatalystSqlParser.parsePlan | ||
| import org.apache.spark.sql.catalyst.plans.logical.UnsetNamespaceProperties | ||
|
|
||
| class AlterNamespaceUnsetPropertiesParserSuite extends AnalysisTest { | ||
|
|
||
| test("unset namespace properties") { | ||
| Seq("DATABASE", "SCHEMA", "NAMESPACE").foreach { nsToken => | ||
| Seq("PROPERTIES", "DBPROPERTIES").foreach { propToken => | ||
| comparePlans( | ||
| parsePlan(s"ALTER $nsToken a.b.c UNSET $propToken ('a', 'b', 'c')"), | ||
| UnsetNamespaceProperties( | ||
| UnresolvedNamespace(Seq("a", "b", "c")), Seq("a", "b", "c"), ifExists = false)) | ||
|
|
||
| comparePlans( | ||
| parsePlan(s"ALTER $nsToken a.b.c UNSET $propToken IF EXISTS ('a', 'b', 'c')"), | ||
| UnsetNamespaceProperties( | ||
| UnresolvedNamespace(Seq("a", "b", "c")), Seq("a", "b", "c"), ifExists = true)) | ||
|
|
||
| comparePlans( | ||
| parsePlan(s"ALTER $nsToken a.b.c UNSET $propToken ('a')"), | ||
| UnsetNamespaceProperties( | ||
| UnresolvedNamespace(Seq("a", "b", "c")), Seq("a"), ifExists = false)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test("property values must not be set") { | ||
| val sql = "ALTER NAMESPACE my_db UNSET PROPERTIES('key_without_value', 'key_with_value'='x')" | ||
| checkError( | ||
| exception = parseException(parsePlan)(sql), | ||
| errorClass = "_LEGACY_ERROR_TEMP_0035", | ||
| parameters = Map("message" -> "Values should not be specified for key(s): [key_with_value]"), | ||
| context = ExpectedContext( | ||
| fragment = sql, | ||
| start = 0, | ||
| stop = 80)) | ||
| } | ||
| } |
127 changes: 127 additions & 0 deletions
127
...scala/org/apache/spark/sql/execution/command/AlterNamespaceUnsetPropertiesSuiteBase.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.spark.sql.execution.command | ||
|
|
||
| import org.apache.spark.sql.{AnalysisException, QueryTest} | ||
| import org.apache.spark.sql.catalyst.parser.ParseException | ||
| import org.apache.spark.sql.connector.catalog.{CatalogV2Util, SupportsNamespaces} | ||
| import org.apache.spark.sql.errors.DataTypeErrors.toSQLId | ||
| import org.apache.spark.sql.internal.SQLConf | ||
|
|
||
| /** | ||
| * This base suite contains unified tests for the `ALTER NAMESPACE ... UNSET PROPERTIES` command | ||
| * that check V1 and V2 table catalogs. The tests that cannot run for all supported catalogs are | ||
| * located in more specific test suites: | ||
| * | ||
| * - V2 table catalog tests: | ||
| * `org.apache.spark.sql.execution.command.v2.AlterNamespaceUnsetPropertiesSuite` | ||
| * - V1 table catalog tests: | ||
| * `org.apache.spark.sql.execution.command.v1.AlterNamespaceUnsetPropertiesSuiteBase` | ||
| * - V1 In-Memory catalog: | ||
| * `org.apache.spark.sql.execution.command.v1.AlterNamespaceUnsetPropertiesSuite` | ||
| * - V1 Hive External catalog: | ||
| * `org.apache.spark.sql.hive.execution.command.AlterNamespaceUnsetPropertiesSuite` | ||
| */ | ||
| trait AlterNamespaceUnsetPropertiesSuiteBase extends QueryTest with DDLCommandTestUtils { | ||
| override val command = "ALTER NAMESPACE ... UNSET PROPERTIES" | ||
|
|
||
| protected def namespace: String | ||
|
|
||
| protected def getProperties(namespace: String): String = { | ||
| val propsRow = sql(s"DESCRIBE NAMESPACE EXTENDED $namespace") | ||
| .toDF("key", "value") | ||
| .where("key like 'Properties%'") | ||
| .collect() | ||
| assert(propsRow.length == 1) | ||
| propsRow(0).getString(1) | ||
| } | ||
|
|
||
| test("namespace does not exist") { | ||
| val ns = "not_exist" | ||
| val e = intercept[AnalysisException] { | ||
| sql(s"ALTER NAMESPACE $catalog.$ns UNSET PROPERTIES ('d')") | ||
| } | ||
| checkError(e, | ||
| errorClass = "SCHEMA_NOT_FOUND", | ||
| parameters = Map("schemaName" -> s"`$ns`")) | ||
| } | ||
|
|
||
| test("basic test") { | ||
| val ns = s"$catalog.$namespace" | ||
| withNamespace(ns) { | ||
| sql(s"CREATE NAMESPACE $ns") | ||
| assert(getProperties(ns) === "") | ||
| sql(s"ALTER NAMESPACE $ns SET PROPERTIES ('a'='a', 'b'='b', 'c'='c')") | ||
| assert(getProperties(ns) === "((a,a), (b,b), (c,c))") | ||
| sql(s"ALTER NAMESPACE $ns UNSET PROPERTIES ('b')") | ||
| assert(getProperties(ns) === "((a,a), (c,c))") | ||
|
|
||
| checkError( | ||
| exception = intercept[AnalysisException] { | ||
| sql(s"ALTER NAMESPACE $ns UNSET PROPERTIES ('b')") | ||
| }, | ||
| errorClass = "UNSET_NONEXISTENT_PROPERTIES", | ||
| parameters = Map("properties" -> "`b`", "relationId" -> toSQLId(namespace))) | ||
| sql(s"ALTER NAMESPACE $ns UNSET PROPERTIES IF EXISTS ('b')") | ||
| } | ||
| } | ||
|
|
||
| test("test reserved properties") { | ||
| import SupportsNamespaces._ | ||
| import org.apache.spark.sql.connector.catalog.CatalogV2Implicits._ | ||
| val ns = s"$catalog.$namespace" | ||
| withSQLConf((SQLConf.LEGACY_PROPERTY_NON_RESERVED.key, "false")) { | ||
| CatalogV2Util.NAMESPACE_RESERVED_PROPERTIES.filterNot(_ == PROP_COMMENT).foreach { key => | ||
| withNamespace(ns) { | ||
| sql(s"CREATE NAMESPACE $ns") | ||
| val sqlText = s"ALTER NAMESPACE $ns UNSET PROPERTIES ('$key')" | ||
| checkErrorMatchPVals( | ||
| exception = intercept[ParseException] { | ||
| sql(sqlText) | ||
| }, | ||
| errorClass = "UNSUPPORTED_FEATURE.SET_NAMESPACE_PROPERTY", | ||
| parameters = Map( | ||
| "property" -> key, | ||
| "msg" -> ".*"), | ||
| sqlState = None, | ||
| context = ExpectedContext( | ||
| fragment = sqlText, | ||
| start = 0, | ||
| stop = 37 + ns.length + key.length) | ||
| ) | ||
| } | ||
| } | ||
| } | ||
| withSQLConf((SQLConf.LEGACY_PROPERTY_NON_RESERVED.key, "true")) { | ||
| CatalogV2Util.NAMESPACE_RESERVED_PROPERTIES.filterNot(_ == PROP_COMMENT).foreach { key => | ||
| withNamespace(ns) { | ||
| // Set the location explicitly because v2 catalog may not set the default location. | ||
| // Without this, `meta.get(key)` below may return null. | ||
| sql(s"CREATE NAMESPACE $ns LOCATION 'tmp/prop_test'") | ||
| assert(getProperties(ns) === "") | ||
| sql(s"ALTER NAMESPACE $ns UNSET PROPERTIES ('$key')") | ||
| assert(getProperties(ns) === "", s"$key is a reserved namespace property and ignored") | ||
| val meta = spark.sessionState.catalogManager.catalog(catalog) | ||
| .asNamespaceCatalog.loadNamespaceMetadata(namespace.split('.')) | ||
| assert(!meta.get(key).contains("foo"), | ||
| "reserved properties should not have side effects") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.