rdblue commented on a change in pull request #227: ORC column map fix URL: https://github.com/apache/incubator-iceberg/pull/227#discussion_r326398294
########## File path: orc/src/test/java/org/apache/iceberg/orc/TestORCSchemaUtil.java ########## @@ -0,0 +1,207 @@ +/* + * 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.orc; + +import org.apache.iceberg.Schema; +import org.apache.iceberg.types.Types; +import org.apache.orc.TypeDescription; +import org.junit.Test; + +import static org.apache.iceberg.types.Types.NestedField.optional; +import static org.apache.iceberg.types.Types.NestedField.required; +import static org.junit.Assert.assertEquals; + +public class TestORCSchemaUtil { + + @Test + public void testRoundtripConversionPrimitive() { + Schema expectedSchema = new Schema( + optional(1, "intCol", Types.IntegerType.get()), + optional(3, "longCol", Types.LongType.get()), + optional(6, "intCol2", Types.IntegerType.get()), + optional(20, "intCol3", Types.IntegerType.get()), + required(9, "doubleCol", Types.DoubleType.get()) + ); + TypeDescription orcSchema = ORCSchemaUtil.toOrc(expectedSchema); + assertEquals(expectedSchema.asStruct(), ORCSchemaUtil.toIceberg(orcSchema).asStruct()); + } + + @Test + public void testRoundtripConversionNested() { + Types.StructType leafStructType = Types.StructType.of( + optional(6, "leafLongCol", Types.LongType.get()), + optional(7, "leafBinaryCol", Types.BinaryType.get()) + ); + Types.StructType nestedStructType = Types.StructType.of( + optional(4, "longCol", Types.LongType.get()), + optional(5, "leafStructCol", leafStructType) + ); + // all fields in expected iceberg schema will be optional since we don't have a column mapping + Schema expectedSchema = new Schema( + optional(1, "intCol", Types.IntegerType.get()), + optional(2, "longCol", Types.LongType.get()), + optional(3, "nestedStructCol", nestedStructType), + optional(8, "intCol3", Types.IntegerType.get()), + optional(9, "doubleCol", Types.DoubleType.get()) + ); + TypeDescription orcSchema = ORCSchemaUtil.toOrc(expectedSchema); + assertEquals(expectedSchema.asStruct(), ORCSchemaUtil.toIceberg(orcSchema).asStruct()); + } + + @Test + public void testSchemaEvolutionPrimitiveNoOp() { + Schema originalSchema = new Schema( + optional(1, "a", Types.IntegerType.get()), + optional(2, "b", Types.StringType.get()) + ); + + // Original mapping (stored in ORC) + TypeDescription orcSchema = ORCSchemaUtil.toOrc(originalSchema); + assertEquals(2, orcSchema.getChildren().size()); + assertEquals(1, orcSchema.findSubtype("a").getId()); + assertEquals(TypeDescription.Category.INT, orcSchema.findSubtype("a").getCategory()); + assertEquals(2, orcSchema.findSubtype("b").getId()); + assertEquals(TypeDescription.Category.STRING, orcSchema.findSubtype("b").getCategory()); + } + + @Test + public void testSchemaEvolutionPrimitive() { + Schema originalSchema = new Schema( + optional(1, "a", Types.IntegerType.get()), + optional(2, "b", Types.StringType.get()) + ); + + // Original mapping (stored in ORC) + TypeDescription orcSchema = ORCSchemaUtil.toOrc(originalSchema); + + // Evolve schema + Schema evolveSchema = new Schema( + optional(2, "a", Types.StringType.get()), + optional(3, "c", Types.DateType.get()) + ); + + TypeDescription newOrcSchema = ORCSchemaUtil.toOrc(evolveSchema, orcSchema); + assertEquals(2, newOrcSchema.getChildren().size()); + assertEquals(1, newOrcSchema.findSubtype("b").getId()); + assertEquals(TypeDescription.Category.STRING, newOrcSchema.findSubtype("b").getCategory()); + assertEquals(2, newOrcSchema.findSubtype("c").getId()); + assertEquals(TypeDescription.Category.DATE, newOrcSchema.findSubtype("c").getCategory()); + } + + @Test + public void testSchemaEvolutionNestedNoOp() { + Types.StructType nestedStructType = Types.StructType.of( + optional(2, "b", Types.StringType.get()), + optional(3, "c", Types.DateType.get()) + ); + Schema originalSchema = new Schema( + optional(1, "a", nestedStructType) + ); + + // Original mapping (stored in ORC) + TypeDescription orcSchema = ORCSchemaUtil.toOrc(originalSchema); + + TypeDescription newOrcSchema = ORCSchemaUtil.toOrc(originalSchema, orcSchema); + assertEquals(1, newOrcSchema.getChildren().size()); + assertEquals(TypeDescription.Category.STRUCT, newOrcSchema.findSubtype("a").getCategory()); + TypeDescription nestedCol = newOrcSchema.findSubtype("a"); + assertEquals(2, nestedCol.findSubtype("b").getId()); + assertEquals(TypeDescription.Category.STRING, nestedCol.findSubtype("b").getCategory()); + assertEquals(3, nestedCol.findSubtype("c").getId()); + assertEquals(TypeDescription.Category.DATE, nestedCol.findSubtype("c").getCategory()); + } + + @Test + public void testSchemaEvolutionNested() { + Types.StructType nestedStructType = Types.StructType.of( + optional(2, "b", Types.StringType.get()), + optional(3, "c", Types.DateType.get()) + ); + Schema originalSchema = new Schema( + optional(1, "a", nestedStructType) + ); + + // Original mapping (stored in ORC) + TypeDescription orcSchema = ORCSchemaUtil.toOrc(originalSchema); + + // Evolve schema + Types.StructType newNestedStructType = Types.StructType.of( + optional(3, "cc", Types.DateType.get()), + optional(2, "bb", Types.StringType.get()) + ); + Schema evolveSchema = new Schema( + optional(1, "aa", newNestedStructType) + ); + + TypeDescription newOrcSchema = ORCSchemaUtil.toOrc(evolveSchema, orcSchema); + assertEquals(1, newOrcSchema.getChildren().size()); + assertEquals(TypeDescription.Category.STRUCT, newOrcSchema.findSubtype("a").getCategory()); + TypeDescription nestedCol = newOrcSchema.findSubtype("a"); + assertEquals(2, nestedCol.findSubtype("c").getId()); + assertEquals(TypeDescription.Category.DATE, nestedCol.findSubtype("c").getCategory()); + assertEquals(3, nestedCol.findSubtype("b").getId()); + assertEquals(TypeDescription.Category.STRING, nestedCol.findSubtype("b").getCategory()); + } + + @Test + public void testTypePromotions() { + Schema originalSchema = new Schema( + optional(1, "a", Types.IntegerType.get()), + optional(2, "b", Types.FloatType.get()), + optional(3, "c", Types.DecimalType.of(10, 2)) + ); + + // Original mapping (stored in ORC) + TypeDescription orcSchema = ORCSchemaUtil.toOrc(originalSchema); + + // Evolve schema + Schema evolveSchema = new Schema( + optional(1, "a", Types.LongType.get()), + optional(2, "b", Types.DoubleType.get()), + optional(3, "c", Types.DecimalType.of(15, 2)) + ); + + TypeDescription newOrcSchema = ORCSchemaUtil.toOrc(evolveSchema, orcSchema); + assertEquals(3, newOrcSchema.getChildren().size()); + assertEquals(1, newOrcSchema.findSubtype("a").getId()); + assertEquals(TypeDescription.Category.LONG, newOrcSchema.findSubtype("a").getCategory()); + assertEquals(2, newOrcSchema.findSubtype("b").getId()); + assertEquals(TypeDescription.Category.DOUBLE, newOrcSchema.findSubtype("b").getCategory()); + TypeDescription decimalC = newOrcSchema.findSubtype("c"); + assertEquals(3, decimalC.getId()); + assertEquals(TypeDescription.Category.DECIMAL, decimalC.getCategory()); + assertEquals(15, decimalC.getPrecision()); + assertEquals(2, decimalC.getScale()); + } + + @Test(expected = IllegalArgumentException.class) + public void testInvalidTypePromotions() { Review comment: I recommend using `AssertHelpers.assertThrows` from iceberg-core instead of `expected`. It's easier to check the error message and you can have more than one assertion per 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] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
