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 2019/06/19 23:53:20 UTC
[lucene-solr] branch branch_8x updated: SOLR-10291: Add match
Stream Evaluator to support regex matching
This is an automated email from the ASF dual-hosted git repository.
jbernste pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new f5a39b5 SOLR-10291: Add match Stream Evaluator to support regex matching
f5a39b5 is described below
commit f5a39b5d081dbfd2d9f8e92a3824a7c53a185eab
Author: Joel Bernstein <jb...@apache.org>
AuthorDate: Wed Jun 19 19:40:04 2019 -0400
SOLR-10291: Add match Stream Evaluator to support regex matching
---
.../java/org/apache/solr/client/solrj/io/Lang.java | 1 +
.../client/solrj/io/eval/MatchesEvaluator.java | 61 ++++++++++++++++++++++
.../org/apache/solr/client/solrj/io/TestLang.java | 3 +-
.../client/solrj/io/stream/MathExpressionTest.java | 30 +++++++++++
4 files changed, 94 insertions(+), 1 deletion(-)
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 52b8875..608b1e4 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
@@ -289,6 +289,7 @@ public class Lang {
.withFunctionName("recNum", RecNumEvaluator.class)
.withFunctionName("notNull", NotNullEvaluator.class)
.withFunctionName("isNull", IsNullEvaluator.class)
+ .withFunctionName("matches", MatchesEvaluator.class)
// Boolean Stream Evaluators
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatchesEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatchesEvaluator.java
new file mode 100644
index 0000000..0436f51
--- /dev/null
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/MatchesEvaluator.java
@@ -0,0 +1,61 @@
+/*
+ * 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.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
+import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
+
+public class MatchesEvaluator extends RecursiveBooleanEvaluator implements ManyValueWorker {
+ protected static final long serialVersionUID = 1L;
+ private Pattern pattern;
+
+ public MatchesEvaluator(StreamExpression expression, StreamFactory factory) throws IOException{
+ super(expression, factory);
+
+ if(containedEvaluators.size() != 2){
+ throw new IOException(String.format(Locale.ROOT,"Invalid expression %s - expecting two parameters but found %d",expression,containedEvaluators.size()));
+ }
+ }
+
+ public Object doWork(Object[] values) throws IOException {
+ if(values[1] instanceof String) {
+ String s = values[0].toString();
+ if(pattern == null) {
+ String p = (String) values[1];
+ pattern = Pattern.compile(p.replace("\"", ""));
+ }
+
+ if(s.startsWith("\"")) {
+ s = s.replace("\"", "");
+ }
+
+ Matcher matcher = pattern.matcher(s);
+ return matcher.find();
+ } else {
+ throw new IOException("The matches function requires a String regex");
+ }
+ }
+
+ protected Checker constructChecker(Object value) throws IOException {
+ return null;
+ }
+}
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 a2ad7de..f2aa27e 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
@@ -75,7 +75,8 @@ public class TestLang extends SolrTestCase {
"convexHull", "getVertices", "getBaryCenter", "getArea", "getBoundarySize","oscillate",
"getAmplitude", "getPhase", "getAngularFrequency", "enclosingDisk", "getCenter", "getRadius",
"getSupportPoints", "pairSort", "log10", "plist", "recip", "pivot", "ltrim", "rtrim", "export",
- "zplot", "natural", "repeat", "movingMAD", "hashRollup", "noop", "var", "stddev", "recNum", "isNull", "notNull"};
+ "zplot", "natural", "repeat", "movingMAD", "hashRollup", "noop", "var", "stddev", "recNum", "isNull",
+ "notNull", "matches"};
@Test
public void testLang() {
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 8c8718c..42aa163 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
@@ -1999,6 +1999,36 @@ public class MathExpressionTest extends SolrCloudTestCase {
@Test
+ public void testMatches() throws Exception {
+ String cexpr = "having(list(tuple(a=\"Hello World\"), tuple(a=\"Good bye\")), matches(a, Hello))";
+ 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);
+ assertEquals(tuples.size(), 1);
+ Tuple tuple0 = tuples.get(0);
+ assertEquals(tuple0.getString("a"), "Hello World");
+
+ cexpr = "having(list(tuple(a=\"Hello World\"), tuple(a=\"Good bye\")), matches(a, \"(?i)good\"))";
+ paramsLoc = new ModifiableSolrParams();
+ paramsLoc.set("expr", cexpr);
+ paramsLoc.set("qt", "/stream");
+ url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString()+"/"+COLLECTIONORALIAS;
+ solrStream = new SolrStream(url, paramsLoc);
+ context = new StreamContext();
+ solrStream.setStreamContext(context);
+ tuples = getTuples(solrStream);
+ assertEquals(tuples.size(), 1);
+ tuple0 = tuples.get(0);
+ assertEquals(tuple0.getString("a"), "Good bye");
+ }
+
+
+ @Test
public void testNotNullHaving() throws Exception {
String cexpr = "having(list(tuple(a=add(1, 1)), tuple(b=add(1, 2))), notNull(b))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();