Index: src/test/org/apache/lucene/index/TestIndexWriter.java
===================================================================
--- src/test/org/apache/lucene/index/TestIndexWriter.java (revision 580016)
+++ src/test/org/apache/lucene/index/TestIndexWriter.java (working copy)
@@ -1151,8 +1151,8 @@
RAMDirectory dir = new RAMDirectory();
IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), true);
writer.setMaxBufferedDocs(10);
+ writer.setRAMBufferSizeMB(IndexWriter.DISABLE_AUTO_FLUSH);
- int lastNumFile = dir.list().length;
long lastGen = -1;
for(int j=1;j<52;j++) {
Document doc = new Document();
@@ -1169,25 +1169,30 @@
assertTrue(gen > lastGen);
lastGen = gen;
writer.setRAMBufferSizeMB(0.000001);
+ writer.setMaxBufferedDocs(IndexWriter.DISABLE_AUTO_FLUSH);
} else if (j < 20) {
assertTrue(gen > lastGen);
lastGen = gen;
} else if (20 == j) {
writer.setRAMBufferSizeMB(16);
+ writer.setMaxBufferedDocs(IndexWriter.DISABLE_AUTO_FLUSH);
lastGen = gen;
} else if (j < 30) {
assertEquals(gen, lastGen);
} else if (30 == j) {
writer.setRAMBufferSizeMB(0.000001);
+ writer.setMaxBufferedDocs(IndexWriter.DISABLE_AUTO_FLUSH);
} else if (j < 40) {
assertTrue(gen> lastGen);
lastGen = gen;
} else if (40 == j) {
writer.setMaxBufferedDocs(10);
+ writer.setRAMBufferSizeMB(IndexWriter.DISABLE_AUTO_FLUSH);
lastGen = gen;
} else if (j < 50) {
assertEquals(gen, lastGen);
writer.setMaxBufferedDocs(10);
+ writer.setRAMBufferSizeMB(IndexWriter.DISABLE_AUTO_FLUSH);
} else if (50 == j) {
assertTrue(gen > lastGen);
}
Index: src/test/org/apache/lucene/index/TestIndexModifier.java
===================================================================
--- src/test/org/apache/lucene/index/TestIndexModifier.java (revision 580016)
+++ src/test/org/apache/lucene/index/TestIndexModifier.java (working copy)
@@ -75,7 +75,7 @@
// Lucene defaults:
assertNull(i.getInfoStream());
assertTrue(i.getUseCompoundFile());
- assertEquals(0, i.getMaxBufferedDocs());
+ assertEquals(IndexWriter.DISABLE_AUTO_FLUSH, i.getMaxBufferedDocs());
assertEquals(10000, i.getMaxFieldLength());
assertEquals(10, i.getMergeFactor());
// test setting properties:
Index: src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
===================================================================
--- src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (revision 580016)
+++ src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (working copy)
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.util.List;
-import java.util.LinkedList;
import java.util.ArrayList;
/** A {@link MergeScheduler} that runs each merge using a
Index: src/java/org/apache/lucene/index/IndexModifier.java
===================================================================
--- src/java/org/apache/lucene/index/IndexModifier.java (revision 580016)
+++ src/java/org/apache/lucene/index/IndexModifier.java (working copy)
@@ -208,7 +208,7 @@
indexWriter.setMergeScheduler(new SerialMergeScheduler());
indexWriter.setInfoStream(infoStream);
indexWriter.setUseCompoundFile(useCompoundFile);
- if (maxBufferedDocs != 0)
+ if (maxBufferedDocs != IndexWriter.DISABLE_AUTO_FLUSH)
indexWriter.setMaxBufferedDocs(maxBufferedDocs);
indexWriter.setMaxFieldLength(maxFieldLength);
indexWriter.setMergeFactor(mergeFactor);
Index: src/java/org/apache/lucene/index/LogMergePolicy.java
===================================================================
--- src/java/org/apache/lucene/index/LogMergePolicy.java (revision 580016)
+++ src/java/org/apache/lucene/index/LogMergePolicy.java (working copy)
@@ -18,8 +18,6 @@
*/
import java.io.IOException;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Set;
import org.apache.lucene.store.Directory;
Index: src/java/org/apache/lucene/index/DocumentsWriter.java
===================================================================
--- src/java/org/apache/lucene/index/DocumentsWriter.java (revision 580016)
+++ src/java/org/apache/lucene/index/DocumentsWriter.java (working copy)
@@ -165,18 +165,25 @@
/** Set how much RAM we can use before flushing. */
void setRAMBufferSizeMB(double mb) {
- ramBufferSize = (long) (mb*1024*1024);
+ if (mb == IndexWriter.DISABLE_AUTO_FLUSH) {
+ ramBufferSize = IndexWriter.DISABLE_AUTO_FLUSH;
+ } else {
+ ramBufferSize = (long) (mb*1024*1024);
+ }
}
double getRAMBufferSizeMB() {
- return ramBufferSize/1024./1024.;
+ if (ramBufferSize == IndexWriter.DISABLE_AUTO_FLUSH) {
+ return ramBufferSize;
+ } else {
+ return ramBufferSize/1024./1024.;
+ }
}
/** Set max buffered docs, which means we will flush by
* doc count instead of by RAM usage. */
void setMaxBufferedDocs(int count) {
maxBufferedDocs = count;
- ramBufferSize = 0;
}
int getMaxBufferedDocs() {
@@ -2137,10 +2144,8 @@
// We must at this point commit to flushing to ensure we
// always get N docs when we flush by doc count, even if
// > 1 thread is adding documents:
- /* new merge policy
- if (!flushPending && maxBufferedDocs > 0 && numDocsInRAM >= maxBufferedDocs) {
- */
- if (!flushPending && ramBufferSize == 0 && numDocsInRAM >= maxBufferedDocs) {
+ if (!flushPending && maxBufferedDocs != IndexWriter.DISABLE_AUTO_FLUSH
+ && numDocsInRAM >= maxBufferedDocs) {
flushPending = true;
state.doFlushAfter = true;
} else
@@ -2236,12 +2241,12 @@
}
synchronized private boolean timeToFlushDeletes() {
- return numBufferedDeleteTerms >= maxBufferedDeleteTerms && setFlushPending();
+ return maxBufferedDeleteTerms != IndexWriter.DISABLE_AUTO_FLUSH
+ && numBufferedDeleteTerms >= maxBufferedDeleteTerms
+ && setFlushPending();
}
void setMaxBufferedDeleteTerms(int maxBufferedDeleteTerms) {
- if (maxBufferedDeleteTerms < 1)
- throw new IllegalArgumentException("maxBufferedDeleteTerms must at least be 1");
this.maxBufferedDeleteTerms = maxBufferedDeleteTerms;
}
@@ -2827,7 +2832,7 @@
* pools to match the current docs. */
private synchronized void balanceRAM() {
- if (ramBufferSize == 0.0 || postingsIsFull)
+ if (ramBufferSize == IndexWriter.DISABLE_AUTO_FLUSH || postingsIsFull)
return;
// We free our allocations if we've allocated 5% over
Index: src/java/org/apache/lucene/index/SerialMergeScheduler.java
===================================================================
--- src/java/org/apache/lucene/index/SerialMergeScheduler.java (revision 580016)
+++ src/java/org/apache/lucene/index/SerialMergeScheduler.java (working copy)
@@ -18,7 +18,6 @@
*/
import java.io.IOException;
-import java.util.LinkedList;
/** A {@link MergeScheduler} that simply does each merge
* sequentially, using the current thread. */
Index: src/java/org/apache/lucene/index/IndexWriter.java
===================================================================
--- src/java/org/apache/lucene/index/IndexWriter.java (revision 580016)
+++ src/java/org/apache/lucene/index/IndexWriter.java (working copy)
@@ -37,7 +37,6 @@
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Iterator;
-import java.util.ListIterator;
import java.util.Map.Entry;
/**
@@ -205,21 +204,27 @@
public final static int DEFAULT_MERGE_FACTOR = LogMergePolicy.DEFAULT_MERGE_FACTOR;
/**
- * Default value is 0 (because IndexWriter flushes by RAM
- * usage by default). Change using {@link #setMaxBufferedDocs(int)}.
+ * Value to denote a flush trigger is disabled
*/
- public final static int DEFAULT_MAX_BUFFERED_DOCS = 0;
+ public final static int DISABLE_AUTO_FLUSH = -1;
/**
+ * Disabled by default (because IndexWriter flushes by RAM usage
+ * by default). Change using {@link #setMaxBufferedDocs(int)}.
+ */
+ public final static int DEFAULT_MAX_BUFFERED_DOCS = DISABLE_AUTO_FLUSH;
+
+ /**
* Default value is 16 MB (which means flush when buffered
* docs consume 16 MB RAM). Change using {@link #setRAMBufferSizeMB}.
*/
public final static double DEFAULT_RAM_BUFFER_SIZE_MB = 16.0;
/**
- * Default value is 1000. Change using {@link #setMaxBufferedDeleteTerms(int)}.
+ * Disabled by default (because IndexWriter flushes by RAM usage
+ * by default). Change using {@link #setMaxBufferedDeleteTerms(int)}.
*/
- public final static int DEFAULT_MAX_BUFFERED_DELETE_TERMS = 1000;
+ public final static int DEFAULT_MAX_BUFFERED_DELETE_TERMS = DISABLE_AUTO_FLUSH;
/**
* @deprecated
@@ -820,17 +825,22 @@
* maxBufferedDocs added documents and never flush by RAM
* usage.
*
- * The default value is 0 (writer flushes by RAM
- * usage).
+ * Disabled by default (writer flushes by RAM * usage).
*
* @throws IllegalArgumentException if maxBufferedDocs is
- * smaller than 2
+ * enabled but smaller than 2, or it disables maxBufferedDocs
+ * when ramBufferSize is already disabled
* @see #setRAMBufferSizeMB
*/
public void setMaxBufferedDocs(int maxBufferedDocs) {
ensureOpen();
- if (maxBufferedDocs < 2)
- throw new IllegalArgumentException("maxBufferedDocs must at least be 2");
+ if (maxBufferedDocs != DISABLE_AUTO_FLUSH && maxBufferedDocs < 2)
+ throw new IllegalArgumentException(
+ "maxBufferedDocs must at least be 2 when enabled");
+ if (maxBufferedDocs == DISABLE_AUTO_FLUSH
+ && getRAMBufferSizeMB() == DISABLE_AUTO_FLUSH)
+ throw new IllegalArgumentException(
+ "one of ramBufferSize and maxBufferedDocs must be eanbled");
docWriter.setMaxBufferedDocs(maxBufferedDocs);
pushMaxBufferedDocs();
}
@@ -841,7 +851,7 @@
* as its minMergeDocs, to keep backwards compatibility.
*/
private void pushMaxBufferedDocs() {
- if (docWriter.getRAMBufferSizeMB() == 0.0) {
+ if (docWriter.getMaxBufferedDocs() != DISABLE_AUTO_FLUSH) {
final MergePolicy mp = mergePolicy;
if (mp instanceof LogDocMergePolicy) {
LogDocMergePolicy lmp = (LogDocMergePolicy) mp;
@@ -856,9 +866,8 @@
}
/**
- * Returns 0 if this writer is flushing by RAM usage, else
- * returns the number of buffered added documents that will
- * trigger a flush.
+ * Returns the number of buffered added documents that will
+ * trigger a flush if enabled.
* @see #setMaxBufferedDocs
*/
public int getMaxBufferedDocs() {
@@ -876,17 +885,23 @@
* buffered documents use this much RAM.
*
* The default value is {@link #DEFAULT_RAM_BUFFER_SIZE_MB}.
+ *
+ * @throws IllegalArgumentException if ramBufferSize is
+ * enabled but non-positive, or it disables ramBufferSize
+ * when maxBufferedDocs is already disabled
*/
public void setRAMBufferSizeMB(double mb) {
- if (mb <= 0.0)
- throw new IllegalArgumentException("ramBufferSize should be > 0.0 MB");
+ if (mb != DISABLE_AUTO_FLUSH && mb <= 0.0)
+ throw new IllegalArgumentException(
+ "ramBufferSize should be > 0.0 MB when enabled");
+ if (mb == DISABLE_AUTO_FLUSH && getMaxBufferedDocs() == DISABLE_AUTO_FLUSH)
+ throw new IllegalArgumentException(
+ "one of ramBufferSize and maxBufferedDocs must be eanbled");
docWriter.setRAMBufferSizeMB(mb);
}
/**
- * Returns 0.0 if this writer is flushing by document
- * count, else returns the value set by {@link
- * #setRAMBufferSizeMB}.
+ * Returns the value set by {@link #setRAMBufferSizeMB} if enabled.
*/
public double getRAMBufferSizeMB() {
return docWriter.getRAMBufferSizeMB();
@@ -898,17 +913,24 @@
* buffered in memory at the time, they are merged and a new segment is
* created.
- * The default value is {@link #DEFAULT_MAX_BUFFERED_DELETE_TERMS}.
- * @throws IllegalArgumentException if maxBufferedDeleteTerms is smaller than 1
+ * Disabled by default (writer flushes by RAM * usage).
+ *
+ * @throws IllegalArgumentException if maxBufferedDeleteTerms
+ * is enabled but smaller than 1
+ * @see #setRAMBufferSizeMB
*/
public void setMaxBufferedDeleteTerms(int maxBufferedDeleteTerms) {
ensureOpen();
+ if (maxBufferedDeleteTerms != DISABLE_AUTO_FLUSH
+ && maxBufferedDeleteTerms < 1)
+ throw new IllegalArgumentException(
+ "maxBufferedDeleteTerms must at least be 1 when enabled");
docWriter.setMaxBufferedDeleteTerms(maxBufferedDeleteTerms);
}
/**
* Returns the number of buffered deleted terms that will
- * trigger a flush.
+ * trigger a flush if enabled.
* @see #setMaxBufferedDeleteTerms
*/
public int getMaxBufferedDeleteTerms() {
@@ -1479,13 +1501,7 @@
}
}
- /** Determines amount of RAM usage by the buffered docs at
- * which point we trigger a flush to the index.
- */
- private double ramBufferSize = DEFAULT_RAM_BUFFER_SIZE_MB*1024F*1024F;
-
/** If non-null, information about merges will be printed to this.
-
*/
private PrintStream infoStream = null;
private static PrintStream defaultInfoStream = null;
Index: src/java/org/apache/lucene/index/TermVectorsWriter.java
===================================================================
--- src/java/org/apache/lucene/index/TermVectorsWriter.java (revision 580016)
+++ src/java/org/apache/lucene/index/TermVectorsWriter.java (working copy)
@@ -22,7 +22,6 @@
import org.apache.lucene.util.StringHelper;
import java.io.IOException;
-import java.util.Vector;
final class TermVectorsWriter {