From 3e70745c79efeedd03beebb76b8266eb67a784ae Mon Sep 17 00:00:00 2001
From: Joel Bernstein <jbernste@apache.org>
Date: Fri, 26 May 2017 11:21:51 -0400
Subject: [PATCH] SOLR-10747: Change the tuple field to return-value

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

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 dc097be59a3..cbb99108dff 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);
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 cbd57b8fe15..c570d95c733 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);