Bump Apache Avro to 1.9.1

Author: Fokko

pom.xml

@@ -815,6 +815,12 @@
                 </exclusions>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.avro</groupId>
+                <artifactId>avro</artifactId>
+                <version>1.9.1</version>
+            </dependency>
+
             <dependency>
                 <groupId>net.sf.opencsv</groupId>
                 <artifactId>opencsv</artifactId>

presto-product-tests/conf/presto/etc/catalog/kafka/all_datatypes_avro_schema.avsc

@@ -7,7 +7,7 @@
               {
                   "name":"a_varchar",
                   "type":["null", "string"],
-                  "default": "null"
+                  "default": null
               },
               {
                   "name":"a_bigint",

presto-product-tests/pom.xml

@@ -21,7 +21,6 @@
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>1.8.1</version>
         </dependency>
 
         <dependency>

presto-record-decoder/pom.xml

@@ -54,7 +54,6 @@
         <dependency>
             <groupId>org.apache.avro</groupId>
             <artifactId>avro</artifactId>
-            <version>1.8.1</version>
         </dependency>
 
         <dependency>

presto-record-decoder/src/test/java/io/prestosql/decoder/avro/TestAvroDecoder.java

@@ -86,10 +86,30 @@ private static String getAvroSchema(String name, String dataType)
         return getAvroSchema(ImmutableMap.of(name, dataType));
     }
 
+    private static String determineDefaultValue(String dataType)
+    {
+        // Apache Avro 1.9 is more strict on the nullability of data types.
+        // If the data type is not nullable, then we don't want to set null as the default.
+        if (dataType.contains("\"array\"")) {
+            // In the case of an Array we just will return an empty array
+            return ", \"default\": []";
+        }
+        if (dataType.contains("\"map\"")) {
+            // In the case of a Map we just will return an empty map
+            return ", \"default\": {}";
+        }
+        if (dataType.contains("null")) {
+            // Will match ["null", "string"] and any other variation.
+            return ", \"default\": null";
+        }
+        // In case of non-nullable types like "string"
+        return "";
+    }
+
     private static String getAvroSchema(Map<String, String> fields)
     {
         String fieldSchema = fields.entrySet().stream()
-                .map(entry -> "{\"name\": \"" + entry.getKey() + "\",\"type\": " + entry.getValue() + ",\"default\": null}")
+                .map(entry -> "{\"name\": \"" + entry.getKey() + "\",\"type\": " + entry.getValue() + determineDefaultValue(entry.getValue()) + "}")
                 .collect(Collectors.joining(","));
 
         return "{\"type\" : \"record\"," +
@@ -424,7 +444,7 @@ public void testArrayDecodedAsArray()
     {
         DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", new ArrayType(BIGINT), "array_field", null, null, false, false, false);
 
-        Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "array_field", "{\"type\": \"array\", \"items\": \"long\"}", ImmutableList.of(114L, 136L));
+        Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "array_field", "{\"type\": \"array\", \"items\": [\"long\"]}", ImmutableList.of(114L, 136L));
         checkArrayValue(decodedRow, row, new long[] {114, 136});
     }
 
@@ -436,7 +456,7 @@ public void testArrayWithNulls()
 
         List<Long> values = new ArrayList<>();
         values.add(null);
-        Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "array_field", "{\"type\": \"array\", \"items\": \"null\"}", values);
+        Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "array_field", "{\"type\": \"array\", \"items\": [\"null\"]}", values);
         checkArrayItemIsNull(decodedRow, row, new long[] {0});
     }