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/11/11 20:50:56 UTC
svn commit: r1201036 [3/4] - in /lucene/dev/trunk:
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/
l...
Copied: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (from r1200273, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java?p2=lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java&p1=lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java&r1=1200273&r2=1201036&rev=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOptimize.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java Fri Nov 11 19:50:51 2011
@@ -28,8 +28,8 @@ import org.apache.lucene.store.MockDirec
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
-public class TestIndexWriterOptimize extends LuceneTestCase {
- public void testOptimizeMaxNumSegments() throws IOException {
+public class TestIndexWriterForceMerge extends LuceneTestCase {
+ public void testPartialMerge() throws IOException {
MockDirectoryWrapper dir = newDirectory();
@@ -56,7 +56,7 @@ public class TestIndexWriterOptimize ext
ldmp.setMergeFactor(5);
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT,
new MockAnalyzer(random)).setMergePolicy(ldmp));
- writer.optimize(3);
+ writer.forceMerge(3);
writer.close();
sis = new SegmentInfos();
@@ -71,7 +71,7 @@ public class TestIndexWriterOptimize ext
dir.close();
}
- public void testOptimizeMaxNumSegments2() throws IOException {
+ public void testMaxNumSegments2() throws IOException {
MockDirectoryWrapper dir = newDirectory();
final Document doc = new Document();
@@ -97,7 +97,7 @@ public class TestIndexWriterOptimize ext
final int segCount = sis.size();
- writer.optimize(7);
+ writer.forceMerge(7);
writer.commit();
writer.waitForMerges();
@@ -115,11 +115,11 @@ public class TestIndexWriterOptimize ext
}
/**
- * Make sure optimize doesn't use any more than 1X
+ * Make sure forceMerge doesn't use any more than 1X
* starting index size as its temporary free space
* required.
*/
- public void testOptimizeTempSpaceUsage() throws IOException {
+ public void testForceMergeTempSpaceUsage() throws IOException {
MockDirectoryWrapper dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(10).setMergePolicy(newLogMergePolicy()));
@@ -156,18 +156,18 @@ public class TestIndexWriterOptimize ext
// smaller one here could increase the disk usage and
// cause a false failure:
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND).setTermIndexInterval(termIndexInterval).setMergePolicy(newLogMergePolicy()));
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
long maxDiskUsage = dir.getMaxUsedSizeInBytes();
- assertTrue("optimize used too much temporary space: starting usage was " + startDiskUsage + " bytes; max temp usage was " + maxDiskUsage + " but should have been " + (4*startDiskUsage) + " (= 4X starting usage)",
+ assertTrue("forceMerge used too much temporary space: starting usage was " + startDiskUsage + " bytes; max temp usage was " + maxDiskUsage + " but should have been " + (4*startDiskUsage) + " (= 4X starting usage)",
maxDiskUsage <= 4*startDiskUsage);
dir.close();
}
- // Test calling optimize(false) whereby optimize is kicked
+ // Test calling forceMerge(1, false) whereby forceMerge is kicked
// off but we don't wait for it to finish (but
// writer.close()) does wait
- public void testBackgroundOptimize() throws IOException {
+ public void testBackgroundForceMerge() throws IOException {
Directory dir = newDirectory();
for(int pass=0;pass<2;pass++) {
@@ -182,22 +182,22 @@ public class TestIndexWriterOptimize ext
doc.add(newField("field", "aaa", StringField.TYPE_UNSTORED));
for(int i=0;i<100;i++)
writer.addDocument(doc);
- writer.optimize(false);
+ writer.forceMerge(1, false);
if (0 == pass) {
writer.close();
IndexReader reader = IndexReader.open(dir, true);
- assertTrue(reader.isOptimized());
+ assertEquals(1, reader.getSequentialSubReaders().length);
reader.close();
} else {
// Get another segment to flush so we can verify it is
- // NOT included in the optimization
+ // NOT included in the merging
writer.addDocument(doc);
writer.addDocument(doc);
writer.close();
IndexReader reader = IndexReader.open(dir, true);
- assertTrue(!reader.isOptimized());
+ assertTrue(reader.getSequentialSubReaders().length > 1);
reader.close();
SegmentInfos infos = new SegmentInfos();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Fri Nov 11 19:50:51 2011
@@ -64,7 +64,7 @@ public class TestIndexWriterMerging exte
setMergePolicy(newLogMergePolicy(2))
);
writer.addIndexes(indexA, indexB);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
fail = verifyIndex(merged, 0);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java Fri Nov 11 19:50:51 2011
@@ -24,7 +24,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
@@ -180,7 +179,7 @@ public class TestIndexWriterOnDiskFull e
}
// Now, build a starting index that has START_COUNT docs. We
- // will then try to addIndexesNoOptimize into a copy of this:
+ // will then try to addIndexes into a copy of this:
MockDirectoryWrapper startDir = newDirectory();
IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
for(int j=0;j<START_COUNT;j++) {
@@ -234,7 +233,7 @@ public class TestIndexWriterOnDiskFull e
String methodName;
if (0 == method) {
- methodName = "addIndexes(Directory[]) + optimize()";
+ methodName = "addIndexes(Directory[]) + forceMerge(1)";
} else if (1 == method) {
methodName = "addIndexes(IndexReader[])";
} else {
@@ -303,7 +302,7 @@ public class TestIndexWriterOnDiskFull e
if (0 == method) {
writer.addIndexes(dirs);
- writer.optimize();
+ writer.forceMerge(1);
} else if (1 == method) {
IndexReader readers[] = new IndexReader[dirs.length];
for(int i=0;i<dirs.length;i++) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Fri Nov 11 19:50:51 2011
@@ -92,7 +92,7 @@ public class TestIndexWriterReader exten
assertFalse(reader.isCurrent());
reader.close();
}
- writer.optimize(); // make sure all merging is done etc.
+ writer.forceMerge(1); // make sure all merging is done etc.
IndexReader reader = writer.getReader();
writer.commit(); // no changes that are not visible to the reader
assertTrue(reader.isCurrent());
@@ -110,7 +110,7 @@ public class TestIndexWriterReader exten
}
public void testUpdateDocument() throws Exception {
- boolean optimize = true;
+ boolean doFullMerge = true;
Directory dir1 = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
@@ -129,7 +129,7 @@ public class TestIndexWriterReader exten
IndexWriter writer = new IndexWriter(dir1, iwc);
// create the index
- createIndexNoClose(!optimize, "index1", writer);
+ createIndexNoClose(!doFullMerge, "index1", writer);
// writer.flush(false, true, true);
@@ -199,7 +199,7 @@ public class TestIndexWriterReader exten
assertTrue(nrtReader.isCurrent());
writer.addDocument(doc);
assertFalse(nrtReader.isCurrent()); // should see the changes
- writer.optimize(); // make sure we don't have a merge going on
+ writer.forceMerge(1); // make sure we don't have a merge going on
assertFalse(nrtReader.isCurrent());
nrtReader.close();
@@ -225,7 +225,7 @@ public class TestIndexWriterReader exten
* @throws Exception
*/
public void testAddIndexes() throws Exception {
- boolean optimize = false;
+ boolean doFullMerge = false;
Directory dir1 = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
@@ -241,13 +241,13 @@ public class TestIndexWriterReader exten
IndexWriter writer = new IndexWriter(dir1, iwc);
// create the index
- createIndexNoClose(!optimize, "index1", writer);
+ createIndexNoClose(!doFullMerge, "index1", writer);
writer.flush(false, true);
// create a 2nd index
Directory dir2 = newDirectory();
IndexWriter writer2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- createIndexNoClose(!optimize, "index2", writer2);
+ createIndexNoClose(!doFullMerge, "index2", writer2);
writer2.close();
IndexReader r0 = writer.getReader();
@@ -280,7 +280,7 @@ public class TestIndexWriterReader exten
}
public void testAddIndexes2() throws Exception {
- boolean optimize = false;
+ boolean doFullMerge = false;
Directory dir1 = newDirectory();
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
@@ -288,7 +288,7 @@ public class TestIndexWriterReader exten
// create a 2nd index
Directory dir2 = newDirectory();
IndexWriter writer2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- createIndexNoClose(!optimize, "index2", writer2);
+ createIndexNoClose(!doFullMerge, "index2", writer2);
writer2.close();
writer.addIndexes(dir2);
@@ -312,12 +312,12 @@ public class TestIndexWriterReader exten
* @throws Exception
*/
public void testDeleteFromIndexWriter() throws Exception {
- boolean optimize = true;
+ boolean doFullMerge = true;
Directory dir1 = newDirectory();
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setReaderTermsIndexDivisor(2));
// create the index
- createIndexNoClose(!optimize, "index1", writer);
+ createIndexNoClose(!doFullMerge, "index1", writer);
writer.flush(false, true);
// get a reader
IndexReader r1 = writer.getReader();
@@ -487,7 +487,7 @@ public class TestIndexWriterReader exten
switch (j % 4) {
case 0:
mainWriter.addIndexes(dirs);
- mainWriter.optimize();
+ mainWriter.forceMerge(1);
break;
case 1:
mainWriter.addIndexes(dirs);
@@ -503,7 +503,7 @@ public class TestIndexWriterReader exten
}
}
- public void testIndexWriterReopenSegmentOptimize() throws Exception {
+ public void testIndexWriterReopenSegmentFullMerge() throws Exception {
doTestIndexWriterReopenSegment(true);
}
@@ -515,13 +515,13 @@ public class TestIndexWriterReader exten
* Tests creating a segment, then check to insure the segment can be seen via
* IW.getReader
*/
- public void doTestIndexWriterReopenSegment(boolean optimize) throws Exception {
+ public void doTestIndexWriterReopenSegment(boolean doFullMerge) throws Exception {
Directory dir1 = newDirectory();
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
IndexReader r1 = writer.getReader();
assertEquals(0, r1.maxDoc());
createIndexNoClose(false, "index1", writer);
- writer.flush(!optimize, true);
+ writer.flush(!doFullMerge, true);
IndexReader iwr1 = writer.getReader();
assertEquals(100, iwr1.maxDoc());
@@ -581,7 +581,7 @@ public class TestIndexWriterReader exten
w.addDocument(DocHelper.createDocument(i, indexName, 4));
}
if (!multiSegment) {
- w.optimize();
+ w.forceMerge(1);
}
w.close();
}
@@ -592,7 +592,7 @@ public class TestIndexWriterReader exten
w.addDocument(DocHelper.createDocument(i, indexName, 4));
}
if (!multiSegment) {
- w.optimize();
+ w.forceMerge(1);
}
}
@@ -636,7 +636,7 @@ public class TestIndexWriterReader exten
final int count = warmer.warmCount;
writer.addDocument(DocHelper.createDocument(17, "test", 4));
- writer.optimize();
+ writer.forceMerge(1);
assertTrue(warmer.warmCount > count);
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java Fri Nov 11 19:50:51 2011
@@ -326,9 +326,9 @@ public class TestIndexWriterUnicode exte
// Test multi segment
r.close();
- writer.optimize();
+ writer.forceMerge(1);
- // Test optimized single segment
+ // Test single segment
r = writer.getReader();
checkTermsOrder(r, allTerms, true);
r.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java Fri Nov 11 19:50:51 2011
@@ -102,7 +102,7 @@ public class TestLazyProxSkipping extend
}
// make sure the index has only a single segment
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
SegmentReader reader = getOnlySegmentReader(IndexReader.open(directory, false));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java Fri Nov 11 19:50:51 2011
@@ -77,7 +77,7 @@ public class TestMultiLevelSkipList exte
writer.addDocument(d1);
}
writer.commit();
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
IndexReader reader = getOnlySegmentReader(IndexReader.open(dir));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java Fri Nov 11 19:50:51 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.store.MockDirec
import org.apache.lucene.util.LuceneTestCase.UseNoMemoryExpensiveCodec;
// TODO
-// - mix in optimize, addIndexes
+// - mix in forceMerge, addIndexes
// - randomoly mix in non-congruent docs
@UseNoMemoryExpensiveCodec
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java Fri Nov 11 19:50:51 2011
@@ -31,7 +31,7 @@ public class TestNoMergePolicy extends L
public void testNoMergePolicy() throws Exception {
MergePolicy mp = NoMergePolicy.NO_COMPOUND_FILES;
assertNull(mp.findMerges(null));
- assertNull(mp.findMergesForOptimize(null, 0, null));
+ assertNull(mp.findForcedMerges(null, 0, null));
assertNull(mp.findMergesToExpungeDeletes(null));
assertFalse(mp.useCompoundFile(null, null));
mp.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNorms.java Fri Nov 11 19:50:51 2011
@@ -36,7 +36,7 @@ import org.apache.lucene.util.LuceneTest
/**
* Test that norms info is preserved during index life - including
- * separate norms, addDocument, addIndexes, optimize.
+ * separate norms, addDocument, addIndexes, forceMerge.
*/
public class TestNorms extends LuceneTestCase {
@@ -74,7 +74,7 @@ public class TestNorms extends LuceneTes
* Test that norms values are preserved as the index is maintained.
* Including separate norms.
* Including merging indexes with seprate norms.
- * Including optimize.
+ * Including forceMerge.
*/
public void testNorms() throws IOException {
Directory dir1 = newDirectory();
@@ -111,7 +111,7 @@ public class TestNorms extends LuceneTes
setMergePolicy(newLogMergePolicy(3))
);
iw.addIndexes(dir1,dir2);
- iw.optimize();
+ iw.forceMerge(1);
iw.close();
norms1.addAll(norms);
@@ -124,7 +124,7 @@ public class TestNorms extends LuceneTes
verifyIndex(dir3);
doTestNorms(random, dir3);
- // now with optimize
+ // now with single segment
iw = new IndexWriter(
dir3,
newIndexWriterConfig(TEST_VERSION_CURRENT, anlzr).
@@ -132,7 +132,7 @@ public class TestNorms extends LuceneTes
setMaxBufferedDocs(5).
setMergePolicy(newLogMergePolicy(3))
);
- iw.optimize();
+ iw.forceMerge(1);
iw.close();
verifyIndex(dir3);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitNorms.java Fri Nov 11 19:50:51 2011
@@ -49,7 +49,7 @@ public class TestOmitNorms extends Lucen
d.add(f2);
writer.addDocument(d);
- writer.optimize();
+ writer.forceMerge(1);
// now we add another document which has term freq for field f2 and not for f1 and verify if the SegmentMerger
// keep things constant
d = new Document();
@@ -62,7 +62,7 @@ public class TestOmitNorms extends Lucen
writer.addDocument(d);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -116,7 +116,7 @@ public class TestOmitNorms extends Lucen
}
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -163,7 +163,7 @@ public class TestOmitNorms extends Lucen
}
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -209,7 +209,7 @@ public class TestOmitNorms extends Lucen
assertNoNrm(ram);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -221,7 +221,7 @@ public class TestOmitNorms extends Lucen
* Tests various combinations of omitNorms=true/false, the field not existing at all,
* ensuring that only omitNorms is 'viral'.
* Internally checks that MultiNorms.norms() is consistent (returns the same bytes)
- * as the optimized equivalent.
+ * as the fully merged equivalent.
*/
public void testOmitNormsCombos() throws IOException {
// indexed with norms
@@ -290,8 +290,8 @@ public class TestOmitNorms extends Lucen
IndexReader ir1 = riw.getReader();
byte[] norms1 = MultiNorms.norms(ir1, field);
- // optimize and validate MultiNorms against single segment.
- riw.optimize();
+ // fully merge and validate MultiNorms against single segment.
+ riw.forceMerge(1);
IndexReader ir2 = riw.getReader();
byte[] norms2 = ir2.getSequentialSubReaders()[0].norms(field);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitPositions.java Fri Nov 11 19:50:51 2011
@@ -109,7 +109,7 @@ public class TestOmitPositions extends L
d.add(f9);
writer.addDocument(d);
- writer.optimize();
+ writer.forceMerge(1);
// now we add another document which has docs-only for f1, f4, f7, docs/freqs for f2, f5, f8,
// and docs/freqs/positions for f3, f6, f9
@@ -148,7 +148,7 @@ public class TestOmitPositions extends L
writer.addDocument(d);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -217,7 +217,7 @@ public class TestOmitPositions extends L
writer.addDocument(d);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestOmitTf.java Fri Nov 11 19:50:51 2011
@@ -81,7 +81,7 @@ public class TestOmitTf extends LuceneTe
d.add(f2);
writer.addDocument(d);
- writer.optimize();
+ writer.forceMerge(1);
// now we add another document which has term freq for field f2 and not for f1 and verify if the SegmentMerger
// keep things constant
d = new Document();
@@ -96,7 +96,7 @@ public class TestOmitTf extends LuceneTe
writer.addDocument(d);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -148,7 +148,7 @@ public class TestOmitTf extends LuceneTe
writer.addDocument(d);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -190,7 +190,7 @@ public class TestOmitTf extends LuceneTe
writer.addDocument(d);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -233,7 +233,8 @@ public class TestOmitTf extends LuceneTe
assertNoPrx(ram);
- // now add some documents with positions, and check there is no prox after optimization
+ // now add some documents with positions, and check
+ // there is no prox after full merge
d = new Document();
f1 = newField("f1", "This field has positions", TextField.TYPE_UNSTORED);
d.add(f1);
@@ -242,7 +243,7 @@ public class TestOmitTf extends LuceneTe
writer.addDocument(d);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -278,7 +279,7 @@ public class TestOmitTf extends LuceneTe
//System.out.println(d);
}
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -413,7 +414,7 @@ public class TestOmitTf extends LuceneTe
@Override
public void collect(int doc) throws IOException {
count++;
- sum += doc + docBase; // use it to avoid any possibility of being optimized away
+ sum += doc + docBase; // use it to avoid any possibility of being merged away
}
public static int getCount() { return count; }
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReader.java Fri Nov 11 19:50:51 2011
@@ -144,64 +144,6 @@ public class TestParallelReader extends
dir2.close();
}
- public void testIsOptimized() throws IOException {
- Directory dir1 = getDir1(random);
- Directory dir2 = getDir2(random);
-
- // add another document to ensure that the indexes are not optimized
- IndexWriter modifier = new IndexWriter(
- dir1,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
- setMergePolicy(newLogMergePolicy(10))
- );
- Document d = new Document();
- d.add(newField("f1", "v1", TextField.TYPE_STORED));
- modifier.addDocument(d);
- modifier.close();
-
- modifier = new IndexWriter(
- dir2,
- newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).
- setMergePolicy(newLogMergePolicy(10))
- );
- d = new Document();
- d.add(newField("f2", "v2", TextField.TYPE_STORED));
- modifier.addDocument(d);
- modifier.close();
-
-
- ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
- assertFalse(pr.isOptimized());
- pr.close();
-
- modifier = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- modifier.optimize();
- modifier.close();
-
- pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
- // just one of the two indexes are optimized
- assertFalse(pr.isOptimized());
- pr.close();
-
-
- modifier = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- modifier.optimize();
- modifier.close();
-
- pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
- // now both indexes are optimized
- assertTrue(pr.isOptimized());
- pr.close();
- dir1.close();
- dir2.close();
- }
-
private void queryTest(Query query) throws IOException {
ScoreDoc[] parallelHits = parallel.search(query, null, 1000).scoreDocs;
ScoreDoc[] singleHits = single.search(query, null, 1000).scoreDocs;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java Fri Nov 11 19:50:51 2011
@@ -58,7 +58,7 @@ public class TestParallelReaderEmptyInde
// When unpatched, Lucene crashes here with a NoSuchElementException (caused by ParallelTermEnum)
iwOut.addIndexes(pr);
- iwOut.optimize();
+ iwOut.forceMerge(1);
iwOut.close();
rdOut.close();
rd1.close();
@@ -88,7 +88,7 @@ public class TestParallelReaderEmptyInde
ir.close();
iw = new IndexWriter(rd1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
- iw.optimize();
+ iw.forceMerge(1);
iw.close();
}
@@ -116,7 +116,7 @@ public class TestParallelReaderEmptyInde
rd1.close();
rd2.close();
- iwOut.optimize();
+ iwOut.forceMerge(1);
iwOut.close();
rdOut.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java Fri Nov 11 19:50:51 2011
@@ -245,7 +245,7 @@ public class TestPayloadProcessorProvide
processors.put(dir, new PerTermPayloadProcessor());
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.WHITESPACE, false)));
writer.setPayloadProcessorProvider(new PerDirPayloadProcessor(processors));
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
verifyPayloadExists(dir, "p", new BytesRef("p1"), 0);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPayloads.java Fri Nov 11 19:50:51 2011
@@ -134,7 +134,7 @@ public class TestPayloads extends Lucene
writer.addDocument(d);
// force merge
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -204,7 +204,7 @@ public class TestPayloads extends Lucene
writer.addDocument(d, analyzer);
}
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -322,7 +322,7 @@ public class TestPayloads extends Lucene
writer.addDocument(d);
- writer.optimize();
+ writer.forceMerge(1);
// flush
writer.close();
@@ -621,7 +621,7 @@ public class TestPayloads extends Lucene
doc.add(new Field("hasMaybepayload2", "here we go", TextField.TYPE_STORED));
writer.addDocument(doc);
writer.addDocument(doc);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java Fri Nov 11 19:50:51 2011
@@ -267,8 +267,8 @@ public class TestPerSegmentDeletes exten
}
@Override
- public MergeSpecification findMergesForOptimize(SegmentInfos segmentInfos,
- int maxSegmentCount, Map<SegmentInfo,Boolean> segmentsToOptimize)
+ public MergeSpecification findForcedMerges(SegmentInfos segmentInfos,
+ int maxSegmentCount, Map<SegmentInfo,Boolean> segmentsToMerge)
throws CorruptIndexException, IOException {
return null;
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Fri Nov 11 19:50:51 2011
@@ -120,7 +120,7 @@ public class TestSegmentTermDocs extends
addDoc(writer, "ccc ccc ccc ccc");
// assure that we deal with a single segment
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
IndexReader reader = IndexReader.open(dir, null, true, indexDivisor);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Fri Nov 11 19:50:51 2011
@@ -61,15 +61,15 @@ public class TestSegmentTermEnum extends
writer.close();
- // verify document frequency of terms in an unoptimized index
+ // verify document frequency of terms in an multi segment index
verifyDocFreq();
- // merge segments by optimizing the index
+ // merge segments
writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
- // verify document frequency of terms in an optimized index
+ // verify document frequency of terms in a single segment index
verifyDocFreq();
}
Copied: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (from r1200273, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java?p2=lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java&p1=lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java&r1=1200273&r2=1201036&rev=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedOptimize.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java Fri Nov 11 19:50:51 2011
@@ -24,7 +24,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
-public class TestSizeBoundedOptimize extends LuceneTestCase {
+public class TestSizeBoundedForceMerge extends LuceneTestCase {
private void addDocs(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
@@ -44,7 +44,7 @@ public class TestSizeBoundedOptimize ext
}
public void testByteSizeLimit() throws Exception {
- // tests that the max merge size constraint is applied during optimize.
+ // tests that the max merge size constraint is applied during forceMerge.
Directory dir = new RAMDirectory();
// Prepare an index w/ several small segments and a large one.
@@ -63,11 +63,11 @@ public class TestSizeBoundedOptimize ext
conf = newWriterConfig();
LogByteSizeMergePolicy lmp = new LogByteSizeMergePolicy();
- lmp.setMaxMergeMBForOptimize((min + 1) / (1 << 20));
+ lmp.setMaxMergeMBForForcedMerge((min + 1) / (1 << 20));
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
// Should only be 3 segments in the index, because one of them exceeds the size limit
@@ -77,7 +77,7 @@ public class TestSizeBoundedOptimize ext
}
public void testNumDocsLimit() throws Exception {
- // tests that the max merge docs constraint is applied during optimize.
+ // tests that the max merge docs constraint is applied during forceMerge.
Directory dir = new RAMDirectory();
// Prepare an index w/ several small segments and a large one.
@@ -100,7 +100,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
// Should only be 3 segments in the index, because one of them exceeds the size limit
@@ -128,7 +128,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
SegmentInfos sis = new SegmentInfos();
@@ -155,7 +155,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
SegmentInfos sis = new SegmentInfos();
@@ -182,7 +182,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
SegmentInfos sis = new SegmentInfos();
@@ -208,7 +208,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
SegmentInfos sis = new SegmentInfos();
@@ -235,7 +235,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
SegmentInfos sis = new SegmentInfos();
@@ -266,7 +266,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
// Should only be 4 segments in the index, because of the merge factor and
@@ -276,7 +276,7 @@ public class TestSizeBoundedOptimize ext
assertEquals(4, sis.size());
}
- public void testSingleNonOptimizedSegment() throws Exception {
+ public void testSingleMergeableSegment() throws Exception {
Directory dir = new RAMDirectory();
IndexWriterConfig conf = newWriterConfig();
@@ -288,7 +288,7 @@ public class TestSizeBoundedOptimize ext
writer.close();
- // delete the last document, so that the last segment is optimized.
+ // delete the last document, so that the last segment is merged.
IndexReader r = IndexReader.open(dir, false);
r.deleteDocument(r.numDocs() - 1);
r.close();
@@ -299,7 +299,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
// Verify that the last segment does not have deletions.
@@ -309,7 +309,7 @@ public class TestSizeBoundedOptimize ext
assertFalse(sis.info(2).hasDeletions());
}
- public void testSingleOptimizedSegment() throws Exception {
+ public void testSingleNonMergeableSegment() throws Exception {
Directory dir = new RAMDirectory();
IndexWriterConfig conf = newWriterConfig();
@@ -325,7 +325,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
// Verify that the last segment does not have deletions.
@@ -334,7 +334,7 @@ public class TestSizeBoundedOptimize ext
assertEquals(1, sis.size());
}
- public void testSingleNonOptimizedTooLargeSegment() throws Exception {
+ public void testSingleMergeableTooLargeSegment() throws Exception {
Directory dir = new RAMDirectory();
IndexWriterConfig conf = newWriterConfig();
@@ -355,7 +355,7 @@ public class TestSizeBoundedOptimize ext
conf.setMergePolicy(lmp);
writer = new IndexWriter(dir, conf);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
// Verify that the last segment does not have deletions.
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressAdvance.java Fri Nov 11 19:50:51 2011
@@ -52,7 +52,7 @@ public class TestStressAdvance extends L
w.addDocument(doc);
}
- w.optimize();
+ w.forceMerge(1);
final List<Integer> aDocIDs = new ArrayList<Integer>();
final List<Integer> bDocIDs = new ArrayList<Integer>();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Fri Nov 11 19:50:51 2011
@@ -179,7 +179,7 @@ public class TestStressIndexing2 extends
threads[i].join();
}
- // w.optimize();
+ // w.forceMerge(1);
//w.close();
for (int i=0; i<threads.length; i++) {
@@ -224,7 +224,7 @@ public class TestStressIndexing2 extends
threads[i].join();
}
- //w.optimize();
+ //w.forceMerge(1);
w.close();
for (int i=0; i<threads.length; i++) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java Fri Nov 11 19:50:51 2011
@@ -107,7 +107,7 @@ public class TestStressNRT extends Lucen
Directory dir = newDirectory();
final RandomIndexWriter writer = new RandomIndexWriter(random, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- writer.setDoRandomOptimizeAssert(false);
+ writer.setDoRandomForceMergeAssert(false);
writer.commit();
reader = IndexReader.open(dir);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java Fri Nov 11 19:50:51 2011
@@ -66,7 +66,7 @@ public class TestSumDocFreq extends Luce
ir.close();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- w.optimize();
+ w.forceMerge(1);
w.close();
ir = IndexReader.open(dir, true);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java Fri Nov 11 19:50:51 2011
@@ -315,7 +315,7 @@ public class TestTermVectorsWriter exten
document.add(termVectorField);
writer.addDocument(document);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
IndexReader reader = IndexReader.open(dir, true);
@@ -333,7 +333,7 @@ public class TestTermVectorsWriter exten
Directory[] indexDirs = {new MockDirectoryWrapper(random, new RAMDirectory(dir, newIOContext(random)))};
writer.addIndexes(indexDirs);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
}
dir.close();
@@ -369,7 +369,7 @@ public class TestTermVectorsWriter exten
Field termVectorField = newField("termVector", "termVector", customType2);
document.add(termVectorField);
writer.addDocument(document);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
IndexReader reader = IndexReader.open(dir, true);
@@ -414,7 +414,7 @@ public class TestTermVectorsWriter exten
for(int i=0;i<6;i++)
writer.addDocument(document);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
IndexReader reader = IndexReader.open(dir, true);
@@ -452,7 +452,7 @@ public class TestTermVectorsWriter exten
// Make 2nd segment
iw.commit();
- iw.optimize();
+ iw.forceMerge(1);
iw.close();
dir.close();
}
@@ -476,7 +476,7 @@ public class TestTermVectorsWriter exten
// Make first segment
iw.commit();
- iw.optimize();
+ iw.forceMerge(1);
FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
customType2.setStoreTermVectors(true);
@@ -484,7 +484,7 @@ public class TestTermVectorsWriter exten
iw.addDocument(document);
// Make 2nd segment
iw.commit();
- iw.optimize();
+ iw.forceMerge(1);
iw.close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java Fri Nov 11 19:50:51 2011
@@ -98,7 +98,7 @@ public class TestTermdocPerf extends Luc
writer.addDocument(doc);
}
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java Fri Nov 11 19:50:51 2011
@@ -510,7 +510,7 @@ public class TestTermsEnum extends Lucen
w.addDocument(doc);
w.commit();
w.deleteDocuments(new Term("field", "one"));
- w.optimize();
+ w.forceMerge(1);
IndexReader r = w.getReader();
w.close();
assertEquals(1, r.numDocs());
Copied: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java (from r1200273, lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java?p2=lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java&p1=lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java&r1=1200273&r2=1201036&rev=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java Fri Nov 11 19:50:51 2011
@@ -31,7 +31,7 @@ import org.apache.lucene.util.LuceneTest
import java.util.Random;
-public class TestThreadedOptimize extends LuceneTestCase {
+public class TestThreadedForceMerge extends LuceneTestCase {
private static final Analyzer ANALYZER = new MockAnalyzer(random, MockTokenizer.SIMPLE, true);
@@ -85,7 +85,7 @@ public class TestThreadedOptimize extend
public void run() {
try {
for(int j=0;j<NUM_ITER2;j++) {
- writerFinal.optimize(false);
+ writerFinal.forceMerge(1, false);
for(int k=0;k<17*(1+iFinal);k++) {
Document d = new Document();
d.add(newField("id", iterFinal + "_" + iFinal + "_" + j + "_" + k, customType));
@@ -94,7 +94,7 @@ public class TestThreadedOptimize extend
}
for(int k=0;k<9*(1+iFinal);k++)
writerFinal.deleteDocuments(new Term("id", iterFinal + "_" + iFinal + "_" + j + "_" + k));
- writerFinal.optimize();
+ writerFinal.forceMerge(1);
}
} catch (Throwable t) {
setFailed();
@@ -124,7 +124,7 @@ public class TestThreadedOptimize extend
OpenMode.APPEND).setMaxBufferedDocs(2));
IndexReader reader = IndexReader.open(directory, true);
- assertTrue("reader=" + reader, reader.isOptimized());
+ assertEquals("reader=" + reader, 1, reader.getSequentialSubReaders().length);
assertEquals(expectedDocCount, reader.numDocs());
reader.close();
}
@@ -135,7 +135,7 @@ public class TestThreadedOptimize extend
Run above stress test against RAMDirectory and then
FSDirectory.
*/
- public void testThreadedOptimize() throws Exception {
+ public void testThreadedForceMerge() throws Exception {
Directory directory = newDirectory();
runTest(random, directory);
directory.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java Fri Nov 11 19:50:51 2011
@@ -65,7 +65,7 @@ public class TestTieredMergePolicy exten
dir.close();
}
- public void testPartialOptimize() throws Exception {
+ public void testPartialMerge() throws Exception {
int num = atLeast(10);
for(int iter=0;iter<num;iter++) {
if (VERBOSE) {
@@ -97,9 +97,9 @@ public class TestTieredMergePolicy exten
int segmentCount = w.getSegmentCount();
int targetCount = _TestUtil.nextInt(random, 1, segmentCount);
if (VERBOSE) {
- System.out.println("TEST: optimize to " + targetCount + " segs (current count=" + segmentCount + ")");
+ System.out.println("TEST: merge to " + targetCount + " segs (current count=" + segmentCount + ")");
}
- w.optimize(targetCount);
+ w.forceMerge(targetCount);
assertEquals(targetCount, w.getSegmentCount());
w.close();
@@ -116,7 +116,7 @@ public class TestTieredMergePolicy exten
conf.setMergePolicy(tmp);
final RandomIndexWriter w = new RandomIndexWriter(random, dir, conf);
- w.setDoRandomOptimize(false);
+ w.setDoRandomForceMerge(false);
final int numDocs = atLeast(200);
for(int i=0;i<numDocs;i++) {
@@ -126,7 +126,7 @@ public class TestTieredMergePolicy exten
w.addDocument(doc);
}
- w.optimize();
+ w.forceMerge(1);
IndexReader r = w.getReader();
assertEquals(numDocs, r.maxDoc());
assertEquals(numDocs, r.numDocs());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestTermInfosReaderIndex.java Fri Nov 11 19:50:51 2011
@@ -181,7 +181,7 @@ public class TestTermInfosReaderIndex ex
}
writer.addDocument(document);
}
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
return config.getTermIndexInterval();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/perfield/TestPerFieldPostingsFormat.java Fri Nov 11 19:50:51 2011
@@ -17,7 +17,6 @@ package org.apache.lucene.index.codecs.p
* limitations under the License.
*/
import java.io.IOException;
-import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -107,7 +106,7 @@ public class TestPerFieldPostingsFormat
writer.commit();
assertEquals(30, writer.maxDoc());
_TestUtil.checkIndex(dir);
- writer.optimize();
+ writer.forceMerge(1);
assertEquals(30, writer.maxDoc());
writer.close();
dir.close();
@@ -158,8 +157,6 @@ public class TestPerFieldPostingsFormat
addDocs2(writer, 10);
writer.commit();
codec = (Lucene40Codec)iwconf.getCodec();
- PostingsFormat origContentCodec = PostingsFormat.forName("MockSep");
- PostingsFormat newContentCodec = PostingsFormat.forName("Lucene40");
assertEquals(30, writer.maxDoc());
assertQuery(new Term("content", "bbb"), dir, 10);
assertQuery(new Term("content", "ccc"), dir, 10); ////
@@ -178,7 +175,7 @@ public class TestPerFieldPostingsFormat
if (VERBOSE) {
System.out.println("TEST: now optimize");
}
- writer.optimize();
+ writer.forceMerge(1);
assertEquals(40, writer.maxDoc());
writer.close();
assertQuery(new Term("content", "ccc"), dir, 10);
@@ -260,7 +257,7 @@ public class TestPerFieldPostingsFormat
writer.addDocument(doc);
}
if (random.nextBoolean()) {
- writer.optimize();
+ writer.forceMerge(1);
}
writer.commit();
assertEquals((i + 1) * docsPerRound, writer.maxDoc());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java Fri Nov 11 19:50:51 2011
@@ -58,7 +58,7 @@ import org.junit.Before;
*/
public class TestDocValuesIndexing extends LuceneTestCase {
/*
- * - add test for unoptimized case with deletes
+ * - add test for multi segment case with deletes
* - add multithreaded tests / integrate into stress indexing?
*/
@@ -83,12 +83,12 @@ public class TestDocValuesIndexing exten
writer.addDocument(doc);
}
writer.commit();
- writer.optimize(true);
+ writer.forceMerge(1, true);
writer.close(true);
IndexReader reader = IndexReader.open(dir, null, true, 1);
- assertTrue(reader.isOptimized());
+ assertEquals(1, reader.getSequentialSubReaders().length);
IndexSearcher searcher = new IndexSearcher(reader);
@@ -159,7 +159,7 @@ public class TestDocValuesIndexing exten
} else {
w.addIndexes(r_1, r_2);
}
- w.optimize(true);
+ w.forceMerge(1, true);
w.commit();
_TestUtil.checkIndex(target);
@@ -418,10 +418,10 @@ public class TestDocValuesIndexing exten
private IndexDocValues getDocValues(IndexReader reader, String field)
throws IOException {
- boolean optimized = reader.isOptimized();
- PerDocValues perDoc = optimized ? reader.getSequentialSubReaders()[0].perDocValues()
+ boolean singleSeg = reader.getSequentialSubReaders().length == 1;
+ PerDocValues perDoc = singleSeg ? reader.getSequentialSubReaders()[0].perDocValues()
: MultiPerDocValues.getPerDocs(reader);
- switch (random.nextInt(optimized ? 3 : 2)) { // case 2 only if optimized
+ switch (random.nextInt(singleSeg ? 3 : 2)) { // case 2 only if single seg
case 0:
return perDoc.docValues(field);
case 1:
@@ -430,7 +430,7 @@ public class TestDocValuesIndexing exten
return docValues;
}
throw new RuntimeException("no such field " + field);
- case 2:// this only works if we are on an optimized index!
+ case 2:// this only works if we are on a single seg index!
return reader.getSequentialSubReaders()[0].docValues(field);
}
throw new RuntimeException();
@@ -538,9 +538,9 @@ public class TestDocValuesIndexing exten
}
w.commit();
- // TODO test unoptimized with deletions
+ // TODO test multi seg with deletions
if (withDeletions || random.nextBoolean()) {
- w.optimize(true);
+ w.forceMerge(1, true);
}
return deleted;
}
@@ -565,7 +565,7 @@ public class TestDocValuesIndexing exten
doc = new Document();
doc.add(f);
w.addDocument(doc);
- w.optimize();
+ w.forceMerge(1);
IndexReader r = w.getReader();
w.close();
assertEquals(17, r.getSequentialSubReaders()[0].perDocValues().docValues("field").load().getInt(0));
@@ -595,7 +595,7 @@ public class TestDocValuesIndexing exten
doc = new Document();
doc.add(f);
w.addDocument(doc);
- w.optimize();
+ w.forceMerge(1);
IndexReader r = w.getReader();
w.close();
assertEquals(17, r.getSequentialSubReaders()[0].perDocValues().docValues("field").load().getInt(0));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java Fri Nov 11 19:50:51 2011
@@ -87,7 +87,7 @@ public class TestTypePromotion extends L
if (random.nextInt(4) == 0) {
// once in a while use addIndexes
- writer.optimize();
+ writer.forceMerge(1);
Directory dir_2 = newDirectory() ;
IndexWriter writer_2 = new IndexWriter(dir_2,
@@ -110,7 +110,7 @@ public class TestTypePromotion extends L
randomValueType(types, random), values, num_1 + num_2, num_3);
}
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
assertValues(type, dir, values);
dir.close();
@@ -119,7 +119,7 @@ public class TestTypePromotion extends L
private void assertValues(TestType type, Directory dir, long[] values)
throws CorruptIndexException, IOException {
IndexReader reader = IndexReader.open(dir);
- assertTrue(reader.isOptimized());
+ assertEquals(1, reader.getSequentialSubReaders().length);
ReaderContext topReaderContext = reader.getTopReaderContext();
ReaderContext[] children = topReaderContext.children();
IndexDocValues docValues = children[0].reader.docValues("promote");
@@ -292,14 +292,14 @@ public class TestTypePromotion extends L
writer.close();
writerConfig = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
if (writerConfig.getMergePolicy() instanceof NoMergePolicy) {
- writerConfig.setMergePolicy(newLogMergePolicy()); // make sure we optimize to one segment (merge everything together)
+ writerConfig.setMergePolicy(newLogMergePolicy()); // make sure we merge to one segment (merge everything together)
}
writer = new IndexWriter(dir, writerConfig);
- // now optimize
- writer.optimize();
+ // now merge
+ writer.forceMerge(1);
writer.close();
IndexReader reader = IndexReader.open(dir);
- assertTrue(reader.isOptimized());
+ assertEquals(1, reader.getSequentialSubReaders().length);
ReaderContext topReaderContext = reader.getTopReaderContext();
ReaderContext[] children = topReaderContext.children();
IndexDocValues docValues = children[0].reader.docValues("promote");
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java Fri Nov 11 19:50:51 2011
@@ -85,7 +85,7 @@ public final class FieldCacheRewriteMeth
/**
* Expert: Return the number of unique terms visited during execution of the filter.
* If there are many of them, you may consider using another filter type
- * or optimize your total term count in index.
+ * or reduce your total term count in index.
* <p>This method is not thread safe, be sure to only call it when no filter is running!
* If you re-use the same filter instance for another
* search, be sure to first reset the term counter
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java Fri Nov 11 19:50:51 2011
@@ -213,7 +213,7 @@ public class TestBooleanQuery extends Lu
doc.add(new TextField("field", contents));
w.addDocument(doc);
}
- w.optimize();
+ w.forceMerge(1);
final IndexReader r = w.getReader();
final IndexSearcher s = newSearcher(r);
w.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Fri Nov 11 19:50:51 2011
@@ -32,7 +32,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.FixedBitSet;
-import org.apache.lucene.util._TestUtil;
public class TestCachingWrapperFilter extends LuceneTestCase {
@@ -239,8 +238,8 @@ public class TestCachingWrapperFilter ex
assertEquals("[just filter] Should *not* find a hit...", 0, docs.totalHits);
assertEquals(missCount, filter.missCount);
- // NOTE: silliness to make sure JRE does not optimize
- // away our holding onto oldReader to prevent
+ // NOTE: silliness to make sure JRE does not eliminate
+ // our holding onto oldReader to prevent
// CachingWrapperFilter's WeakHashMap from dropping the
// entry:
assertTrue(oldReader != null);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Fri Nov 11 19:50:51 2011
@@ -540,7 +540,7 @@ public class TestFieldCacheRangeFilter e
writer.addDocument(doc);
}
- writer.optimize();
+ writer.forceMerge(1);
writer.deleteDocuments(new Term("id","0"));
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredQuery.java Fri Nov 11 19:50:51 2011
@@ -77,7 +77,7 @@ public class TestFilteredQuery extends L
// tests here require single segment (eg try seed
// 8239472272678419952L), because SingleDocTestFilter(x)
// blindly accepts that docID in any sub-segment
- writer.optimize();
+ writer.forceMerge(1);
reader = writer.getReader();
writer.close ();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFilteredSearch.java Fri Nov 11 19:50:51 2011
@@ -61,15 +61,16 @@ public class TestFilteredSearch extends
directory.close();
}
- public void searchFiltered(IndexWriter writer, Directory directory, Filter filter, boolean optimize) {
+ public void searchFiltered(IndexWriter writer, Directory directory, Filter filter, boolean fullMerge) {
try {
for (int i = 0; i < 60; i++) {//Simple docs
Document doc = new Document();
doc.add(newField(FIELD, Integer.toString(i), StringField.TYPE_STORED));
writer.addDocument(doc);
}
- if(optimize)
- writer.optimize();
+ if (fullMerge) {
+ writer.forceMerge(1);
+ }
writer.close();
BooleanQuery booleanQuery = new BooleanQuery();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFuzzyQuery2.java Fri Nov 11 19:50:51 2011
@@ -172,7 +172,7 @@ public class TestFuzzyQuery2 extends Luc
writer.addDocument(doc);
}
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
IndexSearcher searcher = new IndexSearcher(dir);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java Fri Nov 11 19:50:51 2011
@@ -56,7 +56,7 @@ public class TestMultiTermQueryRewrites
writer.addDocument(doc);
((i % 2 == 0) ? swriter1 : swriter2).addDocument(doc);
}
- writer.optimize(); swriter1.optimize(); swriter2.optimize();
+ writer.forceMerge(1); swriter1.forceMerge(1); swriter2.forceMerge(1);
writer.close(); swriter1.close(); swriter2.close();
reader = IndexReader.open(dir, true);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java Fri Nov 11 19:50:51 2011
@@ -71,7 +71,7 @@ public class TestScorerPerf extends Luce
}
iw.addDocument(d);
}
- iw.optimize();
+ iw.forceMerge(1);
iw.close();
}
@@ -103,7 +103,7 @@ public class TestScorerPerf extends Luce
@Override
public void collect(int doc) {
count++;
- sum += docBase + doc; // use it to avoid any possibility of being optimized away
+ sum += docBase + doc; // use it to avoid any possibility of being eliminated by hotspot
}
public int getCount() { return count; }
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestSort.java Fri Nov 11 19:50:51 2011
@@ -201,9 +201,9 @@ public class TestSort extends LuceneTest
}
writer.addDocument (doc);
}
- //writer.optimize ();
+ //writer.forceMerge(1);
//System.out.println(writer.getSegmentCount());
- writer.close ();
+ writer.close();
return new IndexSearcher (indexStore, true);
}
@@ -1132,7 +1132,7 @@ public class TestSort extends LuceneTest
doc.add (new StringField ("string", "b"+i));
writer.addDocument (doc);
}
- writer.optimize(); // enforce one segment to have a higher unique term count in all cases
+ writer.forceMerge(1); // enforce one segment to have a higher unique term count in all cases
writer.close();
sort.setSort(
new SortField("string", SortField.Type.STRING),
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTermVectors.java Fri Nov 11 19:50:51 2011
@@ -514,22 +514,22 @@ public class TestTermVectors extends Luc
r.close();
}
- public void testOptimizeAddDocs() throws Exception {
+ public void testFullMergeAddDocs() throws Exception {
Directory target = newDirectory();
IndexWriter writer = createWriter(target);
- // with maxBufferedDocs=2, this results in two segments, so that optimize
+ // with maxBufferedDocs=2, this results in two segments, so that forceMerge
// actually does something.
for (int i = 0; i < 4; i++) {
writer.addDocument(createDoc());
}
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
verifyIndex(target);
target.close();
}
- public void testOptimizeAddIndexesDir() throws Exception {
+ public void testFullMergeAddIndexesDir() throws Exception {
Directory[] input = new Directory[] { newDirectory(), newDirectory() };
Directory target = newDirectory();
@@ -539,7 +539,7 @@ public class TestTermVectors extends Luc
IndexWriter writer = createWriter(target);
writer.addIndexes(input);
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
verifyIndex(target);
@@ -547,7 +547,7 @@ public class TestTermVectors extends Luc
IOUtils.close(target, input[0], input[1]);
}
- public void testOptimizeAddIndexesReader() throws Exception {
+ public void testFullMergeAddIndexesReader() throws Exception {
Directory[] input = new Directory[] { newDirectory(), newDirectory() };
Directory target = newDirectory();
@@ -561,7 +561,7 @@ public class TestTermVectors extends Luc
writer.addIndexes(r);
r.close();
}
- writer.optimize();
+ writer.forceMerge(1);
writer.close();
verifyIndex(target);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java Fri Nov 11 19:50:51 2011
@@ -74,7 +74,7 @@ public class TestTopDocsMerge extends Lu
{
dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random, dir);
- // w.setDoRandomOptimize(false);
+ // w.setDoRandomForceMerge(false);
// w.w.getConfig().setMaxBufferedDocs(atLeast(100));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestRAMDirectory.java Fri Nov 11 19:50:51 2011
@@ -104,7 +104,7 @@ public class TestRAMDirectory extends Lu
final IndexWriter writer = new IndexWriter(ramDir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
- writer.optimize();
+ writer.forceMerge(1);
assertEquals(ramDir.sizeInBytes(), ramDir.getRecomputedSizeInBytes());
@@ -131,7 +131,7 @@ public class TestRAMDirectory extends Lu
for (int i=0; i<numThreads; i++)
threads[i].join();
- writer.optimize();
+ writer.forceMerge(1);
assertEquals(ramDir.sizeInBytes(), ramDir.getRecomputedSizeInBytes());
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java Fri Nov 11 19:50:51 2011
@@ -1461,7 +1461,7 @@ public class TestFSTs extends LuceneTest
w.addDocument(doc);
}
- //w.optimize();
+ //w.forceMerge(1);
// turn writer into reader:
final IndexReader r = w.getReader();
Modified: lucene/dev/trunk/modules/benchmark/conf/analyzer.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/analyzer.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/analyzer.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/analyzer.alg Fri Nov 11 19:50:51 2011
@@ -55,7 +55,7 @@ log.queries=true
{ "Populate"
CreateIndex
{ "MAddDocs" AddDoc > : 2000
- Optimize
+ ForcMerge(1)
CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/collector-small.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/collector-small.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/collector-small.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/collector-small.alg Fri Nov 11 19:50:51 2011
@@ -52,7 +52,7 @@ log.queries=true
{ "Populate"
CreateIndex
{ "MAddDocs" AddDoc } : 200000
- Optimize
+ ForcMerge(1)
CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/collector.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/collector.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/collector.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/collector.alg Fri Nov 11 19:50:51 2011
@@ -52,7 +52,7 @@ log.queries=true
{ "Populate"
CreateIndex
{ "MAddDocs" AddDoc } : 2000000
- Optimize
+ ForcMerge(1)
CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/deletes.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/deletes.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/deletes.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/deletes.alg Fri Nov 11 19:50:51 2011
@@ -58,7 +58,7 @@ CloseIndex
{ "Populate"
OpenIndex
{ AddDoc(10) > : 200000
- Optimize
+ ForcMerge(1)
CloseIndex
>
Modified: lucene/dev/trunk/modules/benchmark/conf/facets.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/facets.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/facets.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/facets.alg Fri Nov 11 19:50:51 2011
@@ -52,7 +52,7 @@ task.max.depth.log=2
-CreateIndex
-CreateTaxonomyIndex
{ "MAddDocs" AddFacetedDoc > : *
- -Optimize
+ -ForcMerge(1)
-CloseIndex
-CloseTaxonomyIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/highlight-profile.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/highlight-profile.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/highlight-profile.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/highlight-profile.alg Fri Nov 11 19:50:51 2011
@@ -44,7 +44,7 @@ log.queries=true
{ "Populate"
CreateIndex
{ "MAddDocs" AddDoc } : 20000
- Optimize
+ ForcMerge(1)
CloseIndex
}
{ "Rounds"
Modified: lucene/dev/trunk/modules/benchmark/conf/highlight-vs-vector-highlight.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/highlight-vs-vector-highlight.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/highlight-vs-vector-highlight.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/highlight-vs-vector-highlight.alg Fri Nov 11 19:50:51 2011
@@ -48,7 +48,7 @@ log.queries=true
{ "Populate"
CreateIndex
{ "MAddDocs" AddDoc } : 20000
- Optimize
+ ForcMerge(1)
CloseIndex
}
{
Modified: lucene/dev/trunk/modules/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/indexing-flush-by-RAM-multithreaded.alg Fri Nov 11 19:50:51 2011
@@ -54,7 +54,7 @@ log.queries=true
{ "Populate"
CreateIndex
[{ "MAddDocs" AddDoc } : 5000] : 4
- Optimize
+ ForcMerge(1)
CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/indexing-flush-by-RAM.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/indexing-flush-by-RAM.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/indexing-flush-by-RAM.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/indexing-flush-by-RAM.alg Fri Nov 11 19:50:51 2011
@@ -54,7 +54,7 @@ log.queries=true
{ "Populate"
CreateIndex
{ "MAddDocs" AddDoc } : 20000
- Optimize
+ ForcMerge(1)
CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/indexing-multithreaded.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/indexing-multithreaded.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/indexing-multithreaded.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/indexing-multithreaded.alg Fri Nov 11 19:50:51 2011
@@ -54,7 +54,7 @@ log.queries=true
{ "Populate"
CreateIndex
[{ "MAddDocs" AddDoc } : 5000] : 4
- Optimize
+ ForcMerge(1)
CommitIndex(commit1)
CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/indexing.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/indexing.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/indexing.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/indexing.alg Fri Nov 11 19:50:51 2011
@@ -54,7 +54,7 @@ log.queries=true
{ "Populate"
CreateIndex
{ "MAddDocs" AddDoc } : 20000
- Optimize
+ ForcMerge(1)
CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/micro-standard-flush-by-ram.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/micro-standard-flush-by-ram.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/micro-standard-flush-by-ram.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/micro-standard-flush-by-ram.alg Fri Nov 11 19:50:51 2011
@@ -53,7 +53,7 @@ log.queries=true
{ "Populate"
CreateIndex
{ "MAddDocs" AddDoc > : 2000
- Optimize
+ ForcMerge(1)
CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/micro-standard.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/micro-standard.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/micro-standard.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/micro-standard.alg Fri Nov 11 19:50:51 2011
@@ -52,7 +52,7 @@ log.queries=true
{ "Populate"
-CreateIndex
{ "MAddDocs" AddDoc > : 2000
- -Optimize
+ -ForcMerge(1)
-CloseIndex
}
Modified: lucene/dev/trunk/modules/benchmark/conf/sample.alg
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/conf/sample.alg?rev=1201036&r1=1201035&r2=1201036&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/conf/sample.alg (original)
+++ lucene/dev/trunk/modules/benchmark/conf/sample.alg Fri Nov 11 19:50:51 2011
@@ -62,7 +62,7 @@ log.queries=false
{ "PopulateShort"
CreateIndex
{ AddDoc(4000) > : 20000
- Optimize
+ ForcMerge(1)
CloseIndex
>
@@ -71,7 +71,7 @@ log.queries=false
{ "PopulateLong"
CreateIndex
{ AddDoc(8000) > : 10000
- Optimize
+ ForcMerge(1)
CloseIndex
>