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/09/11 19:06:10 UTC
lucene-solr:master: SOLR-11350: Add primes Stream Evaluator
Repository: lucene-solr
Updated Branches:
refs/heads/master 31eab319f -> 154483930
SOLR-11350: Add primes 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/15448393
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/15448393
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/15448393
Branch: refs/heads/master
Commit: 1544839309d6511b6136c7947b06d41e4c85e475
Parents: 31eab31
Author: Joel Bernstein <jb...@apache.org>
Authored: Mon Sep 11 15:00:06 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon Sep 11 15:00:19 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/handler/StreamHandler.java | 1 +
.../client/solrj/io/eval/PrimesEvaluator.java | 58 ++++++++++++++++++++
.../solrj/io/stream/StreamExpressionTest.java | 29 ++++++++++
3 files changed, 88 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15448393/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 f7e59c3..bde5f3b 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -296,6 +296,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("probability", ProbabilityEvaluator.class)
.withFunctionName("sumDifference", SumDifferenceEvaluator.class)
.withFunctionName("meanDifference", MeanDifferenceEvaluator.class)
+ .withFunctionName("primes", PrimesEvaluator.class)
// Boolean Stream Evaluators
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15448393/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrimesEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrimesEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrimesEvaluator.java
new file mode 100644
index 0000000..94a3628
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/PrimesEvaluator.java
@@ -0,0 +1,58 @@
+/*
+ * 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 java.util.Locale;
+
+import org.apache.commons.math3.primes.Primes;
+import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+
+public class PrimesEvaluator extends RecursiveNumericEvaluator implements ManyValueWorker {
+ protected static final long serialVersionUID = 1L;
+
+ public PrimesEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
+ super(expression, factory);
+
+ if(2 != containedEvaluators.size()){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting two values but found %d",expression, containedEvaluators.size()));
+ }
+ }
+
+ @Override
+ public Object doWork(Object... values) throws IOException {
+ if(2 != values.length){
+ throw new IOException(String.format(Locale.ROOT,"%s(...) only works with 2 values but %d were provided", constructingFactory.getFunctionName(getClass()), values.length));
+ }
+
+ int sizeNum = ((Number)values[0]).intValue();
+ int startNum = ((Number)values[1]).intValue();
+ List<Number> primes = new ArrayList();
+
+ for(int i=0; i< sizeNum; i++) {
+ int prime = Primes.nextPrime(startNum);
+ primes.add(prime);
+ startNum = prime;
+ ++startNum;
+ }
+
+ return primes;
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/15448393/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 9b2b186..6fa5d67 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
@@ -5858,6 +5858,35 @@ public class StreamExpressionTest extends SolrCloudTestCase {
@Test
+ public void testPrimes() throws Exception {
+ String cexpr = "primes(10, 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(), 10);
+ assertEquals(asort.get(0).intValue(), 2);
+ assertEquals(asort.get(1).intValue(), 3);
+ assertEquals(asort.get(2).intValue(), 5);
+ assertEquals(asort.get(3).intValue(), 7);
+ assertEquals(asort.get(4).intValue(), 11);
+ assertEquals(asort.get(5).intValue(), 13);
+ assertEquals(asort.get(6).intValue(), 17);
+ assertEquals(asort.get(7).intValue(), 19);
+ assertEquals(asort.get(8).intValue(), 23);
+ assertEquals(asort.get(9).intValue(), 29);
+ }
+
+ @Test
public void testAscend() throws Exception {
String cexpr = "asc(array(11.5, 12.3, 4, 3, 1, 0))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();