You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/06/05 15:50:05 UTC
[1/4] lucene-solr:master: SOLR-10813: Add arraySort Stream Evaluator
Repository: lucene-solr
Updated Branches:
refs/heads/master 2271e73e7 -> 78d95014e
SOLR-10813: Add arraySort Stream Evaluator
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/78d95014
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/78d95014
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/78d95014
Branch: refs/heads/master
Commit: 78d95014e75530fcd91040b1df3c0317a959b887
Parents: 6a9830c
Author: Joel Bernstein <jb...@apache.org>
Authored: Mon Jun 5 11:18:57 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon Jun 5 11:19:17 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../solrj/io/eval/ArraySortEvaluator.java | 77 ++++++++++++++++++++
.../solrj/io/stream/StreamExpressionTest.java | 25 ++++++-
3 files changed, 102 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/78d95014/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
index d4029ff..7889bf7 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -195,6 +195,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("hist", HistogramEvaluator.class)
.withFunctionName("anova", AnovaEvaluator.class)
.withFunctionName("movingAvg", MovingAverageEvaluator.class)
+ .withFunctionName("arraySort", ArraySortEvaluator.class)
// metrics
.withFunctionName("min", MinMetric.class)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/78d95014/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArraySortEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArraySortEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArraySortEvaluator.java
new file mode 100644
index 0000000..dabc615
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ArraySortEvaluator.java
@@ -0,0 +1,77 @@
+/*
+ * 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.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+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 ArraySortEvaluator extends ComplexEvaluator implements Expressible {
+
+ private static final long serialVersionUID = 1;
+
+ public ArraySortEvaluator(StreamExpression expression, StreamFactory factory) throws IOException {
+ super(expression, factory);
+ }
+
+ public List<Number> evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 1) {
+ throw new IOException("Array sort evaluator expects 1 parameters found: "+subEvaluators.size());
+ }
+
+ StreamEvaluator colEval1 = subEvaluators.get(0);
+
+ List<Number> numbers1 = (List<Number>)colEval1.evaluate(tuple);
+ List<Number> numbers2 = new ArrayList();
+ numbers2.addAll(numbers1);
+ Collections.sort(numbers2, new Comparator<Number>() {
+ @Override
+ public int compare(Number o1, Number o2) {
+ Double d1 = o1.doubleValue();
+ Double d2 = o2.doubleValue();
+ return d1.compareTo(d2);
+ }
+ });
+ return numbers2;
+ }
+
+ @Override
+ public StreamExpressionParameter toExpression(StreamFactory factory) throws IOException {
+ StreamExpression expression = new StreamExpression(factory.getFunctionName(getClass()));
+ return expression;
+ }
+
+ @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());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/78d95014/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 8ca52d1..3466af2 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
@@ -5808,9 +5808,32 @@ public class StreamExpressionTest extends SolrCloudTestCase {
tuple = tuples.get(0);
p = tuple.getDouble("return-value");
assertEquals(p, 2.4, 0.001);
-
}
+ @Test
+ public void testArraySort() throws Exception {
+ String cexpr = "arraySort(array(11.5, 12.3, 4, 3, 1, 0))";
+ ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", cexpr);
+ paramsLoc.set("qt", "/stream");
+
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString()+"/"+COLLECTIONORALIAS;
+ TupleStream solrStream = new SolrStream(url, paramsLoc);
+
+ StreamContext context = new StreamContext();
+ solrStream.setStreamContext(context);
+ List<Tuple> tuples = getTuples(solrStream);
+ assertTrue(tuples.size() == 1);
+ Tuple tuple = tuples.get(0);
+ List<Number> asort = (List<Number>)tuple.get("return-value");
+ assertEquals(asort.size(), 6);
+ assertEquals(asort.get(0).doubleValue(), 0, 0.0);
+ assertEquals(asort.get(1).doubleValue(), 1, 0.0);
+ assertEquals(asort.get(2).doubleValue(), 3, 0.0);
+ assertEquals(asort.get(3).doubleValue(), 4, 0.0);
+ assertEquals(asort.get(4).doubleValue(), 11.5, 0.0);
+ assertEquals(asort.get(5).doubleValue(), 12.3, 0.0);
+ }
@Test
public void testCumulativeProbability() throws Exception {
[4/4] lucene-solr:master: SOLR-10805: Improve error handling for
statistical Stream Evaluators
Posted by jb...@apache.org.
SOLR-10805: Improve error handling for statistical Stream Evaluators
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f275e3b2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f275e3b2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f275e3b2
Branch: refs/heads/master
Commit: f275e3b254ef70179bf9923140c1d805c4314dd3
Parents: 2271e73
Author: Joel Bernstein <jb...@apache.org>
Authored: Fri Jun 2 12:13:34 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon Jun 5 11:19:17 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java | 5 +++++
.../apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java | 6 ++++++
.../apache/solr/client/solrj/io/eval/CorrelationEvaluator.java | 5 +++++
.../apache/solr/client/solrj/io/eval/CovarianceEvaluator.java | 5 +++++
.../apache/solr/client/solrj/io/eval/DistanceEvaluator.java | 5 +++++
.../apache/solr/client/solrj/io/eval/FindDelayEvaluator.java | 5 +++++
.../apache/solr/client/solrj/io/eval/HistogramEvaluator.java | 6 ++++--
.../solr/client/solrj/io/eval/MovingAverageEvaluator.java | 5 +++++
.../org/apache/solr/client/solrj/io/eval/RankEvaluator.java | 5 +++++
.../org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java | 5 +++++
.../org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java | 5 +++++
.../apache/solr/client/solrj/io/eval/SequenceEvaluator.java | 5 +++++
12 files changed, 60 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java
index b228821..d80e693 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/AnovaEvaluator.java
@@ -40,6 +40,11 @@ public class AnovaEvaluator extends ComplexEvaluator implements Expressible {
}
public Tuple evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() < 2) {
+ throw new IOException("ANOVA evaluator expects atleast 2 parameters found: "+subEvaluators.size());
+ }
+
List<double[]> list = new ArrayList();
for(StreamEvaluator subEvaluator : subEvaluators) {
List<Number> nums = (List<Number>)subEvaluator.evaluate(tuple);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
index 6ca178d..000fa0d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ConvolutionEvaluator.java
@@ -38,6 +38,12 @@ public class ConvolutionEvaluator extends ComplexEvaluator implements Expressibl
}
public List<Number> evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Convolution evaluator expects 2 parameters found: "+subEvaluators.size());
+ }
+
+
StreamEvaluator colEval1 = subEvaluators.get(0);
StreamEvaluator colEval2 = subEvaluators.get(1);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java
index fc3d8c3..05db16f 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CorrelationEvaluator.java
@@ -37,6 +37,11 @@ public class CorrelationEvaluator extends ComplexEvaluator implements Expressibl
}
public Number evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Correlation evaluator expects 2 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator colEval1 = subEvaluators.get(0);
StreamEvaluator colEval2 = subEvaluators.get(1);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java
index 7a6de68..5778289 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CovarianceEvaluator.java
@@ -37,6 +37,11 @@ public class CovarianceEvaluator extends ComplexEvaluator implements Expressible
}
public Number evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Covariance evaluator expects 2 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator colEval1 = subEvaluators.get(0);
StreamEvaluator colEval2 = subEvaluators.get(1);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java
index 201da4b..f4ac319 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/DistanceEvaluator.java
@@ -38,6 +38,11 @@ public class DistanceEvaluator extends ComplexEvaluator implements Expressible {
}
public Number evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Distance evaluator expects 2 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator colEval1 = subEvaluators.get(0);
StreamEvaluator colEval2 = subEvaluators.get(1);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java
index c5a9b8a..0cdd153 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/FindDelayEvaluator.java
@@ -38,6 +38,11 @@ public class FindDelayEvaluator extends ComplexEvaluator implements Expressible
}
public Number evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Finddelay evaluator expects 2 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator colEval1 = subEvaluators.get(0);
StreamEvaluator colEval2 = subEvaluators.get(1);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java
index c691698..aa8408b 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/HistogramEvaluator.java
@@ -42,6 +42,10 @@ public class HistogramEvaluator extends ComplexEvaluator implements Expressible
public List<Map> evaluate(Tuple tuple) throws IOException {
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Histogram evaluator expects 2 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator colEval1 = subEvaluators.get(0);
List<Number> numbers1 = (List<Number>)colEval1.evaluate(tuple);
@@ -79,8 +83,6 @@ public class HistogramEvaluator extends ComplexEvaluator implements Expressible
return binList;
}
-
-
@Override
public StreamExpressionParameter toExpression(StreamFactory factory) throws IOException {
StreamExpression expression = new StreamExpression(factory.getFunctionName(getClass()));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java
index 2e0788f..783116e 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MovingAverageEvaluator.java
@@ -38,6 +38,11 @@ public class MovingAverageEvaluator extends ComplexEvaluator implements Expressi
}
public List<Number> evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Moving average evaluator expects 2 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator colEval = subEvaluators.get(0);
StreamEvaluator windowEval = subEvaluators.get(1);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
index 8a22e94..2086c92 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RankEvaluator.java
@@ -38,6 +38,11 @@ public class RankEvaluator extends ComplexEvaluator implements Expressible {
}
public List<Number> evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 1) {
+ throw new IOException("Rank evaluator expects 1 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator colEval = subEvaluators.get(0);
List<Number> numbers = (List<Number>)colEval.evaluate(tuple);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java
index 016e995..cb11c91 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ReverseEvaluator.java
@@ -37,6 +37,11 @@ public class ReverseEvaluator extends ComplexEvaluator implements Expressible {
}
public List<Number> evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 1) {
+ throw new IOException("Reverse evaluator expects 1 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator colEval1 = subEvaluators.get(0);
List<Number> numbers1 = (List<Number>)colEval1.evaluate(tuple);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
index 8ff2a7c..f45e2c4 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ScaleEvaluator.java
@@ -38,6 +38,11 @@ public class ScaleEvaluator extends ComplexEvaluator implements Expressible {
}
public List<Number> evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Scale evaluator expects 2 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator numEval = subEvaluators.get(0);
StreamEvaluator colEval1 = subEvaluators.get(1);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f275e3b2/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java
index a88d695..c45e551 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java
@@ -38,6 +38,11 @@ public class SequenceEvaluator extends ComplexEvaluator implements Expressible {
}
public List<Number> evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 3) {
+ throw new IOException("Sequence evaluator expects 3 parameters found: "+subEvaluators.size());
+ }
+
StreamEvaluator sizeEval = subEvaluators.get(0);
StreamEvaluator startEval = subEvaluators.get(1);
StreamEvaluator strideEval = subEvaluators.get(2);
[2/4] lucene-solr:master: SOLR-10696: Add cumulative probability
function
Posted by jb...@apache.org.
SOLR-10696: Add cumulative probability function
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/99ca13f9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/99ca13f9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/99ca13f9
Branch: refs/heads/master
Commit: 99ca13f90fa04fb804e20bbdf51bf6cfc4ea3a34
Parents: f275e3b
Author: Joel Bernstein <jb...@apache.org>
Authored: Fri Jun 2 15:19:38 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon Jun 5 11:19:17 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../io/eval/CumulativeProbabilityEvaluator.java | 66 ++++++++++++++++++++
.../solrj/io/eval/PercentileEvaluator.java | 24 ++++---
.../solrj/io/stream/StreamExpressionTest.java | 65 +++++++++++++++++--
4 files changed, 143 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/99ca13f9/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
index f79f86e..d4029ff 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -187,6 +187,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("copyOfRange", CopyOfRangeEvaluator.class)
.withFunctionName("percentile", PercentileEvaluator.class)
.withFunctionName("empiricalDistribution", EmpiricalDistributionEvaluator.class)
+ .withFunctionName("cumulativeProbability", CumulativeProbabilityEvaluator.class)
.withFunctionName("describe", DescribeEvaluator.class)
.withFunctionName("finddelay", FindDelayEvaluator.class)
.withFunctionName("sequence", SequenceEvaluator.class)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/99ca13f9/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CumulativeProbabilityEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CumulativeProbabilityEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CumulativeProbabilityEvaluator.java
new file mode 100644
index 0000000..469e983
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/CumulativeProbabilityEvaluator.java
@@ -0,0 +1,66 @@
+/*
+ * 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 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 CumulativeProbabilityEvaluator extends ComplexEvaluator implements Expressible {
+
+ private static final long serialVersionUID = 1;
+
+ public CumulativeProbabilityEvaluator(StreamExpression expression, StreamFactory factory) throws IOException {
+ super(expression, factory);
+ }
+
+ public Number evaluate(Tuple tuple) throws IOException {
+
+ if(subEvaluators.size() != 2) {
+ throw new IOException("Cumulative probability expects 2 parameters: an emperical distribution and a number");
+ }
+
+ StreamEvaluator r = subEvaluators.get(0);
+ StreamEvaluator d = subEvaluators.get(1);
+
+ EmpiricalDistributionEvaluator.EmpiricalDistributionTuple e = (EmpiricalDistributionEvaluator.EmpiricalDistributionTuple)r.evaluate(tuple);
+ Number n = (Number)d.evaluate(tuple);
+ return e.percentile(n.doubleValue());
+ }
+
+ @Override
+ public StreamExpressionParameter toExpression(StreamFactory factory) throws IOException {
+ StreamExpression expression = new StreamExpression(factory.getFunctionName(getClass()));
+ return expression;
+ }
+
+ @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());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/99ca13f9/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
index 19d423d..7867048 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
@@ -17,6 +17,9 @@
package org.apache.solr.client.solrj.io.eval;
+import java.text.DecimalFormat;
+import java.text.NumberFormat;
+import java.util.List;
import java.io.IOException;
import org.apache.solr.client.solrj.io.Tuple;
@@ -26,6 +29,7 @@ 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;
+import org.apache.commons.math3.stat.descriptive.rank.Percentile;
public class PercentileEvaluator extends ComplexEvaluator implements Expressible {
@@ -36,17 +40,23 @@ public class PercentileEvaluator extends ComplexEvaluator implements Expressible
}
public Number evaluate(Tuple tuple) throws IOException {
-
if(subEvaluators.size() != 2) {
- throw new IOException("Percentile expects 2 parameters: a regression result and a number");
+ throw new IOException("Percentile expects 2 parameters: an array and a number");
}
- StreamEvaluator r = subEvaluators.get(0);
- StreamEvaluator d = subEvaluators.get(1);
+ StreamEvaluator colEval = subEvaluators.get(0);
+ List<Number> column = (List<Number>)colEval.evaluate(tuple);
+
+ double[] data = new double[column.size()];
+ for(int i=0; i<data.length; i++) {
+ data[i] = column.get(i).doubleValue();
+ }
- EmpiricalDistributionEvaluator.EmpiricalDistributionTuple e = (EmpiricalDistributionEvaluator.EmpiricalDistributionTuple)r.evaluate(tuple);
- Number n = (Number)d.evaluate(tuple);
- return e.percentile(n.doubleValue());
+ Percentile percentile = new Percentile();
+ percentile.setData(data);
+ StreamEvaluator numEval = subEvaluators.get(1);
+ Number num = (Number)numEval.evaluate(tuple);
+ return percentile.evaluate(num.doubleValue());
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/99ca13f9/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 3957915..8ca52d1 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
@@ -5759,8 +5759,61 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
+
+ @Test
+ public void testPercentile() throws Exception {
+ String cexpr = "percentile(array(1,2,3,4,5,6,7,8,9,10,11), 50)";
+ ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", cexpr);
+ paramsLoc.set("qt", "/stream");
+
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString()+"/"+COLLECTIONORALIAS;
+ TupleStream solrStream = new SolrStream(url, paramsLoc);
+
+ StreamContext context = new StreamContext();
+ solrStream.setStreamContext(context);
+ List<Tuple> tuples = getTuples(solrStream);
+ assertTrue(tuples.size() == 1);
+ Tuple tuple = tuples.get(0);
+ double p = tuple.getDouble("return-value");
+ assertEquals(p, 6, 0.0);
+
+
+ cexpr = "percentile(array(11,10,3,4,5,6,7,8,9,2,1), 50)";
+ paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", cexpr);
+ paramsLoc.set("qt", "/stream");
+
+ solrStream = new SolrStream(url, paramsLoc);
+
+ context = new StreamContext();
+ solrStream.setStreamContext(context);
+ tuples = getTuples(solrStream);
+ assertTrue(tuples.size() == 1);
+ tuple = tuples.get(0);
+ p = tuple.getDouble("return-value");
+ assertEquals(p, 6, 0.0);
+
+ cexpr = "percentile(array(11,10,3,4,5,6,7,8,9,2,1), 20)";
+ paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", cexpr);
+ paramsLoc.set("qt", "/stream");
+
+ solrStream = new SolrStream(url, paramsLoc);
+
+ context = new StreamContext();
+ solrStream.setStreamContext(context);
+ tuples = getTuples(solrStream);
+ assertTrue(tuples.size() == 1);
+ tuple = tuples.get(0);
+ p = tuple.getDouble("return-value");
+ assertEquals(p, 2.4, 0.001);
+
+ }
+
+
@Test
- public void testPercentiles() throws Exception {
+ public void testCumulativeProbability() throws Exception {
UpdateRequest updateRequest = new UpdateRequest();
int i=0;
@@ -5773,11 +5826,11 @@ public class StreamExpressionTest extends SolrCloudTestCase {
String expr = "search("+COLLECTIONORALIAS+", q=\"*:*\", fl=\"price_f\", sort=\"price_f asc\", rows=\"200\")";
String cexpr = "let(a="+expr+", c=col(a, price_f), e=empiricalDistribution(c), " +
- "tuple(p1=percentile(e, 88), " +
- "p2=percentile(e, 2), " +
- "p3=percentile(e, 99), " +
- "p4=percentile(e, 77), " +
- "p5=percentile(e, 98)))";
+ "tuple(p1=cumulativeProbability(e, 88), " +
+ "p2=cumulativeProbability(e, 2), " +
+ "p3=cumulativeProbability(e, 99), " +
+ "p4=cumulativeProbability(e, 77), " +
+ "p5=cumulativeProbability(e, 98)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
[3/4] lucene-solr:master: SOLR-10696: Fix precommit
Posted by jb...@apache.org.
SOLR-10696: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6a9830cd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6a9830cd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6a9830cd
Branch: refs/heads/master
Commit: 6a9830cdc0b5a5bf5ae18ff75119e64923d8266a
Parents: 99ca13f
Author: Joel Bernstein <jb...@apache.org>
Authored: Fri Jun 2 15:33:49 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon Jun 5 11:19:17 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6a9830cd/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
index 7867048..658e66a 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PercentileEvaluator.java
@@ -17,8 +17,6 @@
package org.apache.solr.client.solrj.io.eval;
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
import java.util.List;
import java.io.IOException;