You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/25 17:55:48 UTC
[39/44] lucene-solr:jira/solr-8668: SOLR-10743: Add sequence
StreamEvaluator
SOLR-10743: Add sequence StreamEvaluator
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0b47126e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0b47126e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0b47126e
Branch: refs/heads/jira/solr-8668
Commit: 0b47126e5c10cb6a092c4f49e4b1835bd15aa878
Parents: 7fef7e3
Author: Joel Bernstein <jb...@apache.org>
Authored: Thu May 25 11:20:15 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Thu May 25 11:20:15 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../client/solrj/io/eval/SequenceEvaluator.java | 72 ++++++++++++++++++++
.../solrj/io/stream/StreamExpressionTest.java | 53 ++++++++++++++
3 files changed, 126 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0b47126e/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 9880512..b219a2c 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -186,6 +186,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("empiricalDistribution", EmpiricalDistributionEvaluator.class)
.withFunctionName("describe", DescribeEvaluator.class)
.withFunctionName("finddelay", FindDelayEvaluator.class)
+ .withFunctionName("sequence", SequenceEvaluator.class)
// metrics
.withFunctionName("min", MinMetric.class)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0b47126e/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
new file mode 100644
index 0000000..a88d695
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/SequenceEvaluator.java
@@ -0,0 +1,72 @@
+/*
+ * 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.List;
+
+import org.apache.commons.math3.util.MathArrays;
+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 SequenceEvaluator extends ComplexEvaluator implements Expressible {
+
+ private static final long serialVersionUID = 1;
+
+ public SequenceEvaluator(StreamExpression expression, StreamFactory factory) throws IOException {
+ super(expression, factory);
+ }
+
+ public List<Number> evaluate(Tuple tuple) throws IOException {
+ StreamEvaluator sizeEval = subEvaluators.get(0);
+ StreamEvaluator startEval = subEvaluators.get(1);
+ StreamEvaluator strideEval = subEvaluators.get(2);
+
+ Number sizeNum = (Number)sizeEval.evaluate(tuple);
+ Number startNum = (Number)startEval.evaluate(tuple);
+ Number strideNum = (Number)strideEval.evaluate(tuple);
+
+ int[] sequence = MathArrays.sequence(sizeNum.intValue(), startNum.intValue(), strideNum.intValue());
+ List<Number> numbers = new ArrayList(sequence.length);
+ for(int i : sequence) {
+ numbers.add(i);
+ }
+
+ return numbers;
+ }
+
+ @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/0b47126e/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 ab792f9..0dff6fc 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
@@ -5207,6 +5207,59 @@ public class StreamExpressionTest extends SolrCloudTestCase {
@Test
+ public void testSequence() throws Exception {
+ String expr = "tuple(seq=sequence(20, 0, 1))";
+ ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", expr);
+ 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);
+ List<Number> sequence = (List<Number>)tuples.get(0).get("seq");
+ assertTrue(sequence.size() == 20);
+ for(int i=0; i<sequence.size(); i++) {
+ assertTrue(sequence.get(i).intValue() == i);
+ }
+
+ //Change the size, stride
+ expr = "tuple(seq=sequence(100, 0, 4))";
+ paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", expr);
+ paramsLoc.set("qt", "/stream");
+
+ solrStream = new SolrStream(url, paramsLoc);
+ tuples = getTuples(solrStream);
+ assertTrue(tuples.size() == 1);
+ sequence = (List<Number>)tuples.get(0).get("seq");
+ assertTrue(sequence.size() == 100);
+ for(int i=0; i<sequence.size(); i++) {
+ assertTrue(sequence.get(i).intValue() == (i*4));
+ }
+
+ //Change the start
+ expr = "tuple(seq=sequence(100, 10, 1))";
+ paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", expr);
+ paramsLoc.set("qt", "/stream");
+
+ solrStream = new SolrStream(url, paramsLoc);
+ tuples = getTuples(solrStream);
+ assertTrue(tuples.size() == 1);
+ sequence = (List<Number>)tuples.get(0).get("seq");
+ assertTrue(sequence.size() == 100);
+ for(int i=0; i<sequence.size(); i++) {
+ assertTrue(sequence.get(i).intValue() == (i+10));
+ }
+ }
+
+
+
+ @Test
public void testEvalStream() throws Exception {
UpdateRequest updateRequest = new UpdateRequest();
updateRequest.add(id, "hello", "test_t", "l b c d c");