You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/03/23 23:35:13 UTC
lucene-solr:branch_6_0: SOLR-8810: Implement Connection.setReadOnly,
Statement.set/getFetchSize, ResultSet.getType
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_0 d05954f17 -> 8edc53528
SOLR-8810: Implement Connection.setReadOnly, Statement.set/getFetchSize, ResultSet.getType
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8edc5352
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8edc5352
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8edc5352
Branch: refs/heads/branch_6_0
Commit: 8edc535286fcadfbc361da7d7f0d1d2b0230a888
Parents: d05954f
Author: Kevin Risden <kr...@apache.org>
Authored: Wed Mar 23 17:02:05 2016 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Mar 23 17:34:35 2016 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../apache/solr/client/solrj/io/sql/ConnectionImpl.java | 2 +-
.../apache/solr/client/solrj/io/sql/ResultSetImpl.java | 2 +-
.../apache/solr/client/solrj/io/sql/StatementImpl.java | 5 ++---
.../org/apache/solr/client/solrj/io/sql/JdbcTest.java | 10 ++++++++++
5 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8edc5352/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index de8d039..69f038d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -435,6 +435,9 @@ Other Changes
* SOLR-8819: Implement DatabaseMetaDataImpl getTables() and fix getSchemas(). (Trey Cahill,
Joel Bernstein, Kevin Risden)
+* SOLR-8810: Implement Connection.setReadOnly, Statement.set/getFetchSize,
+ ResultSet.getType (Kevin Risden)
+
================== 5.5.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8edc5352/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java
index d1e79eb..aa78e14 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java
@@ -152,7 +152,7 @@ class ConnectionImpl implements Connection {
@Override
public void setReadOnly(boolean readOnly) throws SQLException {
- throw new UnsupportedOperationException();
+
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8edc5352/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 0aa3a4b..e4dcaed 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
@@ -560,7 +560,7 @@ class ResultSetImpl implements ResultSet {
@Override
public int getType() throws SQLException {
- throw new UnsupportedOperationException();
+ return ResultSet.TYPE_FORWARD_ONLY;
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8edc5352/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
index 7f1e2f9..6af58da 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.HashMap;
import java.util.Random;
@@ -240,12 +239,12 @@ class StatementImpl implements Statement {
@Override
public void setFetchSize(int rows) throws SQLException {
- throw new UnsupportedOperationException();
+
}
@Override
public int getFetchSize() throws SQLException {
- throw new UnsupportedOperationException();
+ return 0;
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8edc5352/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 393d63a..200c971 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
@@ -492,6 +492,10 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
assertFalse(rs.next());
}
+ assertTrue(con.isReadOnly());
+ con.setReadOnly(true);
+ assertTrue(con.isReadOnly());
+
assertNull(con.getWarnings());
con.clearWarnings();
assertNull(con.getWarnings());
@@ -503,6 +507,10 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
statement.clearWarnings();
assertNull(statement.getWarnings());
+ assertEquals(0, statement.getFetchSize());
+ statement.setFetchSize(0);
+ assertEquals(0, statement.getFetchSize());
+
try (ResultSet rs = statement.executeQuery(sql)) {
assertEquals(statement, rs.getStatement());
@@ -564,6 +572,8 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
}
private void checkResultSet(ResultSet rs) throws Exception {
+ assertEquals(ResultSet.TYPE_FORWARD_ONLY, rs.getType());
+
assertNull(rs.getWarnings());
rs.clearWarnings();
assertNull(rs.getWarnings());