You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2010/08/14 15:06:23 UTC
svn commit: r985485 [5/8] - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/src/ lucene/backwards/src/test/org/apache/lucene/analysis/
lucene/backwards/src/test/org/apache/lucene/document/
lucene/backwards/src/test/org/apache/lucene/inde...
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterDelete.java Sat Aug 14 13:06:17 2010
@@ -49,7 +49,7 @@ public class TestIndexWriterDelete exten
"Venice has lots of canals" };
String[] text = { "Amsterdam", "Venice" };
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDeleteTerms(1));
@@ -84,7 +84,7 @@ public class TestIndexWriterDelete exten
// test when delete terms only apply to disk segments
public void testNonRAMDelete() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2)
.setMaxBufferedDeleteTerms(2));
@@ -118,7 +118,7 @@ public class TestIndexWriterDelete exten
}
public void testMaxBufferedDeletes() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDeleteTerms(1));
writer.deleteDocuments(new Term("foobar", "1"));
@@ -132,7 +132,7 @@ public class TestIndexWriterDelete exten
// test when delete terms only apply to ram segments
public void testRAMDeletes() throws IOException {
for(int t=0;t<2;t++) {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(4)
.setMaxBufferedDeleteTerms(4));
@@ -173,7 +173,7 @@ public class TestIndexWriterDelete exten
// test when delete terms apply to both disk and ram segments
public void testBothDeletes() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(100)
.setMaxBufferedDeleteTerms(100));
@@ -201,11 +201,13 @@ public class TestIndexWriterDelete exten
IndexReader reader = IndexReader.open(dir, true);
assertEquals(5, reader.numDocs());
modifier.close();
+ reader.close();
+ dir.close();
}
// test that batched delete terms are flushed together
public void testBatchDeletes() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2)
.setMaxBufferedDeleteTerms(2));
@@ -248,7 +250,7 @@ public class TestIndexWriterDelete exten
// test deleteAll()
public void testDeleteAll() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2)
.setMaxBufferedDeleteTerms(2));
@@ -294,7 +296,7 @@ public class TestIndexWriterDelete exten
// test rollback of deleteAll()
public void testDeleteAllRollback() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2)
.setMaxBufferedDeleteTerms(2));
@@ -331,7 +333,7 @@ public class TestIndexWriterDelete exten
// test deleteAll() w/ near real-time reader
public void testDeleteAllNRT() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2)
.setMaxBufferedDeleteTerms(2));
@@ -421,7 +423,9 @@ public class TestIndexWriterDelete exten
int END_COUNT = 144;
// First build up a starting index:
- MockRAMDirectory startDir = new MockRAMDirectory();
+ MockRAMDirectory startDir = newDirectory(random);
+ // TODO: find the resource leak that only occurs sometimes here.
+ startDir.setNoDeleteOpenFile(false);
IndexWriter writer = new IndexWriter(startDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
for (int i = 0; i < 157; i++) {
Document d = new Document();
@@ -599,6 +603,8 @@ public class TestIndexWriterDelete exten
}
}
+ modifier.close();
+ startDir.close();
dir.close();
// Try again with 10 more bytes of free space:
@@ -656,7 +662,7 @@ public class TestIndexWriterDelete exten
"Venice has lots of canals" };
String[] text = { "Amsterdam", "Venice" };
- MockRAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDeleteTerms(2).setReaderPooling(false));
LogMergePolicy lmp = (LogMergePolicy) modifier.getConfig().getMergePolicy();
@@ -766,7 +772,7 @@ public class TestIndexWriterDelete exten
"Venice has lots of canals" };
String[] text = { "Amsterdam", "Venice" };
- MockRAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = newDirectory(random);
IndexWriter modifier = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
modifier.commit();
dir.failOn(failure.reset());
@@ -793,6 +799,8 @@ public class TestIndexWriterDelete exten
infos.read(dir);
new IndexFileDeleter(dir, new KeepOnlyLastCommitDeletionPolicy(), infos, null, null);
String[] endFiles = dir.listAll();
+ modifier.close();
+ dir.close();
if (!Arrays.equals(startFiles, endFiles)) {
fail("docswriter abort() failed to delete unreferenced files:\n before delete:\n "
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Sat Aug 14 13:06:17 2010
@@ -130,7 +130,7 @@ public class TestIndexWriterExceptions e
public void testRandomExceptions() throws Throwable {
Random random = newRandom();
- MockRAMDirectory dir = new MockRAMDirectory();
+ MockRAMDirectory dir = newDirectory(random);
MockIndexWriter writer = new MockIndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setRAMBufferSizeMB(0.1).setMergeScheduler(new ConcurrentMergeScheduler()));
@@ -166,12 +166,13 @@ public class TestIndexWriterExceptions e
r2.close();
_TestUtil.checkIndex(dir);
+ dir.close();
}
public void testRandomExceptionsThreads() throws Throwable {
-
- MockRAMDirectory dir = new MockRAMDirectory();
- MockIndexWriter writer = new MockIndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
+ Random random = newRandom();
+ MockRAMDirectory dir = newDirectory(random);
+ MockIndexWriter writer = new MockIndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setRAMBufferSizeMB(0.2).setMergeScheduler(new ConcurrentMergeScheduler()));
((ConcurrentMergeScheduler) writer.getConfig().getMergeScheduler()).setSuppressExceptions();
//writer.setMaxBufferedDocs(10);
@@ -213,5 +214,6 @@ public class TestIndexWriterExceptions e
r2.close();
_TestUtil.checkIndex(dir);
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java Sat Aug 14 13:06:17 2010
@@ -18,24 +18,31 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
+import java.util.Random;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.LuceneTestCase;
public class TestIndexWriterMergePolicy extends LuceneTestCase {
-
+ private Random random;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ random = newRandom();
+ }
+
// Test the normal case
public void testNormalCase() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(10).setMergePolicy(new LogDocMergePolicy()));
@@ -45,13 +52,14 @@ public class TestIndexWriterMergePolicy
}
writer.close();
+ dir.close();
}
// Test to see if there is over merge
public void testNoOverMerge() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(10).setMergePolicy(new LogDocMergePolicy()));
@@ -66,16 +74,17 @@ public class TestIndexWriterMergePolicy
assertTrue(noOverMerge);
writer.close();
+ dir.close();
}
// Test the case where flush is forced after every addDoc
public void testForceFlush() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
LogDocMergePolicy mp = new LogDocMergePolicy();
mp.setMinMergeDocs(100);
mp.setMergeFactor(10);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(10).setMergePolicy(mp));
@@ -85,7 +94,7 @@ public class TestIndexWriterMergePolicy
mp = new LogDocMergePolicy();
mp.setMergeFactor(10);
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
OpenMode.APPEND).setMaxBufferedDocs(10).setMergePolicy(mp));
mp.setMinMergeDocs(100);
@@ -93,13 +102,14 @@ public class TestIndexWriterMergePolicy
}
writer.close();
+ dir.close();
}
// Test the case where mergeFactor changes
public void testMergeFactorChange() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(10).setMergePolicy(new LogDocMergePolicy()));
@@ -118,13 +128,14 @@ public class TestIndexWriterMergePolicy
checkInvariants(writer);
writer.close();
+ dir.close();
}
// Test the case where both mergeFactor and maxBufferedDocs change
public void testMaxBufferedDocsChange() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(101).setMergePolicy(new LogDocMergePolicy()));
@@ -137,7 +148,7 @@ public class TestIndexWriterMergePolicy
}
writer.close();
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
OpenMode.APPEND).setMaxBufferedDocs(101).setMergePolicy(
new LogDocMergePolicy()));
@@ -146,9 +157,9 @@ public class TestIndexWriterMergePolicy
writer.close();
LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMergeFactor(10);
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
- OpenMode.APPEND).setMaxBufferedDocs(10).setMergePolicy(ldmp));
+ OpenMode.APPEND).setMaxBufferedDocs(10).setMergePolicy(ldmp).setMergeScheduler(new ConcurrentMergeScheduler()));
// merge policy only fixes segments on levels where merges
// have been triggered, so check invariants after all adds
@@ -166,15 +177,16 @@ public class TestIndexWriterMergePolicy
checkInvariants(writer);
writer.close();
+ dir.close();
}
// Test the case where a merge results in no doc at all
public void testMergeDocCount0() throws IOException {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
LogDocMergePolicy ldmp = new LogDocMergePolicy();
ldmp.setMergeFactor(100);
- IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(10).setMergePolicy(ldmp));
@@ -190,9 +202,9 @@ public class TestIndexWriterMergePolicy
ldmp = new LogDocMergePolicy();
ldmp.setMergeFactor(5);
- writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT,
+ writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT,
new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setOpenMode(
- OpenMode.APPEND).setMaxBufferedDocs(10).setMergePolicy(ldmp));
+ OpenMode.APPEND).setMaxBufferedDocs(10).setMergePolicy(ldmp).setMergeScheduler(new ConcurrentMergeScheduler()));
// merge factor is changed, so check invariants after all adds
for (int i = 0; i < 10; i++) {
@@ -205,6 +217,7 @@ public class TestIndexWriterMergePolicy
assertEquals(10, writer.maxDoc());
writer.close();
+ dir.close();
}
private void addDoc(IndexWriter writer) throws IOException {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Sat Aug 14 13:06:17 2010
@@ -38,8 +38,8 @@ public class TestIndexWriterMerging exte
Random random = newRandom();
int num=100;
- Directory indexA = new MockRAMDirectory();
- Directory indexB = new MockRAMDirectory();
+ Directory indexA = newDirectory(random);
+ Directory indexB = newDirectory(random);
fillIndex(random, indexA, 0, num);
boolean fail = verifyIndex(indexA, 0);
@@ -55,7 +55,7 @@ public class TestIndexWriterMerging exte
fail("Index b is invalid");
}
- Directory merged = new MockRAMDirectory();
+ Directory merged = newDirectory(random);
IndexWriter writer = new IndexWriter(merged, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
@@ -68,6 +68,9 @@ public class TestIndexWriterMerging exte
merged.close();
assertFalse("The merged index is invalid", fail);
+ indexA.close();
+ indexB.close();
+ merged.close();
}
private boolean verifyIndex(Directory directory, int startAt) throws IOException
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Sat Aug 14 13:06:17 2010
@@ -65,7 +65,7 @@ public class TestIndexWriterReader exten
public void testUpdateDocument() throws Exception {
boolean optimize = true;
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
// create the index
@@ -126,7 +126,7 @@ public class TestIndexWriterReader exten
public void testAddIndexes() throws Exception {
boolean optimize = false;
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.setInfoStream(infoStream);
// create the index
@@ -134,7 +134,7 @@ public class TestIndexWriterReader exten
writer.flush(false, true, true);
// create a 2nd index
- Directory dir2 = new MockRAMDirectory();
+ Directory dir2 = newDirectory(random);
IndexWriter writer2 = new IndexWriter(dir2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer2.setInfoStream(infoStream);
createIndexNoClose(!optimize, "index2", writer2);
@@ -166,17 +166,18 @@ public class TestIndexWriterReader exten
r1.close();
writer.close();
dir1.close();
+ dir2.close();
}
public void testAddIndexes2() throws Exception {
boolean optimize = false;
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.setInfoStream(infoStream);
// create a 2nd index
- Directory dir2 = new MockRAMDirectory();
+ Directory dir2 = newDirectory(random);
IndexWriter writer2 = new IndexWriter(dir2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer2.setInfoStream(infoStream);
createIndexNoClose(!optimize, "index2", writer2);
@@ -194,6 +195,7 @@ public class TestIndexWriterReader exten
r1.close();
writer.close();
dir1.close();
+ dir2.close();
}
/**
@@ -204,7 +206,7 @@ public class TestIndexWriterReader exten
public void testDeleteFromIndexWriter() throws Exception {
boolean optimize = true;
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setReaderTermsIndexDivisor(2));
writer.setInfoStream(infoStream);
// create the index
@@ -256,7 +258,7 @@ public class TestIndexWriterReader exten
final int numIter = 2;
int numDirs = 3;
- Directory mainDir = new MockRAMDirectory();
+ Directory mainDir = newDirectory(random);
IndexWriter mainWriter = new IndexWriter(mainDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
mainWriter.setInfoStream(infoStream);
AddDirectoriesThreads addDirThreads = new AddDirectoriesThreads(numIter, mainWriter);
@@ -299,7 +301,7 @@ public class TestIndexWriterReader exten
public AddDirectoriesThreads(int numDirs, IndexWriter mainWriter) throws Throwable {
this.numDirs = numDirs;
this.mainWriter = mainWriter;
- addDir = new MockRAMDirectory();
+ addDir = newDirectory(random);
IndexWriter writer = new IndexWriter(addDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(2));
for (int i = 0; i < NUM_INIT_DOCS; i++) {
Document doc = createDocument(i, "addindex", 4);
@@ -405,7 +407,7 @@ public class TestIndexWriterReader exten
* IW.getReader
*/
public void doTestIndexWriterReopenSegment(boolean optimize) throws Exception {
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.setInfoStream(infoStream);
IndexReader r1 = writer.getReader();
@@ -516,7 +518,7 @@ public class TestIndexWriterReader exten
public void testMergeWarmer() throws Exception {
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
// Enroll warmer
MyWarmer warmer = new MyWarmer();
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random,
@@ -551,7 +553,7 @@ public class TestIndexWriterReader exten
}
public void testAfterCommit() throws Exception {
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMergeScheduler(new ConcurrentMergeScheduler()));
writer.commit();
writer.setInfoStream(infoStream);
@@ -584,7 +586,7 @@ public class TestIndexWriterReader exten
// Make sure reader remains usable even if IndexWriter closes
public void testAfterClose() throws Exception {
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.setInfoStream(infoStream);
@@ -613,7 +615,7 @@ public class TestIndexWriterReader exten
// Stress test reopen during addIndexes
public void testDuringAddIndexes() throws Exception {
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
final IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.setInfoStream(infoStream);
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
@@ -690,7 +692,7 @@ public class TestIndexWriterReader exten
// Stress test reopen during add/delete
public void testDuringAddDelete() throws Exception {
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
final IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
writer.setInfoStream(infoStream);
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
@@ -770,7 +772,7 @@ public class TestIndexWriterReader exten
}
public void testExpungeDeletes() throws Throwable {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
doc.add(new Field("field", "a b c", Field.Store.NO, Field.Index.ANALYZED));
@@ -794,7 +796,7 @@ public class TestIndexWriterReader exten
}
public void testDeletesNumDocs() throws Throwable {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
final IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
doc.add(new Field("field", "a b c", Field.Store.NO, Field.Index.ANALYZED));
@@ -824,16 +826,17 @@ public class TestIndexWriterReader exten
public void testEmptyIndex() throws Exception {
// Ensures that getReader works on an empty index, which hasn't been committed yet.
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
IndexReader r = w.getReader();
assertEquals(0, r.numDocs());
r.close();
w.close();
+ dir.close();
}
public void testSegmentWarmer() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setMaxBufferedDocs(2).setReaderPooling(true));
((LogMergePolicy) w.getMergePolicy()).setMergeFactor(10);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestLazyBug.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestLazyBug.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestLazyBug.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestLazyBug.java Sat Aug 14 13:06:17 2010
@@ -67,10 +67,10 @@ public class TestLazyBug extends LuceneT
}
};
- private Directory makeIndex() throws RuntimeException {
- Directory dir = new MockRAMDirectory();
+ private Directory makeIndex() throws Exception {
+ Random r = newRandom();
+ Directory dir = newDirectory(r);
try {
- Random r = newRandom();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(r,
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy();
@@ -120,6 +120,7 @@ public class TestLazyBug extends LuceneT
}
}
reader.close();
+ dir.close();
}
public void testLazyWorks() throws Exception {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestLazyProxSkipping.java Sat Aug 14 13:06:17 2010
@@ -119,8 +119,9 @@ public class TestLazyProxSkipping extend
}
public void testSeek() throws IOException {
- Directory directory = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ Random random = newRandom();
+ Directory directory = newDirectory(random);
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
for (int i = 0; i < 10; i++) {
Document doc = new Document();
doc.add(new Field(this.field, "a b", Field.Store.YES, Field.Index.ANALYZED));
@@ -142,7 +143,8 @@ public class TestLazyProxSkipping extend
assertEquals(tp.doc(), i);
assertEquals(tp.nextPosition(), 0);
}
-
+ reader.close();
+ directory.close();
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java Sat Aug 14 13:06:17 2010
@@ -31,7 +31,7 @@ public class TestNRTReaderWithThreads ex
AtomicInteger seq = new AtomicInteger(1);
public void testIndexing() throws Exception {
- Directory mainDir = new MockRAMDirectory();
+ Directory mainDir = newDirectory(random);
IndexWriter writer = new IndexWriter(mainDir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)).setMaxBufferedDocs(10));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNewestSegment.java Sat Aug 14 13:06:17 2010
@@ -18,13 +18,18 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.analysis.SimpleAnalyzer;
+import java.util.Random;
+
import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestNewestSegment extends LuceneTestCase {
public void testNewestSegment() throws Exception {
- MockRAMDirectory directory = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
+ Random random = newRandom();
+ MockRAMDirectory directory = newDirectory(random);
+ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
assertNull(writer.newestSegment());
+ writer.close();
+ directory.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java Sat Aug 14 13:06:17 2010
@@ -23,6 +23,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
+import java.util.Random;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
@@ -73,8 +74,9 @@ public class TestNoDeletionPolicy extend
@Test
public void testAllCommitsRemain() throws Exception {
- Directory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT))
.setIndexDeletionPolicy(NoDeletionPolicy.INSTANCE));
for (int i = 0; i < 10; i++) {
@@ -85,6 +87,7 @@ public class TestNoDeletionPolicy extend
assertEquals("wrong number of commits !", i + 1, IndexReader.listCommits(dir).size());
}
writer.close();
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNorms.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestNorms.java Sat Aug 14 13:06:17 2010
@@ -76,7 +76,7 @@ public class TestNorms extends LuceneTes
*/
public void testNorms() throws IOException {
Random random = newRandom();
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
norms = new ArrayList<Float>();
modifiedNorms = new ArrayList<Float>();
@@ -93,13 +93,13 @@ public class TestNorms extends LuceneTes
modifiedNorms = new ArrayList<Float>();
numDocNorms = 0;
- Directory dir2 = new MockRAMDirectory();
+ Directory dir2 = newDirectory(random);
createIndex(random, dir2);
doTestNorms(random, dir2);
// add index1 and index2 to a third index: index3
- Directory dir3 = new MockRAMDirectory();
+ Directory dir3 = newDirectory(random);
createIndex(random, dir3);
IndexWriter iw = new IndexWriter(dir3, newIndexWriterConfig(random,
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestOmitTf.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestOmitTf.java Sat Aug 14 13:06:17 2010
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.util.Collection;
+import java.util.Random;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -35,12 +36,18 @@ import org.apache.lucene.search.Similari
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.search.Explanation.IDFExplanation;
public class TestOmitTf extends LuceneTestCase {
-
+ private Random random;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ random = newRandom();
+ }
+
public static class SimpleSimilarity extends Similarity {
@Override public float lengthNorm(String field, int numTerms) { return 1.0f; }
@Override public float queryNorm(float sumOfSquaredWeights) { return 1.0f; }
@@ -65,9 +72,9 @@ public class TestOmitTf extends LuceneTe
// Tests whether the DocumentWriter correctly enable the
// omitTermFreqAndPositions bit in the FieldInfo
public void testOmitTermFreqAndPositions() throws Exception {
- Directory ram = new MockRAMDirectory();
+ Directory ram = newDirectory(random);
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
- IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, analyzer));
+ IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(random, TEST_VERSION_CURRENT, analyzer));
Document d = new Document();
// this field will have Tf
@@ -111,9 +118,9 @@ public class TestOmitTf extends LuceneTe
// Tests whether merging of docs that have different
// omitTermFreqAndPositions for the same field works
public void testMixedMerge() throws Exception {
- Directory ram = new MockRAMDirectory();
+ Directory ram = newDirectory(random);
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
- IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(3));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
Document d = new Document();
@@ -164,9 +171,9 @@ public class TestOmitTf extends LuceneTe
// field X, then adding docs that do omitTermFreqAndPositions for that same
// field,
public void testMixedRAM() throws Exception {
- Directory ram = new MockRAMDirectory();
+ Directory ram = newDirectory(random);
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
- IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(10));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
Document d = new Document();
@@ -212,9 +219,9 @@ public class TestOmitTf extends LuceneTe
// Verifies no *.prx exists when all fields omit term freq:
public void testNoPrxFile() throws Throwable {
- Directory ram = new MockRAMDirectory();
+ Directory ram = newDirectory(random);
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
- IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(3));
LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy();
lmp.setMergeFactor(2);
@@ -245,9 +252,9 @@ public class TestOmitTf extends LuceneTe
// Test scores with one field with Term Freqs and one without, otherwise with equal content
public void testBasic() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
Analyzer analyzer = new StandardAnalyzer(TEST_VERSION_CURRENT);
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(),
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random,
TEST_VERSION_CURRENT, analyzer).setMaxBufferedDocs(2)
.setSimilarity(new SimpleSimilarity()));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(2);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelReader.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelReader.java Sat Aug 14 13:06:17 2010
@@ -40,9 +40,10 @@ import org.apache.lucene.util.LuceneTest
public class TestParallelReader extends LuceneTestCase {
- private Searcher parallel;
- private Searcher single;
+ private IndexSearcher parallel;
+ private IndexSearcher single;
private Random random;
+ private Directory dir, dir1, dir2;
@Override
protected void setUp() throws Exception {
@@ -51,6 +52,16 @@ public class TestParallelReader extends
single = single(random);
parallel = parallel(random);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ single.getIndexReader().close();
+ parallel.getIndexReader().close();
+ dir.close();
+ dir1.close();
+ dir2.close();
+ super.tearDown();
+ }
public void testQueries() throws Exception {
queryTest(new TermQuery(new Term("f1", "v1")));
@@ -80,6 +91,9 @@ public class TestParallelReader extends
assertTrue(fieldNames.contains("f2"));
assertTrue(fieldNames.contains("f3"));
assertTrue(fieldNames.contains("f4"));
+ pr.close();
+ dir1.close();
+ dir2.close();
}
public void testDocument() throws IOException {
@@ -101,6 +115,9 @@ public class TestParallelReader extends
assertEquals("v2", doc24.get("f4"));
assertEquals("v2", doc223.get("f2"));
assertEquals("v2", doc223.get("f3"));
+ pr.close();
+ dir1.close();
+ dir2.close();
}
public void testIncompatibleIndexes() throws IOException {
@@ -108,7 +125,7 @@ public class TestParallelReader extends
Directory dir1 = getDir1(random);
// one document only:
- Directory dir2 = new MockRAMDirectory();
+ Directory dir2 = newDirectory(random);
IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
Document d3 = new Document();
d3.add(new Field("f3", "v1", Field.Store.YES, Field.Index.ANALYZED));
@@ -117,12 +134,17 @@ public class TestParallelReader extends
ParallelReader pr = new ParallelReader();
pr.add(IndexReader.open(dir1, false));
+ IndexReader ir = IndexReader.open(dir2, false);
try {
- pr.add(IndexReader.open(dir2, false));
+ pr.add(ir);
fail("didn't get exptected exception: indexes don't have same number of documents");
} catch (IllegalArgumentException e) {
// expected exception
}
+ pr.close();
+ ir.close();
+ dir1.close();
+ dir2.close();
}
public void testIsCurrent() throws IOException {
@@ -147,6 +169,9 @@ public class TestParallelReader extends
// now both are not current anymore
assertFalse(pr.isCurrent());
+ pr.close();
+ dir1.close();
+ dir2.close();
}
public void testIsOptimized() throws IOException {
@@ -197,7 +222,8 @@ public class TestParallelReader extends
// now both indexes are optimized
assertTrue(pr.isOptimized());
pr.close();
-
+ dir1.close();
+ dir2.close();
}
public void testAllTermDocs() throws IOException {
@@ -236,8 +262,8 @@ public class TestParallelReader extends
}
// Fields 1-4 indexed together:
- private Searcher single(Random random) throws IOException {
- Directory dir = new MockRAMDirectory();
+ private IndexSearcher single(Random random) throws IOException {
+ dir = newDirectory(random);
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
Document d1 = new Document();
d1.add(new Field("f1", "v1", Field.Store.YES, Field.Index.ANALYZED));
@@ -257,9 +283,9 @@ public class TestParallelReader extends
}
// Fields 1 & 2 in one index, 3 & 4 in other, with ParallelReader:
- private Searcher parallel(Random random) throws IOException {
- Directory dir1 = getDir1(random);
- Directory dir2 = getDir2(random);
+ private IndexSearcher parallel(Random random) throws IOException {
+ dir1 = getDir1(random);
+ dir2 = getDir2(random);
ParallelReader pr = new ParallelReader();
pr.add(IndexReader.open(dir1, false));
pr.add(IndexReader.open(dir2, false));
@@ -267,7 +293,7 @@ public class TestParallelReader extends
}
private Directory getDir1(Random random) throws IOException {
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(random);
IndexWriter w1 = new IndexWriter(dir1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
Document d1 = new Document();
d1.add(new Field("f1", "v1", Field.Store.YES, Field.Index.ANALYZED));
@@ -282,7 +308,7 @@ public class TestParallelReader extends
}
private Directory getDir2(Random random) throws IOException {
- Directory dir2 = new MockRAMDirectory();
+ Directory dir2 = newDirectory(random);
IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new StandardAnalyzer(TEST_VERSION_CURRENT)));
Document d3 = new Document();
d3.add(new Field("f3", "v1", Field.Store.YES, Field.Index.ANALYZED));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java Sat Aug 14 13:06:17 2010
@@ -48,13 +48,13 @@ public class TestParallelReaderEmptyInde
*/
public void testEmptyIndex() throws IOException {
Random random = newRandom();
- MockRAMDirectory rd1 = new MockRAMDirectory();
+ MockRAMDirectory rd1 = newDirectory(random);
IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
iw.close();
- MockRAMDirectory rd2 = new MockRAMDirectory(rd1);
+ MockRAMDirectory rd2 = newDirectory(random, rd1);
- MockRAMDirectory rdOut = new MockRAMDirectory();
+ MockRAMDirectory rdOut = newDirectory(random);
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
ParallelReader pr = new ParallelReader();
@@ -78,8 +78,8 @@ public class TestParallelReaderEmptyInde
* any exception.
*/
public void testEmptyIndexWithVectors() throws IOException {
- MockRAMDirectory rd1 = new MockRAMDirectory();
Random random = newRandom();
+ MockRAMDirectory rd1 = newDirectory(random);
{
IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
@@ -100,7 +100,7 @@ public class TestParallelReaderEmptyInde
iw.close();
}
- MockRAMDirectory rd2 = new MockRAMDirectory();
+ MockRAMDirectory rd2 = newDirectory(random);
{
IndexWriter iw = new IndexWriter(rd2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
@@ -108,7 +108,7 @@ public class TestParallelReaderEmptyInde
iw.close();
}
- MockRAMDirectory rdOut = new MockRAMDirectory();
+ MockRAMDirectory rdOut = newDirectory(random);
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
ParallelReader pr = new ParallelReader();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java Sat Aug 14 13:06:17 2010
@@ -31,13 +31,15 @@ import org.apache.lucene.store.MockRAMDi
public class TestParallelTermEnum extends LuceneTestCase {
private IndexReader ir1;
private IndexReader ir2;
-
+ private MockRAMDirectory rd1;
+ private MockRAMDirectory rd2;
+
@Override
protected void setUp() throws Exception {
super.setUp();
Document doc;
Random random = newRandom();
- MockRAMDirectory rd1 = new MockRAMDirectory();
+ rd1 = newDirectory(random);
IndexWriter iw1 = new IndexWriter(rd1, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
doc = new Document();
@@ -49,7 +51,7 @@ public class TestParallelTermEnum extend
iw1.addDocument(doc);
iw1.close();
- MockRAMDirectory rd2 = new MockRAMDirectory();
+ rd2 = newDirectory(random);
IndexWriter iw2 = new IndexWriter(rd2, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
doc = new Document();
@@ -70,6 +72,8 @@ public class TestParallelTermEnum extend
protected void tearDown() throws Exception {
ir1.close();
ir2.close();
+ rd1.close();
+ rd2.close();
super.tearDown();
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPayloadProcessorProvider.java Sat Aug 14 13:06:17 2010
@@ -129,7 +129,7 @@ public class TestPayloadProcessorProvide
private void populateDirs(Random random, Directory[] dirs, boolean multipleCommits)
throws IOException {
for (int i = 0; i < dirs.length; i++) {
- dirs[i] = new MockRAMDirectory();
+ dirs[i] = newDirectory(random);
populateDocs(random, dirs[i], multipleCommits);
verifyPayloadExists(dirs[i], new Term("p", "p1"), NUM_DOCS);
verifyPayloadExists(dirs[i], new Term("p", "p2"), NUM_DOCS);
@@ -183,7 +183,7 @@ public class TestPayloadProcessorProvide
Directory[] dirs = new Directory[2];
populateDirs(random, dirs, multipleCommits);
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
if (!addToEmptyIndex) {
populateDocs(random, dir, multipleCommits);
verifyPayloadExists(dir, new Term("p", "p1"), NUM_DOCS);
@@ -216,6 +216,9 @@ public class TestPayloadProcessorProvide
numExpectedPayloads = NUM_DOCS * dirs.length
+ (addToEmptyIndex ? 0 : NUM_DOCS);
verifyPayloadExists(dir, new Term("p", "p2"), numExpectedPayloads);
+ for (Directory d : dirs)
+ d.close();
+ dir.close();
}
@Test
@@ -241,7 +244,7 @@ public class TestPayloadProcessorProvide
@Test
public void testRegularMerges() throws Exception {
Random random = newRandom();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
populateDocs(random, dir, true);
verifyPayloadExists(dir, new Term("p", "p1"), NUM_DOCS);
verifyPayloadExists(dir, new Term("p", "p2"), NUM_DOCS);
@@ -257,6 +260,7 @@ public class TestPayloadProcessorProvide
verifyPayloadExists(dir, new Term("p", "p1"), 0);
verifyPayloadExists(dir, new Term("p", "p2"), NUM_DOCS);
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPayloads.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPayloads.java Sat Aug 14 13:06:17 2010
@@ -99,7 +99,7 @@ public class TestPayloads extends Lucene
// payload bit in the FieldInfo
public void testPayloadFieldBit() throws Exception {
rnd = newRandom();
- Directory ram = new RAMDirectory();
+ Directory ram = newDirectory(rnd);
PayloadAnalyzer analyzer = new PayloadAnalyzer();
IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(rnd, TEST_VERSION_CURRENT, analyzer));
Document d = new Document();
@@ -150,20 +150,22 @@ public class TestPayloads extends Lucene
assertTrue("Payload field bit should be set.", fi.fieldInfo("f2").storePayloads);
assertTrue("Payload field bit should be set.", fi.fieldInfo("f3").storePayloads);
reader.close();
+ ram.close();
}
// Tests if payloads are correctly stored and loaded using both RamDirectory and FSDirectory
public void testPayloadsEncoding() throws Exception {
rnd = newRandom();
// first perform the test using a RAMDirectory
- Directory dir = new RAMDirectory();
+ Directory dir = newDirectory(rnd);
performTest(rnd, dir);
-
+ dir.close();
// now use a FSDirectory and repeat same test
File dirName = _TestUtil.getTempDir("test_payloads");
dir = FSDirectory.open(dirName);
performTest(rnd, dir);
_TestUtil.rmDir(dirName);
+ dir.close();
}
// builds an index with payloads in the given Directory and performs
@@ -469,7 +471,7 @@ public class TestPayloads extends Lucene
final int numDocs = 50 * RANDOM_MULTIPLIER;
final ByteArrayPool pool = new ByteArrayPool(numThreads, 5);
- Directory dir = new RAMDirectory();
+ Directory dir = newDirectory(rnd);
final IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(rnd,
TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
final String field = "test";
@@ -513,7 +515,7 @@ public class TestPayloads extends Lucene
}
terms.close();
reader.close();
-
+ dir.close();
assertEquals(pool.size(), numThreads);
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java Sat Aug 14 13:06:17 2010
@@ -21,19 +21,32 @@ import static org.junit.Assert.*;
import java.io.IOException;
import java.util.Map;
-import java.util.Random;
import java.util.Map.Entry;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
public class TestPersistentSnapshotDeletionPolicy extends TestSnapshotDeletionPolicy {
-
// Keep it a class member so that getDeletionPolicy can use it
- private Directory snapshotDir = new MockRAMDirectory();
+ private Directory snapshotDir;
+
+ @Before
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ snapshotDir = newDirectory(random);
+ }
+
+ @After
+ @Override
+ public void tearDown() throws Exception {
+ snapshotDir.close();
+ super.tearDown();
+ }
@Override
protected SnapshotDeletionPolicy getDeletionPolicy() throws IOException {
@@ -57,9 +70,8 @@ public class TestPersistentSnapshotDelet
@Override
@Test
public void testExistingSnapshots() throws Exception {
- Random random = newRandom();
int numSnapshots = 3;
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
PersistentSnapshotDeletionPolicy psdp = (PersistentSnapshotDeletionPolicy) getDeletionPolicy();
IndexWriter writer = new IndexWriter(dir, getConfig(random, psdp));
prepareIndexAndSnapshots(psdp, writer, numSnapshots, "snapshot");
@@ -75,6 +87,7 @@ public class TestPersistentSnapshotDelet
assertSnapshotExists(dir, psdp, numSnapshots);
assertEquals(numSnapshots, psdp.getSnapshots().size());
psdp.close();
+ dir.close();
}
@Test(expected=IllegalArgumentException.class)
@@ -85,9 +98,10 @@ public class TestPersistentSnapshotDelet
@Test
public void testInvalidSnapshotInfos() throws Exception {
// Add the correct number of documents (1), but without snapshot information
- IndexWriter writer = new IndexWriter(snapshotDir, getConfig(newRandom(), null));
+ IndexWriter writer = new IndexWriter(snapshotDir, getConfig(random, null));
writer.addDocument(new Document());
writer.close();
+ PersistentSnapshotDeletionPolicy dp = null;
try {
new PersistentSnapshotDeletionPolicy(
new KeepOnlyLastCommitDeletionPolicy(), snapshotDir, OpenMode.APPEND,
@@ -100,7 +114,7 @@ public class TestPersistentSnapshotDelet
@Test
public void testNoSnapshotInfos() throws Exception {
// Initialize an empty index in snapshotDir - PSDP should initialize successfully.
- new IndexWriter(snapshotDir, getConfig(newRandom(), null)).close();
+ new IndexWriter(snapshotDir, getConfig(random, null)).close();
new PersistentSnapshotDeletionPolicy(
new KeepOnlyLastCommitDeletionPolicy(), snapshotDir, OpenMode.APPEND,
TEST_VERSION_CURRENT).close();
@@ -109,7 +123,7 @@ public class TestPersistentSnapshotDelet
@Test(expected=IllegalStateException.class)
public void testTooManySnapshotInfos() throws Exception {
// Write two documents to the snapshots directory - illegal.
- IndexWriter writer = new IndexWriter(snapshotDir, getConfig(newRandom(), null));
+ IndexWriter writer = new IndexWriter(snapshotDir, getConfig(random, null));
writer.addDocument(new Document());
writer.addDocument(new Document());
writer.close();
@@ -122,9 +136,9 @@ public class TestPersistentSnapshotDelet
@Test
public void testSnapshotRelease() throws Exception {
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
PersistentSnapshotDeletionPolicy psdp = (PersistentSnapshotDeletionPolicy) getDeletionPolicy();
- IndexWriter writer = new IndexWriter(dir, getConfig(newRandom(), psdp));
+ IndexWriter writer = new IndexWriter(dir, getConfig(random, psdp));
prepareIndexAndSnapshots(psdp, writer, 1, "snapshot");
writer.close();
@@ -135,6 +149,8 @@ public class TestPersistentSnapshotDelet
new KeepOnlyLastCommitDeletionPolicy(), snapshotDir, OpenMode.APPEND,
TEST_VERSION_CURRENT);
assertEquals("Should have no snapshots !", 0, psdp.getSnapshots().size());
+ psdp.close();
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestRollback.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestRollback.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestRollback.java Sat Aug 14 13:06:17 2010
@@ -24,15 +24,14 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.Field.Index;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
public class TestRollback extends LuceneTestCase {
// LUCENE-2536
public void testRollbackIntegrityWithBufferFlush() throws Exception {
- Directory dir = new MockRAMDirectory();
Random random = newRandom();
+ Directory dir = newDirectory(random);
RandomIndexWriter rw = new RandomIndexWriter(random, dir);
for (int i = 0; i < 5; i++) {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java Sat Aug 14 13:06:17 2010
@@ -24,17 +24,18 @@ import org.apache.lucene.document.Docume
import java.io.IOException;
import java.util.Collection;
+import java.util.Random;
public class TestSegmentMerger extends LuceneTestCase {
//The variables for the new merged segment
- private Directory mergedDir = new MockRAMDirectory();
+ private Directory mergedDir;
private String mergedSegment = "test";
//First segment to be merged
- private Directory merge1Dir = new MockRAMDirectory();
+ private Directory merge1Dir;
private Document doc1 = new Document();
private SegmentReader reader1 = null;
//Second Segment to be merged
- private Directory merge2Dir = new MockRAMDirectory();
+ private Directory merge2Dir;
private Document doc2 = new Document();
private SegmentReader reader2 = null;
@@ -46,6 +47,10 @@ public class TestSegmentMerger extends L
@Override
protected void setUp() throws Exception {
super.setUp();
+ Random random = newRandom();
+ mergedDir = newDirectory(random);
+ merge1Dir = newDirectory(random);
+ merge2Dir = newDirectory(random);
DocHelper.setupDoc(doc1);
SegmentInfo info1 = DocHelper.writeDoc(merge1Dir, doc1);
DocHelper.setupDoc(doc2);
@@ -53,6 +58,16 @@ public class TestSegmentMerger extends L
reader1 = SegmentReader.get(true, info1, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
reader2 = SegmentReader.get(true, info2, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ reader1.close();
+ reader2.close();
+ mergedDir.close();
+ merge1Dir.close();
+ merge2Dir.close();
+ super.tearDown();
+ }
public void test() {
assertTrue(mergedDir != null);
@@ -110,5 +125,6 @@ public class TestSegmentMerger extends L
}
TestSegmentReader.checkNorms(mergedReader);
+ mergedReader.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java Sat Aug 14 13:06:17 2010
@@ -30,7 +30,7 @@ import org.apache.lucene.search.Similari
import org.apache.lucene.store.MockRAMDirectory;
public class TestSegmentReader extends LuceneTestCase {
- private MockRAMDirectory dir = new MockRAMDirectory();
+ private MockRAMDirectory dir;
private Document testDoc = new Document();
private SegmentReader reader = null;
@@ -42,10 +42,18 @@ public class TestSegmentReader extends L
@Override
protected void setUp() throws Exception {
super.setUp();
+ dir = newDirectory(newRandom());
DocHelper.setupDoc(testDoc);
SegmentInfo info = DocHelper.writeDoc(dir, testDoc);
reader = SegmentReader.get(true, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ reader.close();
+ dir.close();
+ super.tearDown();
+ }
public void test() {
assertTrue(dir != null);
@@ -80,6 +88,7 @@ public class TestSegmentReader extends L
assertTrue(deleteReader.isDeleted(0) == true);
assertTrue(deleteReader.hasDeletions() == true);
assertTrue(deleteReader.numDocs() == 0);
+ deleteReader.close();
}
public void testGetFieldNameVariations() {
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Sat Aug 14 13:06:17 2010
@@ -18,19 +18,19 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.store.MockRAMDirectory;
-import org.apache.lucene.store.MockRAMDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import java.io.IOException;
+import java.util.Random;
public class TestSegmentTermDocs extends LuceneTestCase {
private Document testDoc = new Document();
- private Directory dir = new MockRAMDirectory();
+ private Directory dir;
private SegmentInfo info;
+ private Random random;
public TestSegmentTermDocs(String s) {
super(s);
@@ -39,9 +39,17 @@ public class TestSegmentTermDocs extends
@Override
protected void setUp() throws Exception {
super.setUp();
+ random = newRandom();
+ dir = newDirectory(random);
DocHelper.setupDoc(testDoc);
info = DocHelper.writeDoc(dir, testDoc);
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ dir.close();
+ super.tearDown();
+ }
public void test() {
assertTrue(dir != null);
@@ -98,8 +106,8 @@ public class TestSegmentTermDocs extends
}
public void testSkipTo(int indexDivisor) throws IOException {
- Directory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ Directory dir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
Term ta = new Term("content","aaa");
for(int i = 0; i < 10; i++)
@@ -223,7 +231,6 @@ public class TestSegmentTermDocs extends
}
public void testIndexDivisor() throws IOException {
- dir = new MockRAMDirectory();
testDoc = new Document();
DocHelper.setupDoc(testDoc);
DocHelper.writeDoc(dir, testDoc);
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Sat Aug 14 13:06:17 2010
@@ -26,16 +26,27 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockRAMDirectory;
-import org.apache.lucene.store.MockRAMDirectory;
public class TestSegmentTermEnum extends LuceneTestCase {
- Directory dir = new MockRAMDirectory();
+ Directory dir;
+ Random random;
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ random = newRandom();
+ dir = newDirectory(random);
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ dir.close();
+ super.tearDown();
+ }
public void testTermEnum() throws IOException {
- Random random = newRandom();
IndexWriter writer = null;
writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
@@ -64,8 +75,8 @@ public class TestSegmentTermEnum extends
public void testPrevTermAtEnd() throws IOException
{
- Directory dir = new MockRAMDirectory();
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
+ Directory dir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new WhitespaceAnalyzer(TEST_VERSION_CURRENT)));
addDoc(writer, "aaa bbb");
writer.close();
SegmentReader reader = SegmentReader.getOnlySegmentReader(dir);
@@ -77,6 +88,8 @@ public class TestSegmentTermEnum extends
assertEquals("bbb", termEnum.term().text());
assertFalse(termEnum.next());
assertEquals("bbb", termEnum.prev().text());
+ reader.close();
+ dir.close();
}
private void verifyDocFreq()
@@ -111,8 +124,8 @@ public class TestSegmentTermEnum extends
// assert that term is 'bbb'
assertEquals("bbb", termEnum.term().text());
assertEquals(100, termEnum.docFreq());
-
termEnum.close();
+ reader.close();
}
private void addDoc(IndexWriter writer, String value) throws IOException
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java Sat Aug 14 13:06:17 2010
@@ -24,6 +24,7 @@ import org.apache.lucene.index.SnapshotD
import org.apache.lucene.util.LuceneTestCaseJ4;
import org.apache.lucene.util.ThreadInterruptedException;
import org.apache.lucene.util._TestUtil;
+import org.junit.Before;
import org.junit.Test;
//
@@ -32,9 +33,16 @@ import org.junit.Test;
//
public class TestSnapshotDeletionPolicy extends LuceneTestCaseJ4 {
-
+ protected Random random;
public static final String INDEX_PATH = "test.snapshots";
+ @Before
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ random = newRandom();
+ }
+
protected IndexWriterConfig getConfig(Random random, IndexDeletionPolicy dp) {
IndexWriterConfig conf = newIndexWriterConfig(random, TEST_VERSION_CURRENT, new KeywordAnalyzer());
if (dp != null) {
@@ -86,7 +94,6 @@ public class TestSnapshotDeletionPolicy
@Test
public void testSnapshotDeletionPolicy() throws Exception {
- Random random = newRandom();
File dir = _TestUtil.getTempDir(INDEX_PATH);
try {
Directory fsDir = FSDirectory.open(dir);
@@ -96,7 +103,7 @@ public class TestSnapshotDeletionPolicy
_TestUtil.rmDir(dir);
}
- MockRAMDirectory dir2 = new MockRAMDirectory();
+ MockRAMDirectory dir2 = newDirectory(random);
runTest(random, dir2);
dir2.close();
}
@@ -233,10 +240,9 @@ public class TestSnapshotDeletionPolicy
public void testBasicSnapshots() throws Exception {
int numSnapshots = 3;
SnapshotDeletionPolicy sdp = getDeletionPolicy();
- Random random = newRandom();
// Create 3 snapshots: snapshot0, snapshot1, snapshot2
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
IndexWriter writer = new IndexWriter(dir, getConfig(random, sdp));
prepareIndexAndSnapshots(sdp, writer, numSnapshots, "snapshot");
writer.close();
@@ -261,12 +267,12 @@ public class TestSnapshotDeletionPolicy
// expected - snapshot should not exist
}
}
+ dir.close();
}
@Test
public void testMultiThreadedSnapshotting() throws Exception {
- Random random = newRandom();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
final SnapshotDeletionPolicy sdp = getDeletionPolicy();
final IndexWriter writer = new IndexWriter(dir, getConfig(random, sdp));
@@ -305,13 +311,13 @@ public class TestSnapshotDeletionPolicy
}
assertEquals(1, IndexReader.listCommits(dir).size());
writer.close();
+ dir.close();
}
@Test
public void testRollbackToOldSnapshot() throws Exception {
- Random random = newRandom();
int numSnapshots = 2;
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
SnapshotDeletionPolicy sdp = getDeletionPolicy();
IndexWriter writer = new IndexWriter(dir, getConfig(random, sdp));
prepareIndexAndSnapshots(sdp, writer, numSnapshots, "snapshot");
@@ -327,12 +333,12 @@ public class TestSnapshotDeletionPolicy
// but 'snapshot1' files will still exist (need to release snapshot before they can be deleted).
String segFileName = sdp.getSnapshot("snapshot1").getSegmentsFileName();
assertTrue("snapshot files should exist in the directory: " + segFileName, dir.fileExists(segFileName));
+ dir.close();
}
@Test
public void testReleaseSnapshot() throws Exception {
- Random random = newRandom();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
SnapshotDeletionPolicy sdp = getDeletionPolicy();
IndexWriter writer = new IndexWriter(dir, getConfig(random, sdp));
prepareIndexAndSnapshots(sdp, writer, 1, "snapshot");
@@ -355,15 +361,15 @@ public class TestSnapshotDeletionPolicy
assertNull(sdp.getSnapshots().get(snapId));
writer.deleteUnusedFiles();
assertFalse("segments file should not be found in dirctory: " + segFileName, dir.fileExists(segFileName));
+ dir.close();
}
@Test
public void testExistingSnapshots() throws Exception {
- Random random = newRandom();
// Tests the ability to construct a SDP from existing snapshots, and
// asserts that those snapshots/commit points are protected.
int numSnapshots = 3;
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
SnapshotDeletionPolicy sdp = getDeletionPolicy();
IndexWriter writer = new IndexWriter(dir, getConfig(random, sdp));
prepareIndexAndSnapshots(sdp, writer, numSnapshots, "snapshot");
@@ -376,12 +382,12 @@ public class TestSnapshotDeletionPolicy
writer.deleteUnusedFiles();
writer.close();
assertSnapshotExists(dir, sdp, numSnapshots);
+ dir.close();
}
@Test
public void testSnapshotLastCommitTwice() throws Exception {
- Random random = newRandom();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
SnapshotDeletionPolicy sdp = getDeletionPolicy();
IndexWriter writer = new IndexWriter(dir, getConfig(random, sdp));
writer.addDocument(new Document());
@@ -403,14 +409,14 @@ public class TestSnapshotDeletionPolicy
checkSnapshotExists(dir, ic2);
writer.close();
+ dir.close();
}
@Test
public void testMissingCommits() throws Exception {
- Random random = newRandom();
// Tests the behavior of SDP when commits that are given at ctor are missing
// on onInit().
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(random);
SnapshotDeletionPolicy sdp = getDeletionPolicy();
IndexWriter writer = new IndexWriter(dir, getConfig(random, sdp));
writer.addDocument(new Document());
@@ -438,6 +444,7 @@ public class TestSnapshotDeletionPolicy
} catch (IllegalStateException e) {
// expected.
}
+ dir.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java Sat Aug 14 13:06:17 2010
@@ -169,7 +169,7 @@ public class TestStressIndexing extends
RANDOM = newRandom();
// With ConcurrentMergeScheduler, in RAMDir
- Directory directory = new MockRAMDirectory();
+ Directory directory = newDirectory(RANDOM);
runStressTest(directory, new ConcurrentMergeScheduler());
directory.close();
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Sat Aug 14 13:06:17 2010
@@ -66,7 +66,7 @@ public class TestStressIndexing2 extends
public void testRandomIWReader() throws Throwable {
r = newRandom();
- Directory dir = new MockRAMDirectory();
+ Directory dir = newDirectory(r);
// TODO: verify equals using IW.getReader
DocsAndWriter dw = indexRandomIWReader(5, 3, 100, dir);
@@ -80,9 +80,9 @@ public class TestStressIndexing2 extends
public void testRandom() throws Throwable {
r = newRandom();
- Directory dir1 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(r);
// dir1 = FSDirectory.open("foofoofoo");
- Directory dir2 = new MockRAMDirectory();
+ Directory dir2 = newDirectory(r);
// mergeFactor=2; maxBufferedDocs=2; Map docs = indexRandom(1, 3, 2, dir1);
int maxThreadStates = 1+r.nextInt(10);
boolean doReaderPooling = r.nextBoolean();
@@ -94,6 +94,8 @@ public class TestStressIndexing2 extends
// verifyEquals(dir2, dir2, "id");
verifyEquals(dir1, dir2, "id");
+ dir1.close();
+ dir2.close();
}
public void testMultiConfig() throws Throwable {
@@ -111,11 +113,13 @@ public class TestStressIndexing2 extends
int nThreads=r.nextInt(5)+1;
int iter=r.nextInt(5)+1;
int range=r.nextInt(20)+1;
- Directory dir1 = new MockRAMDirectory();
- Directory dir2 = new MockRAMDirectory();
+ Directory dir1 = newDirectory(r);
+ Directory dir2 = newDirectory(r);
Map<String,Document> docs = indexRandom(nThreads, iter, range, dir1, maxThreadStates, doReaderPooling);
indexSerial(r, docs, dir2);
verifyEquals(dir1, dir2, "id");
+ dir1.close();
+ dir2.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java Sat Aug 14 13:06:17 2010
@@ -22,6 +22,7 @@ import java.io.Reader;
import java.util.Arrays;
import java.util.Iterator;
import java.util.Map;
+import java.util.Random;
import java.util.SortedSet;
import org.apache.lucene.analysis.Analyzer;
@@ -42,7 +43,7 @@ public class TestTermVectorsReader exten
private String[] testTerms = {"this", "is", "a", "test"};
private int[][] positions = new int[testTerms.length][];
private TermVectorOffsetInfo[][] offsets = new TermVectorOffsetInfo[testTerms.length][];
- private MockRAMDirectory dir = new MockRAMDirectory();
+ private MockRAMDirectory dir;
private String seg;
private FieldInfos fieldInfos = new FieldInfos();
private static int TERM_FREQ = 3;
@@ -92,7 +93,9 @@ public class TestTermVectorsReader exten
}
Arrays.sort(tokens);
- IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(newRandom(), TEST_VERSION_CURRENT, new MyAnalyzer()).setMaxBufferedDocs(-1));
+ Random random = newRandom();
+ dir = newDirectory(random);
+ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(random, TEST_VERSION_CURRENT, new MyAnalyzer()).setMaxBufferedDocs(-1));
((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundFile(false);
((LogMergePolicy) writer.getConfig().getMergePolicy()).setUseCompoundDocStore(false);
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(10);
@@ -121,6 +124,12 @@ public class TestTermVectorsReader exten
fieldInfos = new FieldInfos(dir, IndexFileNames.segmentFileName(seg, IndexFileNames.FIELD_INFOS_EXTENSION));
}
+
+ @Override
+ protected void tearDown() throws Exception {
+ dir.close();
+ super.tearDown();
+ }
private class MyTokenStream extends TokenStream {
int tokenUpto;
@@ -181,6 +190,7 @@ public class TestTermVectorsReader exten
assertTrue(term.equals(testTerms[i]));
}
}
+ reader.close();
}
public void testPositionReader() throws IOException {
@@ -223,6 +233,7 @@ public class TestTermVectorsReader exten
//System.out.println("Term: " + term);
assertTrue(term.equals(testTerms[i]));
}
+ reader.close();
}
public void testOffsetReader() throws IOException {
@@ -251,6 +262,7 @@ public class TestTermVectorsReader exten
assertTrue(termVectorOffsetInfo.equals(offsets[i][j]));
}
}
+ reader.close();
}
public void testMapper() throws IOException {
@@ -365,37 +377,45 @@ public class TestTermVectorsReader exten
assertEquals(0, docNumAwareMapper.getDocumentNumber());
ir.close();
-
+ reader.close();
}
/**
* Make sure exceptions and bad params are handled appropriately
*/
- public void testBadParams() {
+ public void testBadParams() throws IOException {
+ TermVectorsReader reader = null;
try {
- TermVectorsReader reader = new TermVectorsReader(dir, seg, fieldInfos);
+ reader = new TermVectorsReader(dir, seg, fieldInfos);
//Bad document number, good field number
reader.get(50, testFields[0]);
fail();
} catch (IOException e) {
// expected exception
+ } finally {
+ reader.close();
}
try {
- TermVectorsReader reader = new TermVectorsReader(dir, seg, fieldInfos);
+ reader = new TermVectorsReader(dir, seg, fieldInfos);
//Bad document number, no field
reader.get(50);
fail();
} catch (IOException e) {
// expected exception
+ } finally {
+ reader.close();
}
try {
- TermVectorsReader reader = new TermVectorsReader(dir, seg, fieldInfos);
+ reader = new TermVectorsReader(dir, seg, fieldInfos);
//good document number, bad field number
TermFreqVector vector = reader.get(0, "f50");
assertTrue(vector == null);
+ reader.close();
} catch (IOException e) {
fail();
+ } finally {
+ reader.close();
}
}
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java Sat Aug 14 13:06:17 2010
@@ -56,8 +56,7 @@ class RepeatingTokenStream extends Token
public class TestTermdocPerf extends LuceneTestCase {
- void addDocs(Directory dir, final int ndocs, String field, final String val, final int maxTF, final float percentDocs) throws IOException {
- final Random random = newRandom();
+ void addDocs(final Random random, Directory dir, final int ndocs, String field, final String val, final int maxTF, final float percentDocs) throws IOException {
final RepeatingTokenStream ts = new RepeatingTokenStream(val);
Analyzer analyzer = new Analyzer() {
@@ -86,10 +85,11 @@ public class TestTermdocPerf extends Luc
public int doTest(int iter, int ndocs, int maxTF, float percentDocs) throws IOException {
- Directory dir = new MockRAMDirectory();
+ Random random = newRandom();
+ Directory dir = newDirectory(random);
long start = System.currentTimeMillis();
- addDocs(dir, ndocs, "foo", "val", maxTF, percentDocs);
+ addDocs(random, dir, ndocs, "foo", "val", maxTF, percentDocs);
long end = System.currentTimeMillis();
if (VERBOSE) System.out.println("milliseconds for creation of " + ndocs + " docs = " + (end-start));
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java?rev=985485&r1=985484&r2=985485&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java Sat Aug 14 13:06:17 2010
@@ -138,7 +138,7 @@ public class TestThreadedOptimize extend
*/
public void testThreadedOptimize() throws Exception {
Random random = newRandom();
- Directory directory = new MockRAMDirectory();
+ Directory directory = newDirectory(random);
runTest(random, directory, new SerialMergeScheduler());
runTest(random, directory, new ConcurrentMergeScheduler());
directory.close();