Skip to content

API: Fix NPE when validating identifier fields #4372

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.

Sign up for GitHub

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

Merged
szehon-ho merged 4 commits into from
Mar 23, 2022
Merged

API: Fix NPE when validating identifier fields #4372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e61479a
API: Fix NPE when validating identifier fields
liuml07 Mar 22, 2022
c0395e7
Address comments
liuml07 Mar 22, 2022
2ed28fe
%d -> %s
liuml07 Mar 22, 2022
e919cb3
not exists -> does not exist
liuml07 Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions api/src/main/java/org/apache/iceberg/Schema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ public Schema(int schemaId, List<NestedField> columns, Map<String, Integer> alia
static void validateIdentifierField(int fieldId, Map<Integer, Types.NestedField> idToField,
Map<Integer, Integer> idToParent) {
Types.NestedField field = idToField.get(fieldId);
Preconditions.checkArgument(field != null,
"Cannot add fieldId %s as an identifier field: field does not exist", fieldId);
Preconditions.checkArgument(field.type().isPrimitiveType(),
"Cannot add field %s as an identifier field: not a primitive type field", field.name());
Preconditions.checkArgument(field.isRequired(),
Expand Down
10 changes: 7 additions & 3 deletions core/src/test/java/org/apache/iceberg/TestSchemaUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,24 +1334,28 @@ public void testRemoveIdentifierFields() {

@Test
public void testSetIdentifierFieldsFails() {

Schema testSchema = new Schema(
optional(1, "id", Types.IntegerType.get()),
required(2, "float", Types.FloatType.get()),
required(3, "double", Types.DoubleType.get())
);

AssertHelpers.assertThrows("Creating schema with nonexistent identifier fieldId should fail",
IllegalArgumentException.class,
"Cannot add fieldId 999 as an identifier field: field does not exist",
() -> new Schema(testSchema.asStruct().fields(), ImmutableSet.of(999)));

AssertHelpers.assertThrows("Creating schema with optional identifier field should fail",
IllegalArgumentException.class,
"Cannot add field id as an identifier field: not a required field",
() -> new Schema(testSchema.asStruct().fields(), ImmutableSet.of(1)));

AssertHelpers.assertThrows("Creating schema with optional identifier field should fail",
AssertHelpers.assertThrows("Creating schema with float identifier field should fail",
IllegalArgumentException.class,
"Cannot add field float as an identifier field: must not be float or double field",
() -> new Schema(testSchema.asStruct().fields(), ImmutableSet.of(2)));

AssertHelpers.assertThrows("Creating schema with optional identifier field should fail",
AssertHelpers.assertThrows("Creating schema with double identifier field should fail",
IllegalArgumentException.class,
"Cannot add field double as an identifier field: must not be float or double field",
() -> new Schema(testSchema.asStruct().fields(), ImmutableSet.of(3)));
Expand Down