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 yo...@apache.org on 2007/04/29 16:05:22 UTC

svn commit: r533507 - in /lucene/solr/trunk: CHANGES.txt src/java/org/apache/solr/core/SolrCore.java src/java/org/apache/solr/update/SolrIndexWriter.java

Author: yonik
Date: Sun Apr 29 07:05:21 2007
New Revision: 533507

URL: http://svn.apache.org/viewvc?view=rev&rev=533507
Log:
make writeLockTimeout work: SOLR-222

Modified:
    lucene/solr/trunk/CHANGES.txt
    lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
    lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java

Modified: lucene/solr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/CHANGES.txt?view=diff&rev=533507&r1=533506&r2=533507
==============================================================================
--- lucene/solr/trunk/CHANGES.txt (original)
+++ lucene/solr/trunk/CHANGES.txt Sun Apr 29 07:05:21 2007
@@ -245,6 +245,9 @@
     and avoid use of "find -maxdepth" on platforms where it is not
     supported. (yonik)
 
+12. SOLR-222: Changing writeLockTimeout in solrconfig.xml did not
+    change the effective timeout. (Koji Sekiguchi via yonik)
+
  
 Other Changes
  1. Updated to Lucene 2.1

Modified: lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java?view=diff&rev=533507&r1=533506&r2=533507
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/core/SolrCore.java Sun Apr 29 07:05:21 2007
@@ -32,6 +32,7 @@
 import javax.xml.xpath.XPathConstants;
 
 import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.search.BooleanQuery;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
@@ -84,6 +85,7 @@
 
   static {
     BooleanQuery.setMaxClauseCount(SolrConfig.config.getInt("query/maxBooleanClauses",BooleanQuery.getMaxClauseCount()));
+    if (mainIndexConfig.writeLockTimeout != -1) IndexWriter.setDefaultWriteLockTimeout(mainIndexConfig.writeLockTimeout);
   }
 
 

Modified: lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java?view=diff&rev=533507&r1=533506&r2=533507
==============================================================================
--- lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java (original)
+++ lucene/solr/trunk/src/java/org/apache/solr/update/SolrIndexWriter.java Sun Apr 29 07:05:21 2007
@@ -51,8 +51,7 @@
       if (config.maxMergeDocs != -1) setMaxMergeDocs(config.maxMergeDocs);
       if (config.mergeFactor != -1)  setMergeFactor(config.mergeFactor);
       if (config.maxFieldLength != -1) setMaxFieldLength(config.maxFieldLength);
-      if (config.writeLockTimeout != -1) setWriteLockTimeout(config.writeLockTimeout);
-      if (config.commitLockTimeout != -1) setWriteLockTimeout(config.commitLockTimeout);
+      //if (config.commitLockTimeout != -1) setWriteLockTimeout(config.commitLockTimeout);
     }
 
   }