Skip to content

Commit 2ac75c6

Browse files
committed
fix checkstyle
1 parent f52fe36 commit 2ac75c6

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

parquet/src/main/java/org/apache/iceberg/data/parquet/BaseParquetReaders.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,11 @@ public ParquetValueReader<?> struct(
235235
Type fieldType = fields.get(i);
236236
int fieldD = type.getMaxDefinitionLevel(path(fieldType.getName())) - 1;
237237
int id =
238-
fieldType.getId() != null
239-
? fieldType.getId().intValue()
240-
: expected.fields().get(i).fieldId();
238+
fieldType.getId() != null
239+
? fieldType.getId().intValue()
240+
: i < expected.fields().size()
241+
? expected.fields().get(i).fieldId()
242+
: -1;
241243
readersById.put(id, ParquetValueReaders.option(fieldType, fieldD, fieldReader));
242244
}
243245
}

parquet/src/main/java/org/apache/iceberg/parquet/TypeWithSchemaVisitor.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,11 @@ private static <T> List<T> visitFields(
201201
int fieldIdFromStruct = 0;
202202
for (Type field : group.getFields()) {
203203
int id =
204-
field.getId() != null
205-
? field.getId().intValue()
206-
: (struct != null) ? struct.fields().get(fieldIdFromStruct).fieldId() : -1;
204+
field.getId() != null
205+
? field.getId().intValue()
206+
: (struct != null && fieldIdFromStruct < struct.fields().size())
207+
? struct.fields().get(fieldIdFromStruct).fieldId()
208+
: -1;
207209
fieldIdFromStruct++;
208210
Types.NestedField iField = (struct != null && id >= 0) ? struct.field(id) : null;
209211
results.add(visitField(iField, field, visitor));

0 commit comments

Comments
 (0)