Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12851: Improvements and fixes to let and select Streaming Expressions

This commit is contained in:
Joel Bernstein 2018-10-11 10:43:30 -04:00
parent c87778c504
commit a0bb501772
4 changed files with 58 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LetStream.java
View File

@ -36,6 +36,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExplanation;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
@ -76,7 +77,11 @@ public class LetStream extends TupleStream implements Expressible {
}
StreamExpressionParameter param = ((StreamExpressionNamedParameter)np).getParameter();
if(factory.isEvaluator((StreamExpression)param)) {
if(param instanceof StreamExpressionValue) {
String paramValue = ((StreamExpressionValue) param).getValue();
letParams.put(name, factory.constructPrimitiveObject(paramValue));
} else if(factory.isEvaluator((StreamExpression)param)) {
StreamEvaluator evaluator = factory.constructEvaluator((StreamExpression) param);
letParams.put(name, evaluator);
} else {
@ -182,7 +187,7 @@ public class LetStream extends TupleStream implements Expressible {
} finally {
tStream.close();
}
} else {
} else if(o instanceof StreamEvaluator) {
//Add the data from the StreamContext to a tuple.
//Let the evaluator works from this tuple.
//This will allow columns to be created from tuples already in the StreamContext.
@ -196,6 +201,8 @@ public class LetStream extends TupleStream implements Expressible {
} else {
lets.put(name, eo);
}
} else {
lets.put(name, o);
}
}
stream.open();

11
solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.client.solrj.io.stream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@ -63,14 +64,14 @@ public class SelectStream extends TupleStream implements Expressible {
this.selectedFields.put(selectedField, selectedField);
}
operations = new ArrayList<>();
selectedEvaluators = new HashMap<>();
selectedEvaluators = new LinkedHashMap();
}
public SelectStream(TupleStream stream, Map<String,String> selectedFields) throws IOException {
this.stream = stream;
this.selectedFields = selectedFields;
operations = new ArrayList<>();
selectedEvaluators = new HashMap<>();
selectedEvaluators = new LinkedHashMap();
}
public SelectStream(StreamExpression expression,StreamFactory factory) throws IOException {
@ -100,7 +101,7 @@ public class SelectStream extends TupleStream implements Expressible {
stream = factory.constructStream(streamExpressions.get(0));
selectedFields = new HashMap<String,String>();
selectedEvaluators = new HashMap<StreamEvaluator, String>();
selectedEvaluators = new LinkedHashMap();
for(StreamExpressionParameter parameter : selectAsFieldsExpressions){
StreamExpressionValue selectField = (StreamExpressionValue)parameter;
String value = selectField.getValue().trim();
@ -281,7 +282,9 @@ public class SelectStream extends TupleStream implements Expressible {
// Apply all evaluators
for(Map.Entry<StreamEvaluator, String> selectedEvaluator : selectedEvaluators.entrySet()) {
workingToReturn.put(selectedEvaluator.getValue(), selectedEvaluator.getKey().evaluate(workingForEvaluators));
Object o = selectedEvaluator.getKey().evaluate(workingForEvaluators);
workingForEvaluators.put(selectedEvaluator.getValue(), o);
workingToReturn.put(selectedEvaluator.getValue(), o);
}
return workingToReturn;

5
solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
View File

@ -439,9 +439,8 @@ public class StreamFactory implements Serializable {
if("null".equals(lower)){ return null; }
if("true".equals(lower) || "false".equals(lower)){ return Boolean.parseBoolean(lower); }
try{ return Long.valueOf(original); } catch(Exception ignored){};
try{ if (original.matches(".{1,8}")){ return Double.valueOf(original); }} catch(Exception ignored){};
try{ if (original.matches(".{1,17}")){ return Double.valueOf(original); }} catch(Exception ignored){};
try{ return Double.valueOf(original); } catch(Exception ignored){};
// is a string
return original;
}

41
solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
View File

@ -1169,7 +1169,6 @@ public class MathExpressionTest extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(solrStream);
assertTrue(tuples.size() == 1);
List<List<Number>> out = (List<List<Number>>)tuples.get(0).get("c");
System.out.println("###### out:"+out);
assertEquals(out.size(), 2);
List<Number> row1 = out.get(0);
assertEquals(row1.get(0).doubleValue(), 2.1, 0);
@ -1721,6 +1720,46 @@ public class MathExpressionTest extends SolrCloudTestCase {
assertEquals(sd, 3.5, 0.0);
}
@Test
public void testSelectWithSequentialEvaluators() throws Exception {
String cexpr = "select(list(tuple(a=add(1,2)), tuple(a=add(2,2))), " +
" add(1, a) as blah, " +
" add(1, blah) as blah1)";
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(), 2);
Tuple tuple0 = tuples.get(0);
assertEquals(tuple0.getLong("blah").longValue(), 4L);
assertEquals(tuple0.getLong("blah1").longValue(), 5L);
Tuple tuple1 = tuples.get(1);
assertEquals(tuple1.getLong("blah").longValue(), 5L);
assertEquals(tuple1.getLong("blah1").longValue(), 6L);
}
@Test
public void testLetWithNumericVariables() throws Exception {
String cexpr = "let(echo=true, a=1.88888, b=8888888888.98)";
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 tuple = tuples.get(0);
assertEquals(tuple.getDouble("a").doubleValue(), 1.88888, 0.0);
assertEquals(tuple.getDouble("b").doubleValue(), 8888888888.98, 0.0);
}
@Test
public void testTermVectors() throws Exception {
// Test termVectors with only documents and default termVector settings