Index: lucene/CHANGES.txt =================================================================== --- lucene/CHANGES.txt (revision 1491727) +++ lucene/CHANGES.txt (working copy) @@ -231,6 +231,13 @@ JRE vendor via Runtime.halt(). (Mike McCandless, Robert Muir, Uwe Schindler, Rodrigo Trujillo, Dawid Weiss) +Changes in runtime behavior + +* LUCENE-5038: New segments written by IndexWriter are now wrapped into CFS + by default. DocumentsWriterPerThread doesn't consult MergePolicy anymore + to decide if a CFS must be written, instead IndexWriterConfig now has a + property to enable / disable CFS for newly created segments. (Simon Willnauer) + ======================= Lucene 4.3.1 ======================= Bug Fixes Index: lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (revision 1491727) +++ lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (working copy) @@ -263,9 +263,9 @@ // NOTE: only works for TMP and LMP!! public static void setUseCompoundFile(MergePolicy mp, boolean v) { if (mp instanceof TieredMergePolicy) { - ((TieredMergePolicy) mp).setUseCompoundFile(v); + ((TieredMergePolicy) mp).setNoCFSRatio(v ? 1.0 : 0.0); } else if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(v); + ((LogMergePolicy) mp).setNoCFSRatio(v ? 1.0 : 0.0); } else { throw new IllegalArgumentException("cannot set compound file for MergePolicy " + mp); } @@ -766,12 +766,12 @@ if (mp instanceof LogMergePolicy) { LogMergePolicy lmp = (LogMergePolicy) mp; lmp.setMergeFactor(Math.min(5, lmp.getMergeFactor())); - lmp.setUseCompoundFile(true); + lmp.setNoCFSRatio(1.0); } else if (mp instanceof TieredMergePolicy) { TieredMergePolicy tmp = (TieredMergePolicy) mp; tmp.setMaxMergeAtOnce(Math.min(5, tmp.getMaxMergeAtOnce())); tmp.setSegmentsPerTier(Math.min(5, tmp.getSegmentsPerTier())); - tmp.setUseCompoundFile(true); + tmp.setNoCFSRatio(1.0); } MergeScheduler ms = w.getConfig().getMergeScheduler(); if (ms instanceof ConcurrentMergeScheduler) { Index: lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (revision 1491727) +++ lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (working copy) @@ -808,6 +808,7 @@ if (rarely(r)) { c.setMergedSegmentWarmer(new SimpleMergedSegmentWarmer(c.getInfoStream())); } + c.setUseCompoundFile(r.nextBoolean()); c.setReaderPooling(r.nextBoolean()); c.setReaderTermsIndexDivisor(_TestUtil.nextInt(r, 1, 4)); return c; @@ -831,15 +832,17 @@ public static LogMergePolicy newLogMergePolicy(Random r) { LogMergePolicy logmp = r.nextBoolean() ? new LogDocMergePolicy() : new LogByteSizeMergePolicy(); - logmp.setUseCompoundFile(r.nextBoolean()); logmp.setCalibrateSizeByDeletes(r.nextBoolean()); if (rarely(r)) { logmp.setMergeFactor(_TestUtil.nextInt(r, 2, 9)); } else { logmp.setMergeFactor(_TestUtil.nextInt(r, 10, 50)); } - logmp.setUseCompoundFile(r.nextBoolean()); - logmp.setNoCFSRatio(0.1 + r.nextDouble()*0.8); + if (r.nextBoolean()) { + logmp.setNoCFSRatio(0.1 + r.nextDouble()*0.8); + } else { + logmp.setNoCFSRatio(r.nextBoolean() ? 1.0 : 0.0); + } if (rarely()) { logmp.setMaxCFSSegmentSizeMB(0.2 + r.nextDouble() * 2.0); } @@ -867,8 +870,12 @@ } else { tmp.setSegmentsPerTier(_TestUtil.nextInt(r, 10, 50)); } - tmp.setUseCompoundFile(r.nextBoolean()); - tmp.setNoCFSRatio(0.1 + r.nextDouble()*0.8); + if (r.nextBoolean()) { + tmp.setNoCFSRatio(0.1 + r.nextDouble()*0.8); + } else { + tmp.setNoCFSRatio(r.nextBoolean() ? 1.0 : 0.0); + } + if (rarely()) { tmp.setMaxCFSSegmentSizeMB(0.2 + r.nextDouble() * 2.0); } @@ -878,13 +885,13 @@ public static LogMergePolicy newLogMergePolicy(boolean useCFS) { LogMergePolicy logmp = newLogMergePolicy(); - logmp.setUseCompoundFile(useCFS); + logmp.setNoCFSRatio(useCFS ? 1.0 : 0.0); return logmp; } public static LogMergePolicy newLogMergePolicy(boolean useCFS, int mergeFactor) { LogMergePolicy logmp = newLogMergePolicy(); - logmp.setUseCompoundFile(useCFS); + logmp.setNoCFSRatio(useCFS ? 1.0 : 0.0); logmp.setMergeFactor(mergeFactor); return logmp; } Index: lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (revision 1491727) +++ lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (working copy) @@ -272,7 +272,7 @@ public static SegmentInfoPerCommit writeDoc(Random random, Directory dir, Analyzer analyzer, Similarity similarity, Document doc) throws IOException { IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( /* LuceneTestCase.newIndexWriterConfig(random, */ TEST_VERSION_CURRENT, analyzer).setSimilarity(similarity == null ? IndexSearcher.getDefaultSimilarity() : similarity)); - //writer.setUseCompoundFile(false); + //writer.setNoCFSRatio(0.0); writer.addDocument(doc); writer.commit(); SegmentInfoPerCommit info = writer.newestSegment(); Index: lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java (revision 1491727) +++ lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java (working copy) @@ -94,7 +94,7 @@ Directory dir = newDirectory(); Random rand = random(); RandomIndexWriter w = new RandomIndexWriter(rand, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(_TestUtil.nextInt(rand, 5, 20))); - //w.w.setUseCompoundFile(false); + //w.w.setNoCFSRatio(0.0); final int docCount = atLeast(200); final int fieldCount = _TestUtil.nextInt(rand, 1, 5); Index: lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java =================================================================== --- lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (working copy) @@ -54,7 +54,7 @@ IndexWriter writer = new IndexWriter( fsd, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())). - setMergePolicy(newLogMergePolicy(false)).setCodec(Codec.forName("Lucene40")) + setMergePolicy(newLogMergePolicy(false)).setCodec(Codec.forName("Lucene40")).setUseCompoundFile(false) ); TestIndexWriterReader.createIndexNoClose(true, "ram", writer); IndexReader reader = DirectoryReader.open(writer, true); Index: lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java =================================================================== --- lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java (working copy) @@ -49,6 +49,7 @@ iwConf.setCodec(CompressingCodec.randomInstance(random())); // disable CFS because this test checks file names iwConf.setMergePolicy(newLogMergePolicy(false)); + iwConf.setUseCompoundFile(false); RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConf); final Document validDoc = new Document(); Index: lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java =================================================================== --- lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java (working copy) @@ -58,7 +58,7 @@ private IndexWriter newWriter(Directory dir, IndexWriterConfig conf) throws IOException { LogDocMergePolicy logByteSizeMergePolicy = new LogDocMergePolicy(); - logByteSizeMergePolicy.setUseCompoundFile(false); // make sure we use plain + logByteSizeMergePolicy.setNoCFSRatio(0.0); // make sure we use plain // files conf.setMergePolicy(logByteSizeMergePolicy); @@ -146,7 +146,7 @@ iwconf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())) .setOpenMode(OpenMode.APPEND).setCodec(codec); - //((LogMergePolicy) iwconf.getMergePolicy()).setUseCompoundFile(false); + //((LogMergePolicy) iwconf.getMergePolicy()).setNoCFSRatio(0.0); //((LogMergePolicy) iwconf.getMergePolicy()).setMergeFactor(10); iwconf.setMaxBufferedDocs(IndexWriterConfig.DISABLE_AUTO_FLUSH); Index: lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (working copy) @@ -41,7 +41,7 @@ super.setUp(); directory = newDirectory(); IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy())); - //writer.setUseCompoundFile(false); + //writer.setNoCFSRatio(0.0); //writer.infoStream = System.out; FieldType customType = new FieldType(TextField.TYPE_STORED); customType.setTokenized(false); Index: lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (working copy) @@ -50,7 +50,7 @@ public static void beforeClass() throws Exception { directory = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.SIMPLE, true)).setMergePolicy(newLogMergePolicy())); - //writer.setUseCompoundFile(true); + //writer.setNoCFSRatio(1.0); //writer.infoStream = System.out; for (int i = 0; i < 1000; i++) { Document doc = new Document(); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (working copy) @@ -769,7 +769,7 @@ TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)).setMaxBufferedDeleteTerms(2).setReaderPooling(false).setMergePolicy(newLogMergePolicy())); LogMergePolicy lmp = (LogMergePolicy) modifier.getConfig().getMergePolicy(); - lmp.setUseCompoundFile(true); + lmp.setNoCFSRatio(1.0); dir.failOn(failure.reset()); Index: lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (working copy) @@ -151,7 +151,7 @@ 0.1).setMaxBufferedDocs(maxBufferedDocs).setMergePolicy(newLogMergePolicy()), new YieldTestPoint()); w.commit(); LogMergePolicy lmp = (LogMergePolicy) w.getConfig().getMergePolicy(); - lmp.setUseCompoundFile(false); + lmp.setNoCFSRatio(0.0); lmp.setMergeFactor(mergeFactor); /*** w.setMaxMergeDocs(Integer.MAX_VALUE); @@ -202,7 +202,7 @@ .setRAMBufferSizeMB(0.1).setMaxBufferedDocs(maxBufferedDocs).setIndexerThreadPool(new ThreadAffinityDocumentsWriterThreadPool(maxThreadStates)) .setReaderPooling(doReaderPooling).setMergePolicy(newLogMergePolicy()), new YieldTestPoint()); LogMergePolicy lmp = (LogMergePolicy) w.getConfig().getMergePolicy(); - lmp.setUseCompoundFile(false); + lmp.setNoCFSRatio(0.0); lmp.setMergeFactor(mergeFactor); threads = new IndexingThread[nThreads]; Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (working copy) @@ -1142,7 +1142,7 @@ writer = new IndexWriter( dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())). - setMergePolicy(newLogMergePolicy(true)) + setMergePolicy(newLogMergePolicy(true)).setUseCompoundFile(true) ); LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy(); // Force creation of CFS: Index: lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java (working copy) @@ -226,7 +226,7 @@ .setIndexDeletionPolicy(new ExpirationTimeDeletionPolicy(dir, SECONDS)); MergePolicy mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(true); + ((LogMergePolicy) mp).setNoCFSRatio(1.0); } IndexWriter writer = new IndexWriter(dir, conf); ExpirationTimeDeletionPolicy policy = (ExpirationTimeDeletionPolicy) writer.getConfig().getIndexDeletionPolicy(); @@ -247,7 +247,7 @@ OpenMode.APPEND).setIndexDeletionPolicy(policy); mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(true); + ((LogMergePolicy) mp).setNoCFSRatio(1.0); } writer = new IndexWriter(dir, conf); policy = (ExpirationTimeDeletionPolicy) writer.getConfig().getIndexDeletionPolicy(); @@ -327,7 +327,7 @@ .setMergeScheduler(new SerialMergeScheduler()); MergePolicy mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile); + ((LogMergePolicy) mp).setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); } IndexWriter writer = new IndexWriter(dir, conf); KeepAllDeletionPolicy policy = (KeepAllDeletionPolicy) writer.getConfig().getIndexDeletionPolicy(); @@ -348,7 +348,7 @@ OpenMode.APPEND).setIndexDeletionPolicy(policy); mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile); + ((LogMergePolicy) mp).setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); } if (VERBOSE) { System.out.println("TEST: open writer for forceMerge"); @@ -527,7 +527,7 @@ .setMaxBufferedDocs(10); MergePolicy mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile); + ((LogMergePolicy) mp).setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); } IndexWriter writer = new IndexWriter(dir, conf); KeepNoneOnInitDeletionPolicy policy = (KeepNoneOnInitDeletionPolicy) writer.getConfig().getIndexDeletionPolicy(); @@ -540,7 +540,7 @@ .setOpenMode(OpenMode.APPEND).setIndexDeletionPolicy(policy); mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(true); + ((LogMergePolicy) mp).setNoCFSRatio(1.0); } writer = new IndexWriter(dir, conf); policy = (KeepNoneOnInitDeletionPolicy) writer.getConfig().getIndexDeletionPolicy(); @@ -582,7 +582,7 @@ .setMaxBufferedDocs(10); MergePolicy mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile); + ((LogMergePolicy) mp).setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); } IndexWriter writer = new IndexWriter(dir, conf); policy = (KeepLastNDeletionPolicy) writer.getConfig().getIndexDeletionPolicy(); @@ -643,7 +643,7 @@ .setMaxBufferedDocs(10); MergePolicy mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile); + ((LogMergePolicy) mp).setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); } IndexWriter writer = new IndexWriter(dir, conf); KeepLastNDeletionPolicy policy = (KeepLastNDeletionPolicy) writer.getConfig().getIndexDeletionPolicy(); @@ -659,7 +659,7 @@ .setMaxBufferedDocs(10); mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile); + ((LogMergePolicy) mp).setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); } writer = new IndexWriter(dir, conf); policy = (KeepLastNDeletionPolicy) writer.getConfig().getIndexDeletionPolicy(); Index: lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java (working copy) @@ -194,7 +194,7 @@ TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(3).setMergePolicy(newLogMergePolicy())); LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy(); lmp.setMergeFactor(2); - lmp.setUseCompoundFile(false); + lmp.setNoCFSRatio(0.0); Document d = new Document(); FieldType ft = new FieldType(TextField.TYPE_NOT_STORED); Index: lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java (working copy) @@ -193,7 +193,7 @@ TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(3).setMergePolicy(newLogMergePolicy())); LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy(); lmp.setMergeFactor(2); - lmp.setUseCompoundFile(false); + lmp.setNoCFSRatio(0.0); Document d = new Document(); FieldType customType = new FieldType(TextField.TYPE_NOT_STORED); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (working copy) @@ -54,14 +54,15 @@ dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())). setMaxBufferedDocs(10). - setMergePolicy(mergePolicy) + setMergePolicy(mergePolicy).setUseCompoundFile(true) ); int i; for(i=0;i<35;i++) { addDoc(writer, i); } - ((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false); + ((LogMergePolicy) writer.getConfig().getMergePolicy()).setNoCFSRatio(0.0); + writer.getConfig().setUseCompoundFile(false); for(;i<45;i++) { addDoc(writer, i); } @@ -71,7 +72,7 @@ writer = new IndexWriter( dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())). - setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES) + setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES).setUseCompoundFile(true) ); Term searchTerm = new Term("id", "7"); writer.deleteDocuments(searchTerm); Index: lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java (working copy) @@ -215,7 +215,7 @@ TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(3).setMergePolicy(newLogMergePolicy())); LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy(); lmp.setMergeFactor(2); - lmp.setUseCompoundFile(false); + lmp.setNoCFSRatio(0.0); Document d = new Document(); Field f1 = newField("f1", "This field has term freqs", omitType); Index: lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java (working copy) @@ -61,7 +61,7 @@ } dir = newDirectory(); IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()); - ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(false); + ((LogMergePolicy) conf.getMergePolicy()).setNoCFSRatio(0.0); IndexWriter writer = new IndexWriter(dir, conf); writer.addDocument(testDoc); writer.close(); Index: lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (working copy) @@ -596,7 +596,7 @@ Directory dir = newDirectory(); LogByteSizeMergePolicy lmp = new LogByteSizeMergePolicy(); - lmp.setUseCompoundFile(false); + lmp.setNoCFSRatio(0.0); lmp.setMergeFactor(100); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())) @@ -625,7 +625,7 @@ Directory dir2 = newDirectory(); lmp = new LogByteSizeMergePolicy(); lmp.setMinMergeMB(0.0001); - lmp.setUseCompoundFile(false); + lmp.setNoCFSRatio(0.0); lmp.setMergeFactor(4); writer = new IndexWriter(dir2, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())) Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (working copy) @@ -704,7 +704,7 @@ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2).setMergePolicy(newLogMergePolicy())); //LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy(); //lmp.setMergeFactor(2); - //lmp.setUseCompoundFile(false); + //lmp.setNoCFSRatio(0.0); Document doc = new Document(); String contents = "aa bb cc dd ee ff gg hh ii jj kk"; @@ -732,7 +732,7 @@ if (0 == i % 4) { writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); //LogMergePolicy lmp2 = (LogMergePolicy) writer.getConfig().getMergePolicy(); - //lmp2.setUseCompoundFile(false); + //lmp2.setNoCFSRatio(0.0); writer.forceMerge(1); writer.close(); } @@ -1348,7 +1348,7 @@ IndexWriter w = new IndexWriter( dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())). - setMergePolicy(mergePolicy) + setMergePolicy(mergePolicy).setUseCompoundFile(true) ); Document doc = new Document(); doc.add(newTextField("field", "go", Field.Store.NO)); @@ -1468,7 +1468,7 @@ Directory dir = newDirectory(); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())) - .setMaxBufferedDocs(2).setMergePolicy(newLogMergePolicy())); + .setMaxBufferedDocs(2).setMergePolicy(newLogMergePolicy()).setUseCompoundFile(false)); String[] files = dir.listAll(); // Creating over empty dir should not create any files, @@ -1550,7 +1550,7 @@ Directory dir = newDirectory(); IndexWriter indexWriter = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setRAMBufferSizeMB(0.01).setMergePolicy(newLogMergePolicy())); - ((LogMergePolicy) indexWriter.getConfig().getMergePolicy()).setUseCompoundFile(false); + ((LogMergePolicy) indexWriter.getConfig().getMergePolicy()).setNoCFSRatio(0.0); String BIG="alskjhlaksjghlaksjfhalksvjepgjioefgjnsdfjgefgjhelkgjhqewlrkhgwlekgrhwelkgjhwelkgrhwlkejg"; BIG=BIG+BIG+BIG+BIG; Index: lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (working copy) @@ -93,7 +93,7 @@ dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MyAnalyzer()). setMaxBufferedDocs(-1). - setMergePolicy(newLogMergePolicy(false, 10)) + setMergePolicy(newLogMergePolicy(false, 10)).setUseCompoundFile(false) ); Document doc = new Document(); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (working copy) @@ -78,6 +78,7 @@ assertEquals(IndexWriterConfig.DEFAULT_RAM_PER_THREAD_HARD_LIMIT_MB, conf.getRAMPerThreadHardLimitMB()); assertEquals(Codec.getDefault(), conf.getCodec()); assertEquals(InfoStream.getDefault(), conf.getInfoStream()); + assertEquals(IndexWriterConfig.DEFAULT_USE_COMPOUND_FILE_SYSTEM, conf.getUseCompoundFile()); // Sanity check - validate that all getters are covered. Set getters = new HashSet(); getters.add("getAnalyzer"); @@ -104,6 +105,7 @@ getters.add("getRAMPerThreadHardLimitMB"); getters.add("getCodec"); getters.add("getInfoStream"); + getters.add("getUseCompoundFile"); for (Method m : IndexWriterConfig.class.getDeclaredMethods()) { if (m.getDeclaringClass() == IndexWriterConfig.class && m.getName().startsWith("get")) { @@ -188,6 +190,7 @@ assertEquals(IndexWriterConfig.DISABLE_AUTO_FLUSH, IndexWriterConfig.DEFAULT_MAX_BUFFERED_DOCS); assertEquals(16.0, IndexWriterConfig.DEFAULT_RAM_BUFFER_SIZE_MB, 0.0); assertEquals(false, IndexWriterConfig.DEFAULT_READER_POOLING); + assertEquals(true, IndexWriterConfig.DEFAULT_USE_COMPOUND_FILE_SYSTEM); assertEquals(DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, IndexWriterConfig.DEFAULT_READER_TERMS_INDEX_DIVISOR); } @@ -372,14 +375,14 @@ iwc.setMergePolicy(newLogMergePolicy(true)); // Start false: - ((LogMergePolicy) iwc.getMergePolicy()).setUseCompoundFile(false); + ((LogMergePolicy) iwc.getMergePolicy()).setNoCFSRatio(0.0); IndexWriter w = new IndexWriter(dir, iwc); // Change to true: LogMergePolicy lmp = ((LogMergePolicy) w.getConfig().getMergePolicy()); lmp.setNoCFSRatio(1.0); lmp.setMaxCFSSegmentSizeMB(Double.POSITIVE_INFINITY); - lmp.setUseCompoundFile(true); + lmp.setNoCFSRatio(1.0); Document doc = new Document(); doc.add(newStringField("field", "foo", Store.NO)); Index: lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (working copy) @@ -573,8 +573,7 @@ _TestUtil.rmDir(indexDir); Directory dir = newFSDirectory(indexDir); LogByteSizeMergePolicy mp = new LogByteSizeMergePolicy(); - mp.setUseCompoundFile(doCFS); - mp.setNoCFSRatio(1.0); + mp.setNoCFSRatio(doCFS ? 1.0 : 0.0); mp.setMaxCFSSegmentSizeMB(Double.POSITIVE_INFINITY); // TODO: remove randomness IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())) @@ -593,7 +592,7 @@ if (!fullyMerged) { // open fresh writer so we get no prx file in the added segment mp = new LogByteSizeMergePolicy(); - mp.setUseCompoundFile(doCFS); + mp.setNoCFSRatio(doCFS ? 1.0 : 0.0); mp.setNoCFSRatio(1.0); // TODO: remove randomness conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())) Index: lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java =================================================================== --- lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (working copy) @@ -73,7 +73,7 @@ IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer); final MergePolicy mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFiles); + ((LogMergePolicy) mp).setNoCFSRatio(useCompoundFiles ? 1.0 : 0.0); } IndexWriter writer = new IndexWriter(directory, conf); if (VERBOSE) { Index: lucene/core/src/test/org/apache/lucene/TestSearch.java =================================================================== --- lucene/core/src/test/org/apache/lucene/TestSearch.java (revision 1491727) +++ lucene/core/src/test/org/apache/lucene/TestSearch.java (working copy) @@ -113,7 +113,7 @@ IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer); MergePolicy mp = conf.getMergePolicy(); if (mp instanceof LogMergePolicy) { - ((LogMergePolicy) mp).setUseCompoundFile(useCompoundFile); + ((LogMergePolicy) mp).setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); } IndexWriter writer = new IndexWriter(directory, conf); Index: lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java (revision 1491727) +++ lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java (working copy) @@ -98,6 +98,9 @@ /** {@link Version} that {@link IndexWriter} should emulate. */ protected final Version matchVersion; + /** True if segment flushes should use compound file format */ + protected volatile boolean useCompoundFile = IndexWriterConfig.DEFAULT_USE_COMPOUND_FILE_SYSTEM; + // used by IndexWriterConfig LiveIndexWriterConfig(Analyzer analyzer, Version matchVersion) { this.analyzer = analyzer; @@ -110,6 +113,7 @@ termIndexInterval = IndexWriterConfig.DEFAULT_TERM_INDEX_INTERVAL; // TODO: this should be private to the codec, not settable here delPolicy = new KeepOnlyLastCommitDeletionPolicy(); commit = null; + useCompoundFile = IndexWriterConfig.DEFAULT_USE_COMPOUND_FILE_SYSTEM; openMode = OpenMode.CREATE_OR_APPEND; similarity = IndexSearcher.getDefaultSimilarity(); mergeScheduler = new ConcurrentMergeScheduler(); @@ -154,6 +158,7 @@ readerPooling = config.getReaderPooling(); flushPolicy = config.getFlushPolicy(); perThreadHardLimitMB = config.getRAMPerThreadHardLimitMB(); + useCompoundFile = config.getUseCompoundFile(); } /** Returns the default analyzer to use for indexing documents. */ @@ -542,6 +547,27 @@ return infoStream; } + /** + * Sets if the {@link IndexWriter} should pack newly written segments in a + * compound file. Default is true. + *

