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/26 15:29:02 UTC

lucene-solr:master: SOLR-10747: Change the tuple field to return-value

Repository: lucene-solr
Updated Branches:
  refs/heads/master 81821b29a -> 3e70745c7


SOLR-10747: Change the tuple field to return-value


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3e70745c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3e70745c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3e70745c

Branch: refs/heads/master
Commit: 3e70745c79efeedd03beebb76b8266eb67a784ae
Parents: 81821b2
Author: Joel Bernstein <jb...@apache.org>
Authored: Fri May 26 11:21:51 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Fri May 26 11:21:51 2017 -0400

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/handler/StreamHandler.java      | 2 +-
 .../apache/solr/client/solrj/io/stream/StreamExpressionTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3e70745c/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 dc097be..cbb9910 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -305,7 +305,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
       StreamExpression streamExpression = StreamExpressionParser.parse(params.get("expr"));
       if(this.streamFactory.isEvaluator(streamExpression)) {
         StreamExpression tupleExpression = new StreamExpression("tuple");
-        tupleExpression.addParameter(new StreamExpressionNamedParameter("out", streamExpression));
+        tupleExpression.addParameter(new StreamExpressionNamedParameter("return-value", streamExpression));
         tupleStream = this.streamFactory.constructStream(tupleExpression);
       } else {
         tupleStream = this.streamFactory.constructStream(streamExpression);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3e70745c/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 cbd57b8..c570d95 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
@@ -5220,7 +5220,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
     solrStream.setStreamContext(context);
     List<Tuple> tuples = getTuples(solrStream);
     assertTrue(tuples.size() == 1);
-    List<Number> sequence = (List<Number>)tuples.get(0).get("out");
+    List<Number> sequence = (List<Number>)tuples.get(0).get("return-value");
     assertTrue(sequence.size() == 20);
     for(int i=0; i<sequence.size(); i++) {
       assertTrue(sequence.get(i).intValue() == i);