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/05/03 17:48:52 UTC
[14/36] lucene-solr:branch_6x: SOLR-10485: Fix precommit
SOLR-10485: Fix precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5de0ca5a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5de0ca5a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5de0ca5a
Branch: refs/heads/branch_6x
Commit: 5de0ca5a473ffe174fd5c740ccaf16777f251a82
Parents: 17360d4
Author: Joel Bernstein <jb...@apache.org>
Authored: Wed Apr 12 17:26:30 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Wed May 3 12:57:20 2017 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/handler/StreamHandler.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/CalculatorStream.java | 1 -
.../apache/solr/client/solrj/io/stream/StreamExpressionTest.java | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5de0ca5a/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 f766ef5..fd34da4 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -203,7 +203,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("significantTerms", SignificantTermsStream.class)
.withFunctionName("cartesianProduct", CartesianProductStream.class)
.withFunctionName("shuffle", ShuffleStream.class)
- .withFunctionName("calc", CalculatorStream.class)
+ .withFunctionName("eval", CalculatorStream.class)
// metrics
.withFunctionName("min", MinMetric.class)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5de0ca5a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java
index 5b5c23d..4a73e22 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CalculatorStream.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.Date;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.comp.StreamComparator;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5de0ca5a/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 559c29b..85e775b 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
@@ -4787,7 +4787,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
@Test
public void testCalculatorStream() throws Exception {
- String expr = "select(calc(), add(1, 1) as result)";
+ String expr = "select(eval(), add(1, 1) as result)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
paramsLoc.set("qt", "/stream");