-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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
- Loading branch information
Showing
9 changed files
with
377 additions
and
70 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
39 changes: 39 additions & 0 deletions
39
....5/spark-extensions/src/main/scala/org/apache/spark/sql/catalyst/analysis/ViewCheck.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,39 @@ | ||
| /* | ||
| * 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.iceberg.spark.Spark3Util | ||
| 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.ViewCatalog | ||
| import org.apache.spark.sql.execution.command.ViewHelper | ||
|
|
||
| object ViewCheck extends (LogicalPlan => Unit) { | ||
|
|
||
| override def apply(plan: LogicalPlan): Unit = { | ||
| plan foreach { | ||
| case CreateIcebergView(ResolvedIdentifier(_: ViewCatalog, ident), _, _, _, _, query, _, _) => | ||
| val identifier = Spark3Util.toV1TableIdentifier(ident) | ||
| ViewHelper.verifyTemporaryObjectsNotExists(false, identifier, query, Seq.empty) | ||
| ViewHelper.verifyAutoGeneratedAliasesNotExists(query, false, identifier) | ||
| case _ => // OK | ||
| } | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
.../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,41 @@ | ||
| /* | ||
| * 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, | ||
| userSpecifiedColumns: Seq[(String, Option[String])], | ||
| comment: Option[String], | ||
| properties: Map[String, String], | ||
| originalText: Option[String], | ||
| query: LogicalPlan, | ||
| allowExisting: Boolean, | ||
| replace: Boolean) 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) | ||
| } |
147 changes: 147 additions & 0 deletions
147
...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,147 @@ | ||
| /* | ||
| * 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.iceberg.spark.Spark3Util | ||
| import org.apache.spark.sql.catalyst.InternalRow | ||
| import org.apache.spark.sql.catalyst.analysis.ViewAlreadyExistsException | ||
| import org.apache.spark.sql.catalyst.expressions.Alias | ||
| import org.apache.spark.sql.catalyst.expressions.Attribute | ||
| import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan | ||
| import org.apache.spark.sql.catalyst.plans.logical.Project | ||
| import org.apache.spark.sql.connector.catalog.Identifier | ||
| import org.apache.spark.sql.connector.catalog.ViewCatalog | ||
| import org.apache.spark.sql.errors.QueryCompilationErrors | ||
| import org.apache.spark.sql.execution.CommandExecutionMode | ||
| import org.apache.spark.sql.internal.SQLConf | ||
| import org.apache.spark.sql.types.MetadataBuilder | ||
| import org.apache.spark.sql.util.SchemaUtils | ||
| import scala.collection.JavaConverters._ | ||
|
|
||
|
|
||
| case class CreateV2ViewExec( | ||
| catalog: ViewCatalog, | ||
| ident: Identifier, | ||
| originalText: String, | ||
| query: LogicalPlan, | ||
| userSpecifiedColumns: Seq[(String, Option[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 qe = session.sessionState.executePlan(query, CommandExecutionMode.SKIP) | ||
| qe.assertAnalyzed() | ||
| val analyzedPlan = qe.analyzed | ||
|
|
||
| val identifier = Spark3Util.toV1TableIdentifier(ident) | ||
|
|
||
| if (userSpecifiedColumns.nonEmpty) { | ||
| if (userSpecifiedColumns.length > analyzedPlan.output.length) { | ||
| throw QueryCompilationErrors.cannotCreateViewNotEnoughColumnsError( | ||
| identifier, userSpecifiedColumns.map(_._1), analyzedPlan) | ||
| } else if (userSpecifiedColumns.length < analyzedPlan.output.length) { | ||
| throw QueryCompilationErrors.cannotCreateViewTooManyColumnsError( | ||
| identifier, userSpecifiedColumns.map(_._1), analyzedPlan) | ||
| } | ||
| } | ||
|
|
||
| val queryColumnNames = analyzedPlan.schema.fieldNames | ||
| SchemaUtils.checkColumnNameDuplication(queryColumnNames, SQLConf.get.resolver) | ||
|
|
||
| val viewSchema = aliasPlan(analyzedPlan, userSpecifiedColumns).schema | ||
| val columnAliases = userSpecifiedColumns.map(_._1).toArray | ||
| val columnComments = userSpecifiedColumns.map(_._2.getOrElse("")).toArray | ||
|
|
||
| val currentCatalog = session.sessionState.catalogManager.currentCatalog.name | ||
| val currentNamespace = session.sessionState.catalogManager.currentNamespace | ||
|
|
||
| val engineVersion = "Spark " + org.apache.spark.SPARK_VERSION | ||
| val createEngineVersion = Some(engineVersion) | ||
| val newProperties = properties ++ | ||
| comment.map(ViewCatalog.PROP_COMMENT -> _) ++ | ||
| createEngineVersion.map(ViewCatalog.PROP_CREATE_ENGINE_VERSION -> _) + | ||
| (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, | ||
| originalText, | ||
| currentCatalog, | ||
| currentNamespace, | ||
| viewSchema, | ||
| queryColumnNames, | ||
| columnAliases, | ||
| columnComments, | ||
| newProperties.asJava) | ||
| } else { | ||
| try { | ||
| // CREATE VIEW [IF NOT EXISTS] | ||
| catalog.createView( | ||
| ident, | ||
| originalText, | ||
| currentCatalog, | ||
| currentNamespace, | ||
| viewSchema, | ||
| queryColumnNames, | ||
| columnAliases, | ||
| columnComments, | ||
| newProperties.asJava) | ||
| } catch { | ||
| case _: ViewAlreadyExistsException if allowExisting => // Ignore | ||
| } | ||
| } | ||
|
|
||
| Nil | ||
| } | ||
|
|
||
| override def simpleString(maxFields: Int): String = { | ||
| s"CreateV2ViewExec: ${ident}" | ||
| } | ||
|
|
||
| /** | ||
| * If `userSpecifiedColumns` is defined, alias the analyzed plan to the user specified columns, | ||
| * else return the analyzed plan directly. | ||
| */ | ||
| private def aliasPlan( | ||
| analyzedPlan: LogicalPlan, | ||
| userSpecifiedColumns: Seq[(String, Option[String])]): LogicalPlan = { | ||
| if (userSpecifiedColumns.isEmpty) { | ||
| analyzedPlan | ||
| } else { | ||
| val projectList = analyzedPlan.output.zip(userSpecifiedColumns).map { | ||
| case (attr, (colName, None)) => Alias(attr, colName)() | ||
| case (attr, (colName, Some(colComment))) => | ||
| val meta = new MetadataBuilder().putString("comment", colComment).build() | ||
| Alias(attr, colName)(explicitMetadata = Some(meta)) | ||
| } | ||
| val projectedPlan = Project(projectList, analyzedPlan) | ||
| session.sessionState.executePlan(projectedPlan, CommandExecutionMode.SKIP).analyzed | ||
| } | ||
| } | ||
| } |
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.