-
Notifications
You must be signed in to change notification settings - Fork 3k
[#2039] Support default value semantics - API changes #2496
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
82 changes: 82 additions & 0 deletions
82
api/src/test/java/org/apache/iceberg/types/TestDefaultValuesForContainerTypes.java
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,82 @@ | ||
| /* | ||
| * 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.types; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.Lists; | ||
| import org.apache.iceberg.relocated.com.google.common.collect.Maps; | ||
| import org.junit.Assert; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.apache.iceberg.types.Types.NestedField; | ||
| import static org.apache.iceberg.types.Types.StructType; | ||
|
|
||
| public class TestDefaultValuesForContainerTypes { | ||
|
|
||
| static NestedField intFieldType; | ||
| static NestedField stringFieldType; | ||
| static StructType structType; | ||
|
|
||
| @BeforeClass | ||
| public static void beforeClass() { | ||
| intFieldType = NestedField.optional(0, "optionalIntField", Types.IntegerType.get()); | ||
| stringFieldType = NestedField.required(1, "requiredStringField", Types.StringType.get()); | ||
| structType = StructType.of(Arrays.asList(intFieldType, stringFieldType)); | ||
| } | ||
|
|
||
| @Test | ||
| public void testStructTypeDefault() { | ||
| Map<String, Object> structDefaultvalue = Maps.newHashMap(); | ||
| structDefaultvalue.put(intFieldType.name(), Integer.valueOf(1)); | ||
| structDefaultvalue.put(stringFieldType.name(), "two"); | ||
| NestedField structField = NestedField.optional(2, "optionalStructField", structType, structDefaultvalue, "doc"); | ||
| Assert.assertTrue(structField.hasDefaultValue()); | ||
| Assert.assertEquals(structDefaultvalue, structField.getDefaultValue()); | ||
| } | ||
|
|
||
| @Test (expected = IllegalArgumentException.class) | ||
| public void testStructTypeDefaultInvalidFieldsTypes() { | ||
| Map<String, Object> structDefaultvalue = Maps.newHashMap(); | ||
| structDefaultvalue.put(intFieldType.name(), "one"); | ||
| structDefaultvalue.put(stringFieldType.name(), "two"); | ||
| NestedField.optional(2, "optionalStructField", structType, structDefaultvalue, "doc"); | ||
| } | ||
|
|
||
| @Test (expected = IllegalArgumentException.class) | ||
| public void testStructTypeDefaultInvalidNumberFields() { | ||
| Map<String, Object> structDefaultvalue = Maps.newHashMap(); | ||
| structDefaultvalue.put(intFieldType.name(), Integer.valueOf(1)); | ||
| structDefaultvalue.put(stringFieldType.name(), "two"); | ||
| structDefaultvalue.put("extraFieldName", "three"); | ||
| NestedField.optional(2, "optionalStructField", structType, structDefaultvalue, "doc"); | ||
| } | ||
|
|
||
| @Test (expected = IllegalArgumentException.class) | ||
| public void testStructTypeDefaultInvalidObjectType() { | ||
| List<Object> structDefaultvalue = Lists.newArrayList(); | ||
| structDefaultvalue.add(Integer.valueOf(1)); | ||
| structDefaultvalue.add("two"); | ||
| NestedField.optional(2, "optionalStructField", structType, structDefaultvalue, "doc"); | ||
| } | ||
| } | ||
|
|
83 changes: 83 additions & 0 deletions
83
api/src/test/java/org/apache/iceberg/types/TestNestedFieldDefaultValues.java
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,83 @@ | ||
| /* | ||
| * 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.types; | ||
|
|
||
| import org.apache.iceberg.types.Types.NestedField; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.apache.iceberg.types.Types.NestedField.optional; | ||
| import static org.apache.iceberg.types.Types.NestedField.required; | ||
|
|
||
|
|
||
| public class TestNestedFieldDefaultValues { | ||
|
|
||
| private final int id = 1; | ||
| private final String fieldName = "fieldName"; | ||
| private final Type fieldType = Types.IntegerType.get(); | ||
| private final String doc = "field doc"; | ||
| private final Integer defaultValue = 100; | ||
|
|
||
| @Test | ||
| public void testConstructorsValidCases() { | ||
| // optional-constructors | ||
| Assert.assertFalse(optional(id, fieldName, fieldType).hasDefaultValue()); | ||
| Assert.assertFalse(optional(id, fieldName, fieldType, doc).hasDefaultValue()); | ||
| NestedField nestedFieldWithDefault = optional(id, fieldName, fieldType, defaultValue, doc); | ||
| Assert.assertTrue(nestedFieldWithDefault.hasDefaultValue()); | ||
| Assert.assertEquals(defaultValue, nestedFieldWithDefault.getDefaultValue()); | ||
| nestedFieldWithDefault = optional(id, fieldName, fieldType, defaultValue, null); | ||
| Assert.assertTrue(nestedFieldWithDefault.hasDefaultValue()); | ||
| Assert.assertEquals(defaultValue, nestedFieldWithDefault.getDefaultValue()); | ||
|
|
||
| // required-constructors | ||
| Assert.assertFalse(required(id, fieldName, fieldType).hasDefaultValue()); | ||
| Assert.assertFalse(required(id, fieldName, fieldType, doc).hasDefaultValue()); | ||
| Assert.assertFalse(required(id, fieldName, fieldType, null, doc).hasDefaultValue()); | ||
| nestedFieldWithDefault = required(id, fieldName, fieldType, defaultValue, doc); | ||
| Assert.assertTrue(nestedFieldWithDefault.hasDefaultValue()); | ||
| Assert.assertEquals(defaultValue, nestedFieldWithDefault.getDefaultValue()); | ||
| nestedFieldWithDefault = required(id, fieldName, fieldType, defaultValue, null); | ||
| Assert.assertTrue(nestedFieldWithDefault.hasDefaultValue()); | ||
| Assert.assertEquals(defaultValue, nestedFieldWithDefault.getDefaultValue()); | ||
|
|
||
| // of-constructors | ||
| Assert.assertFalse(NestedField.of(id, true, fieldName, fieldType).hasDefaultValue()); | ||
| Assert.assertFalse(NestedField.of(id, true, fieldName, fieldType, doc).hasDefaultValue()); | ||
| nestedFieldWithDefault = NestedField.of(id, true, fieldName, fieldType, defaultValue, doc); | ||
| Assert.assertTrue(nestedFieldWithDefault.hasDefaultValue()); | ||
| Assert.assertEquals(defaultValue, nestedFieldWithDefault.getDefaultValue()); | ||
| } | ||
|
|
||
| @Test (expected = IllegalArgumentException.class) | ||
| public void testOptionalWithInvalidDefaultValueClass() { | ||
| // class of default value does not match class of type | ||
| Long wrongClassDefaultValue = 100L; | ||
| optional(id, fieldName, fieldType, wrongClassDefaultValue, doc); | ||
| } | ||
|
|
||
| @Test (expected = IllegalArgumentException.class) | ||
| public void testReqiredWithInvalidDefaultValueClass() { | ||
| // class of default value does not match class of type | ||
| Long wrongClassDefaultValue = 100L; | ||
| required(id, fieldName, fieldType, wrongClassDefaultValue, doc); | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.
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.