Adding correct floatvector serialization & warning on unknown types

vitrivr · Jul 16, 2019 · ad5c5da · ad5c5da
1 parent 641a7c6
commit ad5c5da
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/src/org/vitrivr/cineast/core/db/cottontaildb/CottontailMessageBuilder.java b/src/org/vitrivr/cineast/core/db/cottontaildb/CottontailMessageBuilder.java
@@ -32,6 +32,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.vitrivr.cineast.core.config.ReadableQueryConfig;
+import org.vitrivr.cineast.core.data.ReadableFloatVector;
 import org.vitrivr.cineast.core.data.providers.primitive.BooleanTypeProvider;
 import org.vitrivr.cineast.core.data.providers.primitive.DoubleTypeProvider;
 import org.vitrivr.cineast.core.data.providers.primitive.FloatArrayTypeProvider;
@@ -194,6 +195,10 @@ public static Data toData(Object o) {
       return dataBuilder.setVectorData(toVector((float[]) o)).build();
     }
 
+    if (o instanceof ReadableFloatVector) {
+      return dataBuilder.setVectorData(toVector(((ReadableFloatVector) o))).build();
+    }
+
     Vector.Builder vectorBuilder = Vector.newBuilder();
 
     if (o instanceof double[]) {
@@ -224,6 +229,8 @@ public static Data toData(Object o) {
           .build();
     }
 
+    LOGGER.debug("Unknown type {} in message builder, serializing to string representation {}", o.getClass().getName(), o.toString());
+
     return dataBuilder.setStringData(o.toString()).build();
   }
 
@@ -284,6 +291,14 @@ public static Vector toVector(float[] vector) {
         .build();
   }
 
+  private static Vector toVector(ReadableFloatVector vector) {
+    List<Float> floats = new ArrayList<>();
+    for (int i = 0; i < vector.getElementCount(); i++) {
+      floats.add(vector.getElement(i));
+    }
+    return Vector.newBuilder().setFloatVector(FloatVector.newBuilder().addAllVector(floats)).build();
+  }
+
   public static List<Data> toData(Iterable<Object> obs) {
 
     List<Data> _return = new ArrayList<>();