forked from apache/iceberg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Spark: Support creating views via SQL (apache#9423)
- Loading branch information
1 parent
7495c3a
commit 6bee092
Showing
10 changed files
with
609 additions
and
3 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
62 changes: 62 additions & 0 deletions
62
...5/spark-extensions/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckViews.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,62 @@ | ||
| /* | ||
| * 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.catalyst.analysis | ||
|
|
||
| import org.apache.spark.sql.AnalysisException | ||
| import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan | ||
| import org.apache.spark.sql.catalyst.plans.logical.views.CreateIcebergView | ||
| import org.apache.spark.sql.connector.catalog.Identifier | ||
| import org.apache.spark.sql.connector.catalog.ViewCatalog | ||
| import org.apache.spark.sql.internal.SQLConf | ||
| import org.apache.spark.sql.util.SchemaUtils | ||
|
|
||
| object CheckViews extends (LogicalPlan => Unit) { | ||
|
|
||
| override def apply(plan: LogicalPlan): Unit = { | ||
| plan foreach { | ||
| case CreateIcebergView(ResolvedIdentifier(_: ViewCatalog, ident), _, query, columnAliases, _, | ||
| _, _, _, _, _, _) => | ||
| verifyColumnCount(ident, columnAliases, query) | ||
| SchemaUtils.checkColumnNameDuplication(query.schema.fieldNames, SQLConf.get.resolver) | ||
|
|
||
| case _ => // OK | ||
| } | ||
| } | ||
|
|
||
| private def verifyColumnCount(ident: Identifier, columns: Seq[String], query: LogicalPlan): Unit = { | ||
| if (columns.nonEmpty) { | ||
| if (columns.length > query.output.length) { | ||
| throw new AnalysisException( | ||
| errorClass = "CREATE_VIEW_COLUMN_ARITY_MISMATCH.NOT_ENOUGH_DATA_COLUMNS", | ||
| messageParameters = Map( | ||
| "viewName" -> ident.toString, | ||
| "viewColumns" -> columns.mkString(", "), | ||
| "dataColumns" -> query.output.map(c => c.name).mkString(", "))) | ||
| } else if (columns.length < query.output.length) { | ||
| throw new AnalysisException( | ||
| errorClass = "CREATE_VIEW_COLUMN_ARITY_MISMATCH.TOO_MANY_DATA_COLUMNS", | ||
| messageParameters = Map( | ||
| "viewName" -> ident.toString, | ||
| "viewColumns" -> columns.mkString(", "), | ||
| "dataColumns" -> query.output.map(c => c.name).mkString(", "))) | ||
| } | ||
| } | ||
| } | ||
| } |
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
44 changes: 44 additions & 0 deletions
44
.../src/main/scala/org/apache/spark/sql/catalyst/plans/logical/views/CreateIcebergView.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,44 @@ | ||
| /* | ||
| * 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.catalyst.plans.logical.views | ||
|
|
||
| import org.apache.spark.sql.catalyst.plans.logical.BinaryCommand | ||
| import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan | ||
|
|
||
| case class CreateIcebergView( | ||
| child: LogicalPlan, | ||
| queryText: String, | ||
| query: LogicalPlan, | ||
| columnAliases: Seq[String], | ||
| columnComments: Seq[Option[String]], | ||
| queryColumnNames: Seq[String] = Seq.empty, | ||
| comment: Option[String], | ||
| properties: Map[String, String], | ||
| allowExisting: Boolean, | ||
| replace: Boolean, | ||
| rewritten: Boolean = false) extends BinaryCommand { | ||
| override def left: LogicalPlan = child | ||
|
|
||
| override def right: LogicalPlan = query | ||
|
|
||
| override protected def withNewChildrenInternal( | ||
| newLeft: LogicalPlan, newRight: LogicalPlan): LogicalPlan = | ||
| copy(child = newLeft, query = newRight) | ||
| } |
98 changes: 98 additions & 0 deletions
98
...sions/src/main/scala/org/apache/spark/sql/execution/datasources/v2/CreateV2ViewExec.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,98 @@ | ||
| /* | ||
| * 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.analysis.ViewAlreadyExistsException | ||
| import org.apache.spark.sql.catalyst.expressions.Attribute | ||
| import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan | ||
| import org.apache.spark.sql.connector.catalog.Identifier | ||
| import org.apache.spark.sql.connector.catalog.ViewCatalog | ||
| import org.apache.spark.sql.types.StructType | ||
| import scala.collection.JavaConverters._ | ||
|
|
||
|
|
||
| case class CreateV2ViewExec( | ||
| catalog: ViewCatalog, | ||
| ident: Identifier, | ||
| queryText: String, | ||
| viewSchema: StructType, | ||
| columnAliases: Seq[String], | ||
| columnComments: Seq[Option[String]], | ||
| queryColumnNames: Seq[String], | ||
| comment: Option[String], | ||
| properties: Map[String, String], | ||
| allowExisting: Boolean, | ||
| replace: Boolean) extends LeafV2CommandExec { | ||
|
|
||
| override lazy val output: Seq[Attribute] = Nil | ||
|
|
||
| override protected def run(): Seq[InternalRow] = { | ||
| val currentCatalogName = session.sessionState.catalogManager.currentCatalog.name | ||
| val currentCatalog = if (!catalog.name().equals(currentCatalogName)) currentCatalogName else null | ||
| val currentNamespace = session.sessionState.catalogManager.currentNamespace | ||
|
|
||
| val engineVersion = "Spark " + org.apache.spark.SPARK_VERSION | ||
| val newProperties = properties ++ | ||
| comment.map(ViewCatalog.PROP_COMMENT -> _) + | ||
| (ViewCatalog.PROP_CREATE_ENGINE_VERSION -> engineVersion, | ||
| ViewCatalog.PROP_ENGINE_VERSION -> engineVersion) | ||
|
|
||
| if (replace) { | ||
| // CREATE OR REPLACE VIEW | ||
| if (catalog.viewExists(ident)) { | ||
| catalog.dropView(ident) | ||
| } | ||
| // FIXME: replaceView API doesn't exist in Spark 3.5 | ||
| catalog.createView( | ||
| ident, | ||
| queryText, | ||
| currentCatalog, | ||
| currentNamespace, | ||
| viewSchema, | ||
| queryColumnNames.toArray, | ||
| columnAliases.toArray, | ||
| columnComments.map(c => c.orNull).toArray, | ||
| newProperties.asJava) | ||
| } else { | ||
| try { | ||
| // CREATE VIEW [IF NOT EXISTS] | ||
| catalog.createView( | ||
| ident, | ||
| queryText, | ||
| currentCatalog, | ||
| currentNamespace, | ||
| viewSchema, | ||
| queryColumnNames.toArray, | ||
| columnAliases.toArray, | ||
| columnComments.map(c => c.orNull).toArray, | ||
| newProperties.asJava) | ||
| } catch { | ||
| case _: ViewAlreadyExistsException if allowExisting => // Ignore | ||
| } | ||
| } | ||
|
|
||
| Nil | ||
| } | ||
|
|
||
| override def simpleString(maxFields: Int): String = { | ||
| s"CreateV2ViewExec: ${ident}" | ||
| } | ||
| } |
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.