You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2016/12/31 02:10:34 UTC
[1/2] lucene-solr:branch_6x: SOLR-9495: AIOBE with confusing message
for incomplete sort spec in Streaming Expression
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x d396f2d81 -> a7bb14b6c
SOLR-9495: AIOBE with confusing message for incomplete sort spec in Streaming Expression
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ecac79b4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ecac79b4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ecac79b4
Branch: refs/heads/branch_6x
Commit: ecac79b4e5ab75261bd604f8a874a4c38653146a
Parents: d396f2d
Author: Joel Bernstein <jb...@apache.org>
Authored: Fri Dec 30 19:54:00 2016 -0500
Committer: Joel Bernstein <jb...@apache.org>
Committed: Fri Dec 30 19:54:00 2016 -0500
----------------------------------------------------------------------
.../solr/client/solrj/io/stream/CloudSolrStream.java | 4 ++++
.../solr/client/solrj/io/stream/StreamExpressionTest.java | 10 ++++++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ecac79b4/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
index 0580122..f177585 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
@@ -332,6 +332,10 @@ public class CloudSolrStream extends TupleStream implements Expressible {
String[] spec = s.trim().split("\\s+"); //This should take into account spaces in the sort spec.
+ if (spec.length != 2) {
+ throw new IOException("Invalid sort spec:" + s);
+ }
+
String fieldName = spec[0].trim();
String order = spec[1].trim();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ecac79b4/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
index 3bfe129..936d42f 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
@@ -162,6 +162,16 @@ public class StreamExpressionTest extends SolrCloudTestCase {
assertTrue(e.getMessage().contains("fl param expected for search function"));
}
+
+ try {
+ expression = StreamExpressionParser.parse("search(" + COLLECTIONORALIAS + ", q=\"blah\", fl=\"id, a_f\", sort=\"a_f\")");
+ stream = new CloudSolrStream(expression, factory);
+ tuples = getTuples(stream);
+ throw new Exception("Should be an exception here");
+ } catch(Exception e) {
+ assertTrue(e.getMessage().contains("Invalid sort spec"));
+ }
+
}
@Test
[2/2] lucene-solr:branch_6x: SOLR-9495: Update CHANGES.txt
Posted by jb...@apache.org.
SOLR-9495: Update CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a7bb14b6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a7bb14b6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a7bb14b6
Branch: refs/heads/branch_6x
Commit: a7bb14b6cd9bcb91b2a53d30d6463b86afd39c52
Parents: ecac79b
Author: Joel Bernstein <jb...@apache.org>
Authored: Fri Dec 30 20:39:57 2016 -0500
Committer: Joel Bernstein <jb...@apache.org>
Committed: Fri Dec 30 20:44:58 2016 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a7bb14b6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0bb9917..3551e70 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -240,6 +240,8 @@ Bug Fixes
* SOLR-9620: fix cross core query-time join by numeric fields (Mikhail Khludnev)
+* SOLR-9495: AIOBE with confusing message for incomplete sort spec in Streaming Expression (Gus Heck, Joel Bernstein)
+
Other Changes
----------------------