Improve array literal handling.

Author: Mark Hale

model/src/main/java/com/msd/gin/halyard/model/AbstractArrayLiteral.java

@@ -69,12 +69,35 @@ public static AbstractArrayLiteral<?> create(String s) {
 			throw new IllegalArgumentException(e);
 		}
 
+		return createFromArray(values, componentType);
+	}
+
+	public static AbstractArrayLiteral<?> createFromArray(Object[] arr) {
+		Class<?> componentType;
+		int len = arr.length;
+		if (len == 0) {
+			componentType = Object.class;
+		} else {
+			componentType = arr[0].getClass();
+			for (int i=1; i<len; i++) {
+				Class<?> nextType = arr[i].getClass();
+				if (nextType != componentType) {
+					componentType = Object.class;
+					break;
+				}
+			}
+		}
+
+		return createFromArray(arr, componentType);
+	}
+
+	private static AbstractArrayLiteral<?> createFromArray(Object[] arr, Class<?> componentType) {
 		if (componentType == Double.class) {
-			double[] darr = new double[values.length];
-			float[] farr = new float[values.length];
+			double[] darr = new double[arr.length];
+			float[] farr = new float[arr.length];
 			componentType = Float.class;
-			for (int i=0; i<values.length; i++) {
-				double v = (Double) values[i];
+			for (int i=0; i<arr.length; i++) {
+				double v = (Double) arr[i];
 				float x = (float) v;
 				darr[i] = v;
 				farr[i] = x;
@@ -88,7 +111,7 @@ public static AbstractArrayLiteral<?> create(String s) {
 				return new DoubleArrayLiteral(darr);
 			}
 		} else {
-			return new ObjectArrayLiteral(values, componentType);
+			return new ObjectArrayLiteral(arr, componentType);
 		}
 	}
 

queryalgebra/src/main/java/com/msd/gin/halyard/query/algebra/evaluation/function/DynamicFunctionRegistry.java

@@ -221,7 +221,7 @@ public Value evaluate(ValueFactory vf, Value... args) throws ValueExprEvaluation
 
 	private static Value toValue(ValueFactory vf, Object v) throws XPathException {
 		if (v instanceof Object[]) {
-			return new ObjectArrayLiteral((Object[]) v);
+			return AbstractArrayLiteral.createFromArray((Object[]) v);
 		} else if (v instanceof Map<?,?>) {
 			return new MapLiteral((Map<String,Object>)v);
 		} else {

sail/src/main/java/com/msd/gin/halyard/sail/search/KNNTupleFunction.java

@@ -47,10 +47,11 @@ public CloseableIteration<? extends List<? extends Value>> evaluate(TripleSource
 			throw new QueryEvaluationException("Invalid query value");
 		}
 		int argPos = 0;
-		Object[] query = ObjectArrayLiteral.objectArray((Literal) args[argPos++]);
-		Float[] vec = new Float[query.length];
-		for (int i = 0; i < query.length; i++) {
-			vec[i] = ((Number) query[i]).floatValue();
+		Literal queryArg = (Literal) args[argPos++];
+		Object[] queryArr = ObjectArrayLiteral.objectArray(queryArg);
+		Float[] vec = new Float[queryArr.length];
+		for (int i = 0; i < queryArr.length; i++) {
+			vec[i] = ((Number) queryArr[i]).floatValue();
 		}
 		int k = ((Literal) args[argPos++]).intValue();
 		int numCandidates = ((Literal) args[argPos++]).intValue();
@@ -73,7 +74,7 @@ public CloseableIteration<? extends List<? extends Value>> evaluate(TripleSource
 			SearchResponse<? extends SearchDocument> searchResults = searchClient.knn(vec, k, numCandidates, minScore, hasAdditionalFields);
 			return SearchTupleFunction.transformResults(searchResults, matches, valueFactory, rdfFactory);
 		} catch (ElasticsearchException e) {
-			LOGGER.error(String.format("Query failed: %s", (Object) query));
+			LOGGER.error(String.format("Query failed: %s", queryArg));
 			throw new QueryEvaluationException(e);
 		} catch (IOException e) {
 			throw new QueryEvaluationException(e);

sail/src/main/java/com/msd/gin/halyard/sail/search/SearchTupleFunction.java

@@ -3,8 +3,8 @@
 import com.google.common.collect.Lists;
 import com.msd.gin.halyard.common.RDFFactory;
 import com.msd.gin.halyard.common.StatementIndices;
+import com.msd.gin.halyard.model.AbstractArrayLiteral;
 import com.msd.gin.halyard.model.FloatArrayLiteral;
-import com.msd.gin.halyard.model.ObjectArrayLiteral;
 import com.msd.gin.halyard.model.ObjectLiteral;
 import com.msd.gin.halyard.model.vocabulary.HALYARD;
 import com.msd.gin.halyard.query.algebra.evaluation.ExtendedTripleSource;
@@ -54,7 +54,8 @@ public CloseableIteration<? extends List<? extends Value>> evaluate(TripleSource
 			throw new QueryEvaluationException("Invalid query value");
 		}
 		int argPos = 0;
-		String query = ((Literal) args[argPos++]).getLabel();
+		Literal queryArg = (Literal) args[argPos++];
+		String query = queryArg.getLabel();
 		int limit = ((Literal) args[argPos++]).intValue();
 		double minScore = ((Literal) args[argPos++]).doubleValue();
 		int fuzziness = ((Literal) args[argPos++]).intValue();
@@ -77,7 +78,7 @@ public CloseableIteration<? extends List<? extends Value>> evaluate(TripleSource
 			SearchResponse<? extends SearchDocument> searchResults = searchClient.search(query, limit, minScore, fuzziness, phraseSlop, hasAdditionalFields);
 			return transformResults(searchResults, matches, valueFactory, rdfFactory);
 		} catch (ElasticsearchException e) {
-			LOGGER.error(String.format("Query failed: %s", query));
+			LOGGER.error(String.format("Query failed: %s", queryArg));
 			throw new QueryEvaluationException(e);
 		} catch (IOException e) {
 			throw new QueryEvaluationException(e);
@@ -128,7 +129,7 @@ protected List<Value> convert(List<Hit<? extends SearchDocument>> matchValues) t
 						} else {
 							Object v = doc.getAdditionalField(fieldParams.name);
 							if (v instanceof List<?>) {
-								l = new ObjectArrayLiteral(((List<?>) v).toArray());
+								l = AbstractArrayLiteral.createFromArray(((List<?>) v).toArray());
 							} else if (v != null) {
 								l = Values.literal(valueFactory, v, false);
 							} else {

strategy/src/main/java/com/msd/gin/halyard/strategy/MathOpEvaluator.java

@@ -71,9 +71,9 @@ private static AbstractArrayLiteral<?> operationBetweenVectors(AbstractArrayLite
 			try {
 				switch (op) {
 					case PLUS:
-						return new ObjectArrayLiteral(add(aarr, barr));
+						return AbstractArrayLiteral.createFromArray(add(aarr, barr));
 					case MINUS:
-						return new ObjectArrayLiteral(subtract(aarr, barr));
+						return AbstractArrayLiteral.createFromArray(subtract(aarr, barr));
 					default:
 						throw new AssertionError("Unsupported operator: " + op);
 				}
@@ -183,7 +183,7 @@ private static AbstractArrayLiteral<?> operationScalarMultiplyVector(Literal sca
 			} catch (ClassCastException ex) {
 				throw new ValueExprEvaluationException(ex);
 			}
-			return new ObjectArrayLiteral(y);
+			return AbstractArrayLiteral.createFromArray(y);
 		}
 	}
 
@@ -223,7 +223,7 @@ private static AbstractArrayLiteral<?> operationVectorDivideScalar(AbstractArray
 			} catch (ClassCastException ex) {
 				throw new ValueExprEvaluationException(ex);
 			}
-			return new ObjectArrayLiteral(y);
+			return AbstractArrayLiteral.createFromArray(y);
 		}
 	}
 }