+ * Use false for batch indexing with very large ram buffer + * settings. + *

+ */ + public LiveIndexWriterConfig setUseCompoundFile(boolean useCompoundFile) { + this.useCompoundFile = useCompoundFile; + return this; + } + + /** + * Retruns true iff the {@link IndexWriter} packs + * newly written segments in a compound file. Default is true. + */ + public boolean getUseCompoundFile() { + return useCompoundFile ; + } + @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -567,7 +593,10 @@ sb.append("indexerThreadPool=").append(getIndexerThreadPool()).append("\n"); sb.append("readerPooling=").append(getReaderPooling()).append("\n"); sb.append("perThreadHardLimitMB=").append(getRAMPerThreadHardLimitMB()).append("\n"); + sb.append("useCompoundFile=").append(getUseCompoundFile()).append("\n"); return sb.toString(); } + + } Index: lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java (revision 1491727) +++ lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java (working copy) @@ -29,15 +29,11 @@ import org.apache.lucene.index.DocumentsWriterPerThread.IndexingChain; import org.apache.lucene.index.DocumentsWriterPerThreadPool.ThreadState; import org.apache.lucene.index.FieldInfos.FieldNumbers; -import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.similarities.Similarity; import org.apache.lucene.store.AlreadyClosedException; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FlushInfo; -import org.apache.lucene.store.IOContext; import org.apache.lucene.util.InfoStream; -import org.apache.lucene.util.MutableBits; /** * This class accepts multiple added documents and directly @@ -114,6 +110,7 @@ List newFiles; final IndexWriter indexWriter; + final LiveIndexWriterConfig indexWriterConfig; private AtomicInteger numDocsInRAM = new AtomicInteger(0); @@ -144,6 +141,7 @@ this.indexWriter = writer; this.infoStream = config.getInfoStream(); this.similarity = config.getSimilarity(); + this.indexWriterConfig = writer.getConfig(); this.perThreadPool = config.getIndexerThreadPool(); this.chain = config.getIndexingChain(); this.perThreadPool.initialize(this, globalFieldNumbers, config); @@ -517,7 +515,7 @@ // buffer, force them all to apply now. This is to // prevent too-frequent flushing of a long tail of // tiny segments: - final double ramBufferSizeMB = indexWriter.getConfig().getRAMBufferSizeMB(); + final double ramBufferSizeMB = indexWriterConfig.getRAMBufferSizeMB(); if (ramBufferSizeMB != IndexWriterConfig.DISABLE_AUTO_FLUSH && flushControl.getDeleteBytesUsed() > (1024*1024*ramBufferSizeMB/2)) { if (infoStream.isEnabled("DW")) { Index: lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java (revision 1491727) +++ lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java (working copy) @@ -110,6 +110,10 @@ * others to finish. Default value is 8. */ public final static int DEFAULT_MAX_THREAD_STATES = 8; + /** Default value for compound file system for newly written segments + * (set to true). For batch indexing with very large + * ram buffers use false */ + public final static boolean DEFAULT_USE_COMPOUND_FILE_SYSTEM = true; /** * Sets the default (for any instance) maximum time to wait for a write lock * (in milliseconds). @@ -540,5 +544,9 @@ public IndexWriterConfig setTermIndexInterval(int interval) { return (IndexWriterConfig) super.setTermIndexInterval(interval); } + + public IndexWriterConfig setUseCompoundFile(boolean useCompoundFile) { + return (IndexWriterConfig) super.setUseCompoundFile(useCompoundFile); + } } Index: lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (revision 1491727) +++ lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java (working copy) @@ -194,6 +194,7 @@ private final NumberFormat nf = NumberFormat.getInstance(Locale.ROOT); final Allocator byteBlockAllocator; final IntBlockPool.Allocator intBlockAllocator; + private final LiveIndexWriterConfig indexWriterConfig; public DocumentsWriterPerThread(Directory directory, DocumentsWriter parent, @@ -203,6 +204,7 @@ this.parent = parent; this.fieldInfos = fieldInfos; this.writer = parent.indexWriter; + this.indexWriterConfig = parent.indexWriterConfig; this.infoStream = parent.infoStream; this.codec = parent.codec; this.docState = new DocState(this, infoStream); @@ -567,7 +569,7 @@ boolean success = false; try { - if (writer.useCompoundFile(newSegment)) { + if (indexWriterConfig.getUseCompoundFile()) { // Now build compound file Collection oldFiles = IndexWriter.createCompoundFile(infoStream, directory, MergeState.CheckAbort.NONE, newSegment.info, context); Index: lucene/core/src/java/org/apache/lucene/index/IndexWriter.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (revision 1491727) +++ lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (working copy) @@ -2269,10 +2269,6 @@ } } - synchronized boolean useCompoundFile(SegmentInfoPerCommit segmentInfo) throws IOException { - return mergePolicy.useCompoundFile(segmentInfos, segmentInfo); - } - private synchronized void resetMergeExceptions() { mergeExceptions = new ArrayList(); mergeGen++; Index: lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (revision 1491727) +++ lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (working copy) @@ -27,9 +27,6 @@ import java.util.List; import java.util.ArrayList; -import org.apache.lucene.index.MergePolicy.MergeTrigger; - - /** * Merges segments of approximately equal size, subject to * an allowed number of segments per tier. This is similar @@ -84,7 +81,6 @@ private long floorSegmentBytes = 2*1024*1024L; private double segsPerTier = 10.0; private double forceMergeDeletesPctAllowed = 10.0; - private boolean useCompoundFile = true; private double noCFSRatio = 0.1; private long maxCFSSegmentSize = Long.MAX_VALUE; private double reclaimDeletesWeight = 2.0; @@ -233,21 +229,6 @@ return segsPerTier; } - /** Sets whether compound file format should be used for - * newly flushed and newly merged segments. Default - * true. */ - public TieredMergePolicy setUseCompoundFile(boolean useCompoundFile) { - this.useCompoundFile = useCompoundFile; - return this; - } - - /** Returns the current useCompoundFile setting. - * - * @see #setUseCompoundFile */ - public boolean getUseCompoundFile() { - return useCompoundFile; - } - /** If a merged segment will be more than this percentage * of the total size of the index, leave the segment as * non-compound file even if compound file is enabled. @@ -638,7 +619,7 @@ @Override public boolean useCompoundFile(SegmentInfos infos, SegmentInfoPerCommit mergedInfo) throws IOException { - if (!getUseCompoundFile()) { + if (getNoCFSRatio() == 0.0) { return false; } long mergedInfoSize = size(mergedInfo); @@ -665,7 +646,7 @@ boolean hasDeletions = w.numDeletedDocs(info) > 0; return !hasDeletions && info.info.dir == w.getDirectory() && - (info.info.getUseCompoundFile() == useCompoundFile || noCFSRatio < 1.0 || maxCFSSegmentSize < Long.MAX_VALUE); + ((noCFSRatio > 0.0 && noCFSRatio < 1.0) || maxCFSSegmentSize < Long.MAX_VALUE); } // Segment size in bytes, pro-rated by % deleted @@ -699,7 +680,6 @@ sb.append("floorSegmentMB=").append(floorSegmentBytes/1024/1024.).append(", "); sb.append("forceMergeDeletesPctAllowed=").append(forceMergeDeletesPctAllowed).append(", "); sb.append("segmentsPerTier=").append(segsPerTier).append(", "); - sb.append("useCompoundFile=").append(useCompoundFile).append(", "); sb.append("maxCFSSegmentSizeMB=").append(getMaxCFSSegmentSizeMB()).append(", "); sb.append("noCFSRatio=").append(noCFSRatio); return sb.toString(); Index: lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java =================================================================== --- lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java (revision 1491727) +++ lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java (working copy) @@ -98,8 +98,7 @@ /** If the size of the merge segment exceeds this ratio of * the total index size then it will remain in - * non-compound format even if {@link - * #setUseCompoundFile} is {@code true}. */ + * non-compound format */ protected double noCFSRatio = DEFAULT_NO_CFS_RATIO; /** If the size of the merged segment exceeds @@ -110,12 +109,6 @@ * percentage of non-deleted documents. */ protected boolean calibrateSizeByDeletes = true; - /** True if new segments (flushed or merged) should use - * the compound file format. Note that large segments - * may sometimes still use non-compound format (see - * {@link #setNoCFSRatio}. */ - protected boolean useCompoundFile = true; - /** Sole constructor. (For invocation by subclass * constructors, typically implicit.) */ public LogMergePolicy() { @@ -181,7 +174,7 @@ // Javadoc inherited @Override public boolean useCompoundFile(SegmentInfos infos, SegmentInfoPerCommit mergedInfo) throws IOException { - if (!getUseCompoundFile()) { + if (getNoCFSRatio() == 0.0) { return false; } long mergedInfoSize = size(mergedInfo); @@ -198,19 +191,6 @@ return mergedInfoSize <= getNoCFSRatio() * totalSize; } - /** Sets whether compound file format should be used for - * newly flushed and newly merged segments. */ - public void setUseCompoundFile(boolean useCompoundFile) { - this.useCompoundFile = useCompoundFile; - } - - /** Returns true if newly flushed and newly merge segments - * are written in compound file format. @see - * #setUseCompoundFile */ - public boolean getUseCompoundFile() { - return useCompoundFile; - } - /** Sets whether the segment size should be calibrated by * the number of deletes when choosing segments for merge. */ public void setCalibrateSizeByDeletes(boolean calibrateSizeByDeletes) { @@ -291,8 +271,7 @@ assert w != null; boolean hasDeletions = w.numDeletedDocs(info) > 0; return !hasDeletions && - info.info.dir == w.getDirectory() && - (info.info.getUseCompoundFile() == useCompoundFile || noCFSRatio < 1.0); + info.info.dir == w.getDirectory() && (noCFSRatio > 0.0 && noCFSRatio < 1.0); } /** @@ -726,7 +705,6 @@ sb.append("maxMergeSizeForForcedMerge=").append(maxMergeSizeForForcedMerge).append(", "); sb.append("calibrateSizeByDeletes=").append(calibrateSizeByDeletes).append(", "); sb.append("maxMergeDocs=").append(maxMergeDocs).append(", "); - sb.append("useCompoundFile=").append(useCompoundFile).append(", "); sb.append("maxCFSSegmentSizeMB=").append(getMaxCFSSegmentSizeMB()).append(", "); sb.append("noCFSRatio=").append(noCFSRatio); sb.append("]"); Index: lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java =================================================================== --- lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (revision 1491727) +++ lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (working copy) @@ -754,7 +754,7 @@ assertEquals(2, writer.getConfig().getMaxBufferedDocs()); assertEquals(IndexWriterConfig.DISABLE_AUTO_FLUSH, (int) writer.getConfig().getRAMBufferSizeMB()); assertEquals(3, ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor()); - assertFalse(((LogMergePolicy) writer.getConfig().getMergePolicy()).getUseCompoundFile()); + assertEquals(0.0d, ((LogMergePolicy) writer.getConfig().getMergePolicy()).getNoCFSRatio(), 0.0); writer.close(); Directory dir = benchmark.getRunData().getDirectory(); IndexReader reader = DirectoryReader.open(dir); Index: lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java =================================================================== --- lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java (revision 1491727) +++ lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java (working copy) @@ -153,11 +153,11 @@ } if(iwConf.getMergePolicy() instanceof LogMergePolicy) { LogMergePolicy logMergePolicy = (LogMergePolicy) iwConf.getMergePolicy(); - logMergePolicy.setUseCompoundFile(isCompound); + logMergePolicy.setNoCFSRatio(isCompound ? 1.0 : 0.0); logMergePolicy.setMergeFactor(config.get("merge.factor",OpenIndexTask.DEFAULT_MERGE_PFACTOR)); } else if(iwConf.getMergePolicy() instanceof TieredMergePolicy) { TieredMergePolicy tieredMergePolicy = (TieredMergePolicy) iwConf.getMergePolicy(); - tieredMergePolicy.setUseCompoundFile(isCompound); + tieredMergePolicy.setNoCFSRatio(isCompound ? 1.0 : 0.0); } } final double ramBuffer = config.get("ram.flush.mb",OpenIndexTask.DEFAULT_RAM_FLUSH_MB); Index: solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java =================================================================== --- solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (revision 1491727) +++ solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (working copy) @@ -217,14 +217,14 @@ if (maxMergeDocs != -1) logMergePolicy.setMaxMergeDocs(maxMergeDocs); - logMergePolicy.setUseCompoundFile(useCompoundFile); + logMergePolicy.setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); if (mergeFactor != -1) logMergePolicy.setMergeFactor(mergeFactor); } else if (policy instanceof TieredMergePolicy) { TieredMergePolicy tieredMergePolicy = (TieredMergePolicy) policy; - tieredMergePolicy.setUseCompoundFile(useCompoundFile); + tieredMergePolicy.setNoCFSRatio(useCompoundFile ? 1.0 : 0.0); if (mergeFactor != -1) { tieredMergePolicy.setMaxMergeAtOnce(mergeFactor); Index: solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java =================================================================== --- solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java (revision 1491727) +++ solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java (working copy) @@ -40,7 +40,7 @@ assertEquals(19, tieredMP.getMaxMergeAtOnceExplicit()); // make sure we apply compoundFile and mergeFactor - assertEquals(false, tieredMP.getUseCompoundFile()); + assertEquals(0.0, tieredMP.getNoCFSRatio(), 0.0); assertEquals(7, tieredMP.getMaxMergeAtOnce()); // make sure we overrode segmentsPerTier (split from maxMergeAtOnce out of mergeFactor)