You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2011/12/09 10:13:45 UTC
svn commit: r1212292 [5/6] - in /lucene/dev/trunk: ./ lucene/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/highlighter/src/test/org/...
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -105,7 +105,7 @@ public class TestLazyProxSkipping extend
writer.forceMerge(1);
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(directory, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(directory));
this.searcher = newSearcher(reader);
}
@@ -153,7 +153,7 @@ public class TestLazyProxSkipping extend
}
writer.close();
- IndexReader reader = IndexReader.open(directory, true);
+ IndexReader reader = IndexReader.open(directory);
DocsAndPositionsEnum tp = MultiFields.getTermPositionsEnum(reader,
MultiFields.getLiveDocs(reader),
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiReader.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestMultiReader.java Fri Dec 9 09:13:39 2011
@@ -38,8 +38,8 @@ public class TestMultiReader extends Tes
IndexReader reader;
sis.read(dir);
- SegmentReader reader1 = SegmentReader.get(false, sis.info(0), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
- SegmentReader reader2 = SegmentReader.get(false, sis.info(1), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ SegmentReader reader1 = SegmentReader.get(sis.info(0), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ SegmentReader reader2 = SegmentReader.get(sis.info(1), IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
readers[0] = reader1;
readers[1] = reader2;
assertTrue(reader1 != null);
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -39,213 +39,6 @@ import org.apache.lucene.util.LuceneTest
* separate norms, addDocument, addIndexes, forceMerge.
*/
public class TestNorms extends LuceneTestCase {
-
- private class SimilarityProviderOne extends DefaultSimilarityProvider {
- @Override
- public Similarity get(String field) {
- return new DefaultSimilarity() {
- @Override
- public byte computeNorm(FieldInvertState state) {
- // diable length norm
- return encodeNormValue(state.getBoost());
- }
- };
- }
- }
-
- private static final int NUM_FIELDS = 10;
-
- private SimilarityProvider similarityProviderOne;
- private Analyzer anlzr;
- private int numDocNorms;
- private ArrayList<Float> norms;
- private ArrayList<Float> modifiedNorms;
- private float lastNorm = 0;
- private float normDelta = (float) 0.001;
-
- @Override
- public void setUp() throws Exception {
- super.setUp();
- similarityProviderOne = new SimilarityProviderOne();
- anlzr = new MockAnalyzer(random);
- }
-
- /**
- * Test that norms values are preserved as the index is maintained.
- * Including separate norms.
- * Including merging indexes with seprate norms.
- * Including forceMerge.
- */
- public void testNorms() throws IOException {
- Directory dir1 = newDirectory();
-
- norms = new ArrayList<Float>();
- modifiedNorms = new ArrayList<Float>();
-
- createIndex(random, dir1);
- doTestNorms(random, dir1);
-
- // test with a single index: index2
- ArrayList<Float> norms1 = norms;
- ArrayList<Float> modifiedNorms1 = modifiedNorms;
- int numDocNorms1 = numDocNorms;
-
- norms = new ArrayList<Float>();
- modifiedNorms = new ArrayList<Float>();
- numDocNorms = 0;
-
- Directory dir2 = newDirectory();
-
- createIndex(random, dir2);
- doTestNorms(random, dir2);
-
- // add index1 and index2 to a third index: index3
- Directory dir3 = newDirectory();
-
- createIndex(random, dir3);
- IndexWriter iw = new IndexWriter(
- dir3,
- newIndexWriterConfig(TEST_VERSION_CURRENT, anlzr).
- setOpenMode(OpenMode.APPEND).
- setMaxBufferedDocs(5).
- setMergePolicy(newLogMergePolicy(3))
- );
- iw.addIndexes(dir1,dir2);
- iw.forceMerge(1);
- iw.close();
-
- norms1.addAll(norms);
- norms = norms1;
- modifiedNorms1.addAll(modifiedNorms);
- modifiedNorms = modifiedNorms1;
- numDocNorms += numDocNorms1;
-
- // test with index3
- verifyIndex(dir3);
- doTestNorms(random, dir3);
-
- // now with single segment
- iw = new IndexWriter(
- dir3,
- newIndexWriterConfig(TEST_VERSION_CURRENT, anlzr).
- setOpenMode(OpenMode.APPEND).
- setMaxBufferedDocs(5).
- setMergePolicy(newLogMergePolicy(3))
- );
- iw.forceMerge(1);
- iw.close();
- verifyIndex(dir3);
-
- dir1.close();
- dir2.close();
- dir3.close();
- }
-
- private void doTestNorms(Random random, Directory dir) throws IOException {
- int num = atLeast(1);
- for (int i=0; i<num; i++) {
- addDocs(random, dir,12,true);
- verifyIndex(dir);
- modifyNormsForF1(dir);
- verifyIndex(dir);
- addDocs(random, dir,12,false);
- verifyIndex(dir);
- modifyNormsForF1(dir);
- verifyIndex(dir);
- }
- }
-
- private void createIndex(Random random, Directory dir) throws IOException {
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.CREATE)
- .setMaxBufferedDocs(5).setSimilarityProvider(similarityProviderOne).setMergePolicy(newLogMergePolicy()));
- LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
- lmp.setMergeFactor(3);
- lmp.setUseCompoundFile(true);
- iw.close();
- }
-
- private void modifyNormsForF1(Directory dir) throws IOException {
- IndexReader ir = IndexReader.open(dir, false);
- int n = ir.maxDoc();
- for (int i = 0; i < n; i+=3) { // modify for every third doc
- int k = (i*3) % modifiedNorms.size();
- float origNorm = modifiedNorms.get(i).floatValue();
- float newNorm = modifiedNorms.get(k).floatValue();
- //System.out.println("Modifying: for "+i+" from "+origNorm+" to "+newNorm);
- //System.out.println(" and: for "+k+" from "+newNorm+" to "+origNorm);
- modifiedNorms.set(i, Float.valueOf(newNorm));
- modifiedNorms.set(k, Float.valueOf(origNorm));
- DefaultSimilarity sim = new DefaultSimilarity();
- ir.setNorm(i, "f"+1, sim.encodeNormValue(newNorm));
- ir.setNorm(k, "f"+1, sim.encodeNormValue(origNorm));
- }
- ir.close();
- }
-
-
- private void verifyIndex(Directory dir) throws IOException {
- IndexReader ir = IndexReader.open(dir, false);
- for (int i = 0; i < NUM_FIELDS; i++) {
- String field = "f"+i;
- byte b[] = MultiNorms.norms(ir, field);
- assertEquals("number of norms mismatches",numDocNorms,b.length);
- ArrayList<Float> storedNorms = (i==1 ? modifiedNorms : norms);
- DefaultSimilarity sim = (DefaultSimilarity) similarityProviderOne.get(field);
- for (int j = 0; j < b.length; j++) {
- float norm = sim.decodeNormValue(b[j]);
- float norm1 = storedNorms.get(j).floatValue();
- assertEquals("stored norm value of "+field+" for doc "+j+" is "+norm+" - a mismatch!", norm, norm1, 0.000001);
- }
- }
- ir.close();
- }
-
- private void addDocs(Random random, Directory dir, int ndocs, boolean compound) throws IOException {
- IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
- TEST_VERSION_CURRENT, anlzr).setOpenMode(OpenMode.APPEND)
- .setMaxBufferedDocs(5).setSimilarityProvider(similarityProviderOne).setMergePolicy(newLogMergePolicy()));
- LogMergePolicy lmp = (LogMergePolicy) iw.getConfig().getMergePolicy();
- lmp.setMergeFactor(3);
- lmp.setUseCompoundFile(compound);
- for (int i = 0; i < ndocs; i++) {
- iw.addDocument(newDoc());
- }
- iw.close();
- }
-
- // create the next document
- private Document newDoc() {
- Document d = new Document();
- float boost = nextNorm("anyfield"); // in this test the same similarity is used for all fields so it does not matter what field is passed
- for (int i = 0; i < 10; i++) {
- Field f = newField("f"+i,"v"+i,TextField.TYPE_UNSTORED);
- f.setBoost(boost);
- d.add(f);
- }
- return d;
- }
-
- // return unique norm values that are unchanged by encoding/decoding
- private float nextNorm(String fname) {
- float norm = lastNorm + normDelta;
- DefaultSimilarity similarity = (DefaultSimilarity) similarityProviderOne.get(fname);
- do {
- float norm1 = similarity.decodeNormValue(similarity.encodeNormValue(norm));
- if (norm1 > lastNorm) {
- //System.out.println(norm1+" > "+lastNorm);
- norm = norm1;
- break;
- }
- norm += normDelta;
- } while (true);
- norms.add(numDocNorms, Float.valueOf(norm));
- modifiedNorms.add(numDocNorms, Float.valueOf(norm));
- //System.out.println("creating norm("+numDocNorms+"): "+norm);
- numDocNorms ++;
- lastNorm = (norm>10 ? 0 : norm); //there's a limit to how many distinct values can be stored in a ingle byte
- return norm;
- }
class CustomNormEncodingSimilarity extends DefaultSimilarity {
@Override
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -66,7 +66,7 @@ public class TestOmitNorms extends Lucen
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f1").omitNorms);
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f2").omitNorms);
@@ -120,7 +120,7 @@ public class TestOmitNorms extends Lucen
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f1").omitNorms);
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f2").omitNorms);
@@ -168,7 +168,7 @@ public class TestOmitNorms extends Lucen
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertTrue("OmitNorms field bit should not be set.", !fi.fieldInfo("f1").omitNorms);
assertTrue("OmitNorms field bit should be set.", fi.fieldInfo("f2").omitNorms);
@@ -180,7 +180,8 @@ public class TestOmitNorms extends Lucen
private void assertNoNrm(Directory dir) throws Throwable {
final String[] files = dir.listAll();
for (int i = 0; i < files.length; i++) {
- assertFalse(files[i].endsWith(".nrm"));
+ // TODO: this relies upon filenames
+ assertFalse(files[i].endsWith(".nrm") || files[i].endsWith(".len"));
}
}
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -153,7 +153,7 @@ public class TestOmitPositions extends L
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
// docs + docs = docs
assertEquals(IndexOptions.DOCS_ONLY, fi.fieldInfo("f1").indexOptions);
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -100,7 +100,7 @@ public class TestOmitTf extends LuceneTe
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f1").indexOptions);
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f2").indexOptions);
@@ -152,7 +152,7 @@ public class TestOmitTf extends LuceneTe
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f1").indexOptions);
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f2").indexOptions);
@@ -195,7 +195,7 @@ public class TestOmitTf extends LuceneTe
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertEquals("OmitTermFreqAndPositions field bit should not be set.", IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, fi.fieldInfo("f1").indexOptions);
assertEquals("OmitTermFreqAndPositions field bit should be set.", IndexOptions.DOCS_ONLY, fi.fieldInfo("f2").indexOptions);
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -75,8 +75,8 @@ public class TestParallelReader extends
Directory dir1 = getDir1(random);
Directory dir2 = getDir2(random);
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
+ pr.add(IndexReader.open(dir1));
+ pr.add(IndexReader.open(dir2));
Collection<String> fieldNames = pr.getFieldNames(IndexReader.FieldOption.ALL);
assertEquals(4, fieldNames.size());
assertTrue(fieldNames.contains("f1"));
@@ -102,8 +102,8 @@ public class TestParallelReader extends
w2.close();
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- IndexReader ir = IndexReader.open(dir2, false);
+ pr.add(IndexReader.open(dir1));
+ IndexReader ir = IndexReader.open(dir2);
try {
pr.add(ir);
fail("didn't get exptected exception: indexes don't have same number of documents");
@@ -115,34 +115,6 @@ public class TestParallelReader extends
dir1.close();
dir2.close();
}
-
- public void testIsCurrent() throws IOException {
- Directory dir1 = getDir1(random);
- Directory dir2 = getDir2(random);
- ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
-
- assertTrue(pr.isCurrent());
- IndexReader modifier = IndexReader.open(dir1, false);
- DefaultSimilarity sim = new DefaultSimilarity();
- modifier.setNorm(0, "f1", sim.encodeNormValue(100f));
- modifier.close();
-
- // one of the two IndexReaders which ParallelReader is using
- // is not current anymore
- assertFalse(pr.isCurrent());
-
- modifier = IndexReader.open(dir2, false);
- modifier.setNorm(0, "f3", sim.encodeNormValue(100f));
- modifier.close();
-
- // now both are not current anymore
- assertFalse(pr.isCurrent());
- pr.close();
- dir1.close();
- dir2.close();
- }
private void queryTest(Query query) throws IOException {
ScoreDoc[] parallelHits = parallel.search(query, null, 1000).scoreDocs;
@@ -177,7 +149,7 @@ public class TestParallelReader extends
w.addDocument(d2);
w.close();
- IndexReader ir = IndexReader.open(dir, false);
+ IndexReader ir = IndexReader.open(dir);
return newSearcher(ir);
}
@@ -186,8 +158,8 @@ public class TestParallelReader extends
dir1 = getDir1(random);
dir2 = getDir2(random);
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(dir1, false));
- pr.add(IndexReader.open(dir2, false));
+ pr.add(IndexReader.open(dir1));
+ pr.add(IndexReader.open(dir2));
return newSearcher(pr);
}
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -24,6 +24,7 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -52,8 +53,8 @@ public class TestParallelReaderEmptyInde
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(rd1,true));
- pr.add(IndexReader.open(rd2,true));
+ pr.add(IndexReader.open(rd1));
+ pr.add(IndexReader.open(rd2));
// When unpatched, Lucene crashes here with a NoSuchElementException (caused by ParallelTermEnum)
iwOut.addIndexes(pr);
@@ -75,16 +76,27 @@ public class TestParallelReaderEmptyInde
{
IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
+ Field idField = newField("id", "", TextField.TYPE_UNSTORED);
+ doc.add(idField);
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
doc.add(newField("test", "", customType));
+ idField.setValue("1");
iw.addDocument(doc);
doc.add(newField("test", "", TextField.TYPE_UNSTORED));
+ idField.setValue("2");
iw.addDocument(doc);
iw.close();
- IndexReader ir = IndexReader.open(rd1,false);
- ir.deleteDocument(0);
+ IndexWriterConfig dontMergeConfig = new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ .setMergePolicy(NoMergePolicy.COMPOUND_FILES);
+ IndexWriter writer = new IndexWriter(rd1, dontMergeConfig);
+
+ writer.deleteDocuments(new Term("id", "1"));
+ writer.close();
+ IndexReader ir = IndexReader.open(rd1);
+ assertEquals(2, ir.maxDoc());
+ assertEquals(1, ir.numDocs());
ir.close();
iw = new IndexWriter(rd1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.APPEND));
@@ -104,8 +116,8 @@ public class TestParallelReaderEmptyInde
IndexWriter iwOut = new IndexWriter(rdOut, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
ParallelReader pr = new ParallelReader();
- pr.add(IndexReader.open(rd1,true));
- pr.add(IndexReader.open(rd2,true));
+ pr.add(IndexReader.open(rd1));
+ pr.add(IndexReader.open(rd2));
// When unpatched, Lucene crashes here with an ArrayIndexOutOfBoundsException (caused by TermVectorsWriter)
iwOut.addIndexes(pr);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java Fri Dec 9 09:13:39 2011
@@ -58,8 +58,8 @@ public class TestParallelTermEnum extend
iw2.close();
- this.ir1 = IndexReader.open(rd1, true);
- this.ir2 = IndexReader.open(rd2, true);
+ this.ir1 = IndexReader.open(rd1);
+ this.ir2 = IndexReader.open(rd2);
}
@Override
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -111,7 +111,7 @@ public class TestPayloads extends Lucene
// flush
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(ram));
FieldInfos fi = reader.fieldInfos();
assertFalse("Payload field bit should not be set.", fi.fieldInfo("f1").storePayloads);
assertTrue("Payload field bit should be set.", fi.fieldInfo("f2").storePayloads);
@@ -138,7 +138,7 @@ public class TestPayloads extends Lucene
// flush
writer.close();
- reader = getOnlySegmentReader(IndexReader.open(ram, false));
+ reader = getOnlySegmentReader(IndexReader.open(ram));
fi = reader.fieldInfos();
assertFalse("Payload field bit should not be set.", fi.fieldInfo("f1").storePayloads);
assertTrue("Payload field bit should be set.", fi.fieldInfo("f2").storePayloads);
@@ -213,7 +213,7 @@ public class TestPayloads extends Lucene
* Verify the index
* first we test if all payloads are stored correctly
*/
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
byte[] verifyPayloadData = new byte[payloadDataLength];
offset = 0;
@@ -326,7 +326,7 @@ public class TestPayloads extends Lucene
// flush
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
tp = MultiFields.getTermPositionsEnum(reader,
MultiFields.getLiveDocs(reader),
fieldName,
@@ -526,7 +526,7 @@ public class TestPayloads extends Lucene
ingesters[i].join();
}
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
TermsEnum terms = MultiFields.getFields(reader).terms(field).iterator(null);
Bits liveDocs = MultiFields.getLiveDocs(reader);
DocsAndPositionsEnum tp = null;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestRollback.java Fri Dec 9 09:13:39 2011
@@ -48,7 +48,7 @@ public class TestRollback extends Lucene
}
w.rollback();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
assertEquals("index should contain same number of docs post rollback", 5, r.numDocs());
r.close();
dir.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentMerger.java Fri Dec 9 09:13:39 2011
@@ -54,8 +54,8 @@ public class TestSegmentMerger extends L
SegmentInfo info1 = DocHelper.writeDoc(random, merge1Dir, doc1);
DocHelper.setupDoc(doc2);
SegmentInfo info2 = DocHelper.writeDoc(random, merge2Dir, doc2);
- reader1 = SegmentReader.get(true, info1, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
- reader2 = SegmentReader.get(true, info2, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ reader1 = SegmentReader.get(info1, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ reader2 = SegmentReader.get(info2, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
}
@Override
@@ -86,7 +86,7 @@ public class TestSegmentMerger extends L
assertTrue(docsMerged == 2);
final FieldInfos fieldInfos = mergeState.fieldInfos;
//Should be able to open a new SegmentReader against the new directory
- SegmentReader mergedReader = SegmentReader.get(false, mergedDir, new SegmentInfo(mergedSegment, docsMerged, mergedDir, false,
+ SegmentReader mergedReader = SegmentReader.getRW(new SegmentInfo(mergedSegment, docsMerged, mergedDir, false,
codec, fieldInfos),
true, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
assertTrue(mergedReader != null);
@@ -158,27 +158,6 @@ public class TestSegmentMerger extends L
}
assertFalse("should not have been able to create a .cfs with .del and .s* files", doFail);
- // Create an index w/ .s*
- w = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE));
- doc = new Document();
- doc.add(new TextField("c", "test"));
- w.addDocument(doc);
- w.close();
- IndexReader r = IndexReader.open(dir, false);
- r.setNorm(0, "c", (byte) 1);
- r.close();
-
- // Assert that SM fails if .s* exists
- SegmentInfos sis = new SegmentInfos();
- sis.read(dir);
- try {
- IndexWriter.createCompoundFile(dir, "b2", MergeState.CheckAbort.NONE, sis.info(0), newIOContext(random));
- doFail = true; // should never get here
- } catch (AssertionError e) {
- // expected
- }
- assertFalse("should not have been able to create a .cfs with .del and .s* files", doFail);
-
dir.close();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSegmentReader.java Fri Dec 9 09:13:39 2011
@@ -41,7 +41,7 @@ public class TestSegmentReader extends L
dir = newDirectory();
DocHelper.setupDoc(testDoc);
SegmentInfo info = DocHelper.writeDoc(random, dir, testDoc);
- reader = SegmentReader.get(true, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, IOContext.READ);
+ reader = SegmentReader.get(info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, IOContext.READ);
}
@Override
@@ -77,7 +77,7 @@ public class TestSegmentReader extends L
Document docToDelete = new Document();
DocHelper.setupDoc(docToDelete);
SegmentInfo info = DocHelper.writeDoc(random, dir, docToDelete);
- SegmentReader deleteReader = SegmentReader.get(false, info, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
+ SegmentReader deleteReader = SegmentReader.getRW(info, true, IndexReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
assertTrue(deleteReader != null);
assertTrue(deleteReader.numDocs() == 1);
deleteReader.deleteDocument(0);
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -56,7 +56,7 @@ public class TestSegmentTermDocs extends
public void testTermDocs(int indexDivisor) throws IOException {
//After adding the document, we should be able to read it back in
- SegmentReader reader = SegmentReader.get(true, info, indexDivisor, newIOContext(random));
+ SegmentReader reader = SegmentReader.get(info, indexDivisor, newIOContext(random));
assertTrue(reader != null);
assertEquals(indexDivisor, reader.getTermInfosIndexDivisor());
@@ -79,7 +79,7 @@ public class TestSegmentTermDocs extends
public void testBadSeek(int indexDivisor) throws IOException {
{
//After adding the document, we should be able to read it back in
- SegmentReader reader = SegmentReader.get(true, info, indexDivisor, newIOContext(random));
+ SegmentReader reader = SegmentReader.get(info, indexDivisor, newIOContext(random));
assertTrue(reader != null);
DocsEnum termDocs = _TestUtil.docs(random, reader,
"textField2",
@@ -93,7 +93,7 @@ public class TestSegmentTermDocs extends
}
{
//After adding the document, we should be able to read it back in
- SegmentReader reader = SegmentReader.get(true, info, indexDivisor, newIOContext(random));
+ SegmentReader reader = SegmentReader.get(info, indexDivisor, newIOContext(random));
assertTrue(reader != null);
DocsEnum termDocs = _TestUtil.docs(random, reader,
"junk",
@@ -130,7 +130,7 @@ public class TestSegmentTermDocs extends
writer.forceMerge(1);
writer.close();
- IndexReader reader = IndexReader.open(dir, null, true, indexDivisor);
+ IndexReader reader = IndexReader.open(dir, indexDivisor);
DocsEnum tdocs = _TestUtil.docs(random, reader,
ta.field(),
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -78,7 +78,7 @@ public class TestSegmentTermEnum extends
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat())));
addDoc(writer, "aaa bbb");
writer.close();
- SegmentReader reader = getOnlySegmentReader(IndexReader.open(dir, false));
+ SegmentReader reader = getOnlySegmentReader(IndexReader.open(dir));
TermsEnum terms = reader.fields().terms("content").iterator(null);
assertNotNull(terms.next());
assertEquals("aaa", terms.term().utf8ToString());
@@ -102,7 +102,7 @@ public class TestSegmentTermEnum extends
private void verifyDocFreq()
throws IOException
{
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
TermsEnum termEnum = MultiFields.getTerms(reader, "content").iterator(null);
// create enumeration of all terms
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java Fri Dec 9 09:13:39 2011
@@ -20,6 +20,8 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
@@ -27,8 +29,15 @@ import org.apache.lucene.util.LuceneTest
public class TestSizeBoundedForceMerge extends LuceneTestCase {
private void addDocs(IndexWriter writer, int numDocs) throws IOException {
+ addDocs(writer, numDocs, false);
+ }
+
+ private void addDocs(IndexWriter writer, int numDocs, boolean withID) throws IOException {
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
+ if (withID) {
+ doc.add(new Field("id", "" + i, StringField.TYPE_UNSTORED));
+ }
writer.addDocument(doc);
}
writer.commit();
@@ -286,12 +295,9 @@ public class TestSizeBoundedForceMerge e
addDocs(writer, 5);
addDocs(writer, 3);
- writer.close();
-
// delete the last document, so that the last segment is merged.
- IndexReader r = IndexReader.open(dir, false);
- r.deleteDocument(r.numDocs() - 1);
- r.close();
+ writer.deleteDocuments(new Term("id", "10"));
+ writer.close();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
@@ -315,7 +321,7 @@ public class TestSizeBoundedForceMerge e
IndexWriterConfig conf = newWriterConfig();
IndexWriter writer = new IndexWriter(dir, conf);
- addDocs(writer, 3);
+ addDocs(writer, 3, true);
writer.close();
@@ -340,14 +346,12 @@ public class TestSizeBoundedForceMerge e
IndexWriterConfig conf = newWriterConfig();
IndexWriter writer = new IndexWriter(dir, conf);
- addDocs(writer, 5);
+ addDocs(writer, 5, true);
- writer.close();
-
// delete the last document
- IndexReader r = IndexReader.open(dir, false);
- r.deleteDocument(r.numDocs() - 1);
- r.close();
+
+ writer.deleteDocuments(new Term("id", "4"));
+ writer.close();
conf = newWriterConfig();
LogMergePolicy lmp = new LogDocMergePolicy();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java Fri Dec 9 09:13:39 2011
@@ -54,7 +54,7 @@ public class TestSnapshotDeletionPolicy
}
protected void checkMaxDoc(IndexCommit commit, int expectedMaxDoc) throws Exception {
- IndexReader reader = IndexReader.open(commit, true);
+ IndexReader reader = IndexReader.open(commit);
try {
assertEquals(expectedMaxDoc, reader.maxDoc());
} finally {
@@ -245,7 +245,7 @@ public class TestSnapshotDeletionPolicy
assertSnapshotExists(dir, sdp, numSnapshots);
// open a reader on a snapshot - should succeed.
- IndexReader.open(sdp.getSnapshot("snapshot0"), true).close();
+ IndexReader.open(sdp.getSnapshot("snapshot0")).close();
// open a new IndexWriter w/ no snapshots to keep and assert that all snapshots are gone.
sdp = getDeletionPolicy();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing.java Fri Dec 9 09:13:39 2011
@@ -103,7 +103,7 @@ public class TestStressIndexing extends
@Override
public void doWork() throws Throwable {
for (int i=0; i<100; i++) {
- IndexReader ir = IndexReader.open(directory, true);
+ IndexReader ir = IndexReader.open(directory);
IndexSearcher is = new IndexSearcher(ir);
is.close();
ir.close();
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -272,8 +272,8 @@ public class TestStressIndexing2 extends
}
public static void verifyEquals(Directory dir1, Directory dir2, String idField) throws Throwable {
- IndexReader r1 = IndexReader.open(dir1, true);
- IndexReader r2 = IndexReader.open(dir2, true);
+ IndexReader r1 = IndexReader.open(dir1);
+ IndexReader r2 = IndexReader.open(dir2);
verifyEquals(r1, r2, idField);
r1.close();
r2.close();
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -17,9 +17,9 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -38,11 +38,14 @@ public class TestSumDocFreq extends Luce
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
+ Field id = newField("id", "", StringField.TYPE_UNSTORED);
Field field1 = newField("foo", "", TextField.TYPE_UNSTORED);
Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
+ doc.add(id);
doc.add(field1);
doc.add(field2);
for (int i = 0; i < numDocs; i++) {
+ id.setValue("" + i);
char ch1 = (char) _TestUtil.nextInt(random, 'a', 'z');
char ch2 = (char) _TestUtil.nextInt(random, 'a', 'z');
field1.setValue("" + ch1 + " " + ch2);
@@ -53,26 +56,20 @@ public class TestSumDocFreq extends Luce
}
IndexReader ir = writer.getReader();
- writer.close();
assertSumDocFreq(ir);
ir.close();
- ir = IndexReader.open(dir, false);
int numDeletions = atLeast(20);
for (int i = 0; i < numDeletions; i++) {
- ir.deleteDocument(random.nextInt(ir.maxDoc()));
+ writer.deleteDocuments(new Term("id", "" + random.nextInt(numDocs)));
}
- ir.close();
-
- IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
- w.forceMerge(1);
- w.close();
+ writer.forceMerge(1);
+ writer.close();
- ir = IndexReader.open(dir, true);
+ ir = IndexReader.open(dir);
assertSumDocFreq(ir);
ir.close();
-
dir.close();
}
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -59,7 +59,7 @@ public class TestTermVectorsWriter exten
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
Terms vector = r.getTermVectors(0).terms("field");
assertNotNull(vector);
TermsEnum termsEnum = vector.iterator(null);
@@ -119,7 +119,7 @@ public class TestTermVectorsWriter exten
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
assertNotNull(termsEnum.next());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null);
@@ -156,7 +156,7 @@ public class TestTermVectorsWriter exten
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
assertNotNull(termsEnum.next());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null);
@@ -197,7 +197,7 @@ public class TestTermVectorsWriter exten
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
assertNotNull(termsEnum.next());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null);
@@ -235,7 +235,7 @@ public class TestTermVectorsWriter exten
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
assertNotNull(termsEnum.next());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null);
@@ -274,7 +274,7 @@ public class TestTermVectorsWriter exten
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
assertNotNull(termsEnum.next());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null);
@@ -325,7 +325,7 @@ public class TestTermVectorsWriter exten
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
assertNotNull(termsEnum.next());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null);
@@ -372,7 +372,7 @@ public class TestTermVectorsWriter exten
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
TermsEnum termsEnum = r.getTermVectors(0).terms("field").iterator(null);
assertNotNull(termsEnum.next());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null);
@@ -433,7 +433,7 @@ public class TestTermVectorsWriter exten
writer.forceMerge(1);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
for(int i=0;i<reader.numDocs();i++) {
reader.document(i);
reader.getTermVectors(i);
@@ -487,7 +487,7 @@ public class TestTermVectorsWriter exten
writer.forceMerge(1);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
assertNull(reader.getTermVectors(0));
assertNull(reader.getTermVectors(1));
assertNotNull(reader.getTermVectors(2));
@@ -532,7 +532,7 @@ public class TestTermVectorsWriter exten
writer.forceMerge(1);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
for(int i=0;i<10;i++) {
reader.getTermVectors(i);
reader.document(i);
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -112,7 +112,7 @@ public class TestTermdocPerf extends Luc
long end = System.currentTimeMillis();
if (VERBOSE) System.out.println("milliseconds for creation of " + ndocs + " docs = " + (end-start));
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
TermsEnum tenum = MultiFields.getTerms(reader, "foo").iterator(null);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedForceMerge.java Fri Dec 9 09:13:39 2011
@@ -123,7 +123,7 @@ public class TestThreadedForceMerge exte
TEST_VERSION_CURRENT, ANALYZER).setOpenMode(
OpenMode.APPEND).setMaxBufferedDocs(2));
- IndexReader reader = IndexReader.open(directory, true);
+ IndexReader reader = IndexReader.open(directory);
assertEquals("reader=" + reader, 1, reader.getSequentialSubReaders().length);
assertEquals(expectedDocCount, reader.numDocs());
reader.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java Fri Dec 9 09:13:39 2011
@@ -86,7 +86,7 @@ public class TestTransactionRollback ext
}
private void checkExpecteds(BitSet expecteds) throws Exception {
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
//Perhaps not the most efficient approach but meets our
//needs here.
@@ -204,7 +204,7 @@ public class TestTransactionRollback ext
// should not work:
new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))
.setIndexDeletionPolicy(new DeleteLastCommitPolicy())).close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
assertEquals(100, r.numDocs());
r.close();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java Fri Dec 9 09:13:39 2011
@@ -183,8 +183,8 @@ public class TestTransactions extends Lu
public void doWork() throws Throwable {
IndexReader r1, r2;
synchronized(lock) {
- r1 = IndexReader.open(dir1, true);
- r2 = IndexReader.open(dir2, true);
+ r1 = IndexReader.open(dir1);
+ r2 = IndexReader.open(dir2);
}
if (r1.numDocs() != r2.numDocs())
throw new RuntimeException("doc counts differ: r1=" + r1.numDocs() + " r2=" + r2.numDocs());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/appending/TestAppendingCodec.java Fri Dec 9 09:13:39 2011
@@ -123,7 +123,7 @@ public class TestAppendingCodec extends
writer.addDocument(doc);
writer.forceMerge(1);
writer.close();
- IndexReader reader = IndexReader.open(dir, null, true, 1);
+ IndexReader reader = IndexReader.open(dir, 1);
assertEquals(2, reader.numDocs());
Document doc2 = reader.document(0);
assertEquals(text, doc2.get("f"));
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -190,7 +190,7 @@ public class TestPerFieldPostingsFormat
if (VERBOSE) {
System.out.println("\nTEST: assertQuery " + t);
}
- IndexReader reader = IndexReader.open(dir, null, true, 1);
+ IndexReader reader = IndexReader.open(dir, 1);
IndexSearcher searcher = newSearcher(reader);
TopDocs search = searcher.search(new TermQuery(t), num + 10);
assertEquals(num, search.totalHits);
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -87,7 +87,7 @@ public class TestDocValuesIndexing exten
writer.close(true);
- IndexReader reader = IndexReader.open(dir, null, true, 1);
+ IndexReader reader = IndexReader.open(dir, 1);
assertEquals(1, reader.getSequentialSubReaders().length);
IndexSearcher searcher = new IndexSearcher(reader);
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -40,7 +40,7 @@ public class TestCachingWrapperFilter ex
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.close();
- IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir, true));
+ IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir));
AtomicReaderContext context = (AtomicReaderContext) reader.getTopReaderContext();
MockFilter filter = new MockFilter();
CachingWrapperFilter cacher = new CachingWrapperFilter(filter);
@@ -66,7 +66,7 @@ public class TestCachingWrapperFilter ex
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.close();
- IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir, true));
+ IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir));
AtomicReaderContext context = (AtomicReaderContext) reader.getTopReaderContext();
final Filter filter = new Filter() {
@@ -89,7 +89,7 @@ public class TestCachingWrapperFilter ex
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
writer.close();
- IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir, true));
+ IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir));
AtomicReaderContext context = (AtomicReaderContext) reader.getTopReaderContext();
final Filter filter = new Filter() {
@@ -134,7 +134,7 @@ public class TestCachingWrapperFilter ex
writer.addDocument(new Document());
writer.close();
- IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir, true));
+ IndexReader reader = new SlowMultiReaderWrapper(IndexReader.open(dir));
// not cacheable:
assertDocIdSetCacheable(reader, new QueryWrapperFilter(new TermQuery(new Term("test","value"))), false);
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -544,7 +544,7 @@ public class TestFieldCacheRangeFilter e
writer.deleteDocuments(new Term("id","0"));
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
IndexSearcher search = newSearcher(reader);
assertTrue(reader.hasDeletions());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java Fri Dec 9 09:13:39 2011
@@ -44,9 +44,8 @@ public class TestMatchAllDocsQuery exten
addDoc("one", iw, 1f);
addDoc("two", iw, 20f);
addDoc("three four", iw, 300f);
- iw.close();
+ IndexReader ir = IndexReader.open(iw, true);
- IndexReader ir = IndexReader.open(dir, false);
IndexSearcher is = newSearcher(ir);
ScoreDoc[] hits;
@@ -70,11 +69,16 @@ public class TestMatchAllDocsQuery exten
hits = is.search(bq, null, 1000).scoreDocs;
assertEquals(1, hits.length);
- // delete a document:
- is.getIndexReader().deleteDocument(0);
+ iw.deleteDocuments(new Term("key", "one"));
+ is.close();
+ ir.close();
+ ir = IndexReader.open(iw, true);
+ is = newSearcher(ir);
+
hits = is.search(new MatchAllDocsQuery(), null, 1000).scoreDocs;
assertEquals(2, hits.length);
-
+
+ iw.close();
is.close();
ir.close();
dir.close();
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -59,16 +59,16 @@ public class TestMultiTermQueryRewrites
writer.forceMerge(1); swriter1.forceMerge(1); swriter2.forceMerge(1);
writer.close(); swriter1.close(); swriter2.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
searcher = newSearcher(reader);
multiReader = new MultiReader(new IndexReader[] {
- IndexReader.open(sdir1, true), IndexReader.open(sdir2, true)
+ IndexReader.open(sdir1), IndexReader.open(sdir2)
}, true);
multiSearcher = newSearcher(multiReader);
multiReaderDupls = new MultiReader(new IndexReader[] {
- IndexReader.open(sdir1, true), IndexReader.open(dir, true)
+ IndexReader.open(sdir1), IndexReader.open(dir)
}, true);
multiSearcherDupls = newSearcher(multiReaderDupls);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Fri Dec 9 09:13:39 2011
@@ -67,7 +67,7 @@ public class TestMultiThreadTermVectors
IndexReader reader = null;
try {
- reader = IndexReader.open(directory, true);
+ reader = IndexReader.open(directory);
for(int i = 1; i <= numThreads; i++)
testTermPositionVectors(reader, i);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Fri Dec 9 09:13:39 2011
@@ -491,7 +491,7 @@ public class TestSpans extends LuceneTes
writer.close();
// Get searcher
- final IndexReader reader = IndexReader.open(dir, true);
+ final IndexReader reader = IndexReader.open(dir);
final IndexSearcher searcher = newSearcher(reader);
// Control (make sure docs indexed)
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestSpansAdvanced2.java Fri Dec 9 09:13:39 2011
@@ -76,7 +76,7 @@ public class TestSpansAdvanced2 extends
* @throws Exception
*/
public void testVerifyIndex() throws Exception {
- final IndexReader reader = IndexReader.open(mDirectory, true);
+ final IndexReader reader = IndexReader.open(mDirectory);
assertEquals(8, reader.numDocs());
reader.close();
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java Fri Dec 9 09:13:39 2011
@@ -256,25 +256,33 @@ public class TestBufferedIndexInput exte
doc.add(newField("id", "" + i, TextField.TYPE_STORED));
writer.addDocument(doc);
}
- writer.close();
dir.allIndexInputs.clear();
- IndexReader reader = IndexReader.open(dir, false);
+ IndexReader reader = IndexReader.open(writer, true);
Term aaa = new Term("content", "aaa");
Term bbb = new Term("content", "bbb");
- Term ccc = new Term("content", "ccc");
- assertEquals(37, reader.docFreq(ccc));
- reader.deleteDocument(0);
- assertEquals(37, reader.docFreq(aaa));
- dir.tweakBufferSizes();
- reader.deleteDocument(4);
- assertEquals(reader.docFreq(bbb), 37);
+
+ reader.close();
+
dir.tweakBufferSizes();
-
+ writer.deleteDocuments(new Term("id", "0"));
+ reader = IndexReader.open(writer, true);
IndexSearcher searcher = newSearcher(reader);
ScoreDoc[] hits = searcher.search(new TermQuery(bbb), null, 1000).scoreDocs;
dir.tweakBufferSizes();
+ assertEquals(36, hits.length);
+
+ reader.close();
+ searcher.close();
+
+ dir.tweakBufferSizes();
+ writer.deleteDocuments(new Term("id", "4"));
+ reader = IndexReader.open(writer, true);
+ searcher = newSearcher(reader);
+
+ hits = searcher.search(new TermQuery(bbb), null, 1000).scoreDocs;
+ dir.tweakBufferSizes();
assertEquals(35, hits.length);
dir.tweakBufferSizes();
hits = searcher.search(new TermQuery(new Term("id", "33")), null, 1000).scoreDocs;
@@ -283,6 +291,7 @@ public class TestBufferedIndexInput exte
hits = searcher.search(new TermQuery(aaa), null, 1000).scoreDocs;
dir.tweakBufferSizes();
assertEquals(35, hits.length);
+ writer.close();
searcher.close();
reader.close();
} finally {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java Fri Dec 9 09:13:39 2011
@@ -94,7 +94,7 @@ public class TestFileSwitchDirectory ext
public void testNoDir() throws Throwable {
Directory dir = newFSSwitchDirectory(Collections.<String>emptySet());
try {
- IndexReader.open(dir, true);
+ IndexReader.open(dir);
fail("did not hit expected exception");
} catch (NoSuchDirectoryException nsde) {
// expected
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestLockFactory.java Fri Dec 9 09:13:39 2011
@@ -345,7 +345,7 @@ public class TestLockFactory extends Luc
Query query = new TermQuery(new Term("content", "aaa"));
for(int i=0;i<this.numIteration;i++) {
try{
- reader = IndexReader.open(dir, false);
+ reader = IndexReader.open(dir);
searcher = new IndexSearcher(reader);
} catch (Exception e) {
hitException = true;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java Fri Dec 9 09:13:39 2011
@@ -123,7 +123,7 @@ public class TestNRTCachingDirectory ext
public void testNoDir() throws Throwable {
Directory dir = new NRTCachingDirectory(newFSDirectory(_TestUtil.getTempDir("doesnotexist")), 2.0, 25.0);
try {
- IndexReader.open(dir, true);
+ IndexReader.open(dir);
fail("did not hit expected exception");
} catch (NoSuchDirectoryException nsde) {
// expected
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=1212292&r1=1212291&r2=1212292&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 Dec 9 09:13:39 2011
@@ -76,7 +76,7 @@ public class TestRAMDirectory extends Lu
assertEquals(ramDir.sizeInBytes(), ramDir.getRecomputedSizeInBytes());
// open reader to test document count
- IndexReader reader = IndexReader.open(ramDir, true);
+ IndexReader reader = IndexReader.open(ramDir);
assertEquals(docsToAdd, reader.numDocs());
// open search zo check if all doc's are there
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java Fri Dec 9 09:13:39 2011
@@ -68,8 +68,8 @@ public class TestFieldCacheSanityChecker
}
wA.close();
wB.close();
- readerA = IndexReader.open(dirA, true);
- readerB = IndexReader.open(dirB, true);
+ readerA = IndexReader.open(dirA);
+ readerB = IndexReader.open(dirB);
readerX = new MultiReader(readerA, readerB);
}
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java Fri Dec 9 09:13:39 2011
@@ -270,7 +270,7 @@ public class TestClassicAnalyzer extends
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
// Make sure all terms < max size were indexed
assertEquals(2, reader.docFreq(new Term("content", "abc")));
@@ -303,7 +303,7 @@ public class TestClassicAnalyzer extends
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, sa));
writer.addDocument(doc);
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
assertEquals(1, reader.docFreq(new Term("content", bigTerm)));
reader.close();
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Fri Dec 9 09:13:39 2011
@@ -95,7 +95,7 @@ public class TestKeywordAnalyzer extends
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
DocsEnum td = _TestUtil.docs(random,
reader,
"partnum",
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java Fri Dec 9 09:13:39 2011
@@ -61,7 +61,7 @@ public class TestLimitTokenCountAnalyzer
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(dir, true);
+ IndexReader reader = IndexReader.open(dir);
Term t = new Term("field", "x");
assertEquals(1, reader.docFreq(t));
reader.close();
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java Fri Dec 9 09:13:39 2011
@@ -53,7 +53,7 @@ public class QueryAutoStopWordAnalyzerTe
writer.addDocument(doc);
}
writer.close();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
}
@Override
Modified: lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Fri Dec 9 09:13:39 2011
@@ -104,7 +104,7 @@ public class TestTeeSinkTokenFilter exte
w.addDocument(doc);
w.close();
- IndexReader r = IndexReader.open(dir, true);
+ IndexReader r = IndexReader.open(dir);
Terms vector = r.getTermVectors(0).terms("field");
assertEquals(1, vector.getUniqueTermCount());
TermsEnum termsEnum = vector.iterator(null);
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java Fri Dec 9 09:13:39 2011
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexReader;
/**
* Commits the IndexWriter.
@@ -51,14 +50,6 @@ public class CommitIndexTask extends Per
IndexWriter iw = getRunData().getIndexWriter();
if (iw != null) {
iw.commit(commitUserData);
- } else {
- IndexReader r = getRunData().getIndexReader();
- if (r != null) {
- r.commit(commitUserData);
- r.decRef();
- } else {
- throw new IllegalStateException("neither IndexWriter nor IndexReader is currently open");
- }
}
return 1;
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java Fri Dec 9 09:13:39 2011
@@ -22,20 +22,17 @@ import java.util.Collection;
import java.util.Map;
import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.index.IndexCommit;
-import org.apache.lucene.index.IndexDeletionPolicy;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.store.Directory;
/**
* Open an index reader.
* <br>Other side effects: index reader object in perfRunData is set.
- * <br> Optional params readOnly,commitUserData eg. OpenReader(false,commit1)
+ * <br> Optional params commitUserData eg. OpenReader(false,commit1)
*/
public class OpenReaderTask extends PerfTask {
public static final String USER_DATA = "userData";
- private boolean readOnly = true;
private String commitUserData = null;
public OpenReaderTask(PerfRunData runData) {
@@ -45,22 +42,11 @@ public class OpenReaderTask extends Perf
@Override
public int doLogic() throws IOException {
Directory dir = getRunData().getDirectory();
- Config config = getRunData().getConfig();
IndexReader r = null;
- final IndexDeletionPolicy deletionPolicy;
- if (readOnly) {
- deletionPolicy = null;
- } else {
- deletionPolicy = CreateIndexTask.getIndexDeletionPolicy(config);
- }
if (commitUserData != null) {
- r = IndexReader.open(OpenReaderTask.findIndexCommit(dir, commitUserData),
- deletionPolicy,
- readOnly);
+ r = IndexReader.open(OpenReaderTask.findIndexCommit(dir, commitUserData));
} else {
- r = IndexReader.open(dir,
- deletionPolicy,
- readOnly);
+ r = IndexReader.open(dir);
}
getRunData().setIndexReader(r);
// We transfer reference to the run data
@@ -74,10 +60,7 @@ public class OpenReaderTask extends Perf
if (params != null) {
String[] split = params.split(",");
if (split.length > 0) {
- readOnly = Boolean.valueOf(split[0]).booleanValue();
- }
- if (split.length > 1) {
- commitUserData = split[1];
+ commitUserData = split[0];
}
}
}
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java Fri Dec 9 09:13:39 2011
@@ -36,7 +36,7 @@ import org.apache.lucene.benchmark.byTas
* logging.
* <li>log.step.[class Task Name] - specifies the same as 'log.step', only for a
* particular task name. For example, log.step.AddDoc will be applied only for
- * {@link AddDocTask}, but not for {@link DeleteDocTask}. It's a way to control
+ * {@link AddDocTask}. It's a way to control
* per task logging settings. If you want to omit logging for any other task,
* include log.step=-1. The syntax is "log.step." together with the Task's
* 'short' name (i.e., without the 'Task' part).
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java Fri Dec 9 09:13:39 2011
@@ -44,11 +44,9 @@ public class PrintReaderTask extends Per
Directory dir = getRunData().getDirectory();
IndexReader r = null;
if (userData == null)
- r = IndexReader.open(dir, true);
+ r = IndexReader.open(dir);
else
- r = IndexReader.open(OpenReaderTask.findIndexCommit(dir, userData),
- null,
- true);
+ r = IndexReader.open(OpenReaderTask.findIndexCommit(dir, userData));
System.out.println("--> numDocs:"+r.numDocs()+" dels:"+r.numDeletedDocs());
r.close();
return 1;
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Fri Dec 9 09:13:39 2011
@@ -84,7 +84,7 @@ public abstract class ReadTask extends P
if (searcher == null) {
// open our own reader
Directory dir = getRunData().getDirectory();
- reader = IndexReader.open(dir, true);
+ reader = IndexReader.open(dir);
searcher = new IndexSearcher(reader);
closeSearcher = true;
} else {
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java?rev=1212292&r1=1212291&r2=1212292&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/QualityQueriesFinder.java Fri Dec 9 09:13:39 2011
@@ -86,7 +86,7 @@ public class QualityQueriesFinder {
private String [] bestTerms(String field,int numTerms) throws IOException {
PriorityQueue<TermDf> pq = new TermsDfQueue(numTerms);
- IndexReader ir = IndexReader.open(dir, true);
+ IndexReader ir = IndexReader.open(dir);
try {
int threshold = ir.maxDoc() / 10; // ignore words too common.
Terms terms = MultiFields.getTerms(ir, field);