SOLR-10291: Add match Stream Evaluator to support regex matching

This commit is contained in:
Joel Bernstein 2019-06-19 19:40:04 -04:00
parent e3752e87d0
commit e88366c9b6
4 changed files with 94 additions and 1 deletions

View File

@ -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

View File

@ -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;
}
}

View File

@ -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() {

View File

@ -1998,6 +1998,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))";