You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2017/01/06 21:47:31 UTC
[11/25] lucene-solr:jira/solr-8593: SOLR-9919: random Streaming
Expression is not registered in /stream or /graph handler
SOLR-9919: random Streaming Expression is not registered in /stream or /graph handler
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b8f4adfd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b8f4adfd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b8f4adfd
Branch: refs/heads/jira/solr-8593
Commit: b8f4adfd575a1b0c8ddba9f19609f8b94527745e
Parents: d3f83bb
Author: Joel Bernstein <jb...@apache.org>
Authored: Wed Jan 4 10:25:14 2017 -0500
Committer: Joel Bernstein <jb...@apache.org>
Committed: Wed Jan 4 10:33:29 2017 -0500
----------------------------------------------------------------------
.../core/src/java/org/apache/solr/handler/GraphHandler.java | 3 ++-
.../src/java/org/apache/solr/handler/StreamHandler.java | 1 +
.../solr/client/solrj/io/stream/StreamExpressionTest.java | 9 +++++++++
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b8f4adfd/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
index 339b4d7..5e5934f 100644
--- a/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/GraphHandler.java
@@ -118,7 +118,8 @@ public class GraphHandler extends RequestHandlerBase implements SolrCoreAware, P
.withFunctionName("shortestPath", ShortestPathStream.class)
.withFunctionName("gatherNodes", GatherNodesStream.class)
.withFunctionName("sort", SortStream.class)
- .withFunctionName("scoreNodes", ScoreNodesStream.class)
+ .withFunctionName("scoreNodes", ScoreNodesStream.class)
+ .withFunctionName("random", RandomStream.class)
// metrics
.withFunctionName("min", MinMetric.class)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b8f4adfd/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 e0f1186..4b319f9 100644
--- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java
@@ -119,6 +119,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
.withFunctionName("jdbc", JDBCStream.class)
.withFunctionName("topic", TopicStream.class)
.withFunctionName("commit", CommitStream.class)
+ .withFunctionName("random", RandomStream.class)
// decorator streams
.withFunctionName("merge", MergeStream.class)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b8f4adfd/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 83c093c..49814a3 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
@@ -728,6 +728,15 @@ public class StreamExpressionTest extends SolrCloudTestCase {
List<Tuple> tuples3 = getTuples(stream);
assert (tuples3.size() == 1);
+
+ //Exercise the /stream handler
+ ModifiableSolrParams sParams = new ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream"));
+ sParams.add("expr", "random(" + COLLECTIONORALIAS + ", q=\"*:*\", rows=\"1\", fl=\"id, a_i\")" );
+ JettySolrRunner jetty = cluster.getJettySolrRunner(0);
+ SolrStream solrStream = new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
+ List<Tuple> tuples4 = getTuples(solrStream);
+ assert (tuples4.size() == 1);
+
} finally {
cache.close();
}