This is an automated email from the ASF dual-hosted git repository.
andywebb pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 377f66d5739 SOLR-17952: Stream decorator test refactoring - use
underscore rather than dot in aliases (#3761)
377f66d5739 is described below
commit 377f66d5739703b9125d64404738daaa20cdf73a
Author: Andy Webb <[email protected]>
AuthorDate: Wed Oct 15 07:06:03 2025 +0100
SOLR-17952: Stream decorator test refactoring - use underscore rather than
dot in aliases (#3761)
---
solr/CHANGES.txt | 2 ++
.../solrj/io/stream/StreamDecoratorTest.java | 38 +++++++++++-----------
.../solrj/io/stream/StreamExpressionTest.java | 8 ++---
.../io/stream/expr/StreamExpressionParserTest.java | 4 +--
4 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 130b99e6f40..c57a7e8a832 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -60,6 +60,8 @@ Other Changes
* SOLR-17541: Deprecate `CloudHttp2SolrClient.Builder#withHttpClient` in favor
of `CloudHttp2SolrClient.Builder#withInternalClientBuilder`.
Deprecate `LBHttp2SolrClient.Builder#withListenerFactory` in favor of
`LBHttp2SolrClient.Builder#withListenerFactories`. (James Dyer)
+* SOLR-17952: Stream decorator test refactoring - use underscore rather than
dot in aliases (Andy Webb)
+
================== 9.9.1 ==================
Bug Fixes
---------------------
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 f31c11a43b4..8bcec9f4136 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
@@ -2373,8 +2373,8 @@ public class StreamDecoratorTest extends
SolrCloudTestCase {
+ ", q=\"side_s:left\", fl=\"id,join1_i,join2_s,ident_s\",
sort=\"ident_s asc\"),"
+ "search("
+ COLLECTIONORALIAS
- + ", q=\"side_s:right\", fl=\"id,join1_i,join2_s,ident_s\",
sort=\"ident_s asc\", aliases=\"id=right.id, join1_i=right.join1_i,
join2_s=right.join2_s, ident_s=right.ident_s\"),"
- + "on=\"ident_s=right.ident_s\")");
+ + ", q=\"side_s:right\", fl=\"id,join1_i,join2_s,ident_s\",
sort=\"ident_s asc\", aliases=\"id=right_id, join1_i=right_join1_i,
join2_s=right_join2_s, ident_s=right_ident_s\"),"
+ + "on=\"ident_s=right_ident_s\")");
stream = new InnerJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -2495,8 +2495,8 @@ public class StreamDecoratorTest extends
SolrCloudTestCase {
+ ", q=\"side_s:left\", fl=\"id,join1_i,join2_s,ident_s\",
sort=\"ident_s asc\"),"
+ "search("
+ COLLECTIONORALIAS
- + ", q=\"side_s:right\", fl=\"id,join1_i,join2_s,ident_s\",
sort=\"ident_s asc\", aliases=\"id=right.id, join1_i=right.join1_i,
join2_s=right.join2_s, ident_s=right.ident_s\"),"
- + "on=\"ident_s=right.ident_s\")");
+ + ", q=\"side_s:right\", fl=\"id,join1_i,join2_s,ident_s\",
sort=\"ident_s asc\", aliases=\"id=right_id, join1_i=right_join1_i,
join2_s=right_join2_s, ident_s=right_ident_s\"),"
+ + "on=\"ident_s=right_ident_s\")");
stream = new LeftOuterJoinStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
@@ -3090,14 +3090,14 @@ public class StreamDecoratorTest extends
SolrCloudTestCase {
clause =
"innerJoin("
+ "select("
- + "id, join1_i as left.join1, join2_s as left.join2, ident_s as
left.ident,"
+ + "id, join1_i as left_join1, join2_s as left_join2, ident_s as
left_ident,"
+ "search(collection1, q=\"side_s:left\",
fl=\"id,join1_i,join2_s,ident_s\", sort=\"join1_i asc, join2_s asc, id asc\")"
+ "),"
+ "select("
- + "join3_i as right.join1, join2_s as right.join2, ident_s as
right.ident,"
+ + "join3_i as right_join1, join2_s as right_join2, ident_s as
right_ident,"
+ "search(collection1, q=\"side_s:right\",
fl=\"join3_i,join2_s,ident_s\", sort=\"join3_i asc, join2_s asc\"),"
+ "),"
- + "on=\"left.join1=right.join1, left.join2=right.join2\""
+ + "on=\"left_join1=right_join1, left_join2=right_join2\""
+ ")";
stream = factory.constructStream(clause);
stream.setStreamContext(streamContext);
@@ -3105,34 +3105,34 @@ public class StreamDecoratorTest extends
SolrCloudTestCase {
assertFields(
tuples,
"id",
- "left.join1",
- "left.join2",
- "left.ident",
- "right.join1",
- "right.join2",
- "right.ident");
+ "left_join1",
+ "left_join2",
+ "left_ident",
+ "right_join1",
+ "right_join2",
+ "right_ident");
// Wrapped select test
clause =
"select("
- + "id, left.ident, right.ident,"
+ + "id, left_ident, right_ident,"
+ "innerJoin("
+ "select("
- + "id, join1_i as left.join1, join2_s as left.join2, ident_s as
left.ident,"
+ + "id, join1_i as left_join1, join2_s as left_join2, ident_s as
left_ident,"
+ "search(collection1, q=\"side_s:left\",
fl=\"id,join1_i,join2_s,ident_s\", sort=\"join1_i asc, join2_s asc, id asc\")"
+ "),"
+ "select("
- + "join3_i as right.join1, join2_s as right.join2, ident_s as
right.ident,"
+ + "join3_i as right_join1, join2_s as right_join2, ident_s as
right_ident,"
+ "search(collection1, q=\"side_s:right\",
fl=\"join3_i,join2_s,ident_s\", sort=\"join3_i asc, join2_s asc\"),"
+ "),"
- + "on=\"left.join1=right.join1, left.join2=right.join2\""
+ + "on=\"left_join1=right_join1, left_join2=right_join2\""
+ ")"
+ ")";
stream = factory.constructStream(clause);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
- assertFields(tuples, "id", "left.ident", "right.ident");
- assertNotFields(tuples, "left.join1", "left.join2", "right.join1",
"right.join2");
+ assertFields(tuples, "id", "left_ident", "right_ident");
+ assertNotFields(tuples, "left_join1", "left_join2", "right_join1",
"right_join2");
} finally {
solrClientCache.close();
}
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 1541312d02e..7f84aeb7988 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
@@ -169,14 +169,14 @@ public class StreamExpressionTest extends
SolrCloudTestCase {
StreamExpressionParser.parse(
"search("
+ COLLECTIONORALIAS
- + ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i
asc\", aliases=\"a_i=alias.a_i, a_s=name\")");
+ + ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i
asc\", aliases=\"a_i=alias_a_i, a_s=name\")");
stream = new CloudSolrStream(expression, factory);
stream.setStreamContext(streamContext);
tuples = getTuples(stream);
assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
- assertLong(tuples.get(0), "alias.a_i", 0);
+ assertLong(tuples.get(0), "alias_a_i", 0);
assertString(tuples.get(0), "name", "hello0");
// Basic filtered test
@@ -439,7 +439,7 @@ public class StreamExpressionTest extends SolrCloudTestCase
{
StreamExpressionParser.parse(
"search("
+ COLLECTIONORALIAS
- + ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i
asc\", aliases=\"a_i=alias.a_i, a_s=name\", zkHost="
+ + ", q=*:*, fl=\"id,a_s,a_i,a_f\", sort=\"a_f asc, a_i
asc\", aliases=\"a_i=alias_a_i, a_s=name\", zkHost="
+ cluster.getZkServer().getZkAddress()
+ ")");
stream = new CloudSolrStream(expression, factory);
@@ -448,7 +448,7 @@ public class StreamExpressionTest extends SolrCloudTestCase
{
assertEquals(5, tuples.size());
assertOrder(tuples, 0, 2, 1, 3, 4);
- assertLong(tuples.get(0), "alias.a_i", 0);
+ assertLong(tuples.get(0), "alias_a_i", 0);
assertString(tuples.get(0), "name", "hello0");
// Basic filtered test
diff --git
a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java
b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java
index 36f6bc348bd..46376c5afb8 100644
---
a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java
+++
b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java
@@ -30,10 +30,10 @@ public class StreamExpressionParserTest extends
SolrTestCase {
public void testParsing() {
StreamExpression actual, expected;
- actual = StreamExpressionParser.parse("aliases(a_i=alias.a_i)");
+ actual = StreamExpressionParser.parse("aliases(a_i=alias_a_i)");
expected =
new StreamExpression("aliases")
- .withParameter(new StreamExpressionNamedParameter("a_i",
"alias.a_i"));
+ .withParameter(new StreamExpressionNamedParameter("a_i",
"alias_a_i"));
assertEquals(expected, actual);
actual = StreamExpressionParser.parse("search(a,b)");
