You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/05/04 17:10:22 UTC
[28/50] lucene-solr:jira/solr-8668: SOLR-10559: Fix TupStream to
respect field order
SOLR-10559: Fix TupStream to respect field order
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ee8ce57e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ee8ce57e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ee8ce57e
Branch: refs/heads/jira/solr-8668
Commit: ee8ce57e51e488a706f9ec64825ad23bda07afdf
Parents: 0a2286c
Author: Joel Bernstein <jb...@apache.org>
Authored: Mon May 1 12:32:37 2017 -0400
Committer: Joel Bernstein <jb...@apache.org>
Committed: Mon May 1 12:32:37 2017 -0400
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/io/stream/TupStream.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ee8ce57e/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
index 8a71ae6..f099e31 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
@@ -46,6 +46,8 @@ public class TupStream extends TupleStream implements Expressible {
private Map<String,String> stringParams = new HashMap<>();
private Map<String,StreamEvaluator> evaluatorParams = new HashMap<>();
private Map<String,TupleStream> streamParams = new HashMap<>();
+ private List<String> fieldNames = new ArrayList();
+ private Map<String, String> fieldLabels = new HashMap();
private boolean finished;
@@ -55,6 +57,8 @@ public class TupStream extends TupleStream implements Expressible {
//Get all the named params
for(StreamExpressionNamedParameter np : namedParams) {
String name = np.getName();
+ fieldNames.add(name);
+ fieldLabels.put(name, name);
StreamExpressionParameter param = np.getParameter();
// we're going to split these up here so we only make the choice once
@@ -186,7 +190,10 @@ public class TupStream extends TupleStream implements Expressible {
}
}
- return new Tuple(values);
+ Tuple tup = new Tuple(values);
+ tup.fieldNames = fieldNames;
+ tup.fieldLabels = fieldLabels;
+ return tup;
}
}