You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2016/06/12 21:14:09 UTC
lucene-solr:branch_6x: SOLR-2199: DataImportHandler (DIH)
JdbcDataSource supports multiple resultsets per query
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 6b0b11907 -> c67258694
SOLR-2199: DataImportHandler (DIH) JdbcDataSource supports multiple resultsets per query
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c6725869
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c6725869
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c6725869
Branch: refs/heads/branch_6x
Commit: c67258694be9e0ce9a0631f64d14a7853e81dc9a
Parents: 6b0b119
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Sun Jun 12 23:50:06 2016 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Mon Jun 13 00:13:42 2016 +0300
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../solr/handler/dataimport/JdbcDataSource.java | 33 ++++++--
.../handler/dataimport/TestJdbcDataSource.java | 89 +++++++++++++++++++-
3 files changed, 116 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6725869/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cb24d26..cf76643 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -285,6 +285,8 @@ Other Changes
* SOLR-8445: fix line separator in log4j.properties files (Ahmet Arslan via Mikhail Khludnev)
+* SOLR-2199: DataImportHandler (DIH) JdbcDataSource supports multiple resultsets per query (Kristine Jetzke, Mark Waddle via Mikhail Khludnev)
+
================== 6.0.1 ==================
Upgrade Notes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6725869/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
index e1eabeb..09ad775 100644
--- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
+++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
@@ -342,7 +342,16 @@ public class JdbcDataSource extends
}
protected ResultSet executeStatement(Statement statement, String query) throws SQLException {
- if (statement.execute(query)) {
+ boolean resultSetReturned = statement.execute(query);
+ return getNextResultSet(resultSetReturned, statement);
+ }
+
+ protected ResultSet getNextResultSet(final boolean initialResultSetAvailable, final Statement statement) throws SQLException {
+ boolean resultSetAvailable = initialResultSetAvailable;
+ while (!resultSetAvailable && statement.getUpdateCount() != -1) {
+ resultSetAvailable = statement.getMoreResults();
+ }
+ if (resultSetAvailable) {
return statement.getResultSet();
}
return null;
@@ -441,8 +450,10 @@ public class JdbcDataSource extends
if (getResultSet().next()) {
return true;
} else {
- close();
- return false;
+ closeResultSet();
+ setResultSet(getNextResultSet(getStatement().getMoreResults(), getStatement()));
+ setColNames(getResultSet());
+ return hasnext();
}
} catch (SQLException e) {
close();
@@ -452,16 +463,26 @@ public class JdbcDataSource extends
}
protected void close() {
+ closeResultSet();
try {
- if (getResultSet() != null)
- getResultSet().close();
if (getStatement() != null)
getStatement().close();
} catch (Exception e) {
+ logError("Exception while closing statement", e);
+ } finally {
+ setStatement(null);
+ }
+ }
+
+ protected void closeResultSet() {
+ try {
+ if (getResultSet() != null) {
+ getResultSet().close();
+ }
+ } catch (Exception e) {
logError("Exception while closing result set", e);
} finally {
setResultSet(null);
- setStatement(null);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6725869/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
index 38ca83e..b6d05c4 100644
--- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
+++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSource.java
@@ -19,7 +19,6 @@ package org.apache.solr.handler.dataimport;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
@@ -27,7 +26,12 @@ import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
import javax.sql.DataSource;
@@ -276,6 +280,7 @@ public class TestJdbcDataSource extends AbstractDataImportHandlerTestCase {
statement.setFetchSize(500);
statement.setMaxRows(0);
EasyMock.expect(statement.execute("query")).andReturn(false);
+ EasyMock.expect(statement.getUpdateCount()).andReturn(-1);
statement.close();
mockControl.replay();
@@ -388,6 +393,7 @@ public class TestJdbcDataSource extends AbstractDataImportHandlerTestCase {
statement.setFetchSize(500);
statement.setMaxRows(0);
EasyMock.expect(statement.execute("other query")).andReturn(false);
+ EasyMock.expect(statement.getUpdateCount()).andReturn(-1);
statement.close();
mockControl.replay();
@@ -399,6 +405,85 @@ public class TestJdbcDataSource extends AbstractDataImportHandlerTestCase {
}
@Test
+ public void testMultipleResultsSets_UpdateCountUpdateCountResultSet() throws Exception {
+ MockInitialContextFactory.bind("java:comp/env/jdbc/JndiDB", dataSource);
+ props.put(JdbcDataSource.JNDI_NAME, "java:comp/env/jdbc/JndiDB");
+ EasyMock.expect(dataSource.getConnection()).andReturn(connection);
+ jdbcDataSource.init(context, props);
+ connection.setAutoCommit(false);
+
+ Statement statement = mockControl.createMock(Statement.class);
+ EasyMock.expect(connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY))
+ .andReturn(statement);
+ statement.setFetchSize(500);
+ statement.setMaxRows(0);
+ EasyMock.expect(statement.execute("query")).andReturn(false);
+ EasyMock.expect(statement.getUpdateCount()).andReturn(1);
+ EasyMock.expect(statement.getMoreResults()).andReturn(false);
+ EasyMock.expect(statement.getUpdateCount()).andReturn(1);
+ EasyMock.expect(statement.getMoreResults()).andReturn(true);
+ ResultSet resultSet = mockControl.createMock(ResultSet.class);
+ EasyMock.expect(statement.getResultSet()).andReturn(resultSet);
+ ResultSetMetaData metaData = mockControl.createMock(ResultSetMetaData.class);
+ EasyMock.expect(resultSet.getMetaData()).andReturn(metaData);
+ EasyMock.expect(metaData.getColumnCount()).andReturn(0);
+
+ mockControl.replay();
+
+ final ResultSetIterator resultSetIterator = jdbcDataSource.new ResultSetIterator("query");
+ assertSame(resultSet, resultSetIterator.getResultSet());
+
+ mockControl.verify();
+
+ }
+
+ @Test
+ public void testMultipleResultsSets_ResultSetResultSet() throws Exception {
+ MockInitialContextFactory.bind("java:comp/env/jdbc/JndiDB", dataSource);
+ props.put(JdbcDataSource.JNDI_NAME, "java:comp/env/jdbc/JndiDB");
+ EasyMock.expect(dataSource.getConnection()).andReturn(connection);
+ jdbcDataSource.init(context, props);
+ connection.setAutoCommit(false);
+
+ Statement statement = mockControl.createMock(Statement.class);
+ EasyMock.expect(connection.createStatement(ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY))
+ .andReturn(statement);
+ statement.setFetchSize(500);
+ statement.setMaxRows(0);
+ EasyMock.expect(statement.execute("query")).andReturn(true);
+ ResultSet resultSet1 = mockControl.createMock(ResultSet.class);
+ EasyMock.expect(statement.getResultSet()).andReturn(resultSet1);
+ ResultSetMetaData metaData1 = mockControl.createMock(ResultSetMetaData.class);
+ EasyMock.expect(resultSet1.getMetaData()).andReturn(metaData1);
+ EasyMock.expect(metaData1.getColumnCount()).andReturn(0);
+ EasyMock.expect(resultSet1.next()).andReturn(false);
+ resultSet1.close();
+ EasyMock.expect(statement.getMoreResults()).andReturn(true);
+ ResultSet resultSet2 = mockControl.createMock(ResultSet.class);
+ EasyMock.expect(statement.getResultSet()).andReturn(resultSet2);
+ ResultSetMetaData metaData2 = mockControl.createMock(ResultSetMetaData.class);
+ EasyMock.expect(resultSet2.getMetaData()).andReturn(metaData2);
+ EasyMock.expect(metaData2.getColumnCount()).andReturn(0);
+ EasyMock.expect(resultSet2.next()).andReturn(true);
+ EasyMock.expect(resultSet2.next()).andReturn(false);
+ resultSet2.close();
+ EasyMock.expect(statement.getMoreResults()).andReturn(false);
+ EasyMock.expect(statement.getUpdateCount()).andReturn(-1);
+ statement.close();
+
+ mockControl.replay();
+
+ final ResultSetIterator resultSetIterator = jdbcDataSource.new ResultSetIterator("query");
+ assertSame(resultSet1, resultSetIterator.getResultSet());
+ assertTrue(resultSetIterator.hasnext());
+ assertSame(resultSet2, resultSetIterator.getResultSet());
+ assertFalse(resultSetIterator.hasnext());
+
+ mockControl.verify();
+
+ }
+
+ @Test
public void testRetrieveFromDriverManager() throws Exception {
DriverManager.registerDriver(driver);
try {