Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-18332: Remove avoidable QT-usage in SolrStream construction (#4799)

Jason Gerlowski4bda06abf6fa
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 cb0d11714f7..51be76352f3 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
@@ -69,7 +69,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
super.setUp();
cluster = new MiniSolrCloudCluster(1, createTempDir(), JettyConfig.builder().build());
- url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + CHECKPOINT_COLL;
+ url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
cluster.uploadConfigSet(configset("cloud-minimal"), CONF_NAME);
// create a single shard, single replica collection. This is necessary until SOLR-13245 since
@@ -110,7 +110,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
createDaemon(DAEMON_DEF.replace("DAEMON_NAME", name), name);
}
- List<Tuple> tuples = getTuples(params("qt", "/stream", "action", "list"));
+ List<Tuple> tuples = getTuples(params("action", "list"));
assertEquals("Should have all daemons listed", numDaemons, tuples.size());
for (int idx = 0; idx < numDaemons; ++idx) {
@@ -125,16 +125,14 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
// We shouldn't be able to open a daemon twice without closing., leads to thread leeks.
Tuple tupleOfInterest =
- getTupleOfInterest(
- params("qt", "/stream", "action", "start", "id", daemonOfInterest), DAEMON_OP);
+ getTupleOfInterest(params("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(
- params("qt", "/stream", "action", "stop", "id", daemonOfInterest), DAEMON_OP);
+ getTupleOfInterest(params("action", "stop", "id", daemonOfInterest), DAEMON_OP);
assertTrue(
"Should have been able to stop the daemon",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + " stopped"));
@@ -149,8 +147,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
// Try starting and check return.
tupleOfInterest =
- getTupleOfInterest(
- params("qt", "/stream", "action", "start", "id", daemonOfInterest), DAEMON_OP);
+ getTupleOfInterest(params("action", "start", "id", daemonOfInterest), DAEMON_OP);
assertTrue(
"Should have been able to start the daemon",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + " started"));
@@ -162,8 +159,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
// Try killing a daemon, it should be removed from lists.
tupleOfInterest =
- getTupleOfInterest(
- params("qt", "/stream", "action", "kill", "id", daemonOfInterest), DAEMON_OP);
+ getTupleOfInterest(params("action", "kill", "id", daemonOfInterest), DAEMON_OP);
assertTrue(
"Daemon should have been killed",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + " killed"));
@@ -173,24 +169,21 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
// Should not be able to start a killed daemon
tupleOfInterest =
- getTupleOfInterest(
- params("qt", "/stream", "action", "start", "id", daemonOfInterest), DAEMON_OP);
+ getTupleOfInterest(params("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(
- params("qt", "/stream", "action", "stop", "id", daemonOfInterest), DAEMON_OP);
+ getTupleOfInterest(params("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(
- params("qt", "/stream", "action", "kill", "id", daemonOfInterest), DAEMON_OP);
+ getTupleOfInterest(params("action", "kill", "id", daemonOfInterest), DAEMON_OP);
assertTrue(
"Daemon should not be found",
tupleOfInterest.getString(DAEMON_OP).contains(daemonOfInterest + " not found"));
@@ -202,7 +195,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
// Now kill them all so the threads disappear.
for (String daemon : daemonNames) {
- getTuples(params("qt", "/stream", "action", "kill", "id", daemon));
+ getTuples(params("action", "kill", "id", daemon));
checkDaemonKilled(daemon);
}
}
@@ -212,7 +205,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
TimeOut timeout = new TimeOut(10, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (timeout.hasTimedOut() == false) {
- Tuple tuple = getTupleOfInterest(params("qt", "/stream", "action", "list"), daemonName);
+ Tuple tuple = getTupleOfInterest(params("action", "list"), daemonName);
String state = tuple.getString("state");
if (state.equals("RUNNABLE") || state.equals("WAITING") || state.equals("TIMED_WAITING")) {
return;
@@ -232,7 +225,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
TimeOut timeout = new TimeOut(10, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (timeout.hasTimedOut() == false) {
- Tuple tuple = getTupleOfInterest(params("qt", "/stream", "action", "list"), daemonOfInterest);
+ Tuple tuple = getTupleOfInterest(params("action", "list"), daemonOfInterest);
if (tuple.getString("state").equals("TERMINATED")) {
return;
}
@@ -245,7 +238,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
TimeOut timeout = new TimeOut(10, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (timeout.hasTimedOut() == false) {
- List<Tuple> tuples = getTuples(params("qt", "/stream", "action", "list"));
+ List<Tuple> tuples = getTuples(params("action", "list"));
Boolean foundIt = false;
for (Tuple tuple : tuples) {
if (tuple.get("id").equals(daemon)) {
@@ -273,24 +266,21 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
private void checkCmdsNoDaemon(String daemonName) throws IOException {
- List<Tuple> tuples = getTuples(params("qt", "/stream", "action", "list"));
+ List<Tuple> tuples = getTuples(params("action", "list"));
assertEquals("List should be empty", 0, tuples.size());
Tuple tupleOfInterest =
- getTupleOfInterest(
- params("qt", "/stream", "action", "start", "id", daemonName), "DaemonOp");
+ getTupleOfInterest(params("action", "start", "id", daemonName), "DaemonOp");
assertTrue(
"Start for daemon should not be found",
tupleOfInterest.getString("DaemonOp").contains("not found on"));
- tupleOfInterest =
- getTupleOfInterest(params("qt", "/stream", "action", "stop", "id", daemonName), "DaemonOp");
+ tupleOfInterest = getTupleOfInterest(params("action", "stop", "id", daemonName), "DaemonOp");
assertTrue(
"Stop for daemon should not be found",
tupleOfInterest.getString("DaemonOp").contains("not found on"));
- tupleOfInterest =
- getTupleOfInterest(params("qt", "/stream", "action", "kill", "id", daemonName), "DaemonOp");
+ tupleOfInterest = getTupleOfInterest(params("action", "kill", "id", daemonName), "DaemonOp");
assertTrue(
"Kill for daemon should not be found",
@@ -304,7 +294,7 @@ public class DaemonStreamApiTest extends SolrTestCaseJ4 {
private List<Tuple> getTuples(final SolrParams params, String ofInterest) throws IOException {
// log.info("Tuples from params: {}", params);
- TupleStream tupleStream = new SolrStream(url, params);
+ TupleStream tupleStream = new SolrStream(url, CHECKPOINT_COLL, "/stream", params);
tupleStream.open();
List<Tuple> tuples = new ArrayList<>();
diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/SQLWithAuthzEnabledTest.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/SQLWithAuthzEnabledTest.java
index 22aeb979ce1..4ec16f671b4 100644
--- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/SQLWithAuthzEnabledTest.java
+++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/SQLWithAuthzEnabledTest.java
@@ -30,7 +30,6 @@ 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;
import org.apache.solr.cloud.SolrCloudTestCase;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.Utils;
import org.apache.solr.security.BasicAuthPlugin;
@@ -108,18 +107,16 @@ public class SQLWithAuthzEnabledTest extends SolrCloudTestCase {
.commit(cluster.getSolrClient(), collectionName);
ModifiableSolrParams params = new ModifiableSolrParams();
- params.set(CommonParams.QT, "/sql");
params.set("stmt", "select id from " + collectionName);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + collectionName;
- SolrStream solrStream = new SolrStream(baseUrl, params);
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ SolrStream solrStream = new SolrStream(baseUrl, collectionName, "/sql", params);
solrStream.setCredentials(SAD_USER, PASS);
// sad user is not authorized to access /sql endpoints
expectThrows(IOException.class, () -> countTuples(solrStream));
// sql user has access
- SolrStream solrStream2 = new SolrStream(baseUrl, params);
+ SolrStream solrStream2 = new SolrStream(baseUrl, collectionName, "/sql", params);
solrStream2.setCredentials(SQL_USER, PASS);
assertEquals(8, countTuples(solrStream2));
}
diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java
index cfbbf23a788..d1ec287f125 100644
--- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java
+++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandler.java
@@ -38,7 +38,6 @@ import org.apache.solr.client.solrj.request.CollectionAdminRequest;
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.SolrParams;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -208,13 +207,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
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");
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
List<Tuple> tuples = getTuples(sParams, baseUrl);
assertEquals(8, tuples.size());
@@ -298,8 +294,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"stmt",
"select id, field_i, str_s from collection1 where text_t='XXXX' order by id desc");
@@ -349,8 +343,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
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");
@@ -365,8 +357,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
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");
@@ -391,8 +381,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
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");
@@ -417,8 +405,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
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");
@@ -442,12 +428,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("a", tuple.get("myString"));
// SOLR-8845 - Test to make sure that 1 = 0 works for things like Spark SQL
- sParams =
- params(
- CommonParams.QT,
- "/sql",
- "stmt",
- "select id, field_i, str_s from collection1 where 1 = 0");
+ sParams = params("stmt", "select id, field_i, str_s from collection1 where 1 = 0");
tuples = getTuples(sParams, baseUrl);
@@ -457,8 +438,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// 'schemaType' is a real Calcite connection property which would crash the request
sParams =
params(
- CommonParams.QT,
- "/sql",
"schemaType",
"someValue",
"stmt",
@@ -491,21 +470,14 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "1", "text_t", "XXXX XXXX", "str_s", "a", "field_i", "7")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
- params(
- CommonParams.QT,
- "/sql",
- "caseSensitive",
- "true",
- "stmt",
- "select id, FIELD_I from collection1 limit 1");
+ params("caseSensitive", "true", "stmt", "select id, FIELD_I from collection1 limit 1");
// caseSensitive is forwarded to Calcite by default, making column names case-sensitive,
// unlike the default MySQL dialect behavior
- SolrStream solrStream = new SolrStream(baseUrl, sParams);
+ SolrStream solrStream = new SolrStream(baseUrl, COLLECTIONORALIAS, "/sql", sParams);
Tuple tuple = getTuple(new ExceptionStream(solrStream));
assertTrue(tuple.EOF);
assertTrue(tuple.EXCEPTION);
@@ -575,16 +547,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
"witha\"quote")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
// Equals
- SolrParams sParams =
- params(
- CommonParams.QT,
- "/sql",
- "stmt",
- "select id from collection1 where id = 1 order by id asc");
+ SolrParams sParams = params("stmt", "select id from collection1 where id = 1 order by id asc");
List<Tuple> tuples = getTuples(sParams, baseUrl);
@@ -594,12 +560,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("1", tuple.get("id"));
// Not Equals <>
- sParams =
- params(
- CommonParams.QT,
- "/sql",
- "stmt",
- "select id from collection1 where id <> 1 order by id asc limit 10");
+ sParams = params("stmt", "select id from collection1 where id <> 1 order by id asc limit 10");
tuples = getTuples(sParams, baseUrl);
@@ -645,12 +606,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
// assertEquals(8L, tuple.get("id"));
// Less than
- sParams =
- params(
- CommonParams.QT,
- "/sql",
- "stmt",
- "select id from collection1 where id < 2 order by id asc");
+ sParams = params("stmt", "select id from collection1 where id < 2 order by id asc");
tuples = getTuples(sParams, baseUrl);
@@ -660,12 +616,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("1", tuple.get("id"));
// Less than equal
- sParams =
- params(
- CommonParams.QT,
- "/sql",
- "stmt",
- "select id from collection1 where id <= 2 order by id asc");
+ sParams = params("stmt", "select id from collection1 where id <= 2 order by id asc");
tuples = getTuples(sParams, baseUrl);
@@ -677,12 +628,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("2", tuple.get("id"));
// Greater than
- sParams =
- params(
- CommonParams.QT,
- "/sql",
- "stmt",
- "select id from collection1 where id > 7 order by id asc");
+ sParams = params("stmt", "select id from collection1 where id > 7 order by id asc");
tuples = getTuples(sParams, baseUrl);
@@ -692,12 +638,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
assertEquals("8", tuple.get("id"));
// Greater than equal
- sParams =
- params(
- CommonParams.QT,
- "/sql",
- "stmt",
- "select id from collection1 where id >= 7 order by id asc");
+ sParams = params("stmt", "select id from collection1 where id >= 7 order by id asc");
tuples = getTuples(sParams, baseUrl);
@@ -732,13 +673,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "8", "Text_t", "XXXX XXXX", "Str_s", "c", "Field_i", "60")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -793,8 +731,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// TODO get sum(Field_i) as named one
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");
@@ -812,8 +748,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -846,13 +780,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "8", "text_t", "XXXX XXXX", "str_s", "c", "field_i", "60")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -892,8 +823,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// reverse the sort
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -930,8 +859,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// reverse the sort
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -968,8 +895,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// test with limit
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -990,12 +915,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test without a sort. Sort should be asc by default.
sParams =
params(
- CommonParams.QT,
- "/sql",
- "aggregationMode",
- "facet",
- "stmt",
- "select distinct str_s, field_i from collection1");
+ "aggregationMode", "facet", "stmt", "select distinct str_s, field_i from collection1");
tuples = getTuples(sParams, baseUrl);
@@ -1033,8 +953,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test with a predicate.
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1067,13 +985,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "8", "text_t", "XXXX XXXX", "str_s", "c", "field_i", "60")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -1109,8 +1024,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// reverse the sort
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -1146,8 +1059,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -1184,8 +1095,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// test with limit
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -1206,8 +1115,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test without a sort. Sort should be asc by default.
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -1244,8 +1151,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test with a predicate.
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -1277,12 +1182,9 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "8", "text_t", "XXXX XXXX", "str_s", "c", "field_i", "60")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -1323,8 +1225,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// reverse the sort
sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -1363,8 +1263,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// reverse the sort
sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -1403,8 +1301,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// test with limit
sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -1427,8 +1323,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test without a sort. Sort should be asc by default.
sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -1467,8 +1361,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test with a predicate.
sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -1504,13 +1396,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "9", "text_t", "XXXX XXXY", "str_s", "d", "field_i", "70")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1543,8 +1432,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1575,8 +1462,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1617,8 +1502,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1659,8 +1542,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1681,8 +1562,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1704,8 +1583,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1727,8 +1604,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -1757,13 +1632,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add(id, "9", "a_s", "hello0", "a_i", "14", "a_f", "10")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
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");
@@ -1798,8 +1670,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
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");
@@ -1835,8 +1705,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test without cast on average int field
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");
@@ -1873,8 +1741,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test where clause hits
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");
@@ -1908,8 +1774,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// Test zero hits
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'");
@@ -1943,8 +1807,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
// test bunch of where predicates
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");
@@ -1967,13 +1829,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add(id, "8", "year_i", "2014", "month_i", "4", "day_i", "2", "item_i", "1")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
@@ -1995,8 +1854,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
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");
@@ -2022,8 +1879,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
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");
@@ -2083,19 +1938,16 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add(id, "8", "text_t", "XXXX XXXX", "str_s", "c", "field_i", "60")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
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);
+ SolrStream solrStream = new SolrStream(baseUrl, COLLECTIONORALIAS, "/sql", sParams);
Tuple tuple = getTuple(new ExceptionStream(solrStream));
assertTrue(tuple.EOF);
assertTrue(tuple.EXCEPTION);
@@ -2103,12 +1955,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
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);
+ solrStream = new SolrStream(baseUrl, COLLECTIONORALIAS, "/sql", sParams);
tuple = getTuple(new ExceptionStream(solrStream));
assertTrue(tuple.EOF);
assertTrue(tuple.EXCEPTION);
@@ -2117,14 +1967,12 @@ public class TestSQLHandler extends SolrCloudTestCase {
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))");
- solrStream = new SolrStream(baseUrl, sParams);
+ solrStream = new SolrStream(baseUrl, COLLECTIONORALIAS, "/sql", sParams);
tuple = getTuple(new ExceptionStream(solrStream));
assertTrue(tuple.EOF);
assertTrue(tuple.EXCEPTION);
@@ -2132,14 +1980,12 @@ public class TestSQLHandler extends SolrCloudTestCase {
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))");
- solrStream = new SolrStream(baseUrl, sParams);
+ solrStream = new SolrStream(baseUrl, COLLECTIONORALIAS, "/sql", sParams);
tuple = getTuple(new ExceptionStream(solrStream));
assertTrue(tuple.EOF);
assertTrue(tuple.EXCEPTION);
@@ -2148,14 +1994,12 @@ public class TestSQLHandler extends SolrCloudTestCase {
// verify exception message formatting with wildcard query
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"map_reduce",
"stmt",
"select str_s from collection1 where not_a_field LIKE 'foo%'");
- solrStream = new SolrStream(baseUrl, sParams);
+ solrStream = new SolrStream(baseUrl, COLLECTIONORALIAS, "/sql", sParams);
tuple = getTuple(new ExceptionStream(solrStream));
assertTrue(tuple.EOF);
assertTrue(tuple.EXCEPTION);
@@ -2176,13 +2020,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add(id, "8", "year_i", "2014", "month_i", "4", "day_i", "2", "item_i", "1")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -2204,8 +2045,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -2233,8 +2072,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"aggregationMode",
"facet",
"stmt",
@@ -2296,13 +2133,10 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add(id, "8", "year_i", "2014", "month_i", "4", "day_i", "2", "item_i", "1")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
SolrParams sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -2330,8 +2164,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -2363,8 +2195,6 @@ public class TestSQLHandler extends SolrCloudTestCase {
sParams =
params(
- CommonParams.QT,
- "/sql",
"numWorkers",
"2",
"aggregationMode",
@@ -2416,7 +2246,7 @@ public class TestSQLHandler extends SolrCloudTestCase {
protected List<Tuple> getTuples(final SolrParams params, String baseUrl) throws IOException {
List<Tuple> tuples = new ArrayList<>();
- try (TupleStream tupleStream = new SolrStream(baseUrl, params)) {
+ try (TupleStream tupleStream = new SolrStream(baseUrl, COLLECTIONORALIAS, "/sql", params)) {
tupleStream.open();
for (; ; ) {
Tuple t = tupleStream.read();
@@ -2446,26 +2276,20 @@ public class TestSQLHandler extends SolrCloudTestCase {
.add("id", "4", "text_t", "foobaz", "str_s", "d")
.commit(cluster.getSolrClient(), COLLECTIONORALIAS);
- SolrParams sParams =
- params(
- CommonParams.QT,
- "/sql",
- "stmt",
- "select id from collection1 where str_s IN ('a','b','c')");
+ SolrParams sParams = params("stmt", "select id from collection1 where str_s IN ('a','b','c')");
- String baseUrl =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String baseUrl = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
List<Tuple> tuples = getTuples(sParams, baseUrl);
assertEquals(3, tuples.size());
}
private String sqlUrl() {
- return cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ return cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
}
private List<Tuple> expectResults(String sql, final int expectedCount) throws Exception {
String sqlStmt = sql.replace("$ALIAS", COLLECTIONORALIAS);
- SolrParams params = params(CommonParams.QT, "/sql", "stmt", sqlStmt);
+ SolrParams params = params("stmt", sqlStmt);
List<Tuple> tuples = getTuples(params, sqlUrl());
assertEquals(expectedCount, tuples.size());
return tuples;
diff --git a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandlerNonCloud.java b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandlerNonCloud.java
index cae84b3a3a9..24113861fec 100644
--- a/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandlerNonCloud.java
+++ b/solr/modules/sql/src/test/org/apache/solr/handler/sql/TestSQLHandlerNonCloud.java
@@ -24,7 +24,6 @@ import org.apache.solr.SolrTestCaseJ4;
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.SolrParams;
import org.apache.solr.common.util.IOUtils;
import org.apache.solr.util.SolrJettyTestRule;
@@ -53,10 +52,10 @@ public class TestSQLHandlerNonCloud extends SolrTestCaseJ4 {
@Test
public void testSQLHandler() throws Exception {
String sql = "select id, field_i, str_s from " + DEFAULT_TEST_COLLECTION_NAME + " limit 10";
- SolrParams sParams = params(CommonParams.QT, "/sql", "stmt", sql);
- String url = solrTestRule.getBaseUrl() + "/" + DEFAULT_TEST_COLLECTION_NAME;
+ SolrParams sParams = params("stmt", sql);
+ String url = solrTestRule.getBaseUrl();
- SolrStream solrStream = new SolrStream(url, sParams);
+ SolrStream solrStream = new SolrStream(url, DEFAULT_TEST_COLLECTION_NAME, "/sql", sParams);
IOException ex = expectThrows(IOException.class, () -> getTuples(solrStream));
assertTrue(ex.getMessage().contains(SQLHandler.sqlNonCloudErrorMsg));
}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java
index 1c28b4f3316..0b34ef954bc 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java
@@ -297,10 +297,9 @@ public class ParallelStream extends CloudSolrStream implements Expressible {
paramsLoc.set("workerID", w);
paramsLoc.set("expr", pushStream.toString());
- paramsLoc.set("qt", "/stream");
String url = shardUrls.get(w);
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(streamContext);
solrStreams.add(solrStream);
}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
index 7520fe2c468..ff1d9ecf950 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java
@@ -52,6 +52,8 @@ public class SolrStream extends TupleStream {
private static final long serialVersionUID = 1;
private String baseUrl;
+ private String core;
+ private String path;
private SolrParams params;
private int numWorkers;
private int workerID;
@@ -63,23 +65,57 @@ public class SolrStream extends TupleStream {
private boolean distrib = true;
private String user;
private String password;
- private String core;
private transient SolrClientCache clientCache;
private transient boolean doCloseCache;
+ // TODO SOLR-17995 proposes that we should deprecate this constructor in favor of one of the other
+ // constructors that requires users to provide the core as an explicit parameter
/**
- * @param baseUrl Base URL of the stream.
- * @param params Map&lt;String, String&gt; of parameters
+ * @param collectionOrCoreUrl URL of the Solr core or collection to query, typically of the form
+ * "http://host:8983/solr/myCore".
+ * @param params query-parameters sent with the streaming request
*/
- public SolrStream(String baseUrl, SolrParams params) {
- this.baseUrl = baseUrl;
+ public SolrStream(String collectionOrCoreUrl, SolrParams params) {
+ this.baseUrl = collectionOrCoreUrl;
this.params = params;
}
- SolrStream(String baseUrl, SolrParams params, String core) {
- this(baseUrl, params);
+ // TODO SOLR-17995 proposes that we should deprecate this constructor in favor of one of the other
+ // constructors that requires users to provide the core as an explicit parameter
+ /**
+ * @param collectionOrCoreUrl URL of the Solr core or collection to query, typically of the form
+ * "http://host:8983/solr/myCore".
+ * @param path the request handler path to query (e.g. "/export"). If not provided, defaults to
+ * "/select".
+ * @param params query-parameters sent with the streaming request
+ */
+ public SolrStream(String collectionOrCoreUrl, String path, SolrParams params) {
+ this(collectionOrCoreUrl, null, path, params);
+ }
+
+ /**
+ * @param baseUrl the Solr node's "base" URL (i.e. no core or collection in the path
+ * @param params query-parameters sent with the streaming request
+ * @param core the name of the collection or core to query; must be hosted at {@code baseUrl}
+ */
+ public SolrStream(String baseUrl, SolrParams params, String core) {
+ this(baseUrl, core, null, params);
+ }
+
+ /**
+ * @param baseUrl the Solr node's "base" URL (i.e. no core or collection in the path
+ * @param core the name of the collection or core to query; must be hosted at {@code baseUrl}
+ * @param path the request handler path to query (e.g. "/export"). If not provided (i.e. {@code
+ * null}), the handler is instead resolved from a "qt" param embedded in {@code params}, or
+ * defaults to "/select" if no such param is present.
+ * @param params query-parameters sent with the streaming request
+ */
+ public SolrStream(String baseUrl, String core, String path, SolrParams params) {
+ this.baseUrl = baseUrl;
this.core = core;
+ this.path = path;
+ this.params = params;
}
public void setFieldMappings(Map<String, String> fieldMappings) {
@@ -273,7 +309,10 @@ public class SolrStream extends TupleStream {
// performance optimization - remove extra whitespace when streaming
requestParams = SolrParams.wrapDefaults(requestParams, SolrParams.of("indent", "off"));
- QueryRequest query = new QueryRequest(requestParams, SolrRequest.METHOD.POST);
+ QueryRequest query =
+ path == null
+ ? new QueryRequest(requestParams, SolrRequest.METHOD.POST)
+ : new QueryRequest(path, requestParams, SolrRequest.METHOD.POST);
String wt = requestParams.get(CommonParams.WT, "json");
query.setResponseParser(new InputStreamResponseParser(wt));
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
index 8b5ad3bf306..442ed2fc224 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
@@ -35,7 +35,6 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExplanation;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
@@ -195,8 +194,7 @@ public class SqlStream extends TupleStream implements Expressible {
Collections.shuffle(shardUrls, new Random());
String url = shardUrls.get(0);
ModifiableSolrParams mParams = new ModifiableSolrParams(params);
- mParams.add(CommonParams.QT, "/sql");
- this.tupleStream = new SolrStream(url, mParams);
+ this.tupleStream = new SolrStream(url, "/sql", mParams);
if (streamContext != null) {
tupleStream.setStreamContext(streamContext);
if (streamContext.isLocal()) {
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
index 7b70f29bcf7..386ff48af29 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/CloudAuthStreamTest.java
@@ -251,11 +251,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
public void testEchoStream() throws Exception {
final SolrStream solrStream =
- new SolrStream(
- solrUrl + "/" + COLLECTION_X,
- params(
- "qt", "/stream",
- "expr", "echo(hello world)"));
+ new SolrStream(solrUrl, COLLECTION_X, "/stream", params("expr", "echo(hello world)"));
solrStream.setCredentials(READ_ONLY_USER, passwordFor(READ_ONLY_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -264,11 +260,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
public void testEchoStreamNoCredentials() {
final SolrStream solrStream =
- new SolrStream(
- solrUrl + "/" + COLLECTION_X,
- params(
- "qt", "/stream",
- "expr", "echo(hello world)"));
+ new SolrStream(solrUrl, COLLECTION_X, "/stream", params("expr", "echo(hello world)"));
// NOTE: no credentials
// NOTE: Can't make any assertions about Exception: SOLR-14226
@@ -281,11 +273,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
public void testEchoStreamInvalidCredentials() {
final SolrStream solrStream =
- new SolrStream(
- solrUrl + "/" + COLLECTION_X,
- params(
- "qt", "/stream",
- "expr", "echo(hello world)"));
+ new SolrStream(solrUrl, COLLECTION_X, "/stream", params("expr", "echo(hello world)"));
solrStream.setCredentials(READ_ONLY_USER, "BOGUS_PASSWORD");
// NOTE: Can't make any assertions about Exception: SOLR-14226
@@ -299,12 +287,11 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
public void testSimpleUpdateStream() throws Exception {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_X,
+ solrUrl,
+ COLLECTION_X,
+ "/stream",
params(
- "qt",
- "/stream",
- "expr",
- "update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42,a_i=1,b_i=5))"));
+ "expr", "update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42,a_i=1,b_i=5))"));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -316,12 +303,11 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
public void testSimpleUpdateStreamInvalidCredentials() throws Exception {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_X,
+ solrUrl,
+ COLLECTION_X,
+ "/stream",
params(
- "qt",
- "/stream",
- "expr",
- "update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42,a_i=1,b_i=5))"));
+ "expr", "update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42,a_i=1,b_i=5))"));
// "WRITE" credentials should be required for 'update(...)'
solrStream.setCredentials(WRITE_X_USER, "BOGUS_PASSWORD");
@@ -341,10 +327,10 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
for (String user : Arrays.asList(READ_ONLY_USER, WRITE_Y_USER)) {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_X,
+ solrUrl,
+ COLLECTION_X,
+ "/stream",
params(
- "qt",
- "/stream",
"expr",
"update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42,a_i=1,b_i=5))"));
@@ -366,9 +352,8 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
solrUrl + "/" + COLLECTION_Y,
+ "/stream",
params(
- "qt",
- "/stream",
"expr",
"update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42,a_i=1,b_i=5))"));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
@@ -398,8 +383,10 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_Y, // NOTE: Y route
- params("qt", "/stream", "expr", expr));
+ solrUrl,
+ COLLECTION_Y, // NOTE: Y route
+ "/stream",
+ params("expr", expr));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -418,8 +405,10 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_X, // NOTE: X route
- params("qt", "/stream", "expr", expr));
+ solrUrl,
+ COLLECTION_X, // NOTE: X route
+ "/stream",
+ params("expr", expr));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(3, tuples.size());
@@ -444,9 +433,8 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
solrUrl + "/" + path,
+ "/stream",
params(
- "qt",
- "/stream",
"expr",
"update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42,a_i=1,b_i=5))"));
solrStream.setCredentials(WRITE_Y_USER, passwordFor(WRITE_Y_USER));
@@ -468,7 +456,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
+ COLLECTION_X
+ ", batchSize=5, tuple(id=42,a_i=1,b_i=5))\"))";
final SolrStream solrStream =
- new SolrStream(solrUrl + "/" + COLLECTION_X, params("qt", "/stream", "expr", expr));
+ new SolrStream(solrUrl, COLLECTION_X, "/stream", params("expr", expr));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(0, tuples.size());
@@ -482,8 +470,8 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
// authz to write to X...
for (String user : Arrays.asList(READ_ONLY_USER, WRITE_Y_USER)) {
// ... regardless of how the request is routed...
- for (String path : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
- final String trace = user + ":" + path;
+ for (String coll : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
+ final String trace = user + ":" + coll;
final String expr =
"executor(threads=1,tuple(expr_s=\"update("
+ COLLECTION_X
@@ -494,8 +482,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
+ "'))\"))";
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + path,
- params("qt", "/stream", "_trace", "executor_via_" + trace, "expr", expr));
+ solrUrl, coll, "/stream", params("_trace", "executor_via_" + trace, "expr", expr));
solrStream.setCredentials(user, passwordFor(user));
// NOTE: Because of the background threads, no failures will to be returned to client...
@@ -526,8 +513,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
"daemon(id=daemonId,runInterval=1000,terminate=true,update("
+ COLLECTION_X
+ ",tuple(id=42,a_i=1,b_i=5)))";
- final SolrStream solrStream =
- new SolrStream(daemonUrl, params("qt", "/stream", "expr", expr));
+ final SolrStream solrStream = new SolrStream(daemonUrl, "/stream", params("expr", expr));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size()); // daemon starting status
@@ -538,11 +524,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final TimeOut timeout = new TimeOut(60, TimeUnit.SECONDS, TimeSource.NANO_TIME);
while (!timeout.hasTimedOut()) {
final SolrStream daemonCheck =
- new SolrStream(
- daemonUrl,
- params(
- "qt", "/stream",
- "action", "list"));
+ new SolrStream(daemonUrl, "/stream", params("action", "list"));
daemonCheck.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(daemonCheck);
assertEquals(1, tuples.size()); // our daemon;
@@ -559,12 +541,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
} finally {
// kill the damon...
final SolrStream daemonKiller =
- new SolrStream(
- daemonUrl,
- params(
- "qt", "/stream",
- "action", "kill",
- "id", "daemonId"));
+ new SolrStream(daemonUrl, "/stream", params("action", "kill", "id", "daemonId"));
daemonKiller.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(daemonKiller);
assertEquals(1, tuples.size()); // daemon death status
@@ -591,7 +568,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
+ ",tuple(id=42,a_i=1,b_i=5))) ";
final SolrStream solrStream =
new SolrStream(
- daemonUrl, params("qt", "/stream", "_trace", "start_" + daemonId, "expr", expr));
+ daemonUrl, "/stream", params("_trace", "start_" + daemonId, "expr", expr));
solrStream.setCredentials(user, passwordFor(user));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size()); // daemon starting status
@@ -603,11 +580,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
while (!timeout.hasTimedOut()) {
final SolrStream daemonCheck =
new SolrStream(
- daemonUrl,
- params(
- "qt", "/stream",
- "_trace", "check_" + daemonId,
- "action", "list"));
+ daemonUrl, "/stream", params("_trace", "check_" + daemonId, "action", "list"));
daemonCheck.setCredentials(user, passwordFor(user));
final List<Tuple> tuples = getTuples(daemonCheck);
assertEquals(1, tuples.size()); // our daemon;
@@ -632,15 +605,8 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream daemonKiller =
new SolrStream(
daemonUrl,
- params(
- "qt",
- "/stream",
- "_trace",
- "kill_" + daemonId,
- "action",
- "kill",
- "id",
- daemonId));
+ "/stream",
+ params("_trace", "kill_" + daemonId, "action", "kill", "id", daemonId));
daemonKiller.setCredentials(user, passwordFor(user));
final List<Tuple> tuples = getTuples(daemonKiller);
assertEquals(1, tuples.size()); // daemon death status
@@ -667,12 +633,10 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_X,
- params(
- "qt",
- "/stream",
- "expr",
- "delete(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
+ solrUrl,
+ COLLECTION_X,
+ "/stream",
+ params("expr", "delete(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -706,7 +670,7 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
+ ", q=\"foo_i:[* TO 10]\", rows=100, fl=\"id,foo_i,_version_\", sort=\"foo_i desc\"))";
final SolrStream solrStream =
- new SolrStream(solrUrl + "/" + COLLECTION_X, params("qt", "/stream", "expr", expr));
+ new SolrStream(solrUrl, COLLECTION_X, "/stream", params("expr", expr));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(2, tuples.size());
@@ -728,12 +692,10 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_X,
- params(
- "qt",
- "/stream",
- "expr",
- "update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
+ solrUrl,
+ COLLECTION_X,
+ "/stream",
+ params("expr", "update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
// "WRITE" credentials should be required for 'update(...)'
solrStream.setCredentials(WRITE_X_USER, "BOGUS_PASSWORD");
@@ -761,12 +723,10 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
for (String user : Arrays.asList(READ_ONLY_USER, WRITE_Y_USER)) {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_X,
- params(
- "qt",
- "/stream",
- "expr",
- "update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
+ solrUrl,
+ COLLECTION_X,
+ "/stream",
+ params("expr", "update(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
solrStream.setCredentials(user, passwordFor(user));
@@ -806,11 +766,8 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
solrUrl + "/" + COLLECTION_Y,
- params(
- "qt",
- "/stream",
- "expr",
- "delete(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42z))"));
+ "/stream",
+ params("expr", "delete(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42z))"));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -833,8 +790,10 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_Y, // NOTE: Y route
- params("qt", "/stream", "expr", expr));
+ solrUrl,
+ COLLECTION_Y, // NOTE: Y route
+ "/stream",
+ params("expr", expr));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -857,8 +816,10 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + COLLECTION_X, // NOTE: X route
- params("qt", "/stream", "expr", expr));
+ solrUrl,
+ COLLECTION_X, // NOTE: X route
+ "/stream",
+ params("expr", expr));
solrStream.setCredentials(WRITE_X_USER, passwordFor(WRITE_X_USER));
final List<Tuple> tuples = getTuples(solrStream);
assertEquals(3, tuples.size());
@@ -889,15 +850,13 @@ public class CloudAuthStreamTest extends SolrCloudTestCase {
assertEquals(1L, commitAndCountDocsInCollection(COLLECTION_X, WRITE_X_USER));
// regardless of how it's routed, WRITE_Y should NOT have authz to delete from X...
- for (String path : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
+ for (String coll : Arrays.asList(COLLECTION_X, COLLECTION_Y)) {
final SolrStream solrStream =
new SolrStream(
- solrUrl + "/" + path,
- params(
- "qt",
- "/stream",
- "expr",
- "delete(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
+ solrUrl,
+ coll,
+ "/stream",
+ params("expr", "delete(" + COLLECTION_X + ",batchSize=1," + "tuple(id=42))"));
solrStream.setCredentials(WRITE_Y_USER, passwordFor(WRITE_Y_USER));
// NOTE: Can't make any assertions about Exception: SOLR-14226
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
index 2ad9eb9dbce..a1cbd9c0499 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
@@ -104,11 +104,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ ", q=\"*:*\", fl=\"id, test_t\", sort=\"id desc\"), analyze(test_t, test_t) as test_t)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -138,9 +136,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
expr = "analyze(\"hello world\", test_t)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -156,9 +153,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ ", q=\"*:*\", fl=\"id, test_t\", sort=\"id desc\"), analyze(test_t) as test_t)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -192,9 +188,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ ", q=\"*:*\", fl=\"id\", sort=\"id desc\"), analyze(test_t, test_t) as test_t)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -208,9 +203,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ ", q=\"*:*\", fl=\"id, test_t\", sort=\"id desc\"), analyze(test_t, test_t) as test1_t)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -233,11 +227,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
" select(list(tuple(field1=\"a\", field2=\"b\"), tuple(field1=\"c\", field2=\"d\")), concat(field1, field2, \"hello\", delim=\"-\") as field3)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -255,11 +247,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
" select(list(tuple(field1=\"abcde\", field2=\"012345\")), trunc(field1, 2) as field3, trunc(field2, 4) as field4)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -277,11 +267,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
" select(list(tuple(field1=\"a\", field2=\"C\")), upper(field1) as field3, lower(field2) as field4)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -299,11 +287,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
" select(list(tuple(field1=array(\"aaaa\",\"bbbb\",\"cccc\"))), trunc(field1, 3) as field2)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -322,11 +308,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
" select(list(tuple(field1=array(\"a\",\"b\",\"c\"), field2=array(\"X\",\"Y\",\"Z\"))), upper(field1) as field3, lower(field2) as field4)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -350,11 +334,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
String expr = " select(list(tuple(field1=\"a, b, c\")), trim(split(field1, \",\")) as field2)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -378,11 +360,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " c=add(f2))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -407,11 +387,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " c=add(f2))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -466,11 +444,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -514,11 +490,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -544,11 +518,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
String expr = "hist(sequence(100, 0, 1), 10)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -565,9 +537,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
expr = "hist(sequence(100, 0, 1), 5)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
assertEquals(5, tuples.size());
@@ -596,11 +567,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " i=projectToBorder(d, matrix(array(99.11076410926444, 109.5441846957560))))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -670,11 +639,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " g=getSupportPoints(d))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -709,11 +676,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
String expr = "cumulativeProbability(normalDistribution(500, 40), 500)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -773,11 +738,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -833,11 +796,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -857,10 +818,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -900,10 +859,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1053,11 +1010,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1115,11 +1070,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1191,11 +1144,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1222,11 +1173,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "percentile(array(1,2,3,4,5,6,7,8,9,10,11), 50)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1239,9 +1188,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "percentile(array(11,10,3,4,5,6,7,8,9,2,1), 50)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1254,9 +1202,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "percentile(array(11,10,3,4,5,6,7,8,9,2,1), 20)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1269,9 +1216,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "percentile(array(11,10,3,4,5,6,7,8,9,2,1), array(20, 50))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1289,11 +1235,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "primes(10, 0)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1320,10 +1264,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "binomialCoefficient(8,3)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1338,11 +1280,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "asc(array(11.5, 12.3, 4, 3, 1, 0))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1401,11 +1341,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1434,10 +1372,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "array(1, 2, 3, 300, 2, 500)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1454,8 +1390,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "array(1.122, 2.222, 3.333, 300.1, 2.13, 500.23)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -1477,10 +1412,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " c=pairSort(a, b))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1508,10 +1441,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "ones(6)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1532,10 +1463,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "natural(6)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1556,10 +1485,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "repeat(6.5, 6)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1580,10 +1507,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "ltrim(array(1,2,3,4,5,6), 2)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1602,10 +1527,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "rtrim(array(1,2,3,4,5,6), 2)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1624,10 +1547,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "zeros(6)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1660,10 +1581,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " i=indexOf(d, \"col3\"))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1722,16 +1641,14 @@ public class MathExpressionTest extends SolrCloudTestCase {
@SuppressWarnings({"unchecked", "rawtypes"})
public void testZplot() throws Exception {
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
String cexpr =
"let(a=array(1,2,3,4)," + " b=array(10,11,12,13)," + " zplot(x=a, y=b))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -1760,8 +1677,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -1790,8 +1706,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -1817,8 +1732,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "zplot(dist=normalDistribution(100, 10))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -1846,8 +1760,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -1873,8 +1786,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -1922,8 +1834,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -1973,8 +1884,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -2035,10 +1945,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2136,10 +2044,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(a=matrix(array(1,2,3), array(4,5,6)), b=transpose(a))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2169,10 +2075,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"let(echo=true, a=unitize(matrix(array(1,2,3), array(4,5,6))), b=unitize(array(4,5,6)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2209,10 +2113,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "c=normalizeSum(array(1,2,3), 100))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2253,10 +2155,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"let(echo=true, a=standardize(matrix(array(1,2,3), array(4,5,6))), b=standardize(array(4,5,6)), c=zscores(array(4,5,6)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2302,10 +2202,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " f=freqTable(s))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2324,10 +2222,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "addAll(array(1, 2, 3), array(4.5, 5.5, 6.5), array(7,8,9))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2351,10 +2247,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(a=normalDistribution(500, 20), " + "b=probability(a, 520, 530))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2377,9 +2271,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "tuple(sample=b, ks=ks(a,b), ks2=ks(a, d), ks3=ks(u, t)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
try {
sampleTest(paramsLoc, url);
} catch (AssertionError e) {
@@ -2398,7 +2290,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
}
private void sampleTest(ModifiableSolrParams paramsLoc, String url) throws IOException {
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2428,10 +2320,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "sumDifference(array(2,4,6,8,10,12),array(1,2,3,4,5,6))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2445,10 +2335,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "meanDifference(array(2,4,6,8,10,12),array(1,2,3,4,5,6))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2466,10 +2354,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " recNum() as recNum)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2491,10 +2377,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"having(list(tuple(a=\"Hello World\"), tuple(a=\"Good bye\")), matches(a, \"Hello\"))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2506,9 +2390,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"having(list(tuple(a=\"Hello World\"), tuple(a=\"Good bye\")), matches(a, \"(?i)good\"))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- solrStream = new SolrStream(url, paramsLoc);
+ url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -2522,10 +2405,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "having(list(tuple(a=add(1, 1)), tuple(b=add(1, 2))), notNull(b))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2539,10 +2420,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "having(list(tuple(a=add(1, 1)), tuple(b=add(1, 2))), isNull(b))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2557,10 +2436,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"select(list(tuple(a=add(1, 1)), tuple(b=add(1, 2))), if(notNull(a),a, 0) as out)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2578,10 +2455,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"select(list(tuple(a=add(1, 1)), tuple(b=add(1, 2))), if(isNull(a), 0, a) as out)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2598,10 +2473,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(echo=true, a=1.88888, b=8888888888.98)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2616,10 +2489,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(echo=true, a=array(10, 20, 30), b=log10(a), c=log10(30.5))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2641,10 +2512,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(echo=true, a=array(10, 20, 30), b=recip(a), c=recip(30.5))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2668,10 +2537,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"let(echo=true, a=array(10, 20, 30), b=pow(a, 2), c=pow(2, a), d=pow(10, 3), e=pow(a, array(1, 2, 3)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2715,10 +2582,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " e=getAttribute(b, \"docFreqs\"))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -2796,8 +2661,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " e=getAttribute(b, \"docFreqs\"))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -2869,8 +2733,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -2941,8 +2804,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " e=getAttribute(b, \"docFreqs\"))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -2996,8 +2858,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " e=getAttribute(b, \"docFreqs\"))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3021,10 +2882,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " d=getColumnLabels(b))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3070,10 +2929,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " h=ebeSubtract(f, g))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3126,10 +2983,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " i=matrixMult(b, a))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3207,10 +3062,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " k=getRowLabels(h))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3287,10 +3140,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " zplot(clusters=f))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3321,10 +3172,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " zplot(clusters=f))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3355,10 +3204,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " zplot(clusters=f))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3383,10 +3230,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " k=getRowLabels(h))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3472,10 +3317,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " l=getMembershipMatrix(f))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3571,10 +3414,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "ebeMultiply(array(2,4,6,8,10,12),array(1,2,3,4,5,6))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3605,10 +3446,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " i=derivative(a))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3654,10 +3493,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " h=ebeAdd(f, g))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3706,10 +3543,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " f=getValue(e, \"blah\"))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3731,10 +3566,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "ebeDivide(array(2,4,6,8,10,12),array(1,2,3,4,5,6))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3755,10 +3588,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "freqTable(array(2,4,6,8,10,12,12,4,8,8,8,2))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3796,10 +3627,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " b=ifft(a))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3856,10 +3685,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "cosineSimilarity(array(2,4,6,8),array(1,1,3,4))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3876,10 +3703,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " by=\"sim desc\")";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3898,10 +3723,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3934,10 +3757,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -3976,10 +3797,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4001,10 +3820,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4024,10 +3841,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(a=sample(zipFDistribution(10, 1), 50000), b=freqTable(a), c=col(b, count))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4059,10 +3874,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " e=valueAt(c, 1, 0))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4079,10 +3892,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(a=sample(betaDistribution(1, 5), 50000), b=hist(a, 11), c=col(b, N))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4102,8 +3913,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "let(a=sample(betaDistribution(5, 1), 50000), b=hist(a, 11), c=col(b, N))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -4133,10 +3943,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4157,9 +3965,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- solrStream = new SolrStream(url, paramsLoc);
+ url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -4177,10 +3984,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "dotProduct(array(2,4,6,8,10,12),array(1,2,3,4,5,6))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4194,10 +3999,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(echo=true,a=var(array(1,2,3,4,5)),b=stddev(array(2,2,2,2)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4218,7 +4021,6 @@ public class MathExpressionTest extends SolrCloudTestCase {
"putCache(\"space1\", \"key1\", dotProduct(array(2,4,6,8,10,12),array(1,2,3,4,5,6)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
// find a node with a replica
ClusterState clusterState = cluster.getSolrClient().getClusterState();
String collection = useAlias ? COLLECTIONORALIAS + "_collection" : COLLECTIONORALIAS;
@@ -4227,14 +4029,14 @@ public class MathExpressionTest extends SolrCloudTestCase {
String url = null;
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
if (jetty.getNodeName().equals(node)) {
- url = jetty.getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ url = jetty.getBaseUrl().toString();
break;
}
}
if (url == null) {
fail("unable to find a node with replica");
}
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4245,8 +4047,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "getCache(\"space1\", \"key1\")";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -4257,8 +4058,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "listCache(\"space1\")";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -4270,8 +4070,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "listCache()";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -4283,8 +4082,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "removeCache(\"space1\", \"key1\")";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -4295,8 +4093,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "listCache(\"space1\")";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -4314,10 +4111,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4358,10 +4153,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " d=getColumnLabels(c))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4393,10 +4186,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"diff(array(1709.0, 1621.0, 1973.0, 1812.0, 1975.0, 1862.0, 1940.0, 2013.0, 1596.0, 1725.0, 1676.0, 1814.0, 1615.0, 1557.0, 1891.0, 1956.0, 1885.0, 1623.0, 1903.0, 1997.0))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4431,10 +4222,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"diff(array(1709.0, 1621.0, 1973.0, 1812.0, 1975.0, 1862.0, 1940.0, 2013.0, 1596.0, 1725.0, 1676.0, 1814.0, 1615.0, 1557.0, 1891.0, 1956.0, 1885.0, 1623.0, 1903.0, 1997.0), 12)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4458,10 +4247,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"diff(diff(array(1709.0, 1621.0, 1973.0, 1812.0, 1975.0, 1862.0, 1940.0, 2013.0, 1596.0, 1725.0, 1676.0, 1814.0, 1615.0, 1557.0, 1891.0, 1956.0, 1885.0, 1623.0, 1903.0, 1997.0)), 12)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4488,10 +4275,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " predictions=predict(fit, a))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4531,10 +4316,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "pairedttest=pairedTtest(a,b))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4571,10 +4354,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4597,10 +4378,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4630,10 +4409,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4684,10 +4461,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " g=getAttributes(f))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4745,10 +4520,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "f=integral(b))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4775,10 +4548,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4819,10 +4590,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4873,10 +4642,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4905,10 +4672,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -4950,10 +4715,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5005,10 +4768,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5044,10 +4805,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5065,10 +4824,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "anova(array(1,2,3,5,4,6), array(5,2,3,5,4,6), array(1,2,7,5,4,6))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5090,10 +4847,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "g=predict(f, e))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5141,10 +4896,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "g=predict(f, e))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5173,9 +4926,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "g=predict(f, array(8, 5, 4)))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- solrStream = new SolrStream(url, paramsLoc);
+ url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -5195,9 +4947,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "g=predict(f, array(8, 5, 4)))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- solrStream = new SolrStream(url, paramsLoc);
+ url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -5210,9 +4961,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
cexpr = "let(echo=true, a=sequence(10, 0, 1), " + "c=knnRegress(a, a, 3)," + "d=predict(c, 3))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- solrStream = new SolrStream(url, paramsLoc);
+ url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -5226,9 +4976,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "d=predict(c, array(3,4)))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- solrStream = new SolrStream(url, paramsLoc);
+ url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -5245,11 +4994,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
"select(list(tuple(a=20001011:10:11:01), tuple(a=20071011:14:30:20)), dateTime(a, \"yyyyMMdd:kk:mm:ss\") as date)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -5266,11 +5013,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
"select(list(tuple(a=20001011), tuple(a=20071011)), dateTime(a, \"yyyyMMdd\", \"UTC\") as date, dateTime(a, \"yyyyMMdd\", \"EST\") as date1, dateTime(a, \"yyyyMMdd\") as date2)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -5297,11 +5042,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
String expr = "select(tuple(d=\"1.1\", l=\"5000\"), double(d) as d, long(l) as l)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -5321,11 +5064,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " tuple(doubles=double(b)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -5348,10 +5089,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5391,10 +5130,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "let(a=array(3,2,3), plot(type=scatter, x=a, y=array(5,6,3)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5420,10 +5157,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "movingAvg(array(1,2,3,4,5,6,7), 4)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5442,10 +5177,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "movingMAD(array(1,2,3,4,5,6,9.25), 4)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5467,10 +5200,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "array(0.10,0.20,0.30,0.10,0.10,0.02,0.05,0.07))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5485,10 +5216,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "movingMedian(array(1,2,6,9,10,12,15), 5)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5506,10 +5235,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "sumSq(array(-3,-2.5, 10))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5524,10 +5251,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"let(a=constantDistribution(10), b=constantDistribution(20), c=monteCarlo(add(sample(a), sample(b)), 10))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5558,10 +5283,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " 10))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5595,10 +5318,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5644,10 +5365,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5674,10 +5393,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5712,10 +5429,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5743,10 +5458,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"let(a=array(1,2,3), b=array(2,4,6), c=array(4, 8, 12), d=transpose(matrix(a, b, c)), f=cov(d))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5790,10 +5503,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " k=getColumnLabels(f))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5897,10 +5608,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"let(echo=true, a=precision(array(1.44445, 1, 2.00006), 4), b=precision(1.44445, 4))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5923,10 +5632,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
"let(a=matrix(array(1.3333999, 2.4444445), array(2.333333, 10.10009)), b=precision(a, 4))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -5956,10 +5663,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ "d=minMaxScale(array(1,2,3,4,5), 0, 100))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -6015,10 +5720,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
String cexpr = "mean(array(1,2,3,4,5))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -6039,10 +5742,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ " f=add(abs(a)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
@@ -6104,11 +5805,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -6176,11 +5875,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -6237,11 +5934,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -6314,11 +6009,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -6346,9 +6039,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -6376,9 +6068,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -6411,11 +6102,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -6482,11 +6171,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cexpr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -6519,11 +6206,9 @@ public class MathExpressionTest extends SolrCloudTestCase {
String expr = "select(calc(), convert(miles, kilometers, 10) as kilometers)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -6538,9 +6223,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ ", q=\"*:*\", sort=\"miles_i asc\", fl=\"miles_i\"), convert(miles, kilometers, miles_i) as kilometers)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -6558,8 +6242,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ ", q=\"*:*\", partitionKeys=miles_i, sort=\"miles_i asc\", fl=\"miles_i\", qt=\"/export\"), convert(miles, kilometers, miles_i) as kilometers))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -6575,8 +6258,7 @@ public class MathExpressionTest extends SolrCloudTestCase {
+ ", q=\"*:*\", sum(miles_i)), convert(miles, kilometers, sum(miles_i)) as kilometers)";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
index 612370ccfe2..33f4cb8796a 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamDecoratorTest.java
@@ -64,7 +64,6 @@ import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.embedded.JettySolrRunner;
import org.junit.Assume;
@@ -3575,8 +3574,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
// Lets sleep long enough for daemon updates to run.
// Lets stop the daemons
- ModifiableSolrParams sParams =
- new ModifiableSolrParams(params(CommonParams.QT, "/stream", "action", "list"));
+ ModifiableSolrParams sParams = new ModifiableSolrParams(params("action", "list"));
int workersComplete = 0;
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
@@ -3584,7 +3582,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
INNER:
while (iterations == 0) {
SolrStream solrStream =
- new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
solrStream.setStreamContext(streamContext);
solrStream.open();
Tuple tupleResponse = solrStream.read();
@@ -3614,11 +3612,11 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
// Lets stop the daemons
sParams = new ModifiableSolrParams();
- sParams.set(CommonParams.QT, "/stream");
sParams.set("action", "stop");
sParams.set("id", "test");
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
- SolrStream solrStream = new SolrStream(jetty.getBaseUrl() + "/collection1", sParams);
+ SolrStream solrStream =
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
solrStream.setStreamContext(streamContext);
solrStream.open();
Tuple tupleResponse = solrStream.read();
@@ -3626,7 +3624,6 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
}
sParams = new ModifiableSolrParams();
- sParams.set(CommonParams.QT, "/stream");
sParams.set("action", "list");
workersComplete = 0;
@@ -3634,7 +3631,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
long stopTime = 0;
INNER:
while (stopTime == 0) {
- SolrStream solrStream = new SolrStream(jetty.getBaseUrl() + "/collection1", sParams);
+ SolrStream solrStream =
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
solrStream.setStreamContext(streamContext);
solrStream.open();
Tuple tupleResponse = solrStream.read();
@@ -3770,8 +3768,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
List<Tuple> tuples = getTuples(parallelUpdateStream);
assertEquals(2, tuples.size());
- ModifiableSolrParams sParams =
- new ModifiableSolrParams(params(CommonParams.QT, "/stream", "action", "list"));
+ ModifiableSolrParams sParams = new ModifiableSolrParams(params("action", "list"));
int workersComplete = 0;
@@ -3781,7 +3778,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
INNER:
while (true) {
SolrStream solrStream =
- new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
solrStream.setStreamContext(streamContext);
solrStream.open();
Tuple tupleResponse = solrStream.read();
@@ -3865,11 +3862,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ " tuple(file=\"file2\", line=\"8,9,\")))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -3898,11 +3893,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ " tuple(file=\"file2\", line=\"8\t\t9\")))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4213,8 +4206,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
// Lets sleep long enough for daemon updates to run.
// Lets stop the daemons
- ModifiableSolrParams sParams =
- new ModifiableSolrParams(params(CommonParams.QT, "/stream", "action", "list"));
+ ModifiableSolrParams sParams = new ModifiableSolrParams(params("action", "list"));
int workersComplete = 0;
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
@@ -4222,7 +4214,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
INNER:
while (iterations == 0) {
SolrStream solrStream =
- new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
solrStream.setStreamContext(streamContext);
solrStream.open();
Tuple tupleResponse = solrStream.read();
@@ -4249,11 +4241,11 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
// Lets stop the daemons
sParams = new ModifiableSolrParams();
- sParams.set(CommonParams.QT, "/stream");
sParams.set("action", "stop");
sParams.set("id", "test");
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
- SolrStream solrStream = new SolrStream(jetty.getBaseUrl() + "/collection1", sParams);
+ SolrStream solrStream =
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
solrStream.setStreamContext(streamContext);
solrStream.open();
Tuple tupleResponse = solrStream.read();
@@ -4261,7 +4253,6 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
}
sParams = new ModifiableSolrParams();
- sParams.set(CommonParams.QT, "/stream");
sParams.set("action", "list");
workersComplete = 0;
@@ -4269,7 +4260,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
long stopTime = 0;
INNER:
while (stopTime == 0) {
- SolrStream solrStream = new SolrStream(jetty.getBaseUrl() + "/collection1", sParams);
+ SolrStream solrStream =
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
solrStream.setStreamContext(streamContext);
solrStream.open();
Tuple tupleResponse = solrStream.read();
@@ -4429,7 +4421,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
String url = null;
for (JettySolrRunner jetty : cluster.getJettySolrRunners()) {
if (jetty.getNodeName().equals(node)) {
- url = jetty.getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ url = jetty.getBaseUrl().toString();
break;
}
}
@@ -4479,8 +4471,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- SolrStream classifyStream = new SolrStream(url, paramsLoc);
+ SolrStream classifyStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
Map<String, Double> idToLabel = getIdToLabel(classifyStream, "probability_d");
assertEquals(idToLabel.size(), 2);
assertEquals(1.0, idToLabel.get("0"), 0.001);
@@ -4492,7 +4483,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
updateRequest.add(id, String.valueOf(3), "text_s", "a b e e f");
updateRequest.commit(cluster.getSolrClient(), "uknownCollection");
- classifyStream = new SolrStream(url, paramsLoc);
+ classifyStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
idToLabel = getIdToLabel(classifyStream, "probability_d");
assertEquals(idToLabel.size(), 2);
assertEquals(1.0, idToLabel.get("2"), 0.001);
@@ -4521,7 +4512,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
updateRequest.add(id, String.valueOf(5), "text_s", "a b e e f");
updateRequest.commit(cluster.getSolrClient(), "uknownCollection");
- classifyStream = new SolrStream(url, paramsLoc);
+ classifyStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
idToLabel = getIdToLabel(classifyStream, "probability_d");
assertEquals(idToLabel.size(), 2);
assertEquals(0, idToLabel.get("4"), 0.001);
@@ -4539,7 +4530,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ "analyzerField=\"tv_text\"))";
paramsLoc.set("expr", expr);
- classifyStream = new SolrStream(url, paramsLoc);
+ classifyStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
idToLabel = getIdToLabel(classifyStream, "probability_d");
assertEquals(idToLabel.size(), 2);
assertEquals(0, idToLabel.get("4"), 0.001);
@@ -4567,11 +4558,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ ", b = add(1,3), c=col(d, test_i), tuple(test = add(1,1), test1=b, results=d, test2=add(c)))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cat);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4606,11 +4595,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
String cat = "let(a =" + expr + ",get(a))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cat);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4633,11 +4620,9 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
String cat = "let(a =" + expr + ",stream(a))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cat);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4675,7 +4660,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
workRequest.commit(cluster.getSolrClient(), "workQueue");
dataRequest.commit(cluster.getSolrClient(), "mainCorpus");
- String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/destination";
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
TupleStream executorStream;
ModifiableSolrParams paramsLoc;
@@ -4703,9 +4688,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
paramsLoc.set(
"expr",
"search(destination, q=\"*:*\", fl=\"id, body_t, field_i\", rows=1000, sort=\"field_i asc\")");
- paramsLoc.set("qt", "/stream");
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "destination", "/stream", paramsLoc);
List<Tuple> tuples = getTuples(solrStream);
assertEquals(500, tuples.size());
for (int i = 0; i < 500; i++) {
@@ -4757,7 +4741,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
workRequest.commit(cluster.getSolrClient(), "workQueue1");
dataRequest.commit(cluster.getSolrClient(), "mainCorpus1");
- String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/destination1";
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
TupleStream executorStream;
ModifiableSolrParams paramsLoc;
@@ -4786,9 +4770,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
paramsLoc.set(
"expr",
"search(destination1, q=\"*:*\", fl=\"id, body_t, field_i\", rows=1000, sort=\"field_i asc\")");
- paramsLoc.set("qt", "/stream");
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "destination1", "/stream", paramsLoc);
List<Tuple> tuples = getTuples(solrStream);
assertEquals(tuples.size(), cnt);
for (int i = 0; i < cnt; i++) {
@@ -5116,8 +5099,7 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
}
public void testDeleteStream() throws Exception {
- final String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
+ final String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
final SolrClient client = cluster.getSolrClient();
{
@@ -5152,7 +5134,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ COLLECTIONORALIAS
+ ",batchSize=10, "
+ " tuple(id=doc_2))) ";
- final SolrStream stream = new SolrStream(url, params("qt", "/stream", "expr", expr));
+ final SolrStream stream =
+ new SolrStream(url, COLLECTIONORALIAS, "/stream", params("expr", expr));
final List<Tuple> tuples = getTuples(stream);
assertEquals(1, tuples.size());
@@ -5180,7 +5163,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ " tuple(id=doc_17), "
+ " tuple(id=doc_15), "
+ " ) ) ) ";
- final SolrStream stream = new SolrStream(url, params("qt", "/stream", "expr", expr));
+ final SolrStream stream =
+ new SolrStream(url, COLLECTIONORALIAS, "/stream", params("expr", expr));
final List<Tuple> tuples = getTuples(stream);
assertEquals(3, tuples.size());
@@ -5219,7 +5203,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ v13_ok
+ "), "
+ " ) ) ) ";
- final SolrStream stream = new SolrStream(url, params("qt", "/stream", "expr", expr));
+ final SolrStream stream =
+ new SolrStream(url, COLLECTIONORALIAS, "/stream", params("expr", expr));
final List<Tuple> tuples = getTuples(stream);
assertEquals(1, tuples.size());
@@ -5257,7 +5242,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ v10_bad
+ "), "
+ " ) ) ) ";
- final SolrStream stream = new SolrStream(url, params("qt", "/stream", "expr", expr));
+ final SolrStream stream =
+ new SolrStream(url, COLLECTIONORALIAS, "/stream", params("expr", expr));
final List<Tuple> tuples = getTuples(stream);
assertEquals(1, tuples.size());
@@ -5289,7 +5275,8 @@ public class StreamDecoratorTest extends SolrCloudTestCase {
+ " q=\"deletable_s:yup\", "
+ " sort=\"id asc\",fl=\"id,_version_\" "
+ " ) ) ) ";
- final SolrStream stream = new SolrStream(url, params("qt", "/stream", "expr", expr));
+ final SolrStream stream =
+ new SolrStream(url, COLLECTIONORALIAS, "/stream", params("expr", expr));
final List<Tuple> tuples = getTuples(stream);
assertEquals(1, tuples.size());
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
index de80b4ae728..fbe02ce3604 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
@@ -58,7 +58,6 @@ import org.apache.solr.client.solrj.io.stream.metrics.SumMetric;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.cloud.SolrCloudTestCase;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.embedded.JettySolrRunner;
@@ -266,7 +265,6 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
ModifiableSolrParams solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add(
"expr", "search(myCollection, q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i asc\")");
solrParams.add("myCollection.shards", buf.toString());
@@ -310,9 +308,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
ModifiableSolrParams solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add("expr", "sort(search(" + COLLECTIONORALIAS + "), by=\"a_i asc\")");
- SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ SolrStream solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
assertEquals(5, tuples.size());
@@ -370,11 +367,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
ModifiableSolrParams solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add(
"expr",
"sql(" + COLLECTIONORALIAS + ", stmt=\"select id from collection1 order by a_i asc\")");
- SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ SolrStream solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
assertEquals(5, tuples.size());
@@ -382,9 +378,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
// Test with using the default collection
solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add("expr", "sql(stmt=\"select id from collection1 order by a_i asc\")");
- solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
assertEquals(5, tuples.size());
@@ -515,7 +510,6 @@ public class StreamExpressionTest extends SolrCloudTestCase {
// Basic test
ModifiableSolrParams sParams = new ModifiableSolrParams();
sParams.set("expr", "merge(" + "${q1}," + "${q2}," + "on=${mySort})");
- sParams.set(CommonParams.QT, "/stream");
sParams.set(
"q1",
"search("
@@ -525,7 +519,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
"q2",
"search(" + COLLECTIONORALIAS + ", q=\"id:(1)\", fl=\"id,a_s,a_i,a_f\", sort=${mySort})");
sParams.set("mySort", "a_f asc");
- stream = new SolrStream(url, sParams);
+ stream = new SolrStream(url, "/stream", sParams);
tuples = getTuples(stream);
assertEquals(4, tuples.size());
@@ -533,7 +527,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
// Basic test desc
sParams.set("mySort", "a_f desc");
- stream = new SolrStream(url, sParams);
+ stream = new SolrStream(url, "/stream", sParams);
tuples = getTuples(stream);
assertEquals(4, tuples.size());
@@ -546,7 +540,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ COLLECTIONORALIAS
+ ", q=\"id:(1 2)\", fl=\"id,a_s,a_i,a_f\", sort=${mySort})");
sParams.set("mySort", "\"a_f asc, a_s asc\"");
- stream = new SolrStream(url, sParams);
+ stream = new SolrStream(url, "/stream", sParams);
tuples = getTuples(stream);
assertEquals(5, tuples.size());
@@ -751,21 +745,21 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
// Exercise the /stream handler
- ModifiableSolrParams sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
+ ModifiableSolrParams sParams = new ModifiableSolrParams(params());
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);
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
List<Tuple> tuples4 = getTuples(solrStream);
assertEquals(1, tuples4.size());
// Assert no x-axis
assertNull(tuples4.get(0).get("x"));
- sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params());
sParams.add("expr", "random(" + COLLECTIONORALIAS + ")");
jetty = cluster.getJettySolrRunner(0);
- solrStream = new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
+ solrStream = new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
tuples4 = getTuples(solrStream);
assertEquals(500, tuples4.size());
@SuppressWarnings({"rawtypes"})
@@ -798,7 +792,7 @@ public class StreamExpressionTest extends SolrCloudTestCase {
SolrClientCache cache = new SolrClientCache();
try {
context.setSolrClientCache(cache);
- ModifiableSolrParams sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
+ ModifiableSolrParams sParams = new ModifiableSolrParams(params());
sParams.add(
"expr",
"knnSearch("
@@ -806,49 +800,49 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ ", id=\"1\", qf=\"a_t\", rows=\"4\", fl=\"id, score\", mintf=\"1\", mindf=\"0\")");
JettySolrRunner jetty = cluster.getJettySolrRunner(0);
SolrStream solrStream =
- new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
+ new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
List<Tuple> tuples = getTuples(solrStream);
assertEquals(3, tuples.size());
assertOrder(tuples, 2, 3, 4);
- sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params());
sParams.add(
"expr",
"knnSearch("
+ COLLECTIONORALIAS
+ ", id=\"1\", qf=\"a_t\", k=\"2\", fl=\"id, score\", mintf=\"1\", mindf=\"0\")");
- solrStream = new SolrStream(jetty.getBaseUrl().toString() + "/collection1", sParams);
+ solrStream = new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
tuples = getTuples(solrStream);
assertEquals(2, tuples.size());
assertOrder(tuples, 2, 3);
- sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params());
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);
+ solrStream = new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
tuples = getTuples(solrStream);
assertEquals(0, tuples.size());
- sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params());
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);
+ solrStream = new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
tuples = getTuples(solrStream);
assertEquals(0, tuples.size());
- sParams = new ModifiableSolrParams(params(CommonParams.QT, "/stream"));
+ sParams = new ModifiableSolrParams(params());
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);
+ solrStream = new SolrStream(jetty.getBaseUrl().toString(), "collection1", "/stream", sParams);
tuples = getTuples(solrStream);
assertEquals(0, tuples.size());
@@ -1048,10 +1042,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
ModifiableSolrParams solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add("expr", expr);
solrParams.add("myCollection.shards", buf.toString());
- SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ SolrStream solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -1080,9 +1073,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
try {
ModifiableSolrParams solrParamsBad = new ModifiableSolrParams();
- solrParamsBad.add("qt", "/stream");
solrParamsBad.add("expr", expr);
- solrStream = new SolrStream(shardUrls.get(0), solrParamsBad);
+ solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParamsBad);
tuples = getTuples(solrStream);
throw new Exception("Exception should have been thrown above");
} catch (IOException e) {
@@ -1115,11 +1107,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
String expr =
"facet2D(collection1, q=\"*:*\", x=\"diseases_s\", y=\"symptoms_s\", dimensions=\"3,1\", count(*))";
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1145,9 +1136,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
paramsLoc = new ModifiableSolrParams();
expr = "facet2D(collection1, x=\"diseases_s\", y=\"symptoms_s\", dimensions=\"3,1\")";
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1174,9 +1164,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
expr =
"facet2D(collection1, q=\"*:*\", x=\"diseases_s\", y=\"symptoms_s\", dimensions=\"3,1\", sum(cases_i))";
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1203,9 +1192,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
expr =
"facet2D(collection1, q=\"*:*\", x=\"diseases_s\", y=\"symptoms_s\", dimensions=\"3,1\", avg(cases_i))";
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1232,9 +1220,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
expr =
"facet2D(collection1, q=\"*:*\", x=\"diseases_s\", y=\"symptoms_s\", dimensions=\"2,2\")";
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1294,11 +1281,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ " sum(cnt), sum(saf)"
+ ")";
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -1355,11 +1340,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ " over=\"a_s\", std(a_i), std(a_f), count(*)"
+ ")";
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- String url =
- cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ String url = cluster.getJettySolrRunners().get(0).getBaseUrl().toString();
+ TupleStream solrStream = new SolrStream(url, COLLECTIONORALIAS, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -2233,11 +2216,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
ModifiableSolrParams solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add(
"expr",
"search(\"collection1, collection2\", q=\"*:*\", fl=\"id, a_i\", rows=50, sort=\"a_i asc\")");
- SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ SolrStream solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
assertEquals(10, tuples.size());
@@ -2246,22 +2228,20 @@ public class StreamExpressionTest extends SolrCloudTestCase {
// Test with export handler, different code path.
solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add(
"expr",
"search(\"collection1, collection2\", q=\"*:*\", fl=\"id, a_i\", sort=\"a_i asc\", qt=\"/export\")");
- solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
assertEquals(10, tuples.size());
assertOrder(tuples, 0, 1, 2, 3, 4, 10, 11, 12, 13, 14);
solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add(
"expr",
"facet(\"collection1, collection2\", q=\"*:*\", buckets=\"a_s\", bucketSorts=\"count(*) asc\", count(*))");
- solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -2279,9 +2259,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ "count(*))";
solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add("expr", expr);
- solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
assertEquals(1, tuples.size());
@@ -2292,11 +2271,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
// Test parallel
solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add(
"expr",
"parallel(collection1, sort=\"a_i asc\", workers=2, search(\"collection1, collection2\", q=\"*:*\", fl=\"id, a_i\", sort=\"a_i asc\", qt=\"/export\", partitionKeys=\"a_s\"))");
- solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);
assertEquals(10, tuples.size());
@@ -2945,11 +2923,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
String expr = "echo(hello world)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -2961,9 +2938,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
expr = "echo(\"hello world\")";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -2974,9 +2950,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
expr = "echo(\"hello, world\")";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -2987,9 +2962,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
expr = "echo(\"hello, \\\"t\\\" world\")";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3004,9 +2978,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ ", workers=2, sort=\"echo asc\", echo(\"hello, \\\"t\\\" world\"))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3021,9 +2994,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ " yiuyiuyi yiuyiuuyiu yiyiuyiyiu iyiuyiuyiuiuyiu yiuyiuyi yiuyiy yiuiyiuiuy\")";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3048,11 +3020,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ ", q=\\\"*:*\\\", fl=id, sort=\\\"id desc\\\")\"), echo as expr_s))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -3153,11 +3124,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ "count(*), sum(price_f), max(price_f), min(price_f), avg(price_f), std(price_f), per(price_f, 50), countDist(id))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -3226,9 +3196,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ "count(*), sum(price_f), max(price_f), min(price_f), avg(price_f), std(price_f), per(price_f, 50))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3281,9 +3250,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ "count(*), sum(price_f), max(price_f), min(price_f), avg(price_f), std(price_f), per(price_f, 50))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3336,9 +3304,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ "count(*), sum(price_f), max(price_f), min(price_f), avg(price_f), std(price_f), per(price_f, 50))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3400,9 +3367,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ "count(*), sum(price_f), max(price_f), min(price_f), avg(price_f), std(price_f), per(price_f, 50))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3579,9 +3545,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ "count(*), sum(price_f), max(price_f), min(price_f), avg(price_f), std(price_f), per(price_f, 50))";
paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
- solrStream = new SolrStream(url, paramsLoc);
+ solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(context);
tuples = getTuples(solrStream);
@@ -3642,11 +3607,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
String cat = "tuple(results=" + expr + ", sum=add(1,1))";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", cat);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -3674,11 +3638,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -3701,11 +3664,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
ModifiableSolrParams paramsLoc2 = new ModifiableSolrParams();
paramsLoc2.set("expr", expr2);
- paramsLoc2.set("qt", "/stream");
String url2 =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream2 = new SolrStream(url2, paramsLoc2);
+ TupleStream solrStream2 = new SolrStream(url2, "/stream", paramsLoc2);
StreamContext context2 = new StreamContext();
solrStream2.setStreamContext(context2);
@@ -4099,10 +4061,9 @@ public class StreamExpressionTest extends SolrCloudTestCase {
}
ModifiableSolrParams solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add("expr", significantTerms);
solrParams.add("myCollection.shards", buf.toString());
- SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ SolrStream solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
tuples = getTuples(solrStream);
assertEquals(2, tuples.size());
@@ -4118,9 +4079,8 @@ public class StreamExpressionTest extends SolrCloudTestCase {
try {
ModifiableSolrParams solrParamsBad = new ModifiableSolrParams();
- solrParamsBad.add("qt", "/stream");
solrParamsBad.add("expr", significantTerms);
- solrStream = new SolrStream(shardUrls.get(0), solrParamsBad);
+ solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParamsBad);
tuples = getTuples(solrStream);
throw new Exception("Exception should have been thrown above");
} catch (IOException e) {
@@ -4219,11 +4179,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
final String catStream = "cat(\"topLevel1.txt\")";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", catStream);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + FILESTREAM_COLLECTION;
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4242,11 +4201,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
final String catStream = "cat(\"topLevel1.txt.gz\")";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", catStream);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + FILESTREAM_COLLECTION;
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4265,11 +4223,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
final String catStream = "cat(\"topLevel-empty.txt\")";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", catStream);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + FILESTREAM_COLLECTION;
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4283,11 +4240,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
final String catStream = "cat(\"topLevel1.txt,topLevel-empty.txt\")";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", catStream);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + FILESTREAM_COLLECTION;
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4307,11 +4263,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
final String catStream = "cat(\"topLevel1.txt\", maxLines=2)";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", catStream);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + FILESTREAM_COLLECTION;
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4330,11 +4285,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
final String catStream = "cat(\"directory1\")";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", catStream);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + FILESTREAM_COLLECTION;
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4364,11 +4318,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
+ "secondLevel2.txt\")";
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", catStream);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + FILESTREAM_COLLECTION;
- SolrStream solrStream = new SolrStream(url, paramsLoc);
+ SolrStream solrStream = new SolrStream(url, "/stream", paramsLoc);
StreamContext context = new StreamContext();
solrStream.setStreamContext(context);
@@ -4392,11 +4345,10 @@ public class StreamExpressionTest extends SolrCloudTestCase {
private void assertSuccess(String expr, StreamContext streamContext) throws IOException {
ModifiableSolrParams paramsLoc = new ModifiableSolrParams();
paramsLoc.set("expr", expr);
- paramsLoc.set("qt", "/stream");
String url =
cluster.getJettySolrRunners().get(0).getBaseUrl().toString() + "/" + COLLECTIONORALIAS;
- TupleStream solrStream = new SolrStream(url, paramsLoc);
+ TupleStream solrStream = new SolrStream(url, "/stream", paramsLoc);
solrStream.setStreamContext(streamContext);
getTuples(solrStream);
}
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
index 31bf75c7b18..181f36787a3 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
@@ -2034,11 +2034,11 @@ public class StreamingTest extends SolrCloudTestCase {
// Wait for the checkpoint
JettySolrRunner jetty = cluster.getJettySolrRunners().get(0);
- SolrParams sParams1 = params("qt", "/get", "ids", "50000000", "fl", "id");
+ SolrParams sParams1 = params("ids", "50000000", "fl", "id");
int count = 0;
while (count == 0) {
SolrStream solrStream =
- new SolrStream(jetty.getBaseUrl().toString() + "/" + COLLECTIONORALIAS, sParams1);
+ new SolrStream(jetty.getBaseUrl().toString(), COLLECTIONORALIAS, "/get", sParams1);
solrStream.setStreamContext(context);
List<Tuple> tuples = getTuples(solrStream);
count = tuples.size();
@@ -2125,13 +2125,12 @@ public class StreamingTest extends SolrCloudTestCase {
List<String> shardUrls =
TupleStream.getShards(solrConnection, COLLECTIONORALIAS, streamContext);
ModifiableSolrParams solrParams = new ModifiableSolrParams();
- solrParams.add("qt", "/stream");
solrParams.add(
"expr",
"rollup(search("
+ COLLECTIONORALIAS
+ ",q=\"*:*\",fl=\"a_s,a_i,a_f,b_f\",sort=\"a_s asc\",partitionKeys=\"a_s\", qt=\"/export\"),over=\"a_s\",sum(a_i),sum(a_f),min(a_i),min(a_f),max(a_i),max(a_f),avg(a_i),avg(a_f),count(*),missing(b_f))\n");
- SolrStream solrStream = new SolrStream(shardUrls.get(0), solrParams);
+ SolrStream solrStream = new SolrStream(shardUrls.get(0), "/stream", solrParams);
streamContext = new StreamContext();
solrStream.setStreamContext(streamContext);
tuples = getTuples(solrStream);