You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dp...@apache.org on 2017/08/26 02:14:35 UTC
[2/6] lucene-solr:branch_7x: SOLR-11283: Refactors all Stream
Evaluators in solrj.io.eval to simplify them
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java
index f555947..5677f50 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SubtractEvaluator.java
@@ -18,41 +18,78 @@ package org.apache.solr.client.solrj.io.eval;
import java.io.IOException;
import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
import java.util.Locale;
+import java.util.stream.Collectors;
-import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-public class SubtractEvaluator extends NumberEvaluator {
+public class SubtractEvaluator extends RecursiveNumericEvaluator implements ManyValueWorker {
protected static final long serialVersionUID = 1L;
public SubtractEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
super(expression, factory);
- if(subEvaluators.size() < 2){
- throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting at least two values but found %d",expression,subEvaluators.size()));
+ if(containedEvaluators.size() < 2){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting at least two values but found %d",expression,containedEvaluators.size()));
}
}
@Override
- public Number evaluate(Tuple tuple) throws IOException {
-
- List<BigDecimal> results = evaluateAll(tuple);
+ public Object doWork(Object... values) throws IOException {
+ if(Arrays.stream(values).anyMatch(item -> null == item)){
+ return null;
+ }
- if(results.stream().anyMatch(item -> null == item)){
+ if(0 == values.length){
return null;
}
- BigDecimal result = null;
- if(results.size() > 0){
- result = results.get(0);
- for(int idx = 1; idx < results.size(); ++idx){
- result = result.subtract(results.get(idx));
+ List<BigDecimal> flattenedValues = flatten(Arrays.stream(values).collect(Collectors.toList()));
+
+ BigDecimal result = flattenedValues.get(0);
+ for(int idx = 1; idx < flattenedValues.size(); ++idx){
+ result = subtract(result, flattenedValues.get(idx));
+ }
+
+ return result;
+ }
+
+ private List<BigDecimal> flatten(Collection<?> values){
+ List<BigDecimal> flattened = new ArrayList<>();
+
+ for(Object value : values){
+ if(null == value){
+ flattened.add(null);
+ }
+ if(value instanceof Collection<?>){
+ flattened.addAll(flatten((Collection<?>)value));
}
+ else if(value instanceof BigDecimal){
+ flattened.add((BigDecimal)value);
+ }
+ else if(value instanceof Number){
+ flattened.add(new BigDecimal(value.toString()));
+ }
+ else{
+ throw new StreamEvaluatorException("Numeric value expected but found type %s for value %s", value.getClass().getName(), value.toString());
+ }
+ }
+
+ return flattened;
+ }
+
+ private BigDecimal subtract(BigDecimal left, Object right) throws IOException{
+
+ if(null == right){
+ return null;
}
- return normalizeType(result);
+ return left.subtract((BigDecimal)right);
}
+
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java
index 525ff1e..eb7e4dc 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TangentEvaluator.java
@@ -20,38 +20,33 @@ import java.io.IOException;
import java.math.BigDecimal;
import java.util.List;
import java.util.Locale;
+import java.util.stream.Collectors;
-import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-public class TangentEvaluator extends NumberEvaluator {
+public class TangentEvaluator extends RecursiveNumericEvaluator implements OneValueWorker {
protected static final long serialVersionUID = 1L;
public TangentEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
super(expression, factory);
- if(1 != subEvaluators.size()){
- throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting one value but found %d",expression,subEvaluators.size()));
+ if(1 != containedEvaluators.size()){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting exactly 1 value but found %d",expression,containedEvaluators.size()));
}
}
@Override
- public Number evaluate(Tuple tuple) throws IOException {
-
- List<BigDecimal> results = evaluateAll(tuple);
-
- // we're still doing these checks because if we ever add an array-flatten evaluator,
- // one found in the constructor could become != 1
- if(1 != results.size()){
- throw new IOException(String.format(Locale.ROOT,"%s(...) only works with a 1 value but %d were provided", constructingFactory.getFunctionName(getClass()), results.size()));
- }
-
- if(null == results.get(0)){
+ public Object doWork(Object value){
+ if(null == value){
return null;
}
-
- return Math.tan(results.get(0).doubleValue());
- }
-
+ else if(value instanceof List){
+ return ((List<?>)value).stream().map(innerValue -> doWork(innerValue)).collect(Collectors.toList());
+ }
+ else{
+ // we know it's a BigDecimal
+ return Math.tan(((BigDecimal)value).doubleValue());
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java
deleted file mode 100644
index 4af1f354..0000000
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.solr.client.solrj.io.eval;
-
-import java.io.IOException;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeParseException;
-import java.time.temporal.TemporalAccessor;
-import java.time.temporal.UnsupportedTemporalTypeException;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.solr.client.solrj.io.Tuple;
-import org.apache.solr.client.solrj.io.stream.expr.Explanation;
-import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
-import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter;
-import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-
-/**
- * A generic date evaluator for use with a TemporalAccessor
- */
-public abstract class TemporalEvaluator extends ComplexEvaluator {
-
- private String field;
-
- public TemporalEvaluator(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
-
- if (1 != subEvaluators.size()) {
- throw new IOException(String.format(Locale.ROOT, "Invalid expression %s - expecting one value but found %d", expression, subEvaluators.size()));
- }
- }
-
- @Override
- public Object evaluate(Tuple tuple) throws IOException {
-
- Instant instant = null;
- TemporalAccessor date = null;
-
- //First evaluate the parameter
- StreamEvaluator streamEvaluator = subEvaluators.get(0);
- Object tupleValue = streamEvaluator.evaluate(tuple);
-
- if (tupleValue == null) return null;
-
- if(field == null) {
- field = streamEvaluator.toExpression(constructingFactory).toString();
- }
-
- Map tupleContext = streamContext.getTupleContext();
- date = (LocalDateTime)tupleContext.get(field); // Check to see if the date has already been created for this field
-
- if(date == null) {
- if (tupleValue instanceof String) {
- instant = getInstant((String) tupleValue);
- } else if (tupleValue instanceof Long) {
- instant = Instant.ofEpochMilli((Long) tupleValue);
- } else if (tupleValue instanceof Instant) {
- instant = (Instant) tupleValue;
- } else if (tupleValue instanceof Date) {
- instant = ((Date) tupleValue).toInstant();
- } else if (tupleValue instanceof TemporalAccessor) {
- date = ((TemporalAccessor) tupleValue);
- tupleContext.put(field, date); // Cache the date in the TupleContext
- }
- }
-
- if (instant != null) {
- if (TemporalEvaluatorEpoch.FUNCTION_NAME.equals(getFunction())) return instant.toEpochMilli();
- date = LocalDateTime.ofInstant(instant, ZoneOffset.UTC);
- tupleContext.put(field, date); // Cache the date in the TupleContext
- }
-
- if (date != null) {
- try {
- return evaluateDate(date);
- } catch (UnsupportedTemporalTypeException utte) {
- throw new IOException(String.format(Locale.ROOT, "It is not possible to call '%s' function on %s", getFunction(), date.getClass().getName()));
- }
- }
-
- throw new IOException(String.format(Locale.ROOT, "Invalid parameter %s - The parameter must be a string formatted ISO_INSTANT or of type Long,Instant,Date,LocalDateTime or TemporalAccessor.", String.valueOf(tupleValue)));
- }
-
- public abstract Object evaluateDate(TemporalAccessor aDate) throws IOException;
- public abstract String getFunction();
-
- protected Instant getInstant(String dateStr) throws IOException {
-
- if (dateStr != null && !dateStr.isEmpty()) {
- try {
- return Instant.parse(dateStr);
- } catch (DateTimeParseException e) {
- throw new IOException(String.format(Locale.ROOT, "Invalid parameter %s - The String must be formatted in the ISO_INSTANT date format.", dateStr));
- }
- }
- return null;
- }
-
- @Override
- public StreamExpressionParameter toExpression(StreamFactory factory) throws IOException {
- StreamExpression expression = new StreamExpression(getFunction());
-
- for (StreamEvaluator evaluator : subEvaluators) {
- expression.addParameter(evaluator.toExpression(factory));
- }
-
- return expression;
- }
-
- @Override
- public Explanation toExplanation(StreamFactory factory) throws IOException {
- return new Explanation(nodeId.toString())
- .withExpressionType(Explanation.ExpressionType.EVALUATOR)
- .withImplementingClass(getClass().getName())
- .withExpression(toExpression(factory).toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java
index 88b5043..3af2307 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDay.java
@@ -27,22 +27,18 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
* Provides a day stream evaluator
*/
-public class TemporalEvaluatorDay extends TemporalEvaluator {
-
+public class TemporalEvaluatorDay extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "day";
public TemporalEvaluatorDay(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(ChronoField.DAY_OF_MONTH);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(ChronoField.DAY_OF_MONTH);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java
index f034377..2d911c2 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfQuarter.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a dayOfQuarter stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorDayOfQuarter extends TemporalEvaluator {
-
+public class TemporalEvaluatorDayOfQuarter extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "dayOfQuarter";
public TemporalEvaluatorDayOfQuarter(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(IsoFields.DAY_OF_QUARTER);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(IsoFields.DAY_OF_QUARTER);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java
index 339f938..6457dec 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorDayOfYear.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a dayOfYear stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorDayOfYear extends TemporalEvaluator {
-
+public class TemporalEvaluatorDayOfYear extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "dayOfYear";
public TemporalEvaluatorDayOfYear(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(ChronoField.DAY_OF_YEAR);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(ChronoField.DAY_OF_YEAR);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java
index a8554b3..7bfe266 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorEpoch.java
@@ -21,33 +21,25 @@ import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.time.temporal.TemporalAccessor;
-import java.util.Locale;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a epoch stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorEpoch extends TemporalEvaluator {
-
+public class TemporalEvaluatorEpoch extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "epoch";
public TemporalEvaluatorEpoch(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) throws IOException {
- if (aDate instanceof LocalDateTime) {
- return ((LocalDateTime)aDate).atZone(ZoneOffset.UTC).toInstant().toEpochMilli();
- }
- throw new IOException(String.format(Locale.ROOT, "Unsupported function '%s' called on %s", FUNCTION_NAME, aDate.toString()));
+ protected Object getDatePart(TemporalAccessor value) {
+ return ((LocalDateTime)value).atZone(ZoneOffset.UTC).toInstant().toEpochMilli();
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java
index 5480870..d89af48 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorHour.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a hour stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorHour extends TemporalEvaluator {
-
+public class TemporalEvaluatorHour extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "hour";
public TemporalEvaluatorHour(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(ChronoField.HOUR_OF_DAY);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(ChronoField.HOUR_OF_DAY);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java
index 9438e9d..9fe4b5d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMinute.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a minute stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorMinute extends TemporalEvaluator {
-
+public class TemporalEvaluatorMinute extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "minute";
public TemporalEvaluatorMinute(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(ChronoField.MINUTE_OF_HOUR);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(ChronoField.MINUTE_OF_HOUR);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java
index b9a70fe..684069a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorMonth.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a month stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorMonth extends TemporalEvaluator {
-
+public class TemporalEvaluatorMonth extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "month";
public TemporalEvaluatorMonth(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(ChronoField.MONTH_OF_YEAR);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(ChronoField.MONTH_OF_YEAR);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java
index 0144311..4de9d2d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorQuarter.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a quarter stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorQuarter extends TemporalEvaluator {
-
+public class TemporalEvaluatorQuarter extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "quarter";
public TemporalEvaluatorQuarter(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(IsoFields.QUARTER_OF_YEAR);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(IsoFields.QUARTER_OF_YEAR);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java
index f5b71fc..fb9e865 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorSecond.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a second stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorSecond extends TemporalEvaluator {
-
+public class TemporalEvaluatorSecond extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "second";
public TemporalEvaluatorSecond(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(ChronoField.SECOND_OF_MINUTE);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(ChronoField.SECOND_OF_MINUTE);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java
index 1a2974a..9c89468 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorWeek.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a week stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorWeek extends TemporalEvaluator {
-
+public class TemporalEvaluatorWeek extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "week";
public TemporalEvaluatorWeek(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java
index 0b8d69c..65c186f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluatorYear.java
@@ -25,24 +25,20 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Provides a year stream evaluator
+ * Provides a day stream evaluator
*/
-public class TemporalEvaluatorYear extends TemporalEvaluator {
-
+public class TemporalEvaluatorYear extends RecursiveTemporalEvaluator {
+ protected static final long serialVersionUID = 1L;
+
public static final String FUNCTION_NAME = "year";
public TemporalEvaluatorYear(StreamExpression expression, StreamFactory factory) throws IOException {
- super(expression, factory);
- }
-
- @Override
- public String getFunction() {
- return FUNCTION_NAME;
+ super(expression, factory, FUNCTION_NAME);
}
@Override
- public Object evaluateDate(TemporalAccessor aDate) {
- return aDate.get(ChronoField.YEAR);
+ protected Object getDatePart(TemporalAccessor value) {
+ return value.get(ChronoField.YEAR);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TwoValueWorker.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TwoValueWorker.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TwoValueWorker.java
new file mode 100644
index 0000000..d8bd0dd
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TwoValueWorker.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.io.eval;
+
+import java.io.IOException;
+import java.util.Locale;
+
+public interface TwoValueWorker extends ValueWorker {
+
+ Object doWork(Object value1, Object value2) throws IOException;
+
+ default Object doWork(Object ... values) throws IOException{
+ if(2 != values.length){
+ throw new IOException(String.format(Locale.ROOT, "Expecting 2 values but found %d", values.length));
+ }
+
+ return doWork(values[0], values[1]);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java
index dec6aa4..bfdf959 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UniformDistributionEvaluator.java
@@ -19,51 +19,30 @@ package org.apache.solr.client.solrj.io.eval;
import java.io.IOException;
import java.util.Locale;
-
import org.apache.commons.math3.distribution.UniformRealDistribution;
-import org.apache.solr.client.solrj.io.Tuple;
-import org.apache.solr.client.solrj.io.stream.expr.Explanation;
-import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType;
-import org.apache.solr.client.solrj.io.stream.expr.Expressible;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
-import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-public class UniformDistributionEvaluator extends ComplexEvaluator implements Expressible {
+public class UniformDistributionEvaluator extends RecursiveNumericEvaluator implements TwoValueWorker {
private static final long serialVersionUID = 1;
public UniformDistributionEvaluator(StreamExpression expression, StreamFactory factory) throws IOException {
super(expression, factory);
-
- if(2 != subEvaluators.size()){
- throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting one column but found %d",expression,subEvaluators.size()));
- }
- }
-
- public Object evaluate(Tuple tuple) throws IOException {
-
- StreamEvaluator numEval1 = subEvaluators.get(0);
- StreamEvaluator numEval2 = subEvaluators.get(1);
-
- Number lower = (Number)numEval1.evaluate(tuple);
- Number upper = (Number)numEval2.evaluate(tuple);
-
- return new UniformRealDistribution(lower.doubleValue(), upper.doubleValue());
}
@Override
- public StreamExpressionParameter toExpression(StreamFactory factory) throws IOException {
- StreamExpression expression = new StreamExpression(factory.getFunctionName(getClass()));
- return expression;
- }
+ public Object doWork(Object first, Object second) throws IOException{
+ if(null == first){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - null found for the first value",toExpression(constructingFactory)));
+ }
+ if(null == second){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - null found for the second value",toExpression(constructingFactory)));
+ }
- @Override
- public Explanation toExplanation(StreamFactory factory) throws IOException {
- return new Explanation(nodeId.toString())
- .withExpressionType(ExpressionType.EVALUATOR)
- .withFunctionName(factory.getFunctionName(getClass()))
- .withImplementingClass(getClass().getName())
- .withExpression(toExpression(factory).toString());
+ Number lower = (Number)first;
+ Number upper = (Number)second;
+
+ return new UniformRealDistribution(lower.doubleValue(), upper.doubleValue());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java
index 0f22ff2..ee0f9eb 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/UuidEvaluator.java
@@ -26,18 +26,18 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-public class UuidEvaluator extends SimpleEvaluator {
- protected static final long serialVersionUID = 1L;
-
- public UuidEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
- // no parameters are used
+public class UuidEvaluator extends SourceEvaluator {
+ private static final long serialVersionUID = 1L;
+
+ public UuidEvaluator(StreamExpression expression, StreamFactory factory) {
+
}
-
+
@Override
- public UUID evaluate(Tuple tuple) throws IOException {
+ public Object evaluate(Tuple tuple) throws IOException {
return UUID.randomUUID();
}
-
+
@Override
public StreamExpressionParameter toExpression(StreamFactory factory) throws IOException {
return new StreamExpression(factory.getFunctionName(getClass()));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ValueWorker.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ValueWorker.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ValueWorker.java
new file mode 100644
index 0000000..98c6b3b
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ValueWorker.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.io.eval;
+
+import java.io.IOException;
+
+public interface ValueWorker {
+
+ Object doWork(Object ... values) throws IOException;
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
index c96b9fe..0c4ce8d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.comp.FieldComparator;
import org.apache.solr.client.solrj.io.comp.StreamComparator;
-import org.apache.solr.client.solrj.io.eval.FieldEvaluator;
+import org.apache.solr.client.solrj.io.eval.FieldValueEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.Explanation;
import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType;
@@ -115,7 +115,7 @@ public class CartesianProductStream extends TupleStream implements Expressible {
}
if(!wasHandledAsEvaluatorFunction){
// treat as a straight field evaluator
- evaluator = new FieldEvaluator(evaluatorPart);
+ evaluator = new FieldValueEvaluator(evaluatorPart);
if(null == asNamePart){
asNamePart = evaluatorPart; // just use the field name
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
index 2f74bc5..b25ff4f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java
@@ -23,7 +23,7 @@ import java.util.Locale;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.comp.StreamComparator;
-import org.apache.solr.client.solrj.io.eval.BooleanEvaluator;
+import org.apache.solr.client.solrj.io.eval.RecursiveBooleanEvaluator;
import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
import org.apache.solr.client.solrj.io.stream.expr.Explanation;
import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType;
@@ -42,12 +42,12 @@ public class HavingStream extends TupleStream implements Expressible {
private static final long serialVersionUID = 1;
private TupleStream stream;
- private BooleanEvaluator evaluator;
+ private RecursiveBooleanEvaluator evaluator;
private StreamContext streamContext;
private transient Tuple currentGroupHead;
- public HavingStream(TupleStream stream, BooleanEvaluator evaluator) throws IOException {
+ public HavingStream(TupleStream stream, RecursiveBooleanEvaluator evaluator) throws IOException {
init(stream, evaluator);
}
@@ -55,7 +55,7 @@ public class HavingStream extends TupleStream implements Expressible {
public HavingStream(StreamExpression expression, StreamFactory factory) throws IOException{
// grab all parameters out
List<StreamExpression> streamExpressions = factory.getExpressionOperandsRepresentingTypes(expression, Expressible.class, TupleStream.class);
- List<StreamExpression> evaluatorExpressions = factory.getExpressionOperandsRepresentingTypes(expression, BooleanEvaluator.class);
+ List<StreamExpression> evaluatorExpressions = factory.getExpressionOperandsRepresentingTypes(expression, RecursiveBooleanEvaluator.class);
// validate expression contains only what we want.
if(expression.getParameters().size() != streamExpressions.size() + 1){
@@ -71,17 +71,17 @@ public class HavingStream extends TupleStream implements Expressible {
if(evaluatorExpressions != null && evaluatorExpressions.size() == 1) {
StreamExpression ex = evaluatorExpressions.get(0);
evaluator = factory.constructEvaluator(ex);
- if(!(evaluator instanceof BooleanEvaluator)) {
- throw new IOException("The HavingStream requires a BooleanEvaluator. A StreamEvaluator was provided.");
+ if(!(evaluator instanceof RecursiveBooleanEvaluator)) {
+ throw new IOException("The HavingStream requires a RecursiveBooleanEvaluator. A StreamEvaluator was provided.");
}
} else {
- throw new IOException("The HavingStream requires a BooleanEvaluator.");
+ throw new IOException("The HavingStream requires a RecursiveBooleanEvaluator.");
}
- init(factory.constructStream(streamExpressions.get(0)), (BooleanEvaluator)evaluator);
+ init(factory.constructStream(streamExpressions.get(0)), (RecursiveBooleanEvaluator)evaluator);
}
- private void init(TupleStream stream, BooleanEvaluator evaluator) throws IOException{
+ private void init(TupleStream stream, RecursiveBooleanEvaluator evaluator) throws IOException{
this.stream = stream;
this.evaluator = evaluator;
}
@@ -155,7 +155,7 @@ public class HavingStream extends TupleStream implements Expressible {
}
streamContext.getTupleContext().clear();
- if(evaluator.evaluate(tuple)){
+ if((boolean)evaluator.evaluate(tuple)){
return tuple;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
index 74e1de8..f4c9b58 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
@@ -361,16 +361,16 @@ public class StreamFactory implements Serializable {
throw new IOException(String.format(Locale.ROOT,"Invalid operation expression %s - function '%s' is unknown (not mapped to a valid StreamOperation)", expression, expression.getFunctionName()));
}
-
- public StreamEvaluator constructEvaluator(String expressionClause) throws IOException {
+
+ public org.apache.solr.client.solrj.io.eval.StreamEvaluator constructEvaluator(String expressionClause) throws IOException {
return constructEvaluator(StreamExpressionParser.parse(expressionClause));
}
- public StreamEvaluator constructEvaluator(StreamExpression expression) throws IOException{
+ public org.apache.solr.client.solrj.io.eval.StreamEvaluator constructEvaluator(StreamExpression expression) throws IOException{
String function = expression.getFunctionName();
if(functionNames.containsKey(function)){
Class<? extends Expressible> clazz = functionNames.get(function);
if(Expressible.class.isAssignableFrom(clazz) && StreamEvaluator.class.isAssignableFrom(clazz)){
- return (StreamEvaluator)createInstance(functionNames.get(function), new Class[]{ StreamExpression.class, StreamFactory.class }, new Object[]{ expression, this});
+ return (org.apache.solr.client.solrj.io.eval.StreamEvaluator)createInstance(functionNames.get(function), new Class[]{ StreamExpression.class, StreamFactory.class }, new Object[]{ expression, this});
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
index 14632b4..670b39d 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
@@ -25,6 +25,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import org.apache.commons.math3.distribution.NormalDistribution;
+import org.apache.commons.math3.stat.inference.KolmogorovSmirnovTest;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -35,7 +37,7 @@ import org.apache.solr.client.solrj.io.comp.ComparatorOrder;
import org.apache.solr.client.solrj.io.comp.FieldComparator;
import org.apache.solr.client.solrj.io.eval.AddEvaluator;
import org.apache.solr.client.solrj.io.eval.AndEvaluator;
-import org.apache.solr.client.solrj.io.eval.EqualsEvaluator;
+import org.apache.solr.client.solrj.io.eval.EqualToEvaluator;
import org.apache.solr.client.solrj.io.eval.GreaterThanEqualToEvaluator;
import org.apache.solr.client.solrj.io.eval.GreaterThanEvaluator;
import org.apache.solr.client.solrj.io.eval.IfThenElseEvaluator;
@@ -1091,7 +1093,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
.withFunctionName("not", NotEvaluator.class)
.withFunctionName("gt", GreaterThanEvaluator.class)
.withFunctionName("lt", LessThanEvaluator.class)
- .withFunctionName("eq", EqualsEvaluator.class)
+ .withFunctionName("eq", EqualToEvaluator.class)
.withFunctionName("lteq", LessThanEqualToEvaluator.class)
.withFunctionName("gteq", GreaterThanEqualToEvaluator.class);
@@ -1198,7 +1200,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
.withFunctionName("not", NotEvaluator.class)
.withFunctionName("gt", GreaterThanEvaluator.class)
.withFunctionName("lt", LessThanEvaluator.class)
- .withFunctionName("eq", EqualsEvaluator.class)
+ .withFunctionName("eq", EqualToEvaluator.class)
.withFunctionName("lteq", LessThanEqualToEvaluator.class)
.withFunctionName("gteq", GreaterThanEqualToEvaluator.class)
.withFunctionName("val", RawValueEvaluator.class)
@@ -5717,17 +5719,11 @@ public class StreamExpressionTest extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(solrStream);
assertTrue(tuples.size() == 1);
List<Number> copy1 = (List<Number>)tuples.get(0).get("copy1");
- assertTrue(copy1.size() == 10);
+ assertTrue(copy1.size() == 4);
assertTrue(copy1.get(0).doubleValue() == 100D);
assertTrue(copy1.get(1).doubleValue() == 500D);
assertTrue(copy1.get(2).doubleValue() == 300D);
assertTrue(copy1.get(3).doubleValue() == 400D);
- assertTrue(copy1.get(4).doubleValue() == 0D);
- assertTrue(copy1.get(5).doubleValue() == 0D);
- assertTrue(copy1.get(6).doubleValue() == 0D);
- assertTrue(copy1.get(7).doubleValue() == 0D);
- assertTrue(copy1.get(8).doubleValue() == 0D);
- assertTrue(copy1.get(9).doubleValue() == 0D);
List<Number> copy2 = (List<Number>)tuples.get(0).get("copy2");
assertTrue(copy2.size() == 4);
@@ -5993,6 +5989,17 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertTrue(out.get(8).intValue() == 9);
}
+ @Test
+ public void fakeTest(){
+ NormalDistribution a = new NormalDistribution(10, 2);
+ NormalDistribution c = new NormalDistribution(100, 6);
+ double[] d = c.sample(250);
+
+ KolmogorovSmirnovTest ks = new KolmogorovSmirnovTest();
+ double pv = ks.kolmogorovSmirnovStatistic(a, d);
+
+ String s = "";
+ }
@Test
public void testDistributions() throws Exception {
@@ -6252,13 +6259,13 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertTrue(tuples.size() == 1);
List<Number> convolution = (List<Number>)(tuples.get(0)).get("conv");
assertTrue(convolution.size() == 7);
- assertTrue(convolution.get(0).equals(20000D));
- assertTrue(convolution.get(1).equals(20000D));
- assertTrue(convolution.get(2).equals(25000D));
- assertTrue(convolution.get(3).equals(30000D));
- assertTrue(convolution.get(4).equals(15000D));
- assertTrue(convolution.get(5).equals(10000D));
- assertTrue(convolution.get(6).equals(5000D));
+ assertTrue(convolution.get(0).equals(20000L));
+ assertTrue(convolution.get(1).equals(20000L));
+ assertTrue(convolution.get(2).equals(25000L));
+ assertTrue(convolution.get(3).equals(30000L));
+ assertTrue(convolution.get(4).equals(15000L));
+ assertTrue(convolution.get(5).equals(10000L));
+ assertTrue(convolution.get(6).equals(5000L));
}
@@ -6311,7 +6318,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
double prediction = tuple.getDouble("p");
assertTrue(prediction == 600.0D);
List<Number> predictions = (List<Number>)tuple.get("pl");
- assertList(predictions, 200.0, 400.0, 600.0, 200.0, 400.0, 800.0, 1200.0);
+ assertList(predictions, 200L, 400L, 600L, 200L, 400L, 800L, 1200L);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
index 59f89c0..d3674d7 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AddEvaluatorTest.java
@@ -258,13 +258,13 @@ public class AddEvaluatorTest extends LuceneTestCase {
Assert.assertEquals(6 * 123456789123456789L, result);
values.clear();
- values.put("a", 4.123456789123456);
- values.put("b", 4.123456789123456);
- values.put("c", 4.123456789123456);
- values.put("d", 4.123456789123456);
+ values.put("a", 4.12345678);
+ values.put("b", 4.12345678);
+ values.put("c", 4.12345678);
+ values.put("d", 4.12345678);
result = evaluator.evaluate(new Tuple(values));
Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(6 * 4.123456789123456, result);
+ Assert.assertEquals(6 * 4.12345678, result);
}
@Test
@@ -318,13 +318,13 @@ public class AddEvaluatorTest extends LuceneTestCase {
Assert.assertEquals(4 * 123456789123456789L, result);
values.clear();
- values.put("a", -4.123456789123456);
- values.put("b", -4.123456789123456);
- values.put("c", -4.123456789123456);
- values.put("d", -4.123456789123456);
+ values.put("a", -4.12345678);
+ values.put("b", -4.12345678);
+ values.put("c", -4.12345678);
+ values.put("d", -4.12345678);
result = evaluator.evaluate(new Tuple(values));
Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(6 * -4.123456789123456, result);
+ Assert.assertEquals(6 * -4.12345678, result);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
new file mode 100644
index 0000000..d63a450
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AppendEvaluatorTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.io.stream.eval;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.eval.AppendEvaluator;
+import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+public class AppendEvaluatorTest extends LuceneTestCase {
+
+ StreamFactory factory;
+ Map<String, Object> values;
+
+ public AppendEvaluatorTest() {
+ super();
+
+ factory = new StreamFactory()
+ .withFunctionName("append", AppendEvaluator.class);
+ values = new HashMap<String,Object>();
+ }
+
+ @Test
+ public void multiField() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("append(a,b,c)");
+ Object result;
+
+ values.clear();
+ values.put("a", 1L);
+ values.put("b", Arrays.asList("foo","bar","baz"));
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof List);
+ Assert.assertEquals(1L, ((List)result).get(0));
+ Assert.assertEquals("foo", ((List)result).get(1));
+ Assert.assertEquals("bar", ((List)result).get(2));
+ Assert.assertEquals("baz", ((List)result).get(3));
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AscEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AscEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AscEvaluatorTest.java
new file mode 100644
index 0000000..d9d4493
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/AscEvaluatorTest.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.io.stream.eval;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.eval.AscEvaluator;
+import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+public class AscEvaluatorTest extends LuceneTestCase {
+
+ StreamFactory factory;
+ Map<String, Object> values;
+
+ public AscEvaluatorTest() {
+ super();
+
+ factory = new StreamFactory()
+ .withFunctionName("asc", AscEvaluator.class);
+ values = new HashMap<String,Object>();
+ }
+
+ @Test
+ public void integerSortTest() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("asc(a)");
+ Object result;
+
+ values.clear();
+ values.put("a", Arrays.asList(2,4,1,3,5,8,7));
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof List<?>);
+ Assert.assertEquals(7, ((List<?>)result).size());
+ checkOrder(Arrays.asList(1L,2L,3L,4L,5L,7L,8L), (List<Object>)result);
+ }
+
+ @Test
+ public void doubleSortTest() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("asc(a)");
+ Object result;
+
+ values.clear();
+ values.put("a", Arrays.asList(2.3, 2.1, 2.7, 2.6, 2.5));
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof List<?>);
+ Assert.assertEquals(5, ((List<?>)result).size());
+ checkOrder(Arrays.asList(2.1, 2.3, 2.5, 2.6, 2.7), (List<Object>)result);
+ }
+
+ @Test
+ public void doubleWithIntegersSortTest() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("asc(a)");
+ Object result;
+
+ values.clear();
+ values.put("a", Arrays.asList(2.3, 2.1, 2.0, 2.7, 2.6, 2.5, 3));
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof List<?>);
+ Assert.assertEquals(7, ((List<?>)result).size());
+ checkOrder(Arrays.asList(2L, 2.1, 2.3, 2.5, 2.6, 2.7, 3L), (List<Object>)result);
+ }
+
+ @Test
+ public void stringSortTest() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("asc(a)");
+ Object result;
+
+ values.clear();
+ values.put("a", Arrays.asList("a","c","b","e","d"));
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof List<?>);
+ Assert.assertEquals(5, ((List<?>)result).size());
+ checkOrder(Arrays.asList("a","b","c","d","e"), (List<Object>)result);
+ }
+
+ private <T> void checkOrder(List<?> expected, List<?> actual){
+ Assert.assertEquals(expected.size(), actual.size());
+ for(int idx = 0; idx < expected.size(); ++idx){
+ Comparable<Object> expectedValue = (Comparable<Object>)expected.get(idx);
+ Comparable<Object> actualValue = (Comparable<Object>)actual.get(idx);
+
+ Assert.assertEquals(0, expectedValue.compareTo(actualValue));
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
index 79f46e7..549c267 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CoalesceEvaluatorTest.java
@@ -50,7 +50,7 @@ public class CoalesceEvaluatorTest extends LuceneTestCase {
values.put("a", null);
values.put("b", 2);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(2, result);
+ Assert.assertEquals(2L, result);
values.clear();
values.put("a", 1.1);
@@ -107,6 +107,6 @@ public class CoalesceEvaluatorTest extends LuceneTestCase {
values.put("c", null);
values.put("d", 4);
result = evaluator.evaluate(new Tuple(values));
- Assert.assertEquals(1, result);
+ Assert.assertEquals(1L, result);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CompoundEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CompoundEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CompoundEvaluatorTest.java
deleted file mode 100644
index 74b44b3..0000000
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CompoundEvaluatorTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.solr.client.solrj.io.stream.eval;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.solr.client.solrj.io.Tuple;
-import org.apache.solr.client.solrj.io.eval.AddEvaluator;
-import org.apache.solr.client.solrj.io.eval.AndEvaluator;
-import org.apache.solr.client.solrj.io.eval.GreaterThanEvaluator;
-import org.apache.solr.client.solrj.io.eval.IfThenElseEvaluator;
-import org.apache.solr.client.solrj.io.eval.LessThanEvaluator;
-import org.apache.solr.client.solrj.io.eval.MultiplyEvaluator;
-import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
-import org.apache.solr.client.solrj.io.eval.SubtractEvaluator;
-import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.junit.Test;
-
-import junit.framework.Assert;
-
-public class CompoundEvaluatorTest extends LuceneTestCase {
-
- StreamFactory factory;
- Map<String, Object> values;
-
- public CompoundEvaluatorTest() {
- super();
-
- factory = new StreamFactory()
- .withFunctionName("and", AndEvaluator.class)
- .withFunctionName("gt", GreaterThanEvaluator.class)
- .withFunctionName("lt", LessThanEvaluator.class)
- .withFunctionName("add", AddEvaluator.class)
- .withFunctionName("sub", SubtractEvaluator.class)
- .withFunctionName("mult", MultiplyEvaluator.class)
- .withFunctionName("if", IfThenElseEvaluator.class);
- values = new HashMap<String,Object>();
- }
-
- @Test
- public void compoundTest() throws Exception{
- StreamEvaluator evaluator = factory.constructEvaluator("add(mult(a,b),if(gt(c,d),e,f),g)");
- Object result;
-
- values.clear();
- values.put("a", 10);
- values.put("b", -3);
- values.put("c", "foo");
- values.put("d", "bar");
- values.put("e", 9);
- values.put("f", 2);
- values.put("g", 5);
- result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Long);
- Assert.assertEquals(-16L, result);
-
- values.clear();
- values.put("a", .1);
- values.put("b", -3);
- values.put("c", "foo");
- values.put("d", "bar");
- values.put("e", 9);
- values.put("f", 2);
- values.put("g", 5);
- result = evaluator.evaluate(new Tuple(values));
- Assert.assertTrue(result instanceof Double);
- Assert.assertEquals(13.7, result);
- }
-}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
index 94124ad..2194b8f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/ConversionEvaluatorsTest.java
@@ -62,7 +62,7 @@ public class ConversionEvaluatorsTest {
evaluator.setStreamContext(streamContext);
assertTrue(false);
} catch (IOException e) {
- assertTrue(e.getCause().getCause().getMessage().contains("Invalid expression convert(inches) - expecting 3 value but found 1"));
+ assertEquals("Invalid expression convert(inches) - expecting exactly 3 parameters but found 1", e.getCause().getCause().getMessage());
}
try {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
new file mode 100644
index 0000000..d915d21
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CorrelationEvaluatorTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.io.stream.eval;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.math3.stat.correlation.PearsonsCorrelation;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.eval.CorrelationEvaluator;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+public class CorrelationEvaluatorTest extends LuceneTestCase {
+
+ StreamFactory factory;
+ Map<String, Object> values;
+
+ public CorrelationEvaluatorTest() {
+ super();
+ factory = new StreamFactory().withFunctionName("corr", CorrelationEvaluator.class);
+ values = new HashMap<String,Object>();
+ }
+
+ @Test
+ public void test() throws IOException {
+ double[] l1 = new double[] {3.4, 4.5, 6.7};
+ double[] l2 = new double[] {1.2, 3.2, 3};
+
+ values.clear();
+ values.put("l1", l1);
+ values.put("l2", l2);
+
+ Assert.assertEquals(new PearsonsCorrelation().correlation(l1, l2), factory.constructEvaluator("corr(l1,l2)").evaluate(new Tuple(values)));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
new file mode 100644
index 0000000..5ad165f
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/CumulativeProbabilityEvaluatorTest.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.io.stream.eval;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.math3.distribution.NormalDistribution;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.eval.CumulativeProbabilityEvaluator;
+import org.apache.solr.client.solrj.io.eval.NormalDistributionEvaluator;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+public class CumulativeProbabilityEvaluatorTest extends LuceneTestCase {
+
+ StreamFactory factory;
+ Map<String, Object> values;
+
+ public CumulativeProbabilityEvaluatorTest() {
+ super();
+ factory = new StreamFactory()
+ .withFunctionName("prob", CumulativeProbabilityEvaluator.class)
+ .withFunctionName("norm", NormalDistributionEvaluator.class);
+ values = new HashMap<String,Object>();
+ }
+
+ @Test
+ public void test() throws IOException {
+ values.clear();
+ values.put("l1", 3);
+ values.put("l2", 7);
+
+ NormalDistribution actual = new NormalDistribution(3,7);
+ Assert.assertEquals(actual.cumulativeProbability(2), factory.constructEvaluator("prob(norm(l1,l2),2)").evaluate(new Tuple(values)));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
new file mode 100644
index 0000000..5b2414e
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EmpiricalDistributionEvaluatorTest.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.io.stream.eval;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.math3.random.EmpiricalDistribution;
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.eval.EmpiricalDistributionEvaluator;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+public class EmpiricalDistributionEvaluatorTest extends LuceneTestCase {
+
+ StreamFactory factory;
+ Map<String,Object> values;
+
+ public EmpiricalDistributionEvaluatorTest() {
+ super();
+ factory = new StreamFactory().withFunctionName("emp", EmpiricalDistributionEvaluator.class);
+ values = new HashMap<String,Object>();
+ }
+
+ @Test
+ public void test() throws IOException {
+ double[] l1 = new double[] {3.4, 4.5, 6.7};
+ double[] l2 = new double[] {1.2, 3.2, 3};
+
+ values.clear();
+ values.put("l1", l1);
+ values.put("l2", l2);
+
+ EmpiricalDistribution dist = new EmpiricalDistribution();
+ dist.load(l1);
+ Assert.assertEquals(dist.getNumericalMean(),
+ ((EmpiricalDistribution) factory.constructEvaluator("emp(l1)").evaluate(new Tuple(values))).getNumericalMean());
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bd587e1f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
new file mode 100644
index 0000000..996b0e4
--- /dev/null
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/EqualToEvaluatorTest.java
@@ -0,0 +1,263 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.client.solrj.io.stream.eval;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.client.solrj.io.Tuple;
+import org.apache.solr.client.solrj.io.eval.EqualToEvaluator;
+import org.apache.solr.client.solrj.io.eval.RawValueEvaluator;
+import org.apache.solr.client.solrj.io.eval.StreamEvaluator;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+import org.junit.Test;
+
+import junit.framework.Assert;
+
+public class EqualToEvaluatorTest extends LuceneTestCase {
+
+ StreamFactory factory;
+ Map<String, Object> values;
+
+ public EqualToEvaluatorTest() {
+ super();
+
+ factory = new StreamFactory()
+ .withFunctionName("eq", EqualToEvaluator.class)
+ .withFunctionName("val", RawValueEvaluator.class)
+ ;
+ values = new HashMap<String,Object>();
+ }
+
+ @Test
+ public void operationFieldName() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("eq(sum(a),val(9))");
+ Object result;
+
+ values.clear();
+ values.put("sum(a)", 9);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ }
+
+ @Test
+ public void eqTwoIntegers() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("eq(a,b)");
+ Object result;
+
+ values.clear();
+ values.put("a", 1);
+ values.put("b", 1);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", 1);
+ values.put("b", 1.0);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", 1.0);
+ values.put("b", 1);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", 1);
+ values.put("b", 2);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, result);
+
+ values.clear();
+ values.put("a", -1);
+ values.put("b", -1);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", 1);
+ values.put("b", 2.0);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, result);
+
+ values.clear();
+ values.put("a", 1.0);
+ values.put("b", 2);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, result);
+ }
+
+ @Test
+ public void eqTwoStrings() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("eq(a,b)");
+ Object result;
+ String foo = "foo";
+ String bar = "bar";
+
+ values.clear();
+ values.put("a", "foo");
+ values.put("b", "foo");
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", "foo");
+ values.put("b", "bar");
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, false);
+
+ values.clear();
+ values.put("a", "foo bar baz");
+ values.put("b", "foo bar baz");
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", "foo bar baz");
+ values.put("b", "foo bar jaz");
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, result);
+
+ values.clear();
+ values.put("a", foo);
+ values.put("b", foo);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", foo);
+ values.put("b", bar);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, result);
+ }
+
+ @Test
+ public void eqTwoBooleans() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("eq(a,b)");
+ Object result;
+ Boolean t = true;
+ Boolean f = false;
+
+ values.clear();
+ values.put("a", true);
+ values.put("b",true);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", false);
+ values.put("b",false);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", true);
+ values.put("b", false);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, false);
+
+ values.clear();
+ values.put("a", false);
+ values.put("b", true);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, result);
+
+ values.clear();
+ values.put("a", t);
+ values.put("b", f);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(false, result);
+
+ values.clear();
+ values.put("a", t);
+ values.put("b", t);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+
+ values.clear();
+ values.put("a", f);
+ values.put("b", f);
+ result = evaluator.evaluate(new Tuple(values));
+ Assert.assertTrue(result instanceof Boolean);
+ Assert.assertEquals(true, result);
+ }
+
+ @Test(expected = IOException.class)
+ public void eqDifferentTypes1() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("eq(a,b)");
+
+ values.clear();
+ values.put("a", true);
+ values.put("b",1);
+ evaluator.evaluate(new Tuple(values));
+ }
+
+ @Test(expected = IOException.class)
+ public void eqDifferentTypes2() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("eq(a,b)");
+
+ values.clear();
+ values.put("a", 1);
+ values.put("b",false);
+ evaluator.evaluate(new Tuple(values));
+ }
+
+ @Test(expected = IOException.class)
+ public void eqDifferentTypes3() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("eq(a,b)");
+
+ values.clear();
+ values.put("a", "1");
+ values.put("b",1);
+ evaluator.evaluate(new Tuple(values));
+ }
+
+ @Test(expected = IOException.class)
+ public void eqDifferentTypes4() throws Exception{
+ StreamEvaluator evaluator = factory.constructEvaluator("eq(a,b)");
+
+ values.clear();
+ values.put("a", "true");
+ values.put("b",true);
+ evaluator.evaluate(new Tuple(values));
+ }
+
+}