Fix #82

Author: cowtowncoder

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/schema/AvroSchemaHelper.java

@@ -213,10 +213,6 @@ protected static <T> T throwUnsupported() {
         throw new UnsupportedOperationException("Format variation not supported");
     }
 
-    public static String getTypeId(JavaType type) {
-        return getTypeId(type.getRawClass());
-    }
-
     /**
      * Initializes a record schema with metadata from the given class; this schema is returned in a non-finalized state, and still
      * needs to have fields added to it.
@@ -267,6 +263,10 @@ public static Schema addAlias(Schema schema, BeanDescription bean) {
         return schema;
     }
 
+    public static String getTypeId(JavaType type) {
+        return getTypeId(type.getRawClass());
+    }
+
     /**
      * Returns the Avro type ID for a given type
      */
@@ -290,7 +290,6 @@ public static String getTypeId(Schema schema) {
         default:
             return schema.getProp(AVRO_SCHEMA_PROP_CLASS);
         }
-
     }
 
     /**

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/ser/AvroWriteContext.java

@@ -252,6 +252,14 @@ public static int resolveUnionIndex(Schema unionSchema, Object datum) {
             if (raw == CLS_STRING) {
                 return _resolveStringIndex(unionSchema, types, (String) datum);
             }
+            // 26-Apr-2017, tatu: This may look odd optimization, but turns out that:
+            //   (a) case of "null and ONE other type" is VERY common, and
+            //   (b) cost of real lookup for POJO types is VERY expensive (due to elaborate
+            //      caching Avro lib does
+            int ix = _findNotNullIndex(types);
+            if (ix >= 0) {
+                return ix;
+            }
             if (raw == CLS_BIG_DECIMAL) {
                 return _resolveBigDecimalIndex(unionSchema, types, (BigDecimal) datum);
             }
@@ -280,7 +288,7 @@ public static int resolveUnionIndex(Schema unionSchema, Object datum) {
             }
             */
         }
-//System.out.println("Union type for: "+datum.getClass());        
+//System.err.println("Missing index for: "+datum.getClass().getName()+" ("+types.size()+") ->\n"+types);  
         return ReflectData.get().resolveUnion(unionSchema, datum);
     }
 
@@ -299,6 +307,14 @@ public static Schema resolveUnionType(Schema unionSchema, Object datum) {
             if (raw == CLS_STRING) {
                 return types.get(_resolveStringIndex(unionSchema, types, (String) datum));
             }
+            // 26-Apr-2017, tatu: This may look odd optimization, but turns out that:
+            //   (a) case of "null and ONE other type" is VERY common, and
+            //   (b) cost of real lookup for POJO types is VERY expensive (due to elaborate
+            //      caching Avro lib does
+            Schema sch = _findNotNull(types);
+            if (sch != null) {
+                return sch;
+            }
             if (raw == CLS_BIG_DECIMAL) {
                 return types.get(_resolveBigDecimalIndex(unionSchema, types, (BigDecimal) datum));
             }
@@ -323,6 +339,7 @@ public static Schema resolveUnionType(Schema unionSchema, Object datum) {
             }
             */
         }
+//System.err.println("Missing schema for: "+datum.getClass().getName()+" ("+types.size()+") ->\n"+types);  
         int ix = ReflectData.get().resolveUnion(unionSchema, datum);
         return types.get(ix);
     }
@@ -359,6 +376,32 @@ private static int _resolveStringIndex(Schema unionSchema, List<Schema> types,
         return ReflectData.get().resolveUnion(unionSchema, value);
     }
 
+    private static Schema _findNotNull(List<Schema> types)
+    {
+        if (types.size() == 2) {
+            if (types.get(0).getType() == Type.NULL) {
+                return types.get(1);
+            }
+            if (types.get(1).getType() == Type.NULL) {
+                return types.get(0);
+            }
+        }
+        return null;
+    }
+
+    private static int _findNotNullIndex(List<Schema> types)
+    {
+        if (types.size() == 2) {
+            if (types.get(0).getType() == Type.NULL) {
+                return 1;
+            }
+            if (types.get(1).getType() == Type.NULL) {
+                return 0;
+            }
+        }
+        return -1;
+    }
+
     private static int _resolveBigDecimalIndex(Schema unionSchema, List<Schema> types,
             BigDecimal value) {
         int match = -1;