Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-02-20 17:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

re-enable writeLock and commitLock configuration

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/incubator/solr/trunk@391645 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2006-04-05 15:45:04 +00:00
parent 022a7db1a4
commit 903814afa5
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example/solr/conf/solrconfig.xml
View File

@ -16,8 +16,6 @@
<maxBufferedDocs>1000</maxBufferedDocs>
<maxMergeDocs>2147483647</maxMergeDocs>
<maxFieldLength>10000</maxFieldLength>
<!-- these are global... can't currently override per index -->
<writeLockTimeout>1000</writeLockTimeout>
<commitLockTimeout>10000</commitLockTimeout>
</indexDefaults>

9
src/java/org/apache/solr/update/SolrIndexConfig.java
View File

@ -17,6 +17,7 @@
package org.apache.solr.update;
import org.apache.solr.core.SolrConfig;
import org.apache.lucene.index.IndexWriter;
//
// For performance reasons, we don't want to re-read
@ -36,8 +37,8 @@ public class SolrIndexConfig {
public static final int defMaxMergeDocs=SolrConfig.config.getInt(defaultsName +"/maxMergeDocs", -1);
public static final int defMergeFactor=SolrConfig.config.getInt(defaultsName +"/mergeFactor", -1);
public static final int defMaxFieldLength=SolrConfig.config.getInt(defaultsName +"/maxFieldLength", -1);
public static final int writeLockTimeout=SolrConfig.config.getInt(defaultsName +"/writeLockTimeout", -1);
public static final int commitLockTimeout=SolrConfig.config.getInt(defaultsName +"/commitLockTimeout", -1);
public static final int defWriteLockTimeout=SolrConfig.config.getInt(defaultsName +"/writeLockTimeout", -1);
public static final int defCommitLockTimeout=SolrConfig.config.getInt(defaultsName +"/commitLockTimeout", -1);
/*** These are "final" in lucene 1.9
static {
@ -51,6 +52,8 @@ public class SolrIndexConfig {
public final int maxMergeDocs;
public final int mergeFactor;
public final int maxFieldLength;
public final int writeLockTimeout;
public final int commitLockTimeout;
public SolrIndexConfig(String prefix) {
useCompoundFile=SolrConfig.config.getBool(prefix+"/useCompoundFile", defUseCompoundFile);
@ -58,5 +61,7 @@ public class SolrIndexConfig {
maxMergeDocs=SolrConfig.config.getInt(prefix+"/maxMergeDocs",defMaxMergeDocs);
mergeFactor=SolrConfig.config.getInt(prefix+"/mergeFactor",defMergeFactor);
maxFieldLength= SolrConfig.config.getInt(prefix+"/maxFieldLength",defMaxFieldLength);
writeLockTimeout= SolrConfig.config.getInt(prefix+"/writeLockTimeout", defWriteLockTimeout);
commitLockTimeout= SolrConfig.config.getInt(prefix+"/commitLockTimeout", defCommitLockTimeout);
}
}

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

@ -50,6 +50,8 @@ public class SolrIndexWriter extends IndexWriter {
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);
}
}