[SPARK-56054][SQL] Add test for MERGE INTO schema evolution with aliased assignments #55239
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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,125 @@ | ||
| /* | ||
| * 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.connector | ||
|
|
||
| import org.apache.spark.sql.{AnalysisException, Row} | ||
| import org.apache.spark.sql.connector.catalog.CatalogV2Util | ||
| import org.apache.spark.sql.functions.col | ||
| import org.apache.spark.sql.types._ | ||
|
|
||
| /** | ||
| * DataFrame API-only tests for MERGE INTO schema evolution with aliased assignments. | ||
| * These tests use the `.as()` DataFrame method which has no SQL equivalent, so they only run | ||
| * in the Scala/DataFrame API test suites. | ||
| */ | ||
| trait MergeIntoSchemaEvolutionExtraScalaTests extends MergeIntoSchemaEvolutionSuiteBase { | ||
|
|
||
| private def withNestedTestData(body: => Unit): Unit = { | ||
| withTable(tableNameAsString) { | ||
| withTempView("source") { | ||
| val targetSchema = StructType(Seq( | ||
| StructField("pk", IntegerType, nullable = false), | ||
| StructField("info", StructType(Seq( | ||
| StructField("a", IntegerType) | ||
| ))) | ||
| )) | ||
| createTable(CatalogV2Util.structTypeToV2Columns(targetSchema), Seq.empty) | ||
| val targetDf = spark.createDataFrame(spark.sparkContext.parallelize(Seq( | ||
| Row(1, Row(10)), | ||
| Row(2, Row(20)) | ||
| )), targetSchema) | ||
| targetDf.writeTo(tableNameAsString).append() | ||
|
|
||
| val sourceSchema = StructType(Seq( | ||
| StructField("pk", IntegerType, nullable = false), | ||
| StructField("info", StructType(Seq( | ||
| StructField("a", IntegerType), | ||
| StructField("b", IntegerType) | ||
| ))) | ||
| )) | ||
| val sourceDf = spark.createDataFrame(spark.sparkContext.parallelize(Seq( | ||
| Row(2, Row(30, 50)), | ||
| Row(3, Row(40, 75)) | ||
| )), sourceSchema) | ||
| sourceDf.createOrReplaceTempView("source") | ||
|
|
||
| body | ||
| } | ||
| } | ||
| } | ||
|
|
||
| test("schema evolution - top-level aliased struct column is not evolved") { | ||
| withNestedTestData { | ||
| val ex = intercept[AnalysisException] { | ||
| spark.table("source") | ||
| .mergeInto(tableNameAsString, | ||
| col(s"$tableNameAsString.pk") === col("source.pk")) | ||
| .whenMatched().update(Map("info" -> col("source.info").as("info"))) | ||
| .withSchemaEvolution() | ||
| .merge() | ||
| } | ||
| assert(ex.getCondition === "INCOMPATIBLE_DATA_FOR_TABLE.EXTRA_STRUCT_FIELDS") | ||
| } | ||
| } | ||
|
|
||
| // Same as above with a mismatched alias name. | ||
| test("schema evolution - top-level aliased struct column with mismatched name is not evolved") { | ||
| withNestedTestData { | ||
| val ex = intercept[AnalysisException] { | ||
| spark.table("source") | ||
| .mergeInto(tableNameAsString, | ||
| col(s"$tableNameAsString.pk") === col("source.pk")) | ||
| .whenMatched().update(Map( | ||
| "info" -> col("source.info").as("something_else"))) | ||
|
Contributor
There was a problem hiding this comment. How does Delta behave in this case? |
||
| .withSchemaEvolution() | ||
| .merge() | ||
| } | ||
| assert(ex.getCondition === "INCOMPATIBLE_DATA_FOR_TABLE.EXTRA_STRUCT_FIELDS") | ||
| } | ||
| } | ||
|
|
||
| test("schema evolution - nested field through aliased struct column is not evolved") { | ||
| withNestedTestData { | ||
| val ex = intercept[AnalysisException] { | ||
| spark.table("source") | ||
| .mergeInto(tableNameAsString, | ||
| col(s"$tableNameAsString.pk") === col("source.pk")) | ||
| .whenMatched().update(Map( | ||
| "info.b" -> col("source.info").as("x").getField("b"))) | ||
| .withSchemaEvolution() | ||
| .merge() | ||
| } | ||
| assert(ex.getCondition === "UNRESOLVED_COLUMN.WITH_SUGGESTION") | ||
| } | ||
| } | ||
|
|
||
| test("schema evolution - complex expression value is not considered for evolution") { | ||
| withNestedTestData { | ||
| val ex = intercept[AnalysisException] { | ||
| spark.table("source") | ||
| .mergeInto(tableNameAsString, | ||
| col(s"$tableNameAsString.pk") === col("source.pk")) | ||
| .whenMatched().update(Map( | ||
| "info.b" -> (col("source.info.b") + 1).as("b"))) | ||
| .withSchemaEvolution() | ||
| .merge() | ||
| } | ||
| assert(ex.getCondition === "UNRESOLVED_COLUMN.WITH_SUGGESTION") | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
Okay, this seems like a behavior change compared to the initial PR then? The code in master would evolve the schema in this case because we had that alias support?