diff --git a/pom.xml b/pom.xml index c5045563cc48e..c2918056b0221 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 6.10 3.8.0 1.2.3 - 1.11.0 + 1.11.1 1.6.8 9.0 1.9.17 @@ -623,7 +623,7 @@ com.facebook.presto.hive hive-apache - 3.0.0-3 + 3.0.0-7 diff --git a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveFileFormats.java b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveFileFormats.java index c51fac96acc5c..a9826e5d5448c 100644 --- a/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveFileFormats.java +++ b/presto-hive/src/test/java/com/facebook/presto/hive/TestHiveFileFormats.java @@ -736,7 +736,7 @@ public void testSchemaMismatch() .isFailingForPageSource(new ParquetPageSourceFactory(FUNCTION_AND_TYPE_MANAGER, FUNCTION_RESOLUTION, HDFS_ENVIRONMENT, STATS, METADATA_READER), expectedErrorCode, expectedMessageMapLongLong); String expectedMessageMapLongMapDouble = "The column column_name of table schema.table is declared as type map, but the Parquet file ((.*?)) declares the column as type optional group column_name \\(MAP\\) \\{\n" - + " repeated group map \\(MAP_KEY_VALUE\\) \\{\n" + + " repeated group key_value \\(MAP_KEY_VALUE\\) \\{\n" + " required double key;\n" + " optional double value;\n" + " \\}\n" @@ -877,8 +877,8 @@ public void testSchemaMismatchOnNestedStruct() HiveErrorCode expectedErrorCode = HIVE_PARTITION_SCHEMA_MISMATCH; String expectedMessageRowLongNest = "The column column_name of table schema.table is declared as type map>, but the Parquet file ((.*?)) declares the column as type optional group column_name \\(MAP\\) \\{\n" + - " repeated group map \\(MAP_KEY_VALUE\\) \\{\n" + - " required binary key \\(UTF8\\);\n" + + " repeated group key_value \\(MAP_KEY_VALUE\\) \\{\n" + + " required binary key \\(STRING\\);\n" + " optional group value \\{\n" + " optional int32 s_int;\n" + " optional double s_double;\n" + diff --git a/presto-iceberg/pom.xml b/presto-iceberg/pom.xml index 85b2891482612..eb3e5a2879537 100644 --- a/presto-iceberg/pom.xml +++ b/presto-iceberg/pom.xml @@ -49,6 +49,10 @@ org.apache.parquet parquet-format + + org.apache.yetus + audience-annotations + org.slf4j slf4j-api diff --git a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetSchemaConverter.java b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetSchemaConverter.java index 7b469091fbcad..af684972bf111 100644 --- a/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetSchemaConverter.java +++ b/presto-parquet/src/main/java/com/facebook/presto/parquet/writer/ParquetSchemaConverter.java @@ -149,7 +149,7 @@ private org.apache.parquet.schema.Type getArrayType(ArrayType type, String name, private org.apache.parquet.schema.Type getMapType(MapType type, String name, List parent) { - parent = ImmutableList.builder().addAll(parent).add(name).add("map").build(); + parent = ImmutableList.builder().addAll(parent).add(name).add("key_value").build(); Type keyType = type.getKeyType(); Type valueType = type.getValueType(); return Types.map(OPTIONAL)