Skip to content

PARQUET-422: Fix a potential bug in MessageTypeParser where we ignore… #308

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

Closed
lw-lin wants to merge 1 commit into from
Closed

PARQUET-422: Fix a potential bug in MessageTypeParser where we ignore… #308

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions parquet-column/src/main/java/org/apache/parquet/schema/MessageTypeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,15 @@ private static void addType(String t, Tokenizer st, Types.GroupBuilder builder)
// Read type.
String type = st.nextToken();
if ("group".equalsIgnoreCase(type)) {
addGroupType(t, st, repetition, builder);
addGroupType(st, repetition, builder);
} else {
addPrimitiveType(t, st, asPrimitive(type, st), repetition, builder);
addPrimitiveType(st, asPrimitive(type, st), repetition, builder);
}
}

private static void addGroupType(String t, Tokenizer st, Repetition r, GroupBuilder<?> builder) {
private static void addGroupType(Tokenizer st, Repetition r, GroupBuilder<?> builder) {
GroupBuilder<?> childBuilder = builder.group(r);
String t;
String name = st.nextToken();

// Read annotation, if any.
Expand All @@ -138,8 +139,9 @@ private static void addGroupType(String t, Tokenizer st, Repetition r, GroupBuil
childBuilder.named(name);
}

private static void addPrimitiveType(String t, Tokenizer st, PrimitiveTypeName type, Repetition r, Types.GroupBuilder<?> builder) {
private static void addPrimitiveType(Tokenizer st, PrimitiveTypeName type, Repetition r, Types.GroupBuilder<?> builder) {
PrimitiveBuilder<?> childBuilder = builder.primitive(type, r);
String t;

if (type == PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY) {
t = st.nextToken();
Expand Down