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 2018/11/08 01:57:05 UTC
lucene-solr:branch_7x: SOLR-12975: Add ltrim and rtrim Stream
Evaluators
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 3dc799171 -> 18b935e68
SOLR-12975: Add ltrim and rtrim 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/18b935e6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/18b935e6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/18b935e6
Branch: refs/heads/branch_7x
Commit: 18b935e68e8e81af13a7b92ae403fd6cd32446b4
Parents: 3dc7991
Author: Joel Bernstein <jb...@apache.org>
Authored: Wed Nov 7 20:45:13 2018 -0500
Committer: Joel Bernstein <jb...@apache.org>
Committed: Wed Nov 7 20:56:49 2018 -0500
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/io/Lang.java | 2 +
.../solrj/io/eval/LeftShiftEvaluator.java | 53 +++++++++++++++++++
.../solrj/io/eval/RightShiftEvaluator.java | 54 ++++++++++++++++++++
.../apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/stream/MathExpressionTest.java | 41 +++++++++++++++
5 files changed, 151 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18b935e6/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
index 200f07b..13c91ec 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Lang.java
@@ -274,6 +274,8 @@ public class Lang {
.withFunctionName("pairSort", PairSortEvaluator.class)
.withFunctionName("recip", RecipEvaluator.class)
.withFunctionName("pivot", PivotEvaluator.class)
+ .withFunctionName("ltrim", LeftShiftEvaluator.class)
+ .withFunctionName("rtrim", RightShiftEvaluator.class)
// Boolean Stream Evaluators
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18b935e6/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LeftShiftEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LeftShiftEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LeftShiftEvaluator.java
new file mode 100644
index 0000000..2e86212
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/LeftShiftEvaluator.java
@@ -0,0 +1,53 @@
+/*
+ * 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.solr.client.solrj.io.stream.expr.StreamExpression;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+
+public class LeftShiftEvaluator extends RecursiveObjectEvaluator implements TwoValueWorker {
+ protected static final long serialVersionUID = 1L;
+
+ public LeftShiftEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
+ super(expression, factory);
+
+ if(2 != containedEvaluators.size()){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting exactly 2 value but found %d",expression,containedEvaluators.size()));
+ }
+ }
+
+ @Override
+ public Object doWork(Object value1, Object value2) throws IOException {
+ if (value1 instanceof List && value2 instanceof Number) {
+ List<?> actual = (List<?>) value1;
+ int val = ((Number) value2).intValue();
+
+ List<Object> shifted = new ArrayList<>();
+ for (int i = val; i < actual.size(); i++) {
+ shifted.add(actual.get(i));
+ }
+ return shifted;
+ } else {
+ throw new IOException("The ltrim function takes two parameters: an array and number to trim it by");
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18b935e6/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RightShiftEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RightShiftEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RightShiftEvaluator.java
new file mode 100644
index 0000000..1dce384
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/RightShiftEvaluator.java
@@ -0,0 +1,54 @@
+/*
+ * 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.solr.client.solrj.io.stream.expr.StreamExpression;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+
+public class RightShiftEvaluator extends RecursiveObjectEvaluator implements TwoValueWorker {
+ protected static final long serialVersionUID = 1L;
+
+ public RightShiftEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
+ super(expression, factory);
+
+ if(2 != containedEvaluators.size()){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting exactly 2 value but found %d",expression,containedEvaluators.size()));
+ }
+ }
+
+ @Override
+ public Object doWork(Object value1, Object value2) throws IOException {
+ if (value1 instanceof List && value2 instanceof Number) {
+ List<?> actual = (List<?>) value1;
+ int val = ((Number) value2).intValue();
+
+ List<Object> shifted = new ArrayList<>();
+ for (int i = 0; i < actual.size()-val; i++) {
+ shifted.add(actual.get(i));
+ }
+ return shifted;
+ } else {
+ throw new IOException("The rtrim function takes two parameters: an array and number to trim it by");
+ }
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18b935e6/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
index 98a6d45..3adac54 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/TestLang.java
@@ -73,7 +73,7 @@ public class TestLang extends LuceneTestCase {
"outliers", "stream", "getCache", "putCache", "listCache", "removeCache", "zscores", "latlonVectors",
"convexHull", "getVertices", "getBaryCenter", "getArea", "getBoundarySize","oscillate",
"getAmplitude", "getPhase", "getAngularFrequency", "enclosingDisk", "getCenter", "getRadius",
- "getSupportPoints", "pairSort", "log10", "plist", "recip", "pivot"};
+ "getSupportPoints", "pairSort", "log10", "plist", "recip", "pivot", "ltrim", "rtrim"};
@Test
public void testLang() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/18b935e6/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
index 9c93ced..0ccd691 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
@@ -1226,6 +1226,47 @@ public class MathExpressionTest extends SolrCloudTestCase {
}
@Test
+ public void testLtrim() throws Exception {
+ String cexpr = "ltrim(array(1,2,3,4,5,6), 2)";
+ 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);
+ List<Number> out = (List<Number>)tuples.get(0).get("return-value");
+ assertEquals(out.size(), 4);
+ assertEquals(out.get(0).intValue(), 3);
+ assertEquals(out.get(1).intValue(), 4);
+ assertEquals(out.get(2).intValue(), 5);
+ assertEquals(out.get(3).intValue(), 6);
+ }
+
+ @Test
+ public void testRtrim() throws Exception {
+ String cexpr = "rtrim(array(1,2,3,4,5,6), 2)";
+ 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);
+ List<Number> out = (List<Number>)tuples.get(0).get("return-value");
+ assertEquals(out.size(), 4);
+ assertEquals(out.get(0).intValue(), 1);
+ assertEquals(out.get(1).intValue(), 2);
+ assertEquals(out.get(2).intValue(), 3);
+ assertEquals(out.get(3).intValue(), 4);
+ }
+
+
+ @Test
public void testZeros() throws Exception {
String cexpr = "zeros(6)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();