Skip to content

Refactor list & map wrappers in hive parquet tests #13837

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
raunaqmorarka merged 1 commit into from
Sep 5, 2022
Merged

Refactor list & map wrappers in hive parquet tests #13837

Show file tree
Hide file tree
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
22 changes: 12 additions & 10 deletions ...no-hive/src/test/java/io/trino/plugin/hive/parquet/write/MapKeyValuesSchemaConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,12 @@ else if (typeInfo.getCategory() == Category.UNION) {
private static GroupType convertArrayType(String name, ListTypeInfo typeInfo)
{
TypeInfo subType = typeInfo.getListElementTypeInfo();
return listWrapper(name, LogicalTypeAnnotation.listType(), new GroupType(Repetition.REPEATED,
ParquetHiveSerDe.ARRAY.toString(), convertType("array_element", subType)));
return listWrapper(
name,
new GroupType(
Repetition.REPEATED,
ParquetHiveSerDe.ARRAY.toString(),
convertType("array_element", subType)));
}

// An optional group containing multiple elements
Expand All @@ -171,10 +175,9 @@ public static GroupType mapType(Repetition repetition, String alias, String mapA
{
//support projection only on key of a map
if (valueType == null) {
return listWrapper(
return mapKvWrapper(
Comment thread
nevillelyh marked this conversation as resolved.
repetition,
alias,
LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance(),
new GroupType(
Repetition.REPEATED,
mapAlias,
Expand All @@ -184,10 +187,9 @@ public static GroupType mapType(Repetition repetition, String alias, String mapA
if (!valueType.getName().equals("value")) {
throw new RuntimeException(valueType.getName() + " should be value");
}
return listWrapper(
return mapKvWrapper(
repetition,
alias,
LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance(),
new GroupType(
Repetition.REPEATED,
mapAlias,
Expand All @@ -196,16 +198,16 @@ public static GroupType mapType(Repetition repetition, String alias, String mapA
}
}

private static GroupType listWrapper(Repetition repetition, String alias, LogicalTypeAnnotation logicalType, Type nested)
private static GroupType mapKvWrapper(Repetition repetition, String alias, Type nested)
{
if (!nested.isRepetition(Repetition.REPEATED)) {
throw new IllegalArgumentException("Nested type should be repeated: " + nested);
}
return Types.buildGroup(repetition).as(logicalType).addField(nested).named(alias);
return Types.buildGroup(repetition).as(LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance()).addField(nested).named(alias);
}

private static GroupType listWrapper(String name, LogicalTypeAnnotation logicalType, GroupType groupType)
private static GroupType listWrapper(String name, GroupType groupType)
{
return Types.optionalGroup().as(logicalType).addField(groupType).named(name);
return Types.optionalGroup().as(LogicalTypeAnnotation.listType()).addField(groupType).named(name);
}
}
16 changes: 7 additions & 9 deletions .../java/io/trino/plugin/hive/parquet/write/SingleLevelArrayMapKeyValuesSchemaConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private static Type convertType(String name, TypeInfo typeInfo, Repetition repet
private static GroupType convertArrayType(String name, ListTypeInfo typeInfo, Repetition repetition)
{
TypeInfo subType = typeInfo.getListElementTypeInfo();
return listWrapper(name, LogicalTypeAnnotation.listType(), convertType("array_element", subType, Repetition.REPEATED), repetition);
return listWrapper(name, convertType("array_element", subType, Repetition.REPEATED), repetition);
}

// An optional group containing multiple elements
Expand All @@ -175,10 +175,9 @@ public static GroupType mapType(Repetition repetition, String alias, String mapA
{
//support projection only on key of a map
if (valueType == null) {
return listWrapper(
return mapKvWrapper(
repetition,
alias,
LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance(),
new GroupType(
Repetition.REPEATED,
mapAlias,
Expand All @@ -187,27 +186,26 @@ public static GroupType mapType(Repetition repetition, String alias, String mapA
if (!valueType.getName().equals("value")) {
throw new RuntimeException(valueType.getName() + " should be value");
}
return listWrapper(
return mapKvWrapper(
repetition,
alias,
LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance(),
new GroupType(
Repetition.REPEATED,
mapAlias,
keyType,
valueType));
}

private static GroupType listWrapper(Repetition repetition, String alias, LogicalTypeAnnotation logicalType, Type nested)
private static GroupType mapKvWrapper(Repetition repetition, String alias, Type nested)
{
if (!nested.isRepetition(Repetition.REPEATED)) {
throw new IllegalArgumentException("Nested type should be repeated: " + nested);
}
return Types.buildGroup(repetition).as(logicalType).addField(nested).named(alias);
return Types.buildGroup(repetition).as(LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance()).addField(nested).named(alias);
}

private static GroupType listWrapper(String name, LogicalTypeAnnotation logicalType, Type elementType, Repetition repetition)
private static GroupType listWrapper(String name, Type elementType, Repetition repetition)
{
return Types.buildGroup(repetition).as(logicalType).addField(elementType).named(name);
return Types.buildGroup(repetition).as(LogicalTypeAnnotation.listType()).addField(elementType).named(name);
}
}
7 changes: 3 additions & 4 deletions ...ive/src/test/java/io/trino/plugin/hive/parquet/write/SingleLevelArraySchemaConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ else if (typeInfo.getCategory() == Category.UNION) {
private static GroupType convertArrayType(String name, ListTypeInfo typeInfo, Repetition repetition)
{
TypeInfo subType = typeInfo.getListElementTypeInfo();
return listWrapper(name, LogicalTypeAnnotation.listType(), convertType("array", subType, Repetition.REPEATED), repetition);
return listWrapper(name, convertType("array", subType, Repetition.REPEATED), repetition);
}

// An optional group containing multiple elements
Expand All @@ -183,9 +183,8 @@ private static GroupType convertMapType(String name, MapTypeInfo typeInfo, Repet
return ConversionPatterns.mapType(repetition, name, keyType, valueType);
}

private static GroupType listWrapper(String name, LogicalTypeAnnotation logicalType,
Type elementType, Repetition repetition)
private static GroupType listWrapper(String name, Type elementType, Repetition repetition)
{
return Types.buildGroup(repetition).as(logicalType).addField(elementType).named(name);
return Types.buildGroup(repetition).as(LogicalTypeAnnotation.listType()).addField(elementType).named(name);
}
}