Skip to content

PARQUET-1335: Logical type names in parquet-mr are not consistent with parquet-format #503

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
gszadovszky merged 1 commit into from
Jul 9, 2018
Merged

PARQUET-1335: Logical type names in parquet-mr are not consistent with parquet-format #503

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
28 changes: 23 additions & 5 deletions parquet-column/src/test/java/org/apache/parquet/parser/TestParquetParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import static org.apache.parquet.schema.LogicalTypeAnnotation.TimeUnit.MILLIS;
import static org.apache.parquet.schema.LogicalTypeAnnotation.intType;
import static org.apache.parquet.schema.LogicalTypeAnnotation.stringType;
import static org.apache.parquet.schema.LogicalTypeAnnotation.timeType;
import static org.apache.parquet.schema.LogicalTypeAnnotation.timestampType;
import static org.junit.Assert.assertEquals;
Expand Down Expand Up @@ -119,27 +120,44 @@ public void testEachPrimitiveType() {
}

@Test
public void testUTF8Annotation() {
public void testSTRINGAnnotation() {
String message =
"message StringMessage {\n" +
" required binary string (STRING);\n" +
"}\n";

MessageType parsed = parseMessageType(message);
MessageType expected = buildMessage()
.required(BINARY).as(UTF8).named("string")
.required(BINARY).as(stringType()).named("string")
.named("StringMessage");

assertEquals(expected, parsed);
MessageType reparsed = parseMessageType(parsed.toString());
assertEquals(expected, reparsed);
}

@Test
public void testUTF8Annotation() {
String message =
"message StringMessage {\n" +
" required binary string (UTF8);\n" +
"}\n";

MessageType parsed = parseMessageType(message);
MessageType expected = buildMessage()
.required(BINARY).as(UTF8).named("string")
.named("StringMessage");

assertEquals(expected, parsed);
MessageType reparsed = parseMessageType(parsed.toString());
assertEquals(expected, reparsed);
}

@Test
public void testIDs() {
String message =
"message Message {\n" +
" required binary string (STRING) = 6;\n" +
" required binary string (UTF8) = 6;\n" +
" required int32 i=1;\n" +
" required binary s2= 3;\n" +
" required binary s3 =4;\n" +
Expand All @@ -165,7 +183,7 @@ public void testMAPAnnotations() {
"message Message {\n" +
" optional group aMap (MAP) {\n" +
" repeated group map (MAP_KEY_VALUE) {\n" +
" required binary key (STRING);\n" +
" required binary key (UTF8);\n" +
" required int32 value;\n" +
" }\n" +
" }\n" +
Expand All @@ -192,7 +210,7 @@ public void testLISTAnnotation() {
String message =
"message Message {\n" +
" required group aList (LIST) {\n" +
" repeated binary string (STRING);\n" +
" repeated binary string (UTF8);\n" +
" }\n" +
"}\n";

Expand Down