rdblue commented on a change in pull request #1986: URL: https://github.com/apache/iceberg/pull/1986#discussion_r552126645
########## File path: spark3-extensions/src/test/java/org/apache/iceberg/spark/extensions/TestMerge.java ########## @@ -0,0 +1,329 @@ +/* + * 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.iceberg.spark.extensions; + +import java.util.Map; +import org.apache.iceberg.AssertHelpers; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.spark.sql.AnalysisException; +import org.junit.After; +import org.junit.BeforeClass; +import org.junit.Test; + +public abstract class TestMerge extends SparkRowLevelOperationsTestBase { + + public TestMerge(String catalogName, String implementation, Map<String, String> config, + String fileFormat, boolean vectorized) { + super(catalogName, implementation, config, fileFormat, vectorized); + } + + @BeforeClass + public static void setupSparkConf() { + spark.conf().set("spark.sql.shuffle.partitions", "4"); + } + + @After + public void removeTables() { + sql("DROP TABLE IF EXISTS %s", tableName); + sql("DROP TABLE IF EXISTS source"); + } + + // TODO: tests for reordering when operations succeed (both insert and update actions) + // TODO: tests for modifying fields in a null struct + // TODO: tests for subqueries in conditions + + @Test + public void testMergeWithNonExistingColumns() { + createAndInitNestedColumnsTable(); Review comment: I think it would be much easier to read these tests if instead of using these methods, you just embedded the `CREATE TABLE` here, like this: ```java sql("CREATE TABLE %s (..., complex struct<c1 int, c2 int) ...", tableName); initTable(tableName); ``` That way, it is easy to see what the available columns are without needing to refer back to the base class. I found it easy to see the structure and data for `source`, but kept going back to see what the target table's schema was. That was a bit harder considering the method is changed in this test. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
