Using typedGet with type default in FieldEvaluator (#108)

Author: 0aix

pom.xml

@@ -50,7 +50,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <bullet.record.version>1.2.0</bullet.record.version>
+        <bullet.record.version>1.2.1</bullet.record.version>
         <sketches.version>0.9.1</sketches.version>
     </properties>
 

src/main/java/com/yahoo/bullet/querying/evaluators/FieldEvaluator.java

@@ -12,6 +12,7 @@
 import com.yahoo.bullet.typesystem.TypedObject;
 
 import java.io.Serializable;
+import java.util.Set;
 
 /**
  * An evaluator that extracts a given field from a {@link BulletRecord}. This is the only evaluator that directly takes a
@@ -45,36 +46,37 @@ private static FieldExtractor getFieldExtractor(FieldExpression fieldExpression)
         final String field = fieldExpression.getField();
         final Serializable key = fieldExpression.getKey();
         final Serializable subKey = fieldExpression.getSubKey();
+        final Type fieldType = fieldExpression.getType() != null ? fieldExpression.getType() : Type.UNKNOWN;
 
         if (key instanceof String) {
             if (subKey instanceof String) {
-                return record -> record.typedGet(field, (String) key, (String) subKey);
+                return record -> record.typedGet(field, (String) key, (String) subKey, getSuperSuperType(Type.COMPLEX_MAPS, fieldType));
             } else if (subKey instanceof Expression) {
                 final Evaluator subKeyEvaluator = ((Expression) subKey).getEvaluator();
                 return record -> {
                     TypedObject subKeyArg = subKeyEvaluator.evaluate(record);
                     if (subKeyArg.isNull()) {
                         return TypedObject.NULL;
                     }
-                    return record.typedGet(field, (String) key, (String) subKeyArg.getValue());
+                    return record.typedGet(field, (String) key, (String) subKeyArg.getValue(), getSuperSuperType(Type.COMPLEX_MAPS, fieldType));
                 };
             } else {
-                return record -> record.typedGet(field, (String) key);
+                return record -> record.typedGet(field, (String) key, getSuperType(Type.MAPS, fieldType));
             }
         } else if (key instanceof Integer) {
             if (subKey instanceof String) {
-                return record -> record.typedGet(field, (Integer) key, (String) subKey);
+                return record -> record.typedGet(field, (Integer) key, (String) subKey, getSuperSuperType(Type.COMPLEX_LISTS, fieldType));
             } else if (subKey instanceof Expression) {
                 final Evaluator subKeyEvaluator = ((Expression) subKey).getEvaluator();
                 return record -> {
                     TypedObject subKeyArg = subKeyEvaluator.evaluate(record);
                     if (subKeyArg.isNull()) {
                         return TypedObject.NULL;
                     }
-                    return record.typedGet(field, (Integer) key, (String) subKeyArg.getValue());
+                    return record.typedGet(field, (Integer) key, (String) subKeyArg.getValue(), getSuperSuperType(Type.COMPLEX_LISTS, fieldType));
                 };
             } else {
-                return record -> record.typedGet(field, (Integer) key);
+                return record -> record.typedGet(field, (Integer) key, getSuperType(Type.LISTS, fieldType));
             }
         } else if (key instanceof Expression) {
             final Evaluator keyEvaluator = ((Expression) key).getEvaluator();
@@ -86,9 +88,9 @@ private static FieldExtractor getFieldExtractor(FieldExpression fieldExpression)
                     }
                     Type type = keyArg.getType();
                     if (Type.isNumeric(type)) {
-                        return record.typedGet(field, ((Number) keyArg.getValue()).intValue(), (String) subKey);
+                        return record.typedGet(field, ((Number) keyArg.getValue()).intValue(), (String) subKey, getSuperSuperType(Type.COMPLEX_LISTS, fieldType));
                     } else {
-                        return record.typedGet(field, (String) keyArg.getValue(), (String) subKey);
+                        return record.typedGet(field, (String) keyArg.getValue(), (String) subKey, getSuperSuperType(Type.COMPLEX_MAPS, fieldType));
                     }
                 };
             } else if (subKey instanceof Expression) {
@@ -104,9 +106,9 @@ private static FieldExtractor getFieldExtractor(FieldExpression fieldExpression)
                     }
                     Type type = keyArg.getType();
                     if (Type.isNumeric(type)) {
-                        return record.typedGet(field, ((Number) keyArg.getValue()).intValue(), (String) subKeyArg.getValue());
+                        return record.typedGet(field, ((Number) keyArg.getValue()).intValue(), (String) subKeyArg.getValue(), getSuperSuperType(Type.COMPLEX_LISTS, fieldType));
                     } else {
-                        return record.typedGet(field, (String) keyArg.getValue(), (String) subKeyArg.getValue());
+                        return record.typedGet(field, (String) keyArg.getValue(), (String) subKeyArg.getValue(), getSuperSuperType(Type.COMPLEX_MAPS, fieldType));
                     }
                 };
             } else {
@@ -117,14 +119,22 @@ private static FieldExtractor getFieldExtractor(FieldExpression fieldExpression)
                     }
                     Type type = keyArg.getType();
                     if (Type.isNumeric(type)) {
-                        return record.typedGet(field, ((Number) keyArg.getValue()).intValue());
+                        return record.typedGet(field, ((Number) keyArg.getValue()).intValue(), getSuperType(Type.LISTS, fieldType));
                     } else {
-                        return record.typedGet(field, (String) keyArg.getValue());
+                        return record.typedGet(field, (String) keyArg.getValue(), getSuperType(Type.MAPS, fieldType));
                     }
                 };
             }
         } else {
-            return record -> record.typedGet(field);
+            return record -> record.typedGet(field, fieldType);
         }
     }
+
+    private static Type getSuperType(Set<Type> types, Type type) {
+        return types.stream().filter(t -> t.getSubType() == type).findFirst().orElse(Type.UNKNOWN);
+    }
+
+    private static Type getSuperSuperType(Set<Type> types, Type type) {
+        return types.stream().filter(t -> t.getSubType().getSubType() == type).findFirst().orElse(Type.UNKNOWN);
+    }
 }

src/main/java/com/yahoo/bullet/querying/tablefunctors/LateralViewBulletRecord.java

@@ -6,6 +6,7 @@
 package com.yahoo.bullet.querying.tablefunctors;
 
 import com.yahoo.bullet.record.BulletRecord;
+import com.yahoo.bullet.typesystem.Type;
 import com.yahoo.bullet.typesystem.TypedObject;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -89,11 +90,11 @@ public BulletRecord remove(String field) {
     }
 
     @Override
-    public TypedObject typedGet(String field) {
+    public TypedObject typedGet(String field, Type hint) {
         if (culledFields.contains(field)) {
             return TypedObject.NULL;
         }
-        return topRecord.hasField(field) ? topRecord.typedGet(field) : baseRecord.typedGet(field);
+        return topRecord.hasField(field) ? topRecord.typedGet(field, hint) : baseRecord.typedGet(field, hint);
     }
 
     @Override