You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/07/26 19:51:07 UTC

svn commit: r1151187 - in /lucene/dev/trunk/lucene/src: java/org/apache/lucene/index/DocumentsWriter.java java/org/apache/lucene/index/IndexWriterConfig.java test/org/apache/lucene/index/TestIndexWriterConfig.java

Author: mikemccand
Date: Tue Jul 26 17:51:06 2011
New Revision: 1151187

URL: http://svn.apache.org/viewvc?rev=1151187&view=rev
Log:
move flush policy default into IWC, matching other configs

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
    lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java?rev=1151187&r1=1151186&r2=1151187&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/DocumentsWriter.java Tue Jul 26 17:51:06 2011
@@ -134,12 +134,8 @@ final class DocumentsWriter {
     this.perThreadPool = config.getIndexerThreadPool();
     this.chain = config.getIndexingChain();
     this.perThreadPool.initialize(this, globalFieldNumbers, config);
-    final FlushPolicy configuredPolicy = config.getFlushPolicy();
-    if (configuredPolicy == null) {
-      flushPolicy = new FlushByRamOrCountsPolicy();
-    } else {
-      flushPolicy = configuredPolicy;
-    }
+    flushPolicy = config.getFlushPolicy();
+    assert flushPolicy != null;
     flushPolicy.init(this);
     flushControl = new DocumentsWriterFlushControl(this, config);
   }

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java?rev=1151187&r1=1151186&r2=1151187&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriterConfig.java Tue Jul 26 17:51:06 2011
@@ -164,6 +164,7 @@ public final class IndexWriterConfig imp
     } else {
       mergePolicy = new LogByteSizeMergePolicy();
     }
+    flushPolicy = new FlushByRamOrCountsPolicy();
     readerPooling = DEFAULT_READER_POOLING;
     indexerThreadPool = new ThreadAffinityDocumentsWriterThreadPool();
     readerTermsIndexDivisor = DEFAULT_READER_TERMS_INDEX_DIVISOR;

Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=1151187&r1=1151186&r2=1151187&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Tue Jul 26 17:51:06 2011
@@ -69,7 +69,7 @@ public class TestIndexWriterConfig exten
     assertEquals(IndexWriterConfig.DEFAULT_READER_TERMS_INDEX_DIVISOR, conf.getReaderTermsIndexDivisor());
     assertEquals(TieredMergePolicy.class, conf.getMergePolicy().getClass());
     assertEquals(ThreadAffinityDocumentsWriterThreadPool.class, conf.getIndexerThreadPool().getClass());
-    assertNull(conf.getFlushPolicy());
+    assertEquals(FlushByRamOrCountsPolicy.class, conf.getFlushPolicy().getClass());
     assertEquals(IndexWriterConfig.DEFAULT_RAM_PER_THREAD_HARD_LIMIT_MB, conf.getRAMPerThreadHardLimitMB());
     // Sanity check - validate that all getters are covered.
     Set<String> getters = new HashSet<String>();