From 5971e79c76d2f25e61903b1470c7062a4b4e435d Mon Sep 17 00:00:00 2001
From: Zehua Zou <41586196+HuaHuaY@users.noreply.github.com>
Date: Tue, 24 Feb 2026 16:06:54 +0800
Subject: [PATCH] remove redundant MAP_KEY_VALUE annotation
---
.../java/org/apache/parquet/avro/package-info.java | 4 ++--
.../parquet/avro/TestAvroSchemaConverter.java | 14 +++++++-------
.../apache/parquet/schema/ConversionPatterns.java | 13 ++-----------
.../main/java/org/apache/parquet/schema/Types.java | 4 ++--
.../parquet/thrift/TestThriftSchemaConverter.java | 12 ++++++------
.../TestThriftSchemaConverterProjectUnion.java | 6 +++---
6 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/package-info.java b/parquet-avro/src/main/java/org/apache/parquet/avro/package-info.java
index fe412e001b..7daff59277 100644
--- a/parquet-avro/src/main/java/org/apache/parquet/avro/package-info.java
+++ b/parquet-avro/src/main/java/org/apache/parquet/avro/package-info.java
@@ -77,7 +77,7 @@
*
* | map |
* group (with original type MAP) containing one repeated group
- * field (with original type MAP_KEY_VALUE) of (key, value) |
+ * field of (key, value)
*
*
* | fixed |
@@ -148,7 +148,7 @@
*
*
* | group (with original type MAP) containing one repeated group
- * field (with original type MAP_KEY_VALUE) of (key, value) |
+ * field of (key, value)
* map |
*
*
diff --git a/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroSchemaConverter.java b/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroSchemaConverter.java
index 346fafe7d3..0d6a76d779 100644
--- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroSchemaConverter.java
+++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestAvroSchemaConverter.java
@@ -119,7 +119,7 @@ public static void setupConf() {
+ " }\n"
+ " }\n"
+ " required group mymap (MAP) {\n"
- + " repeated group map (MAP_KEY_VALUE) {\n"
+ + " repeated group map {\n"
+ " required binary key (UTF8);\n"
+ " required int32 value;\n"
+ " }\n"
@@ -212,13 +212,13 @@ public void testAllTypes() throws Exception {
+ " }\n"
+ " }\n"
+ " required group mymap (MAP) {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (UTF8);\n"
+ " required int32 value;\n"
+ " }\n"
+ " }\n"
+ " required group myemptymap (MAP) {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (UTF8);\n"
+ " required int32 value;\n"
+ " }\n"
@@ -259,13 +259,13 @@ public void testAllTypesOldListBehavior() throws Exception {
+ " repeated int32 array;\n"
+ " }\n"
+ " required group mymap (MAP) {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (UTF8);\n"
+ " required int32 value;\n"
+ " }\n"
+ " }\n"
+ " required group myemptymap (MAP) {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (UTF8);\n"
+ " required int32 value;\n"
+ " }\n"
@@ -320,7 +320,7 @@ public void testOptionalMapValue() throws Exception {
testRoundTripConversion(
schema,
"message record1 {\n" + " required group myintmap (MAP) {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (UTF8);\n"
+ " optional int32 value;\n"
+ " }\n"
@@ -971,7 +971,7 @@ public void testAvroFixed12AsParquetInt96Type() throws Exception {
+ " repeated int96 array;\n"
+ " }\n"
+ " required group mymap (MAP) {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (STRING);\n"
+ " required int96 value;\n"
+ " }\n"
diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/ConversionPatterns.java b/parquet-column/src/main/java/org/apache/parquet/schema/ConversionPatterns.java
index e4ede9f15a..2b812ff601 100644
--- a/parquet-column/src/main/java/org/apache/parquet/schema/ConversionPatterns.java
+++ b/parquet-column/src/main/java/org/apache/parquet/schema/ConversionPatterns.java
@@ -75,11 +75,7 @@ public static GroupType mapType(
repetition,
alias,
LogicalTypeAnnotation.mapType(),
- new GroupType(
- Repetition.REPEATED,
- mapAlias,
- LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance(),
- keyType));
+ new GroupType(Repetition.REPEATED, mapAlias, keyType));
} else {
if (!valueType.getName().equals("value")) {
throw new RuntimeException(valueType.getName() + " should be value");
@@ -88,12 +84,7 @@ public static GroupType mapType(
repetition,
alias,
LogicalTypeAnnotation.mapType(),
- new GroupType(
- Repetition.REPEATED,
- mapAlias,
- LogicalTypeAnnotation.MapKeyValueTypeAnnotation.getInstance(),
- keyType,
- valueType));
+ new GroupType(Repetition.REPEATED, mapAlias, keyType, valueType));
}
}
diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/Types.java b/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
index 7298a356b4..2f12991ab0 100644
--- a/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
+++ b/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
@@ -110,7 +110,7 @@
*
*
* // required group zipMap (MAP) {
- * // repeated group map (MAP_KEY_VALUE) {
+ * // repeated group map {
* // required float key
* // optional int32 value
* // }
@@ -122,7 +122,7 @@
*
*
* // required group zipMap (MAP) {
- * // repeated group map (MAP_KEY_VALUE) {
+ * // repeated group map {
* // required group key {
* // optional int64 first;
* // required group second {
diff --git a/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java b/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java
index 8f9faf160f..fd89ddc1cf 100644
--- a/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java
+++ b/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java
@@ -145,7 +145,7 @@ public void testToProjectedThriftType() {
message TestStructInMap {
optional binary name(UTF8);
optional group names(MAP) {
- repeated group map(MAP_KEY_VALUE) {
+ repeated group map {
required binary key(UTF8);
optional group value {
optional group name {
@@ -153,7 +153,7 @@ repeated group map(MAP_KEY_VALUE) {
optional binary last_name(UTF8);
}
optional group phones(MAP) {
- repeated group map(MAP_KEY_VALUE) {
+ repeated group map {
required binary key(ENUM);
optional binary value(UTF8);
}
@@ -171,7 +171,7 @@ public void testProjectMapThriftType() {
"name;names.key*;names.value",
"message ParquetSchema {\n" + " optional binary name (UTF8) = 1;\n"
+ " optional group names (MAP) = 2 {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (UTF8);\n"
+ " optional group value {\n"
+ " optional group name = 1 {\n"
@@ -179,7 +179,7 @@ public void testProjectMapThriftType() {
+ " optional binary last_name (UTF8) = 2;\n"
+ " }\n"
+ " optional group phones (MAP) = 2 {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (ENUM);\n"
+ " optional binary value (UTF8);\n"
+ " }\n"
@@ -196,7 +196,7 @@ public void testProjectMapThriftType() {
"name;names.key;names.value.name",
"message ParquetSchema {\n" + " optional binary name (UTF8) = 1;\n"
+ " optional group names (MAP) = 2 {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (UTF8);\n"
+ " optional group value {\n"
+ " optional group name = 1 {\n"
@@ -217,7 +217,7 @@ public void testProjectOnlyKeyInMap() {
"name;names.key",
"message ParquetSchema {\n" + " optional binary name (UTF8) = 1;\n"
+ " optional group names (MAP) = 2 {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required binary key (UTF8);\n"
+ " optional group value {\n"
+ " optional group name = 1 {\n"
diff --git a/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverterProjectUnion.java b/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverterProjectUnion.java
index 4a2edd7d7f..151e51cc30 100644
--- a/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverterProjectUnion.java
+++ b/parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverterProjectUnion.java
@@ -315,7 +315,7 @@ public void testMapWithUnionKey() {
"optMapWithUnionKey/key/**",
"optMapWithUnionKey.key",
"message ParquetSchema {\n" + " optional group optMapWithUnionKey (MAP) = 1 {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required group key {\n"
+ " optional group structV3 = 1 {\n"
+ " required binary name (UTF8) = 1;\n"
@@ -348,7 +348,7 @@ public void testMapWithUnionKey() {
"optMapWithUnionKey/key/**;optMapWithUnionKey/value/gender",
"optMapWithUnionKey.{key,value.gender}",
"message ParquetSchema {\n" + " optional group optMapWithUnionKey (MAP) = 1 {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required group key {\n"
+ " optional group structV3 = 1 {\n"
+ " required binary name (UTF8) = 1;\n"
@@ -384,7 +384,7 @@ public void testMapWithUnionValue() {
"optMapWithUnionValue/key/**;optMapWithUnionValue/value/structV4/addedStruct/gender",
"optMapWithUnionValue.{key,value.structV4.addedStruct.gender}",
"message ParquetSchema {\n" + " optional group optMapWithUnionValue (MAP) = 1 {\n"
- + " repeated group key_value (MAP_KEY_VALUE) {\n"
+ + " repeated group key_value {\n"
+ " required group key {\n"
+ " required binary name (UTF8) = 1;\n"
+ " optional binary age (UTF8) = 2;\n"