You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/03/09 17:00:55 UTC
[44/50] [abbrv] lucene-solr git commit: SOLR-8799: Improve error
message when tuple can't be read by SolrJ JDBC
SOLR-8799: Improve error message when tuple can't be read by SolrJ JDBC
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/56ad6e5d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/56ad6e5d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/56ad6e5d
Branch: refs/heads/apiv2
Commit: 56ad6e5d8a3d92f7ea496c598c2097aa572263cc
Parents: 4384627
Author: jbernste <jb...@apache.org>
Authored: Tue Mar 8 15:21:19 2016 -0500
Committer: jbernste <jb...@apache.org>
Committed: Tue Mar 8 15:22:42 2016 -0500
----------------------------------------------------------------------
.../solr/client/solrj/io/sql/ResultSetImpl.java | 2 +-
.../apache/solr/client/solrj/io/sql/JdbcTest.java | 15 +++++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/56ad6e5d/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
index e2f8cf0..0aa3a4b 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java
@@ -78,7 +78,7 @@ class ResultSetImpl implements ResultSet {
this.firstTuple = this.solrStream.read();
this.solrStream.pushBack(firstTuple);
} catch (IOException e) {
- throw new SQLException("Couldn't read first tuple", e);
+ throw new SQLException(e);
}
this.resultSetMetaData = new ResultSetMetaDataImpl(this);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/56ad6e5d/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
index e1e9739..572491e 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
@@ -396,6 +396,21 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
}
}
+
+ //Test error propagation
+ props = new Properties();
+ props.put("aggregationMode", "facet");
+ try (Connection con = DriverManager.getConnection("jdbc:solr://" + zkHost + "?collection=collection1", props)) {
+ try (Statement stmt = con.createStatement()) {
+ try (ResultSet rs = stmt.executeQuery("select crap from collection1 group by a_s " +
+ "order by sum(a_f) desc")) {
+ } catch (Exception e) {
+ String errorMessage = e.getMessage();
+ assertTrue(errorMessage.contains("Group by queries must include atleast one aggregate function"));
+ }
+ }
+ }
+
testDriverMetadata();
}