You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by sh...@apache.org on 2009/03/20 11:36:24 UTC
svn commit: r756407 - in /lucene/solr/trunk/contrib/dataimporthandler:
CHANGES.txt
src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
Author: shalin
Date: Fri Mar 20 10:36:20 2009
New Revision: 756407
URL: http://svn.apache.org/viewvc?rev=756407&view=rev
Log:
SOLR-1055 -- Make DIH JdbcDataSource easily extensible by making the createConnectionFactory method protected and return a Callable<Connection> object
Modified:
lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
Modified: lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt?rev=756407&r1=756406&r2=756407&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/CHANGES.txt Fri Mar 20 10:36:20 2009
@@ -109,6 +109,10 @@
25.SOLR-1076: JdbcDataSource should resolve variables in all its configuration parameters.
(shalin)
+26.SOLR-1055: Make DIH JdbcDataSource easily extensible by making the createConnectionFactory method protected and
+ return a Callable<Connection> object.
+ (Noble Paul, shalin)
+
Optimizations
----------------------
1. SOLR-846: Reduce memory consumption during delta import by removing keys when used
Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java?rev=756407&r1=756406&r2=756407&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java (original)
+++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/JdbcDataSource.java Fri Mar 20 10:36:20 2009
@@ -38,7 +38,7 @@
DataSource<Iterator<Map<String, Object>>> {
private static final Logger LOG = LoggerFactory.getLogger(JdbcDataSource.class);
- private Callable<Connection> factory;
+ protected Callable<Connection> factory;
private long connLastUsed = 0;
@@ -91,7 +91,7 @@
}
}
- private void createConnectionFactory(final Context context,
+ protected Callable<Connection> createConnectionFactory(final Context context,
final Properties initProps) {
final VariableResolver resolver = context.getVariableResolver();
@@ -119,7 +119,7 @@
maxRows = Integer.parseInt(s);
}
- factory = new Callable<Connection>() {
+ return factory = new Callable<Connection>() {
public Connection call() throws Exception {
// Resolve variables again because the variables may have changed
resolveVariables(resolver, initProps);