PARQUET-2448: Fix model conversions for avro <= 1.8 generated classes

parquet-avro/pom.xml

@@ -152,25 +152,23 @@
         <artifactId>avro-maven-plugin</artifactId>
         <version>${avro.version}</version>
         <executions>
+          <execution>
+            <id>compile-idl</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>idl-protocol</goal>
+            </goals>
+            <configuration>
+              <stringType>String</stringType>
+            </configuration>
+          </execution>
           <execution>
             <id>compile-avsc</id>
             <phase>generate-test-sources</phase>
             <goals>
               <goal>schema</goal>
             </goals>
           </execution>
-            <execution>
-                <id>compile-idl</id>
-                <phase>generate-test-sources</phase>
-                <goals>
-                    <goal>idl-protocol</goal>
-                </goals>
-                <configuration>
-                    <sourceDirectory>${project.basedir}/src/test/resources</sourceDirectory>
-                    <outputDirectory>${project.build.directory}/generated-test-sources</outputDirectory>
-                    <stringType>String</stringType>
-                </configuration>
-            </execution>
         </executions>
       </plugin>
       <plugin>
@@ -187,7 +185,7 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-test-sources</source>
+                <source>${project.build.directory}/generated-test-sources/avro</source>
               </sources>
             </configuration>
           </execution>

parquet-avro/src/main/java/org/apache/parquet/avro/AvroRecordConverter.java

@@ -38,9 +38,11 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import org.apache.avro.AvroTypeException;
 import org.apache.avro.Conversion;
 import org.apache.avro.LogicalType;
@@ -172,6 +174,51 @@ public void add(Object value) {
     }
   }
 
+  private static void addLogicalTypeConversion(SpecificData model, Schema schema, Set<Schema> seenSchemas)
+      throws IllegalAccessException {
+    if (seenSchemas.contains(schema)) {
+      return;
+    }
+    seenSchemas.add(schema);
+
+    switch (schema.getType()) {
+      case RECORD:
+        final Class<?> clazz = model.getClass(schema);
+        if (clazz != null) {
+          try {
+            final Field conversionsField = clazz.getDeclaredField("conversions");
+            conversionsField.setAccessible(true);
+            final Conversion<?>[] conversions = (Conversion<?>[]) conversionsField.get(null);
+            for (Conversion<?> conversion : conversions) {
+              if (conversion != null) {
+                model.addLogicalTypeConversion(conversion);
+              }
+            }
+
+            for (Schema.Field field : schema.getFields()) {
+              addLogicalTypeConversion(model, field.schema(), seenSchemas);
+            }
+          } catch (NoSuchFieldException e) {
+            // Avro classes without logical types (denoted by the "conversions" field)
+          }
+        }
+        break;
+      case MAP:
+        addLogicalTypeConversion(model, schema.getValueType(), seenSchemas);
+        break;
+      case ARRAY:
+        addLogicalTypeConversion(model, schema.getElementType(), seenSchemas);
+        break;
+      case UNION:
+        for (Schema type : schema.getTypes()) {
+          addLogicalTypeConversion(model, type, seenSchemas);
+        }
+        break;
+      default:
+        break;
+    }
+  }
+
   /**
    * Returns the specific data model for a given SpecificRecord schema by reflecting the underlying
    * Avro class's `MODEL$` field, or Null if the class is not on the classpath or reflection fails.
@@ -197,49 +244,29 @@ static SpecificData getModelForSchema(Schema schema) {
 
       model = (SpecificData) modelField.get(null);
     } catch (NoSuchFieldException e) {
-      LOG.info(String.format(
-          "Generated Avro class %s did not contain a MODEL$ field. Parquet will use default SpecificData model for "
-              + "reading and writing.",
-          clazz));
+      LOG.info(String.format("Generated Avro class %s did not contain a MODEL$ field. ", clazz)
+          + "Parquet will use default SpecificData model for reading and writing.");
       return null;
     } catch (IllegalAccessException e) {
       LOG.warn(
-          String.format(
-              "Field `MODEL$` in class %s was inaccessible. Parquet will use default SpecificData model for "
-                  + "reading and writing.",
-              clazz),
+          String.format("Field `MODEL$` in class %s was inaccessible. ", clazz)
+              + "Parquet will use default SpecificData model for reading and writing.",
           e);
       return null;
     }
 
     final String avroVersion = getRuntimeAvroVersion();
     // Avro 1.7 and 1.8 don't include conversions in the MODEL$ field by default
     if (avroVersion != null && (avroVersion.startsWith("1.8.") || avroVersion.startsWith("1.7."))) {
-      final Field conversionsField;
       try {
-        conversionsField = clazz.getDeclaredField("conversions");
-      } catch (NoSuchFieldException e) {
-        // Avro classes without logical types (denoted by the "conversions" field) can be returned as-is
-        return model;
-      }
-
-      final Conversion<?>[] conversions;
-      try {
-        conversionsField.setAccessible(true);
-        conversions = (Conversion<?>[]) conversionsField.get(null);
+        addLogicalTypeConversion(model, schema, new HashSet<>());
       } catch (IllegalAccessException e) {
-        LOG.warn(String.format(
-            "Field `conversions` in class %s was inaccessible. Parquet will use default "
-                + "SpecificData model for reading and writing.",
-            clazz));
+        LOG.warn(
+            String.format("Logical-type conversions were inaccessible for %s", clazz)
+                + "Parquet will use default SpecificData model for reading and writing.",
+            e);
         return null;
       }
-
-      for (int i = 0; i < conversions.length; i++) {
-        if (conversions[i] != null) {
-          model.addLogicalTypeConversion(conversions[i]);
-        }
-      }
     }
 
     return model;

parquet-avro/src/test/avro/logicalType.avsc

@@ -1,14 +1,38 @@
 {
-    "type": "record",
-    "name": "LogicalTypesTest",
-    "namespace": "org.apache.parquet.avro",
-    "doc": "Record for testing logical types",
-    "fields": [
-        {
-          "name": "timestamp",
-          "type": {
-            "type": "long", "logicalType": "timestamp-millis"
+  "name": "LogicalTypesTest",
+  "namespace": "org.apache.parquet.avro",
+  "doc": "Record for testing logical types",
+  "type": "record",
+  "fields": [
+    {
+      "name": "timestamp",
+      "type": {
+        "type": "long",
+        "logicalType": "timestamp-millis"
+      }
+    },
+    {
+      "name": "local_date_time",
+      "type": {
+        "name": "LocalDateTimeTest",
+        "type": "record",
+        "fields": [
+          {
+            "name": "date",
+            "type": {
+              "type": "int",
+              "logicalType": "date"
+            }
+          },
+          {
+            "name": "time",
+            "type": {
+              "type": "int",
+              "logicalType": "time-millis"
+            }
           }
-        }
-    ]
+        ]
+      }
+    }
+  ]
 }