xushiyan commented on a change in pull request #3936: URL: https://github.com/apache/hudi/pull/3936#discussion_r748619821
########## File path: hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/TestHoodieOptionConfig.scala ########## @@ -0,0 +1,183 @@ +/* + * 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.hudi + +import org.apache.hudi.common.model.{DefaultHoodieRecordPayload, OverwriteWithLatestAvroPayload} +import org.apache.hudi.common.table.HoodieTableConfig +import org.apache.hudi.testutils.HoodieClientTestBase + +import org.apache.spark.sql.SparkSession +import org.apache.spark.sql.types._ + +import org.junit.jupiter.api.{Assertions, BeforeEach, Test} + +import org.scalatest.Matchers.intercept + +class TestHoodieOptionConfig extends HoodieClientTestBase { + + var spark: SparkSession = _ + + /** + * Setup method running before each test. + */ + @BeforeEach override def setUp() { + initSparkContexts() + spark = sqlContext.sparkSession + } + + @Test + def testWithDefaultSqlOptions(): Unit = { + val ops1 = Map("primaryKey" -> "id") + val with1 = HoodieOptionConfig.withDefaultSqlOptions(ops1) + Assertions.assertTrue(with1.size == 3) Review comment: suggestion: it'd be better with static import for assertXXX method, which makes test code more concise and cleaner; here Assertions are repeated many times but with no extra info ########## File path: hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/TestHoodieOptionConfig.scala ########## @@ -0,0 +1,183 @@ +/* + * 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.hudi + +import org.apache.hudi.common.model.{DefaultHoodieRecordPayload, OverwriteWithLatestAvroPayload} +import org.apache.hudi.common.table.HoodieTableConfig +import org.apache.hudi.testutils.HoodieClientTestBase + +import org.apache.spark.sql.SparkSession +import org.apache.spark.sql.types._ + +import org.junit.jupiter.api.{Assertions, BeforeEach, Test} + +import org.scalatest.Matchers.intercept + +class TestHoodieOptionConfig extends HoodieClientTestBase { + + var spark: SparkSession = _ + + /** + * Setup method running before each test. + */ + @BeforeEach override def setUp() { + initSparkContexts() + spark = sqlContext.sparkSession + } + + @Test + def testWithDefaultSqlOptions(): Unit = { + val ops1 = Map("primaryKey" -> "id") + val with1 = HoodieOptionConfig.withDefaultSqlOptions(ops1) + Assertions.assertTrue(with1.size == 3) + Assertions.assertTrue(with1("primaryKey") == "id") + Assertions.assertTrue(with1("type") == "cow") + Assertions.assertTrue(with1("payloadClass") == classOf[DefaultHoodieRecordPayload].getName) + + val ops2 = Map("primaryKey" -> "id", + "preCombineField" -> "timestamp", + "type" -> "mor", + "payloadClass" -> classOf[OverwriteWithLatestAvroPayload].getName + ) + val with2 = HoodieOptionConfig.withDefaultSqlOptions(ops2) + Assertions.assertTrue(ops2 == with2) + } + + @Test + def testMappingSqlOptionToTableConfig(): Unit = { + val sqlOptions = Map("primaryKey" -> "id,addr", + "preCombineField" -> "timestamp", + "type" -> "mor", + "hoodie.index.type" -> "INMEMORY", + "hoodie.compact.inline" -> "true" + ) + val tableConfigs = HoodieOptionConfig.mappingSqlOptionToTableConfig(sqlOptions) + + Assertions.assertTrue(tableConfigs.size == 5) + Assertions.assertTrue(tableConfigs(HoodieTableConfig.RECORDKEY_FIELDS.key) == "id,addr") + Assertions.assertTrue(tableConfigs(HoodieTableConfig.PRECOMBINE_FIELD.key) == "timestamp") + Assertions.assertTrue(tableConfigs(HoodieTableConfig.TYPE.key) == "MERGE_ON_READ") + Assertions.assertTrue(tableConfigs("hoodie.index.type") == "INMEMORY") + Assertions.assertTrue(tableConfigs("hoodie.compact.inline") == "true") + } + + @Test + def testDeleteHooideOptions(): Unit = { + val sqlOptions = Map("primaryKey" -> "id,addr", + "preCombineField" -> "timestamp", + "type" -> "mor", + "hoodie.index.type" -> "INMEMORY", + "hoodie.compact.inline" -> "true", + "key123" -> "value456" + ) + val tableConfigs = HoodieOptionConfig.deleteHooideOptions(sqlOptions) + Assertions.assertTrue(tableConfigs.size == 1) + Assertions.assertTrue(tableConfigs("key123") == "value456") + } + + @Test + def testExtractSqlOptions(): Unit = { + val sqlOptions = Map("primaryKey" -> "id,addr", + "preCombineField" -> "timestamp", + "type" -> "mor", + "hoodie.index.type" -> "INMEMORY", + "hoodie.compact.inline" -> "true", + "key123" -> "value456" + ) + val tableConfigs = HoodieOptionConfig.extractSqlOptions(sqlOptions) + Assertions.assertTrue(tableConfigs.size == 3) + Assertions.assertTrue(tableConfigs.keySet == Set("primaryKey", "preCombineField", "type")) + } + + @Test + def testValidateTable(): Unit = { + val baseSqlOptions = Map( + "hoodie.datasource.write.hive_style_partitioning" -> "true", + "hoodie.datasource.write.partitionpath.urlencode" -> "false", + "hoodie.table.keygenerator.class" -> "org.apache.hudi.keygen.ComplexKeyGenerator" + ) + + val schema = StructType( + Seq(StructField("id", IntegerType, true), + StructField("name", StringType, true), + StructField("timestamp", TimestampType, true), + StructField("dt", StringType, true)) + ) + + // miss primaryKey parameter + val sqlOptions1 = baseSqlOptions ++ Map( + "type" -> "mor" + ) + + val e1 = intercept[IllegalArgumentException] { + HoodieOptionConfig.validateTable(spark, schema, sqlOptions1) + } + Assertions.assertTrue(e1.getMessage.contains("No `primaryKey` is specified.")) Review comment: you can use assertThrows(() -> {}) here; also applies to a few other occurrences below ########## File path: hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/spark/sql/hudi/TestHoodieOptionConfig.scala ########## @@ -0,0 +1,183 @@ +/* + * 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.hudi + +import org.apache.hudi.common.model.{DefaultHoodieRecordPayload, OverwriteWithLatestAvroPayload} +import org.apache.hudi.common.table.HoodieTableConfig +import org.apache.hudi.testutils.HoodieClientTestBase + +import org.apache.spark.sql.SparkSession +import org.apache.spark.sql.types._ + +import org.junit.jupiter.api.{Assertions, BeforeEach, Test} + +import org.scalatest.Matchers.intercept + +class TestHoodieOptionConfig extends HoodieClientTestBase { + + var spark: SparkSession = _ + + /** + * Setup method running before each test. + */ + @BeforeEach override def setUp() { + initSparkContexts() + spark = sqlContext.sparkSession + } + + @Test + def testWithDefaultSqlOptions(): Unit = { + val ops1 = Map("primaryKey" -> "id") + val with1 = HoodieOptionConfig.withDefaultSqlOptions(ops1) + Assertions.assertTrue(with1.size == 3) + Assertions.assertTrue(with1("primaryKey") == "id") + Assertions.assertTrue(with1("type") == "cow") + Assertions.assertTrue(with1("payloadClass") == classOf[DefaultHoodieRecordPayload].getName) + + val ops2 = Map("primaryKey" -> "id", + "preCombineField" -> "timestamp", + "type" -> "mor", + "payloadClass" -> classOf[OverwriteWithLatestAvroPayload].getName + ) + val with2 = HoodieOptionConfig.withDefaultSqlOptions(ops2) + Assertions.assertTrue(ops2 == with2) + } + + @Test + def testMappingSqlOptionToTableConfig(): Unit = { + val sqlOptions = Map("primaryKey" -> "id,addr", + "preCombineField" -> "timestamp", + "type" -> "mor", + "hoodie.index.type" -> "INMEMORY", + "hoodie.compact.inline" -> "true" + ) + val tableConfigs = HoodieOptionConfig.mappingSqlOptionToTableConfig(sqlOptions) + + Assertions.assertTrue(tableConfigs.size == 5) + Assertions.assertTrue(tableConfigs(HoodieTableConfig.RECORDKEY_FIELDS.key) == "id,addr") + Assertions.assertTrue(tableConfigs(HoodieTableConfig.PRECOMBINE_FIELD.key) == "timestamp") + Assertions.assertTrue(tableConfigs(HoodieTableConfig.TYPE.key) == "MERGE_ON_READ") + Assertions.assertTrue(tableConfigs("hoodie.index.type") == "INMEMORY") + Assertions.assertTrue(tableConfigs("hoodie.compact.inline") == "true") + } + + @Test + def testDeleteHooideOptions(): Unit = { + val sqlOptions = Map("primaryKey" -> "id,addr", + "preCombineField" -> "timestamp", + "type" -> "mor", + "hoodie.index.type" -> "INMEMORY", + "hoodie.compact.inline" -> "true", + "key123" -> "value456" + ) + val tableConfigs = HoodieOptionConfig.deleteHooideOptions(sqlOptions) + Assertions.assertTrue(tableConfigs.size == 1) + Assertions.assertTrue(tableConfigs("key123") == "value456") + } + + @Test + def testExtractSqlOptions(): Unit = { + val sqlOptions = Map("primaryKey" -> "id,addr", + "preCombineField" -> "timestamp", + "type" -> "mor", + "hoodie.index.type" -> "INMEMORY", + "hoodie.compact.inline" -> "true", + "key123" -> "value456" + ) + val tableConfigs = HoodieOptionConfig.extractSqlOptions(sqlOptions) + Assertions.assertTrue(tableConfigs.size == 3) + Assertions.assertTrue(tableConfigs.keySet == Set("primaryKey", "preCombineField", "type")) + } + + @Test + def testValidateTable(): Unit = { + val baseSqlOptions = Map( + "hoodie.datasource.write.hive_style_partitioning" -> "true", + "hoodie.datasource.write.partitionpath.urlencode" -> "false", + "hoodie.table.keygenerator.class" -> "org.apache.hudi.keygen.ComplexKeyGenerator" + ) + + val schema = StructType( + Seq(StructField("id", IntegerType, true), + StructField("name", StringType, true), + StructField("timestamp", TimestampType, true), + StructField("dt", StringType, true)) + ) + + // miss primaryKey parameter + val sqlOptions1 = baseSqlOptions ++ Map( + "type" -> "mor" + ) + + val e1 = intercept[IllegalArgumentException] { + HoodieOptionConfig.validateTable(spark, schema, sqlOptions1) + } + Assertions.assertTrue(e1.getMessage.contains("No `primaryKey` is specified.")) + + // primary field not found + val sqlOptions2 = baseSqlOptions ++ Map( + "primaryKey" -> "xxx", + "type" -> "mor" + ) + val e2 = intercept[IllegalArgumentException] { + HoodieOptionConfig.validateTable(spark, schema, sqlOptions2) + } + Assertions.assertTrue(e2.getMessage.contains("Can't find primary key")) + + // preCombine field not found + val sqlOptions3 = baseSqlOptions ++ Map( + "primaryKey" -> "id", + "preCombineField" -> "ts", + "type" -> "mor" + ) + val e3 = intercept[IllegalArgumentException] { + HoodieOptionConfig.validateTable(spark, schema, sqlOptions3) + } + Assertions.assertTrue(e3.getMessage.contains("Can't find precombine key")) + + // miss type parameter + val sqlOptions4 = baseSqlOptions ++ Map( + "primaryKey" -> "id", + "preCombineField" -> "timestamp" + ) + val e4 = intercept[IllegalArgumentException] { + HoodieOptionConfig.validateTable(spark, schema, sqlOptions4) + } + Assertions.assertTrue(e4.getMessage.contains("No `type` is specified.")) + + // type is invalid + val sqlOptions5 = baseSqlOptions ++ Map( + "primaryKey" -> "id", + "preCombineField" -> "timestamp", + "type" -> "abc" + ) + val e5 = intercept[IllegalArgumentException] { + HoodieOptionConfig.validateTable(spark, schema, sqlOptions5) + } + Assertions.assertTrue(e5.getMessage.contains("'type' must be 'cow' or 'mor'")) + + // right options and schema + val sqlOptions6 = baseSqlOptions ++ Map( + "primaryKey" -> "id", + "preCombineField" -> "timestamp", + "type" -> "cow" + ) + HoodieOptionConfig.validateTable(spark, schema, sqlOptions6) Review comment: use assertNotThrow(() -> {}) to provide assertion failure message? ########## File path: hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/HoodieSparkSqlWriterSuite2.scala ########## @@ -0,0 +1,47 @@ +/* + * 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.hudi + +import org.apache.hudi.config.HoodieWriteConfig +import org.apache.hudi.keygen.{ComplexKeyGenerator, SimpleKeyGenerator} + +import org.apache.spark.sql.hudi.command.SqlKeyGenerator + +import org.junit.jupiter.api.Assertions.assertTrue +import org.junit.jupiter.api.Test + +class HoodieSparkSqlWriterSuite2 { + + @Test + def testGetRealKeyGenerator(): Unit = { Review comment: test name also update? -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
