Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make writeLockTimeout work: SOLR-222 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@533507 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2007-04-29 14:05:21 +00:00
parent 0455f820c4
commit 246ad4dd57
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -245,6 +245,9 @@ Bug Fixes
and avoid use of "find -maxdepth" on platforms where it is not and avoid use of "find -maxdepth" on platforms where it is not
supported. (yonik) supported. (yonik)
12. SOLR-222: Changing writeLockTimeout in solrconfig.xml did not
change the effective timeout. (Koji Sekiguchi via yonik)
Other Changes Other Changes
1. Updated to Lucene 2.1 1. Updated to Lucene 2.1

2
src/java/org/apache/solr/core/SolrCore.java
View File

@ -32,6 +32,7 @@ import java.util.logging.Logger;
import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathConstants;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.FSDirectory;
@ -84,6 +85,7 @@ public final class SolrCore {
static { static {
BooleanQuery.setMaxClauseCount(SolrConfig.config.getInt("query/maxBooleanClauses",BooleanQuery.getMaxClauseCount())); BooleanQuery.setMaxClauseCount(SolrConfig.config.getInt("query/maxBooleanClauses",BooleanQuery.getMaxClauseCount()));
if (mainIndexConfig.writeLockTimeout != -1) IndexWriter.setDefaultWriteLockTimeout(mainIndexConfig.writeLockTimeout);
} }

3
src/java/org/apache/solr/update/SolrIndexWriter.java
View File

@ -51,8 +51,7 @@ public class SolrIndexWriter extends IndexWriter {
if (config.maxMergeDocs != -1) setMaxMergeDocs(config.maxMergeDocs); if (config.maxMergeDocs != -1) setMaxMergeDocs(config.maxMergeDocs);
if (config.mergeFactor != -1) setMergeFactor(config.mergeFactor); if (config.mergeFactor != -1) setMergeFactor(config.mergeFactor);
if (config.maxFieldLength != -1) setMaxFieldLength(config.maxFieldLength); 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);
} }
} }