You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2014/04/15 21:39:28 UTC

svn commit: r1587707 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/contrib/ solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java

Author: markrmiller
Date: Tue Apr 15 19:39:28 2014
New Revision: 1587707

URL: http://svn.apache.org/r1587707
Log:
SOLR-5954: Slower DataImportHandler process caused by not reusing jdbc connections.

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1587707&r1=1587706&r2=1587707&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Tue Apr 15 19:39:28 2014
@@ -45,6 +45,8 @@ Bug Fixes
   was an exception while trying to register as the leader. 
   (Mark Miller, Alan Woodward)
 
+* SOLR-5954: Slower DataImportHandler process caused by not reusing jdbc
+  connections. (Mark Miller, Paco Garcia, Raja Nagendra Kumar)
 Other Changes
 ---------------------
 

Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java?rev=1587707&r1=1587706&r2=1587707&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/JdbcDataSource.java Tue Apr 15 19:39:28 2014
@@ -442,7 +442,7 @@ public class JdbcDataSource extends
     }
   }
 
-  private static final long CONN_TIME_OUT = 10 * 1000; // 10 seconds
+  private static final long CONN_TIME_OUT = TimeUnit.NANOSECONDS.convert(10, TimeUnit.SECONDS);
 
   private static final int FETCH_SIZE = 500;