From cf6fb18337f0749d737ae5492475665c1888e921 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Sat, 9 Jul 2011 11:44:46 +0000 Subject: [PATCH] Make creation of backwards indexes working again (unfortunately in trunk it still has some randomness in MockAnalyzer, added TODO) git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1144658 13f79535-47bb-0310-9956-ffa450edef68 --- .../index/TestBackwardsCompatibility.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java index 5a629dacd85..b3d91e2d80d 100644 --- a/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java +++ b/lucene/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java @@ -455,9 +455,12 @@ public class TestBackwardsCompatibility extends LuceneTestCase { File indexDir = new File(LuceneTestCase.TEMP_DIR, dirName); _TestUtil.rmDir(indexDir); Directory dir = newFSDirectory(indexDir); - - IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(10); - ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(doCFS); + LogByteSizeMergePolicy mp = new LogByteSizeMergePolicy(); + mp.setUseCompoundFile(doCFS); + mp.setNoCFSRatio(1.0); + // TODO: remove randomness + IndexWriterConfig conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)) + .setMaxBufferedDocs(10).setMergePolicy(mp); IndexWriter writer = new IndexWriter(dir, conf); for(int i=0;i<35;i++) { @@ -471,8 +474,12 @@ public class TestBackwardsCompatibility extends LuceneTestCase { if (!optimized) { // open fresh writer so we get no prx file in the added segment - conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(10); - ((LogMergePolicy) conf.getMergePolicy()).setUseCompoundFile(doCFS); + mp = new LogByteSizeMergePolicy(); + mp.setUseCompoundFile(doCFS); + mp.setNoCFSRatio(1.0); + // TODO: remove randomness + conf = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)) + .setMaxBufferedDocs(10).setMergePolicy(mp); writer = new IndexWriter(dir, conf); addNoProxDoc(writer); writer.close();