You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/06/07 14:11:37 UTC
[33/50] [abbrv] lucene-solr:feature/autoscaling: SOLR-10805: Improve
error handling for statistical Stream Evaluators
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/feature/autoscaling
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);