This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 63319cb SOLR-16012: Remove mapParams from StreamingTest and
TestSQLHandler
63319cb is described below
commit 63319cba92fd337763d64328c6c65d1c68d8dd01
Author: Kevin Risden <[email protected]>
AuthorDate: Tue Feb 15 09:31:30 2022 -0500
SOLR-16012: Remove mapParams from StreamingTest and TestSQLHandler
---
.../org/apache/solr/handler/TestSQLHandler.java | 141 ++++++++++-----------
.../solr/handler/TestSQLHandlerNonCloud.java | 13 +-
.../solr/handler/admin/DaemonStreamApiTest.java | 37 +++---
.../solr/client/solrj/io/graph/GraphTest.java | 12 +-
.../solrj/io/stream/StreamDecoratorTest.java | 6 +-
.../solrj/io/stream/StreamExpressionTest.java | 14 +-
.../solr/client/solrj/io/stream/StreamingTest.java | 134 +++++++++-----------
7 files changed, 162 insertions(+), 195 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
index 5c0984d..453f3f4 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
@@ -40,7 +40,6 @@ import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.junit.Assert;
import org.junit.Before;
@@ -81,16 +80,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
}
}
- public static SolrParams mapParams(String... vals) {
- ModifiableSolrParams params = new ModifiableSolrParams();
- assertEquals("Parameters passed in here must be in pairs!", 0,
(vals.length % 2));
- for (int idx = 0; idx < vals.length; idx += 2) {
- params.add(vals[idx], vals[idx + 1]);
- }
-
- return params;
- }
-
@Before
public void cleanIndex() throws Exception {
new UpdateRequest()
@@ -113,7 +102,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "8", "text_t", "XXXX XXXX", "str_s", "c", "field_i", "60",
"field_f", "60.5", "field_d", "60.5", "field_l", "60")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- SolrParams sParams = mapParams(CommonParams.QT, "/sql",
+ SolrParams sParams = params(CommonParams.QT, "/sql",
"stmt",
"select id, field_i, str_s, field_f, field_d, field_l from collection1
where (text_t='(XXXX)' OR text_t='XXXX') AND text_t='XXXX' order by field_i
desc");
@@ -199,7 +188,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
//assertResponseContains(clients.get(0), sParams,
"{\"docs\":[{\"id\":\"8\",\"field_i\":60,\"str_s\":\"c\",\"field_i\":60,\"field_f\":60.5,\"field_d\":60.5,\"field_l\":60}");
- sParams = mapParams(CommonParams.QT, "/sql", "stmt",
+ sParams = params(CommonParams.QT, "/sql", "stmt",
"select id, field_i, str_s from collection1 where text_t='XXXX' order
by id desc");
tuples = getTuples(sParams, baseUrl);
@@ -246,7 +235,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 7);
assert (tuple.get("str_s").equals("a"));
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select id, field_i, str_s from collection1 where
text_t='XXXX' order by field_i desc limit 1");
tuples = getTuples(sParams, baseUrl);
@@ -258,7 +247,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 60);
assert (tuple.get("str_s").equals("c"));
- sParams = mapParams(CommonParams.QT, "/sql", "stmt",
+ sParams = params(CommonParams.QT, "/sql", "stmt",
"select id, field_i, str_s from collection1 where text_t='XXXX' AND
id='(1 2 3)' order by field_i desc");
tuples = getTuples(sParams, baseUrl);
@@ -280,7 +269,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 7);
assert (tuple.get("str_s").equals("a"));
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt",
"select id as myId, field_i as myInt, str_s as myString from
collection1 where text_t='XXXX' AND id='(1 2 3)' order by myInt desc");
@@ -303,7 +292,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("myInt") == 7);
assert (tuple.get("myString").equals("a"));
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt",
"select id as myId, field_i as myInt, str_s as myString from
collection1 where text_t='XXXX' AND id='(1 2 3)' order by field_i desc");
@@ -327,7 +316,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.get("myString").equals("a"));
// SOLR-8845 - Test to make sure that 1 = 0 works for things like Spark SQL
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select id, field_i, str_s from collection1 where 1 = 0");
tuples = getTuples(sParams, baseUrl);
@@ -353,7 +342,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
// Equals
- SolrParams sParams = mapParams(CommonParams.QT, "/sql",
+ SolrParams sParams = params(CommonParams.QT, "/sql",
"stmt", "select id from collection1 where id = 1 order by id asc");
List<Tuple> tuples = getTuples(sParams, baseUrl);
@@ -364,7 +353,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("1", tuple.get("id"));
// Not Equals <>
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select id from collection1 where id <> 1 order by id asc
limit 10");
tuples = getTuples(sParams, baseUrl);
@@ -388,7 +377,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
// TODO requires different Calcite SQL conformance level
// Not Equals !=
- // sParams = mapParams(CommonParams.QT, "/sql",
+ // sParams = params(CommonParams.QT, "/sql",
// "stmt", "select id from collection1 where id != 1 order by id asc limit
10");
//
// tuples = getTuples(sParams);
@@ -411,7 +400,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
// assertEquals(8L, tuple.get("id"));
// Less than
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select id from collection1 where id < 2 order by id asc");
tuples = getTuples(sParams, baseUrl);
@@ -422,7 +411,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("1", tuple.get("id"));
// Less than equal
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select id from collection1 where id <= 2 order by id asc");
tuples = getTuples(sParams, baseUrl);
@@ -435,7 +424,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("2", tuple.get("id"));
// Greater than
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select id from collection1 where id > 7 order by id asc");
tuples = getTuples(sParams, baseUrl);
@@ -446,7 +435,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("8", tuple.get("id"));
// Greater than equal
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select id from collection1 where id >= 7 order by id asc");
tuples = getTuples(sParams, baseUrl);
@@ -484,7 +473,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
"stmt", "select id, Field_i, Str_s from collection1 where
Text_t='XXXX' order by Field_i desc");
List<Tuple> tuples = getTuples(sParams, baseUrl);
@@ -534,7 +523,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.get("Str_s").equals("a"));
// TODO get sum(Field_i) as named one
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt",
"select Str_s, sum(Field_i) from collection1 where id='(1 8)' group by
Str_s having (sum(Field_i) = 7 OR sum(Field_i) = 60) order by sum(Field_i)
desc");
@@ -551,7 +540,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.get("Str_s").equals("a"));
assert (tuple.getDouble("EXPR$1") == 7);
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt",
"select Str_s, sum(Field_i) from collection1 where id='(1 8)' group by
Str_s having (sum(Field_i) = 7 OR sum(Field_i) = 60) order by sum(Field_i)
desc");
@@ -586,7 +575,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"facet",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "aggregationMode",
"facet",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s asc, field_i asc");
@@ -622,7 +611,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 60);
// reverse the sort
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s desc, field_i desc");
tuples = getTuples(sParams, baseUrl);
@@ -654,7 +643,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 1);
// reverse the sort
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select distinct str_s as myString, field_i as myInt from
collection1 order by str_s desc, myInt desc");
tuples = getTuples(sParams, baseUrl);
@@ -686,7 +675,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("myInt") == 1);
// test with limit
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s desc, field_i desc limit 2");
tuples = getTuples(sParams, baseUrl);
@@ -702,7 +691,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 50);
// Test without a sort. Sort should be asc by default.
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select distinct str_s, field_i from collection1");
tuples = getTuples(sParams, baseUrl);
@@ -739,7 +728,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 60);
// Test with a predicate.
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select distinct str_s, field_i from collection1 where str_s =
'a'");
tuples = getTuples(sParams, baseUrl);
@@ -772,7 +761,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s asc, field_i asc");
List<Tuple> tuples = getTuples(sParams, baseUrl);
@@ -803,7 +792,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 60);
// reverse the sort
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s desc, field_i desc");
tuples = getTuples(sParams, baseUrl);
@@ -834,7 +823,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.get("str_s").equals("a"));
assert (tuple.getLong("field_i") == 1);
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt", "select distinct str_s as myString, field_i from collection1
order by myString desc, field_i desc");
tuples = getTuples(sParams, baseUrl);
@@ -866,7 +855,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 1);
// test with limit
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s desc, field_i desc limit 2");
tuples = getTuples(sParams, baseUrl);
@@ -882,7 +871,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 50);
// Test without a sort. Sort should be asc by default.
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1");
tuples = getTuples(sParams, baseUrl);
@@ -914,7 +903,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 60);
// Test with a predicate.
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1 where str_s =
'a'");
tuples = getTuples(sParams, baseUrl);
@@ -945,7 +934,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s asc, field_i asc");
List<Tuple> tuples = getTuples(sParams, baseUrl);
@@ -979,7 +968,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 60);
// reverse the sort
- sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s desc, field_i desc");
tuples = getTuples(sParams, baseUrl);
@@ -1011,7 +1000,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 1);
// reverse the sort
- sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select distinct str_s as myString, field_i from collection1
order by myString desc, field_i desc");
tuples = getTuples(sParams, baseUrl);
@@ -1043,7 +1032,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 1);
// test with limit
- sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1 order by
str_s desc, field_i desc limit 2");
tuples = getTuples(sParams, baseUrl);
@@ -1059,7 +1048,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 50);
// Test without a sort. Sort should be asc by default.
- sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1");
tuples = getTuples(sParams, baseUrl);
@@ -1091,7 +1080,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("field_i") == 60);
// Test with a predicate.
- sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select distinct str_s, field_i from collection1 where str_s =
'a'");
tuples = getTuples(sParams, baseUrl);
@@ -1125,7 +1114,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"facet",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "aggregationMode",
"facet",
"stmt", "select str_s, count(*), sum(field_i), min(field_i),
max(field_i), " +
"cast(avg(1.0 * field_i) as float) from collection1 where
text_t='XXXX' group by str_s " +
"order by sum(field_i) asc limit 2");
@@ -1153,7 +1142,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getDouble("EXPR$4") == 20); // max(field_i)
assert (tuple.getDouble("EXPR$5") == 13.5D); // avg(field_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select str_s, count(*), sum(field_i), min(field_i),
max(field_i), " +
"avg(field_i) from collection1 where text_t='XXXX' group by str_s
" +
"order by sum(field_i) asc limit 2");
@@ -1179,7 +1168,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getDouble("EXPR$4") == 20); // max(field_i)
assert (tuple.getDouble("EXPR$5") == 14); // avg(field_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select str_s, count(*), sum(field_i), min(field_i),
max(field_i), "
+ "cast(avg(1.0 * field_i) as float) from collection1 where
(text_t='XXXX' AND NOT (text_t='XXXY')) "
+ "group by str_s order by str_s desc");
@@ -1215,7 +1204,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getDouble("EXPR$4") == 20); // max(field_i)
assert (tuple.getDouble("EXPR$5") == 13.5D); // avg(field_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select str_s as myString, count(*), sum(field_i) as mySum,
min(field_i), max(field_i), "
+ "cast(avg(1.0 * field_i) as float) from collection1 where
(text_t='XXXX' AND NOT (text_t='XXXY')) "
+ "group by str_s order by myString desc");
@@ -1251,7 +1240,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getDouble("EXPR$4") == 20); // max(field_i)
assert (tuple.getDouble("EXPR$5") == 13.5D); // avg(field_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select str_s, count(*), sum(field_i), min(field_i),
max(field_i), " +
"cast(avg(1.0 * field_i) as float) from collection1 where
text_t='XXXX' group by str_s having sum(field_i) = 19");
@@ -1267,7 +1256,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select str_s, count(*), sum(field_i), min(field_i),
max(field_i), " +
"cast(avg(1.0 * field_i) as float) from collection1 where
text_t='XXXX' group by str_s " +
"having ((sum(field_i) = 19) AND (min(field_i) = 8))");
@@ -1284,7 +1273,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select str_s, count(*), sum(field_i) as mySum, min(field_i),
max(field_i), " +
"cast(avg(1.0 * field_i) as float) from collection1 where
text_t='XXXX' group by str_s " +
"having ((sum(field_i) = 19) AND (min(field_i) = 8))");
@@ -1301,7 +1290,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getDouble("EXPR$4") == 11); // max(field_i)
assert (tuple.getDouble("EXPR$5") == 9.5D); // avg(field_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select str_s, count(*), sum(field_i), min(field_i),
max(field_i), " +
"cast(avg(1.0 * field_i) as float) from collection1 where
text_t='XXXX' group by str_s " +
"having ((sum(field_i) = 19) AND (min(field_i) = 100))");
@@ -1330,7 +1319,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "stmt",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "stmt",
"select count(*), sum(a_i), min(a_i), max(a_i), cast(avg(1.0 * a_i) as
float), sum(a_f), " +
"min(a_f), max(a_f), avg(a_f) from collection1");
@@ -1363,7 +1352,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertTrue(maxf == 10.0D);
assertTrue(avgf == 5.5D);
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select count(*) as myCount, sum(a_i) as mySum, min(a_i) as
myMin, max(a_i) as myMax, " +
"cast(avg(1.0 * a_i) as float) as myAvg, sum(a_f), min(a_f),
max(a_f), avg(a_f) from collection1");
@@ -1397,7 +1386,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertTrue(avgf == 5.5D);
// Test without cast on average int field
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select count(*) as myCount, sum(a_i) as mySum, min(a_i) as
myMin, max(a_i) as myMax, " +
"avg(a_i) as myAvg, sum(a_f), min(a_f), max(a_f), avg(a_f) from
collection1");
@@ -1432,7 +1421,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertTrue(avgf == 5.5D);
// Test where clause hits
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select count(*), sum(a_i), min(a_i), max(a_i), cast(avg(1.0 *
a_i) as float), sum(a_f), " +
"min(a_f), max(a_f), avg(a_f) from collection1 where id = 2");
@@ -1464,7 +1453,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertTrue(avgf == 2.0);
// Test zero hits
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select count(*), sum(a_i), min(a_i), max(a_i), cast(avg(1.0 *
a_i) as float), sum(a_f), " +
"min(a_f), max(a_f), avg(a_f) from collection1 where a_s =
'blah'");
@@ -1495,7 +1484,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertTrue(avgf == null);
// test bunch of where predicates
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select count(*), sum(a_i), min(a_i), max(a_i), cast(avg(1.0 *
a_i) as float), sum(a_f), " +
"min(a_f), max(a_f), avg(a_f) from collection1 where id = 2 AND
a_s='hello0' AND a_i=2 AND a_f=2");
@@ -1522,7 +1511,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
"stmt", "select year_i, sum(item_i) from collection1 group by year_i
order by year_i desc");
List<Tuple> tuples = getTuples(sParams, baseUrl);
@@ -1539,7 +1528,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("year_i") == 2014);
assert (tuple.getDouble("EXPR$1") == 7); // sum(item_i)
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select year_i, month_i, sum(item_i) from collection1 group by
year_i, month_i " +
"order by year_i desc, month_i desc");
@@ -1562,7 +1551,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("month_i") == 4);
assert (tuple.getDouble("EXPR$2") == 7); // sum(item_i)
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select year_i, month_i, day_i, sum(item_i) from collection1
group by year_i, month_i, day_i " +
"order by year_i desc, month_i desc, day_i desc");
@@ -1625,7 +1614,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
"stmt", "select id, str_s from collection1 where text_t='XXXX' order
by field_iff desc");
SolrStream solrStream = new SolrStream(baseUrl, sParams);
@@ -1634,7 +1623,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.EXCEPTION);
assert (tuple.getException().contains("Column 'field_iff' not found in any
table"));
- sParams = mapParams(CommonParams.QT, "/sql",
+ sParams = params(CommonParams.QT, "/sql",
"stmt", "select id, field_iff, str_s from collection1 where
text_t='XXXX' order by field_iff desc");
solrStream = new SolrStream(baseUrl, sParams);
@@ -1644,7 +1633,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getException().contains("Column 'field_iff' not found in any
table"));
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt",
"select str_s, count(*), sum(field_iff), min(field_i), max(field_i),
cast(avg(1.0 * field_i) as float) from collection1 where text_t='XXXX' group by
str_s having ((sum(field_iff) = 19) AND (min(field_i) = 8))");
@@ -1654,7 +1643,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.EXCEPTION);
assert (tuple.getException().contains("Column 'field_iff' not found in any
table"));
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt",
"select str_s, count(*), blah(field_i), min(field_i), max(field_i),
cast(avg(1.0 * field_i) as float) from collection1 where text_t='XXXX' group by
str_s having ((sum(field_i) = 19) AND (min(field_i) = 8))");
@@ -1665,7 +1654,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getException().contains("No match found for function
signature blah"));
// verify exception message formatting with wildcard query
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "map_reduce",
"stmt",
"select str_s from collection1 where not_a_field LIKE 'foo%'");
@@ -1693,7 +1682,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode",
"facet",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "aggregationMode",
"facet",
"stmt", "select year_i, sum(item_i) from collection1 group by year_i
order by year_i desc");
List<Tuple> tuples = getTuples(sParams, baseUrl);
@@ -1710,7 +1699,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("year_i") == 2014);
assert (tuple.getDouble("EXPR$1") == 7); // sum(item_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select year_i, month_i, sum(item_i) from collection1 group by
year_i, month_i " +
"order by year_i desc, month_i desc");
@@ -1733,7 +1722,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("month_i") == 4);
assert (tuple.getDouble("EXPR$2") == 7); // sum(item_i)
- sParams = mapParams(CommonParams.QT, "/sql", "aggregationMode", "facet",
+ sParams = params(CommonParams.QT, "/sql", "aggregationMode", "facet",
"stmt", "select year_i, month_i, day_i, sum(item_i) from collection1
group by year_i, month_i, day_i " +
"order by year_i desc, month_i desc, day_i desc");
@@ -1796,7 +1785,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
String baseUrl =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" +
COLLECTIONORALIAS;
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ SolrParams sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select year_i, sum(item_i) from collection1 group by year_i
order by year_i desc");
List<Tuple> tuples = getTuples(sParams, baseUrl);
@@ -1815,7 +1804,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("year_i") == 2014);
assert (tuple.getDouble("EXPR$1") == 7); // sum(item_i)
- sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select year_i, month_i, sum(item_i) from collection1 group by
year_i, month_i " +
"order by year_i desc, month_i desc");
@@ -1840,7 +1829,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assert (tuple.getLong("month_i") == 4);
assert (tuple.getDouble("EXPR$2") == 7); // sum(item_i)
- sParams = mapParams(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
+ sParams = params(CommonParams.QT, "/sql", "numWorkers", "2",
"aggregationMode", "map_reduce",
"stmt", "select year_i, month_i, day_i, sum(item_i) from collection1
group by year_i, month_i, day_i " +
"order by year_i desc, month_i desc, day_i desc");
@@ -1918,7 +1907,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "4", "text_t", "foobaz", "str_s", "d")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- SolrParams sParams = mapParams(CommonParams.QT, "/sql",
+ SolrParams sParams = params(CommonParams.QT, "/sql",
"stmt",
"select id from collection1 where str_s IN ('a','b','c')");
@@ -1933,7 +1922,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
private List<Tuple> expectResults(String sql, final int expectedCount)
throws Exception {
String sqlStmt = sql.replace("$ALIAS", COLLECTIONORALIAS);
- SolrParams params = mapParams(CommonParams.QT, "/sql", "stmt", sqlStmt);
+ SolrParams params = params(CommonParams.QT, "/sql", "stmt", sqlStmt);
List<Tuple> tuples = getTuples(params, sqlUrl());
assertEquals(expectedCount, tuples.size());
return tuples;
diff --git
a/solr/core/src/test/org/apache/solr/handler/TestSQLHandlerNonCloud.java
b/solr/core/src/test/org/apache/solr/handler/TestSQLHandlerNonCloud.java
index 842272a..4043e4c 100644
--- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandlerNonCloud.java
+++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandlerNonCloud.java
@@ -26,7 +26,6 @@ import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.stream.SolrStream;
import org.apache.solr.client.solrj.io.stream.TupleStream;
import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.IOUtils;
import org.junit.BeforeClass;
@@ -50,7 +49,7 @@ public class TestSQLHandlerNonCloud extends SolrJettyTestBase
{
@Test
public void testSQLHandler() throws Exception {
String sql = "select id, field_i, str_s from " +
DEFAULT_TEST_COLLECTION_NAME + " limit 10";
- SolrParams sParams = mapParams(CommonParams.QT, "/sql", "stmt", sql);
+ SolrParams sParams = params(CommonParams.QT, "/sql", "stmt", sql);
String url = jetty.getBaseUrl() + "/" + DEFAULT_TEST_COLLECTION_NAME;
SolrStream solrStream = new SolrStream(url, sParams);
@@ -75,14 +74,4 @@ public class TestSQLHandlerNonCloud extends
SolrJettyTestBase {
}
return tuples;
}
-
- public static SolrParams mapParams(String... vals) {
- ModifiableSolrParams params = new ModifiableSolrParams();
- assertEquals("Parameters passed in here must be in pairs!", 0,
(vals.length % 2));
- for (int idx = 0; idx < vals.length; idx += 2) {
- params.add(vals[idx], vals[idx + 1]);
- }
-
- return params;
- }
}
diff --git
a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
index 91eef72..11011df 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/DaemonStreamApiTest.java
@@ -35,7 +35,6 @@ import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.cloud.MiniSolrCloudCluster;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.TimeSource;
-import org.apache.solr.handler.TestSQLHandler;
import org.apache.solr.util.TimeOut;
import org.junit.After;
import org.junit.Before;
@@ -111,7 +110,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
createDaemon(DAEMON_DEF.replace("DAEMON_NAME", name), name);
}
- List<Tuple> tuples = getTuples(TestSQLHandler.mapParams("qt", "/stream",
"action", "list"));
+ List<Tuple> tuples = getTuples(params("qt", "/stream", "action", "list"));
assertEquals("Should have all daemons listed", numDaemons, tuples.size());
for (int idx = 0; idx < numDaemons; ++idx) {
@@ -124,13 +123,13 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
}
// We shouldn't be able to open a daemon twice without closing., leads to
thread leeks.
- Tuple tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "start", "id", daemonOfInterest)
+ Tuple tupleOfInterest = getTupleOfInterest(params("qt", "/stream",
"action", "start", "id", daemonOfInterest)
, DAEMON_OP);
assertTrue("Should not open twice without closing",
tupleOfInterest.getString(DAEMON_OP).contains("There is already an
open daemon named"));
// Try stopping and check return.
- tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "stop", "id", daemonOfInterest),
+ tupleOfInterest = getTupleOfInterest(params("qt", "/stream", "action",
"stop", "id", daemonOfInterest),
DAEMON_OP);
assertTrue("Should have been able to stop the daemon",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + "
stopped"));
@@ -144,7 +143,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
}
// Try starting and check return.
- tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "start", "id", daemonOfInterest),
+ tupleOfInterest = getTupleOfInterest(params("qt", "/stream", "action",
"start", "id", daemonOfInterest),
DAEMON_OP);
assertTrue("Should have been able to start the daemon",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + "
started"));
@@ -155,7 +154,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
}
// Try killing a daemon, it should be removed from lists.
- tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "kill", "id", daemonOfInterest),
+ tupleOfInterest = getTupleOfInterest(params("qt", "/stream", "action",
"kill", "id", daemonOfInterest),
DAEMON_OP);
assertTrue("Daemon should have been killed",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + "
killed"));
@@ -164,19 +163,19 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
checkDaemonKilled(daemonOfInterest);
// Should not be able to start a killed daemon
- tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "start", "id", daemonOfInterest),
+ tupleOfInterest = getTupleOfInterest(params("qt", "/stream", "action",
"start", "id", daemonOfInterest),
DAEMON_OP);
assertTrue("Daemon should not be found",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + " not
found"));
// Should not be able to sop a killed daemon
- tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "stop", "id", daemonOfInterest),
+ tupleOfInterest = getTupleOfInterest(params("qt", "/stream", "action",
"stop", "id", daemonOfInterest),
DAEMON_OP);
assertTrue("Daemon should not be found",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + " not
found"));
// Should not be able to kill a killed daemon
- tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "kill", "id", daemonOfInterest),
+ tupleOfInterest = getTupleOfInterest(params("qt", "/stream", "action",
"kill", "id", daemonOfInterest),
DAEMON_OP);
assertTrue("Daemon should not be found",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + " not
found"));
@@ -189,7 +188,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
// Now kill them all so the threads disappear.
for (String daemon : daemonNames) {
- getTuples(TestSQLHandler.mapParams("qt", "/stream", "action", "kill",
"id", daemon));
+ getTuples(params("qt", "/stream", "action", "kill", "id", daemon));
checkDaemonKilled(daemon);
}
}
@@ -199,7 +198,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
TimeOut timeout = new TimeOut(10, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (timeout.hasTimedOut() == false) {
- Tuple tuple = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "list"),
+ Tuple tuple = getTupleOfInterest(params("qt", "/stream", "action",
"list"),
daemonName);
String state = tuple.getString("state");
if (state.equals("RUNNABLE") || state.equals("WAITING") ||
state.equals("TIMED_WAITING")) {
@@ -215,7 +214,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
TimeOut timeout = new TimeOut(10, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (timeout.hasTimedOut() == false) {
- Tuple tuple = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "list"),
+ Tuple tuple = getTupleOfInterest(params("qt", "/stream", "action",
"list"),
daemonOfInterest);
if (tuple.getString("state").equals("TERMINATED")) {
return;
@@ -229,7 +228,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
TimeOut timeout = new TimeOut(10, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (timeout.hasTimedOut() == false) {
- List<Tuple> tuples = getTuples(TestSQLHandler.mapParams("qt", "/stream",
"action", "list"));
+ List<Tuple> tuples = getTuples(params("qt", "/stream", "action",
"list"));
Boolean foundIt = false;
for (Tuple tuple : tuples) {
if (tuple.get("id").equals(daemon)) {
@@ -244,28 +243,28 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
private void createDaemon(String daemonDef, String errMsg) throws
IOException, SolrServerException {
SolrClient client = cluster.getSolrClient();
// create a daemon
- QueryResponse resp = client.query(CHECKPOINT_COLL,
TestSQLHandler.mapParams("expr", daemonDef, "qt", "/stream"));
+ QueryResponse resp = client.query(CHECKPOINT_COLL, params("expr",
daemonDef, "qt", "/stream"));
assertEquals(errMsg, 0, resp.getStatus());
// This should close and replace the current daemon and NOT leak threads.
- resp = client.query(CHECKPOINT_COLL, TestSQLHandler.mapParams("expr",
daemonDef, "qt", "/stream"));
+ resp = client.query(CHECKPOINT_COLL, params("expr", daemonDef, "qt",
"/stream"));
assertEquals(errMsg, 0, resp.getStatus());
}
private void checkCmdsNoDaemon(String daemonName) throws IOException {
- List<Tuple> tuples = getTuples(TestSQLHandler.mapParams("qt", "/stream",
"action", "list"));
+ List<Tuple> tuples = getTuples(params("qt", "/stream", "action", "list"));
assertEquals("List should be empty", 0, tuples.size());
- Tuple tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "start", "id", daemonName),
+ Tuple tupleOfInterest = getTupleOfInterest(params("qt", "/stream",
"action", "start", "id", daemonName),
"DaemonOp");
assertTrue("Start for daemon should not be found",
tupleOfInterest.getString("DaemonOp").contains("not found on"));
- tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "stop", "id", daemonName),
+ tupleOfInterest = getTupleOfInterest(params("qt", "/stream", "action",
"stop", "id", daemonName),
"DaemonOp");
assertTrue("Stop for daemon should not be found",
tupleOfInterest.getString("DaemonOp").contains("not found on"));
- tupleOfInterest = getTupleOfInterest(TestSQLHandler.mapParams("qt",
"/stream", "action", "kill", "id", daemonName),
+ tupleOfInterest = getTupleOfInterest(params("qt", "/stream", "action",
"kill", "id", daemonName),
"DaemonOp");
assertTrue("Kill for daemon should not be found",
tupleOfInterest.getString("DaemonOp").contains("not found on"));
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
index 038bd0e..b28dad4 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/graph/GraphTest.java
@@ -27,7 +27,6 @@ import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.client.solrj.io.SolrClientCache;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.stream.StreamContext;
-import org.apache.solr.client.solrj.io.stream.StreamingTest;
import org.apache.solr.client.solrj.io.stream.TupleStream;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -36,6 +35,7 @@ import org.apache.solr.common.params.SolrParams;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+
/**
* All base tests will be done with CloudSolrStream. Under the covers
CloudSolrStream uses SolrStream so
* SolrStream will get fully exercised through these tests.
@@ -98,7 +98,7 @@ public class GraphTest extends SolrCloudTestCase {
SolrClientCache cache = new SolrClientCache();
context.setSolrClientCache(cache);
- SolrParams sParams = StreamingTest.mapParams("fq", "predicate_s:knows");
+ SolrParams sParams = params("fq", "predicate_s:knows");
stream = new ShortestPathStream(zkHost,
"collection1",
@@ -128,7 +128,7 @@ public class GraphTest extends SolrCloudTestCase {
//Test with batch size of 1
- sParams = StreamingTest.mapParams("fq", "predicate_s:knows");
+ sParams = params("fq", "predicate_s:knows");
stream = new ShortestPathStream(zkHost,
"collection1",
@@ -156,7 +156,7 @@ public class GraphTest extends SolrCloudTestCase {
//Test with bad predicate
- sParams = StreamingTest.mapParams("fq", "predicate_s:crap");
+ sParams = params("fq", "predicate_s:crap");
stream = new ShortestPathStream(zkHost,
"collection1",
@@ -176,7 +176,7 @@ public class GraphTest extends SolrCloudTestCase {
//Test with depth 2
- sParams = StreamingTest.mapParams("fq", "predicate_s:knows");
+ sParams = params("fq", "predicate_s:knows");
stream = new ShortestPathStream(zkHost,
"collection1",
@@ -197,7 +197,7 @@ public class GraphTest extends SolrCloudTestCase {
//Take out alex
- sParams = StreamingTest.mapParams("fq", "predicate_s:knows NOT to_s:alex");
+ sParams = params("fq", "predicate_s:knows NOT to_s:alex");
stream = new ShortestPathStream(zkHost,
"collection1",
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
index 2a048fa..9fc42d8 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
@@ -2911,7 +2911,7 @@ public class StreamDecoratorTest extends
SolrCloudTestCase {
//Lets sleep long enough for daemon updates to run.
//Lets stop the daemons
- ModifiableSolrParams sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream",
"action", "list"));
+ ModifiableSolrParams sParams = new
ModifiableSolrParams(params(CommonParams.QT, "/stream", "action", "list"));
int workersComplete = 0;
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
@@ -3085,7 +3085,7 @@ public class StreamDecoratorTest extends
SolrCloudTestCase {
assert (tuples.size() == 2);
- ModifiableSolrParams sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream",
"action", "list"));
+ ModifiableSolrParams sParams = new
ModifiableSolrParams(params(CommonParams.QT, "/stream", "action", "list"));
int workersComplete = 0;
@@ -3467,7 +3467,7 @@ public class StreamDecoratorTest extends
SolrCloudTestCase {
//Lets sleep long enough for daemon updates to run.
//Lets stop the daemons
- ModifiableSolrParams sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream",
"action", "list"));
+ ModifiableSolrParams sParams = new
ModifiableSolrParams(params(CommonParams.QT, "/stream", "action", "list"));
int workersComplete = 0;
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
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 4c2b766..4043708 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
@@ -652,7 +652,7 @@ public class StreamExpressionTest extends SolrCloudTestCase
{
//Exercise the /stream handler
- ModifiableSolrParams sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream"));
+ ModifiableSolrParams sParams = new
ModifiableSolrParams(params(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);
@@ -662,7 +662,7 @@ public class StreamExpressionTest extends SolrCloudTestCase
{
assertNull(tuples4.get(0).get("x"));
- sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
sParams.add("expr", "random(" + COLLECTIONORALIAS + ")");
jetty = cluster.getJettySolrRunner(0);
solrStream = new SolrStream(jetty.getBaseUrl().toString() +
"/collection1", sParams);
@@ -698,7 +698,7 @@ public class StreamExpressionTest extends SolrCloudTestCase
{
SolrClientCache cache = new SolrClientCache();
try {
context.setSolrClientCache(cache);
- ModifiableSolrParams sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream"));
+ ModifiableSolrParams sParams = new
ModifiableSolrParams(params(CommonParams.QT, "/stream"));
sParams.add("expr", "knnSearch(" + COLLECTIONORALIAS + ", id=\"1\",
qf=\"a_t\", rows=\"4\", fl=\"id, score\", mintf=\"1\")");
JettySolrRunner jetty = cluster.getJettySolrRunner(0);
SolrStream solrStream = new SolrStream(jetty.getBaseUrl().toString() +
"/collection1", sParams);
@@ -706,26 +706,26 @@ public class StreamExpressionTest extends
SolrCloudTestCase {
assertTrue(tuples.size() == 3);
assertOrder(tuples, 2, 3, 4);
- sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
sParams.add("expr", "knnSearch(" + COLLECTIONORALIAS + ", id=\"1\",
qf=\"a_t\", k=\"2\", fl=\"id, score\", mintf=\"1\")");
solrStream = new SolrStream(jetty.getBaseUrl().toString() +
"/collection1", sParams);
tuples = getTuples(solrStream);
assertTrue(tuples.size() == 2);
assertOrder(tuples, 2, 3);
- sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
sParams.add("expr", "knnSearch(" + COLLECTIONORALIAS + ", id=\"1\",
qf=\"a_t\", rows=\"4\", fl=\"id, score\", mintf=\"1\", maxdf=\"0\")");
solrStream = new SolrStream(jetty.getBaseUrl().toString() +
"/collection1", sParams);
tuples = getTuples(solrStream);
assertTrue(tuples.size() == 0);
- sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
sParams.add("expr", "knnSearch(" + COLLECTIONORALIAS + ", id=\"1\",
qf=\"a_t\", rows=\"4\", fl=\"id, score\", mintf=\"1\", maxwl=\"1\")");
solrStream = new SolrStream(jetty.getBaseUrl().toString() +
"/collection1", sParams);
tuples = getTuples(solrStream);
assertTrue(tuples.size() == 0);
- sParams = new
ModifiableSolrParams(StreamingTest.mapParams(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
sParams.add("expr", "knnSearch(" + COLLECTIONORALIAS + ", id=\"1\",
qf=\"a_t\", rows=\"2\", fl=\"id, score\", mintf=\"1\", minwl=\"20\")");
solrStream = new SolrStream(jetty.getBaseUrl().toString() +
"/collection1", sParams);
tuples = getTuples(solrStream);
diff --git
a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
index 208f055..f647c26 100644
---
a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
+++
b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
@@ -161,7 +161,7 @@ public void testUniqueStream() throws Exception {
SolrClientCache solrClientCache = new SolrClientCache();
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParams = StreamingTest.mapParams("q", "*:*", "fl",
"id,a_s,a_i,a_f", "sort", "a_f asc,a_i asc");
+ SolrParams sParams = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParams);
UniqueStream ustream = new UniqueStream(stream, new FieldEqualitor("a_f"));
ustream.setStreamContext(streamContext);
@@ -176,7 +176,7 @@ public void testUniqueStream() throws Exception {
@Test
public void testSpacesInParams() throws Exception {
- SolrParams sParams = StreamingTest.mapParams("q", "*:*", "fl", "id , a_s ,
a_i , a_f", "sort", "a_f asc , a_i asc");
+ SolrParams sParams = params("q", "*:*", "fl", "id , a_s , a_i , a_f",
"sort", "a_f asc , a_i asc");
//CloudSolrStream compares the values of the sort with the fl field.
//The constructor will throw an exception if the sort fields do not the
@@ -206,7 +206,7 @@ public void testNonePartitionKeys() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParamsA = StreamingTest.mapParams("q", "*:*", "fl",
"id,a_s,a_i,a_f", "sort", "a_s asc,a_f asc", "partitionKeys", "none", "qt",
"/export");
+ SolrParams sParamsA = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort",
"a_s asc,a_f asc", "partitionKeys", "none", "qt", "/export");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
ParallelStream pstream = parallelStream(stream, new FieldComparator("a_s",
ComparatorOrder.ASCENDING));
attachStreamFactory(pstream);
@@ -240,7 +240,7 @@ public void testParallelUniqueStream() throws Exception {
try {
- SolrParams sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i asc", "partitionKeys", "a_f", "qt", "/export");
+ SolrParams sParams = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i asc", "partitionKeys", "a_f", "qt", "/export");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParams);
UniqueStream ustream = new UniqueStream(stream, new FieldEqualitor("a_f"));
ParallelStream pstream = parallelStream(ustream, new
FieldComparator("a_f", ComparatorOrder.ASCENDING));
@@ -282,7 +282,7 @@ public void testMultipleFqClauses() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
try {
- ModifiableSolrParams params = new ModifiableSolrParams(mapParams("q",
"*:*", "fl", "id,a_i",
+ ModifiableSolrParams params = new ModifiableSolrParams(params("q", "*:*",
"fl", "id,a_i",
"sort", "a_i asc", "fq", "a_ss:hello0", "fq", "a_ss:hello1"));
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
params);
stream.setStreamContext(streamContext);
@@ -309,7 +309,7 @@ public void testRankStream() throws Exception {
SolrClientCache solrClientCache = new SolrClientCache();
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i", "sort",
"a_i asc");
+ SolrParams sParams = params("q", "*:*", "fl", "id,a_s,a_i", "sort", "a_i
asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParams);
RankStream rstream = new RankStream(stream, 3, new FieldComparator("a_i",
ComparatorOrder.DESCENDING));
rstream.setStreamContext(streamContext);
@@ -341,7 +341,7 @@ public void testParallelRankStream() throws Exception {
SolrClientCache solrClientCache = new SolrClientCache();
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i", "sort",
"a_i asc", "partitionKeys", "a_i", "qt", "/export");
+ SolrParams sParams = params("q", "*:*", "fl", "id,a_s,a_i", "sort", "a_i
asc", "partitionKeys", "a_i", "qt", "/export");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParams);
RankStream rstream = new RankStream(stream, 11, new FieldComparator("a_i",
ComparatorOrder.DESCENDING));
ParallelStream pstream = parallelStream(rstream, new
FieldComparator("a_i", ComparatorOrder.DESCENDING));
@@ -379,7 +379,7 @@ public void testParallelRankStream() throws Exception {
try {
//Test with spaces in the parameter lists.
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "id,a_s, a_i,a_f",
"sort", "a_s asc,a_f asc");
+ SolrParams sParamsA = params("q", "*:*", "fl", "id,a_s, a_i,a_f",
"sort", "a_s asc,a_f asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
stream.setTrace(true);
stream.setStreamContext(streamContext);
@@ -415,7 +415,7 @@ public void testParallelRankStream() throws Exception {
try {
//Test with spaces in the parameter lists.
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "id,a_s, a_i, a_f",
"sort", "a_s asc , a_f asc");
+ SolrParams sParamsA = params("q", "*:*", "fl", "id,a_s, a_i, a_f",
"sort", "a_s asc , a_f asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
ReducerStream rstream = new ReducerStream(stream,
new FieldEqualitor("a_s"),
@@ -439,7 +439,7 @@ public void testParallelRankStream() throws Exception {
assertMaps(maps2, 4, 6);
//Test with spaces in the parameter lists using a comparator
- sParamsA = mapParams("q", "*:*", "fl", "id,a_s, a_i, a_f", "sort", "a_s
asc , a_f asc");
+ sParamsA = params("q", "*:*", "fl", "id,a_s, a_i, a_f", "sort", "a_s
asc , a_f asc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
rstream = new ReducerStream(stream,
new FieldComparator("a_s", ComparatorOrder.ASCENDING),
@@ -488,7 +488,7 @@ public void testParallelRankStream() throws Exception {
try {
//Test with spaces in the parameter lists.
- SolrParams sParamsA = mapParams("q", "blah", "fl", "id,a_s, a_i, a_f",
"sort", "a_s asc , a_f asc");
+ SolrParams sParamsA = params("q", "blah", "fl", "id,a_s, a_i, a_f",
"sort", "a_s asc , a_f asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
ReducerStream rstream = new ReducerStream(stream,
new FieldEqualitor("a_s"),
@@ -523,7 +523,7 @@ public void testParallelRankStream() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "id,a_s,a_i,a_f",
"sort", "a_s asc,a_f asc", "partitionKeys", "a_s", "qt", "/export");
+ SolrParams sParamsA = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort",
"a_s asc,a_f asc", "partitionKeys", "a_s", "qt", "/export");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
ReducerStream rstream = new ReducerStream(stream,
@@ -550,7 +550,7 @@ public void testParallelRankStream() throws Exception {
//Test Descending with Ascending subsort
- sParamsA = mapParams("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_s
desc,a_f asc", "partitionKeys", "a_s", "qt", "/export");
+ sParamsA = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_s
desc,a_f asc", "partitionKeys", "a_s", "qt", "/export");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
rstream = new ReducerStream(stream,
@@ -601,7 +601,7 @@ public void testParallelRankStream() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
//Test an error that comes originates from the /select handler
try {
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f,blah",
"sort", "blah asc");
+ SolrParams sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,blah",
"sort", "blah asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
ExceptionStream estream = new ExceptionStream(stream);
estream.setStreamContext(streamContext);
@@ -611,7 +611,7 @@ public void testParallelRankStream() throws Exception {
assertTrue(t.getException().contains("sort param field can't be found:
blah"));
//Test an error that comes originates from the /export handler
- sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f,score", "sort", "a_s
asc", "qt", "/export");
+ sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,score", "sort", "a_s
asc", "qt", "/export");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
estream = new ExceptionStream(stream);
estream.setStreamContext(streamContext);
@@ -642,7 +642,7 @@ public void testParallelRankStream() throws Exception {
.add(id, "9", "a_s", "hello0", "a_i", "14", "a_f", "10")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f,blah",
"sort", "blah asc");
+ SolrParams sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,blah", "sort",
"blah asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
ParallelStream pstream = new ParallelStream(zkHost, COLLECTIONORALIAS,
stream, 2, new FieldComparator("blah", ComparatorOrder.ASCENDING));
ExceptionStream estream = new ExceptionStream(pstream);
@@ -654,7 +654,7 @@ public void testParallelRankStream() throws Exception {
//Test an error that originates from the /select handler
- sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f,blah", "sort", "blah
asc", "partitionKeys", "a_s", "qt", "/export");
+ sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,blah", "sort", "blah
asc", "partitionKeys", "a_s", "qt", "/export");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
pstream = new ParallelStream(zkHost, COLLECTIONORALIAS, stream, 2, new
FieldComparator("blah", ComparatorOrder.ASCENDING));
estream = new ExceptionStream(pstream);
@@ -665,7 +665,7 @@ public void testParallelRankStream() throws Exception {
//Test an error that originates from the /export handler
- sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f,score", "sort", "a_s
asc", "qt", "/export", "partitionKeys", "a_s");
+ sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f,score", "sort", "a_s
asc", "qt", "/export", "partitionKeys", "a_s");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
pstream = new ParallelStream(zkHost, COLLECTIONORALIAS, stream, 2, new
FieldComparator("a_s", ComparatorOrder.ASCENDING));
estream = new ExceptionStream(pstream);
@@ -697,7 +697,7 @@ public void testParallelRankStream() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParamsA = mapParams("q", "*:*");
+ SolrParams sParamsA = params("q", "*:*");
Metric[] metrics = {new SumMetric("a_i"),
new SumMetric("a_f"),
@@ -764,7 +764,7 @@ public void testParallelRankStream() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f", "sort",
"a_s asc");
+ SolrParams sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f", "sort",
"a_s asc");
Bucket[] buckets = {new Bucket("a_s")};
@@ -1164,7 +1164,7 @@ public void testParallelRankStream() throws Exception {
// selectOrder.add((String) doc.getFieldValue("id"));
// }
// }
-// SolrParams exportParams = mapParams("q", "*:*", "qt", "/export", "fl",
"id," + field, "sort", field + " " + sortDir + ",id asc");
+// SolrParams exportParams = params("q", "*:*", "qt", "/export", "fl",
"id," + field, "sort", field + " " + sortDir + ",id asc");
// try (CloudSolrStream solrStream = new CloudSolrStream(zkHost,
COLLECTIONORALIAS, exportParams)) {
// List<Tuple> tuples = getTuples(solrStream);
// assertEquals("There should be exactly 32 responses returned", 32,
tuples.size());
@@ -1180,7 +1180,7 @@ public void testParallelRankStream() throws Exception {
// Remove below and uncomment above after LUCENE-7548
List<String> selectOrder = ("asc".equals(sortDir)) ?
Arrays.asList(ascOrder) : Arrays.asList(descOrder);
List<String> selectOrderBool = ("asc".equals(sortDir)) ?
Arrays.asList(ascOrderBool) : Arrays.asList(descOrderBool);
- SolrParams exportParams = mapParams("q", "*:*", "qt", "/export", "fl",
"id," + field, "sort", field + " " + sortDir + ",id asc");
+ SolrParams exportParams = params("q", "*:*", "qt", "/export", "fl", "id,"
+ field, "sort", field + " " + sortDir + ",id asc");
StreamContext streamContext = new StreamContext();
SolrClientCache solrClientCache = new SolrClientCache();
streamContext.setSolrClientCache(solrClientCache);
@@ -1224,7 +1224,7 @@ public void testParallelRankStream() throws Exception {
for (String f : fields) {
fl.append(",").append(f);
}
- SolrParams sParams = mapParams("q", "*:*", "qt", "/export", "fl",
fl.toString(), "sort", "id asc");
+ SolrParams sParams = params("q", "*:*", "qt", "/export", "fl",
fl.toString(), "sort", "id asc");
StreamContext streamContext = new StreamContext();
SolrClientCache solrClientCache = new SolrClientCache();
@@ -1387,7 +1387,7 @@ public void testParallelRankStream() throws Exception {
try {
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "a_i,a_f");
+ SolrParams sParamsA = params("q", "*:*", "fl", "a_i,a_f");
Bucket[] buckets = {new Bucket("level1_s"), new Bucket("level2_s")};
@@ -1578,7 +1578,7 @@ public void testParallelRankStream() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f", "sort",
"a_s asc");
+ SolrParams sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f", "sort",
"a_s asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
Bucket[] buckets = {new Bucket("a_s")};
@@ -1697,7 +1697,7 @@ public void testParallelRankStream() throws Exception {
.add(id, "12", "a_s", null, "a_i", "14", "a_f", "10")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f", "sort", "a_s asc",
"qt", "/export");
+ sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f", "sort", "a_s asc",
"qt", "/export");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
Bucket[] buckets1 = {new Bucket("a_s")};
@@ -1752,7 +1752,7 @@ public void testParallelRankStream() throws Exception {
context.setSolrClientCache(cache);
try {
- SolrParams sParams = mapParams("q", "a_s:hello0", "rows", "500", "fl",
"id");
+ SolrParams sParams = params("q", "a_s:hello0", "rows", "500", "fl",
"id");
TopicStream topicStream = new TopicStream(zkHost,
COLLECTIONORALIAS,
@@ -1787,7 +1787,7 @@ public void testParallelRankStream() throws Exception {
// Wait for the checkpoint
JettySolrRunner jetty = cluster.getJettySolrRunners().get(0);
- SolrParams sParams1 = mapParams("qt", "/get", "ids", "50000000", "fl",
"id");
+ SolrParams sParams1 = params("qt", "/get", "ids", "50000000", "fl", "id");
int count = 0;
while (count == 0) {
SolrStream solrStream = new SolrStream(jetty.getBaseUrl().toString() +
"/" + COLLECTIONORALIAS, sParams1);
@@ -1852,7 +1852,7 @@ public void testParallelRankStream() throws Exception {
try {
//Intentionally adding partitionKeys to trigger SOLR-12674
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f", "sort",
"a_s asc", "partitionKeys", "a_s", "qt", "/export" );
+ SolrParams sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f", "sort",
"a_s asc", "partitionKeys", "a_s", "qt", "/export" );
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
Bucket[] buckets = {new Bucket("a_s")};
@@ -1908,7 +1908,7 @@ public void testParallelRankStream() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParamsA = mapParams("q", "*:*", "fl", "a_s,a_i,a_f", "sort",
"a_s asc", "partitionKeys", "a_s", "qt", "/export");
+ SolrParams sParamsA = params("q", "*:*", "fl", "a_s,a_i,a_f", "sort",
"a_s asc", "partitionKeys", "a_s", "qt", "/export");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
Bucket[] buckets = {new Bucket("a_s")};
@@ -2027,7 +2027,7 @@ public void testParallelRankStream() throws Exception {
SolrClientCache solrClientCache = new SolrClientCache();
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParamsA = mapParams("q", "a_s:blah", "fl", "id,a_s,a_i,a_f",
"sort", "a_s asc,a_f asc", "partitionKeys", "a_s", "qt", "/export");
+ SolrParams sParamsA = params("q", "a_s:blah", "fl", "id,a_s,a_i,a_f",
"sort", "a_s asc,a_f asc", "partitionKeys", "a_s", "qt", "/export");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
ReducerStream rstream = new ReducerStream(stream,
new FieldEqualitor("a_s"),
@@ -2056,7 +2056,7 @@ public void testParallelRankStream() throws Exception {
streamContext.setSolrClientCache(solrClientCache);
try {
- SolrParams sParams = mapParams("q", "*:*", "fl",
"id,a_s,a_i,a_f,s_multi,i_multi,f_multi", "sort", "a_s asc");
+ SolrParams sParams = params("q", "*:*", "fl",
"id,a_s,a_i,a_f,s_multi,i_multi,f_multi", "sort", "a_s asc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParams);
stream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(stream);
@@ -2106,10 +2106,10 @@ public void testParallelRankStream() throws Exception {
try {
//Test ascending
- SolrParams sParamsA = mapParams("q", "id:(4 1)", "fl", "id,a_s,a_i",
"sort", "a_i asc");
+ SolrParams sParamsA = params("q", "id:(4 1)", "fl", "id,a_s,a_i",
"sort", "a_i asc");
CloudSolrStream streamA = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
- SolrParams sParamsB = mapParams("q", "id:(0 2 3)", "fl", "id,a_s,a_i",
"sort", "a_i asc");
+ SolrParams sParamsB = params("q", "id:(0 2 3)", "fl", "id,a_s,a_i",
"sort", "a_i asc");
CloudSolrStream streamB = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsB);
MergeStream mstream = new MergeStream(streamA, streamB, new
FieldComparator("a_i", ComparatorOrder.ASCENDING));
@@ -2120,10 +2120,10 @@ public void testParallelRankStream() throws Exception {
assertOrder(tuples, 0, 1, 2, 3, 4);
//Test descending
- sParamsA = mapParams("q", "id:(4 1)", "fl", "id,a_s,a_i", "sort", "a_i
desc");
+ sParamsA = params("q", "id:(4 1)", "fl", "id,a_s,a_i", "sort", "a_i
desc");
streamA = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
- sParamsB = mapParams("q", "id:(0 2 3)", "fl", "id,a_s,a_i", "sort", "a_i
desc");
+ sParamsB = params("q", "id:(0 2 3)", "fl", "id,a_s,a_i", "sort", "a_i
desc");
streamB = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsB);
mstream = new MergeStream(streamA, streamB, new FieldComparator("a_i",
ComparatorOrder.DESCENDING));
@@ -2135,10 +2135,10 @@ public void testParallelRankStream() throws Exception {
//Test compound sort
- sParamsA = mapParams("q", "id:(2 4 1)", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i asc");
+ sParamsA = params("q", "id:(2 4 1)", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i asc");
streamA = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
- sParamsB = mapParams("q", "id:(0 3)", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i asc");
+ sParamsB = params("q", "id:(0 3)", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i asc");
streamB = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsB);
mstream = new MergeStream(streamA, streamB, new
MultipleFieldComparator(new FieldComparator("a_f", ComparatorOrder.ASCENDING),
new FieldComparator("a_i", ComparatorOrder.ASCENDING)));
@@ -2148,10 +2148,10 @@ public void testParallelRankStream() throws Exception {
assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
- sParamsA = mapParams("q", "id:(2 4 1)", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i desc");
+ sParamsA = params("q", "id:(2 4 1)", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i desc");
streamA = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
- sParamsB = mapParams("q", "id:(0 3)", "fl", "id,a_s,a_i,a_f", "sort",
"a_f asc,a_i desc");
+ sParamsB = params("q", "id:(0 3)", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i desc");
streamB = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsB);
mstream = new MergeStream(streamA, streamB, new
MultipleFieldComparator(new FieldComparator("a_f", ComparatorOrder.ASCENDING),
new FieldComparator("a_i", ComparatorOrder.DESCENDING)));
@@ -2188,10 +2188,10 @@ public void testParallelRankStream() throws Exception {
try {
//Test ascending
- SolrParams sParamsA = mapParams("q", "id:(4 1 8 7 9)", "fl",
"id,a_s,a_i", "sort", "a_i asc", "partitionKeys", "a_i", "qt", "/export");
+ SolrParams sParamsA = params("q", "id:(4 1 8 7 9)", "fl", "id,a_s,a_i",
"sort", "a_i asc", "partitionKeys", "a_i", "qt", "/export");
CloudSolrStream streamA = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
- SolrParams sParamsB = mapParams("q", "id:(0 2 3 6)", "fl", "id,a_s,a_i",
"sort", "a_i asc", "partitionKeys", "a_i", "qt", "/export");
+ SolrParams sParamsB = params("q", "id:(0 2 3 6)", "fl", "id,a_s,a_i",
"sort", "a_i asc", "partitionKeys", "a_i", "qt", "/export");
CloudSolrStream streamB = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsB);
MergeStream mstream = new MergeStream(streamA, streamB, new
FieldComparator("a_i", ComparatorOrder.ASCENDING));
@@ -2204,10 +2204,10 @@ public void testParallelRankStream() throws Exception {
assertOrder(tuples, 0, 1, 2, 3, 4, 7, 6, 8, 9);
//Test descending
- sParamsA = mapParams("q", "id:(4 1 8 9)", "fl", "id,a_s,a_i", "sort",
"a_i desc", "partitionKeys", "a_i", "qt", "/export");
+ sParamsA = params("q", "id:(4 1 8 9)", "fl", "id,a_s,a_i", "sort", "a_i
desc", "partitionKeys", "a_i", "qt", "/export");
streamA = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsA);
- sParamsB = mapParams("q", "id:(0 2 3 6)", "fl", "id,a_s,a_i", "sort",
"a_i desc", "partitionKeys", "a_i", "qt", "/export");
+ sParamsB = params("q", "id:(0 2 3 6)", "fl", "id,a_s,a_i", "sort", "a_i
desc", "partitionKeys", "a_i", "qt", "/export");
streamB = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParamsB);
mstream = new MergeStream(streamA, streamB, new FieldComparator("a_i",
ComparatorOrder.DESCENDING));
@@ -2245,10 +2245,10 @@ public void testParallelRankStream() throws Exception {
try {
//Test ascending
- SolrParams sParamsA = mapParams("q", "id:(4 1 8 7 9)", "fl",
"id,a_s,a_i", "sort", "a_i asc", "partitionKeys", "a_i", "qt", "/export");
+ SolrParams sParamsA = params("q", "id:(4 1 8 7 9)", "fl", "id,a_s,a_i",
"sort", "a_i asc", "partitionKeys", "a_i", "qt", "/export");
CloudSolrStream streamA = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsA);
- SolrParams sParamsB = mapParams("q", "id:(0 2 3 6)", "fl", "id,a_s,a_i",
"sort", "a_i asc", "partitionKeys", "a_i", "qt", "/export");
+ SolrParams sParamsB = params("q", "id:(0 2 3 6)", "fl", "id,a_s,a_i",
"sort", "a_i asc", "partitionKeys", "a_i", "qt", "/export");
CloudSolrStream streamB = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParamsB);
MergeStream mstream = new MergeStream(streamA, streamB, new
FieldComparator("a_i", ComparatorOrder.ASCENDING));
@@ -2283,7 +2283,7 @@ public void testParallelRankStream() throws Exception {
//Basic CloudSolrStream Test with Descending Sort
try {
- SolrParams sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i", "sort",
"a_i desc");
+ SolrParams sParams = params("q", "*:*", "fl", "id,a_s,a_i", "sort", "a_i
desc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParams);
stream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(stream);
@@ -2292,7 +2292,7 @@ public void testParallelRankStream() throws Exception {
assertOrder(tuples, 4, 3, 2, 1, 0);
//With Ascending Sort
- sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i", "sort", "a_i asc");
+ sParams = params("q", "*:*", "fl", "id,a_s,a_i", "sort", "a_i asc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2302,7 +2302,7 @@ public void testParallelRankStream() throws Exception {
//Test compound sort
- sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i desc");
+ sParams = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i desc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2311,7 +2311,7 @@ public void testParallelRankStream() throws Exception {
assertOrder(tuples, 2, 0, 1, 3, 4);
- sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i asc");
+ sParams = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i asc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2352,7 +2352,7 @@ public void testParallelRankStream() throws Exception {
//Basic CloudSolrStream Test with Descending Sort
try {
- SolrParams sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i", "sort",
"a_i desc");
+ SolrParams sParams = params("q", "*:*", "fl", "id,a_s,a_i", "sort", "a_i
desc");
CloudSolrStream stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS,
sParams);
stream.setStreamContext(streamContext);
List<Tuple> tuples = getTuples(stream);
@@ -2373,7 +2373,7 @@ public void testParallelRankStream() throws Exception {
}
//With Ascending Sort
- sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i", "sort", "a_i asc");
+ sParams = params("q", "*:*", "fl", "id,a_s,a_i", "sort", "a_i asc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2394,7 +2394,7 @@ public void testParallelRankStream() throws Exception {
}
//Test compound sort
- sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i desc");
+ sParams = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i desc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2414,7 +2414,7 @@ public void testParallelRankStream() throws Exception {
fail("should have 3, 5 or 2 tuples, has hashing algorithm changed?");
}
- sParams = mapParams("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i asc");
+ sParams = params("q", "*:*", "fl", "id,a_s,a_i,a_f", "sort", "a_f
asc,a_i asc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2457,7 +2457,7 @@ public void testParallelRankStream() throws Exception {
private void trySortWithQt(String which) throws Exception {
//Basic CloudSolrStream Test bools desc
- SolrParams sParams = mapParams("q", "*:*", "qt", which, "fl", "id,b_sing",
"sort", "b_sing asc,id asc");
+ SolrParams sParams = params("q", "*:*", "qt", which, "fl", "id,b_sing",
"sort", "b_sing asc,id asc");
StreamContext streamContext = new StreamContext();
SolrClientCache solrClientCache = new SolrClientCache();
streamContext.setSolrClientCache(solrClientCache);
@@ -2471,7 +2471,7 @@ public void testParallelRankStream() throws Exception {
assertOrder(tuples, 0, 2, 1, 3, 4);
//Basic CloudSolrStream Test bools desc
- sParams = mapParams("q", "*:*", "qt", which, "fl", "id,b_sing", "sort",
"b_sing desc,id desc");
+ sParams = params("q", "*:*", "qt", which, "fl", "id,b_sing", "sort",
"b_sing desc,id desc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2480,7 +2480,7 @@ public void testParallelRankStream() throws Exception {
assertOrder(tuples, 4, 3, 1, 2, 0);
//Basic CloudSolrStream Test dates desc
- sParams = mapParams("q", "*:*", "qt", which, "fl", "id,dt_sing", "sort",
"dt_sing desc,id asc");
+ sParams = params("q", "*:*", "qt", which, "fl", "id,dt_sing", "sort",
"dt_sing desc,id asc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2489,7 +2489,7 @@ public void testParallelRankStream() throws Exception {
assertOrder(tuples, 2, 0, 1, 4, 3);
//Basic CloudSolrStream Test ates desc
- sParams = mapParams("q", "*:*", "qt", which, "fl", "id,dt_sing", "sort",
"dt_sing asc,id desc");
+ sParams = params("q", "*:*", "qt", which, "fl", "id,dt_sing", "sort",
"dt_sing asc,id desc");
stream = new CloudSolrStream(zkHost, COLLECTIONORALIAS, sParams);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2529,7 +2529,7 @@ public void testParallelRankStream() throws Exception {
StreamContext streamContext = new StreamContext();
SolrClientCache solrClientCache = new SolrClientCache();
streamContext.setSolrClientCache(solrClientCache);
- SolrParams sParams = StreamingTest.mapParams("q", "*:*", "qt", which, "fl",
+ SolrParams sParams = params("q", "*:*", "qt", which, "fl",
"id,i_sing,i_multi,l_sing,l_multi,f_sing,f_multi,d_sing,d_multi,dt_sing,dt_multi,s_sing,s_multi,b_sing,b_multi",
"sort", "i_sing asc");
try (CloudSolrStream stream = new CloudSolrStream(zkHost,
COLLECTIONORALIAS, sParams)) {
@@ -2584,7 +2584,7 @@ public void testParallelRankStream() throws Exception {
streamContext.setSolrClientCache(new SolrClientCache());
streamContext.setRequestReplicaListTransformerGenerator(new
RequestReplicaListTransformerGenerator(ShardParams.SHARDS_PREFERENCE_REPLICA_TYPE
+ ":TLOG", null, null, null));
- streamContext.setRequestParams(mapParams(ShardParams.SHARDS_PREFERENCE,
ShardParams.SHARDS_PREFERENCE_REPLICA_TYPE + ":nrt"));
+ streamContext.setRequestParams(params(ShardParams.SHARDS_PREFERENCE,
ShardParams.SHARDS_PREFERENCE_REPLICA_TYPE + ":nrt"));
try {
ZkStateReader zkStateReader = cluster.getSolrClient().getZkStateReader();
@@ -2593,7 +2593,7 @@ public void testParallelRankStream() throws Exception {
Map<String, String> replicaTypeMap =
mapReplicasToReplicaType(zkStateReader.getClusterState().getCollectionOrNull(collName));
// Test from extra params
- SolrParams sParams = mapParams("q", "*:*",
ShardParams.SHARDS_PREFERENCE, ShardParams.SHARDS_PREFERENCE_REPLICA_TYPE +
":pull");
+ SolrParams sParams = params("q", "*:*", ShardParams.SHARDS_PREFERENCE,
ShardParams.SHARDS_PREFERENCE_REPLICA_TYPE + ":pull");
testTupleStreamSorting(streamContext, sParams, "PULL", replicaTypeMap);
// Test defaults from streamContext.getParams()
@@ -2678,23 +2678,13 @@ public void testParallelRankStream() throws Exception {
tupleStream.setStreamContext(streamContext);
}
- public static SolrParams mapParams(String... vals) {
- ModifiableSolrParams params = new ModifiableSolrParams();
- assertEquals("Parameters passed in here must be in pairs!", 0,
(vals.length % 2));
- for (int idx = 0; idx < vals.length; idx += 2) {
- params.add(vals[idx], vals[idx + 1]);
- }
- if(random().nextBoolean()) params.add("wt","javabin");
- return params;
- }
-
private ParallelStream parallelStream(TupleStream stream, FieldComparator
comparator) throws IOException {
ParallelStream pstream = new ParallelStream(zkHost, COLLECTIONORALIAS,
stream, numWorkers, comparator);
return pstream;
}
public void testCloudSolrStreamWithoutStreamContext() throws Exception {
- SolrParams sParams = StreamingTest.mapParams("q", "*:*", "fl", "id",
"sort", "id asc");
+ SolrParams sParams = params("q", "*:*", "fl", "id", "sort", "id asc");
try (CloudSolrStream stream = new CloudSolrStream(zkHost,
COLLECTIONORALIAS, sParams)) {
stream.open();
}
