mirror of https://github.com/apache/lucene.git
LUCENE-3606: fix faceting tests
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/lucene3606@1210489 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
1dc3a251c4
commit
8e77a1e5e1
|
@ -323,19 +323,6 @@ public class TestTotalFacetCountsCache extends LuceneTestCase {
|
||||||
assertTrue("Should be obtained from cache at 8th attempt",totalCounts ==
|
assertTrue("Should be obtained from cache at 8th attempt",totalCounts ==
|
||||||
TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams, null));
|
TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams, null));
|
||||||
|
|
||||||
// delete a doc from the reader and commit - should recompute
|
|
||||||
origReader.close();
|
|
||||||
origReader = readers[0].indexReader;
|
|
||||||
readers[0].indexReader = IndexReader.open(origReader.directory(),false);
|
|
||||||
initCache();
|
|
||||||
totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams, null);
|
|
||||||
prevGen = assertRecomputed(totalCounts, prevGen, "after opening a writable reader - 9th attempt!");
|
|
||||||
// now do the delete
|
|
||||||
readers[0].indexReader.deleteDocument(1);
|
|
||||||
readers[0].indexReader.commit(null);
|
|
||||||
totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams, null);
|
|
||||||
prevGen = assertRecomputed(totalCounts, prevGen, "after deleting docs the index - 10th attempt!");
|
|
||||||
|
|
||||||
origReader.close();
|
origReader.close();
|
||||||
readers[0].close();
|
readers[0].close();
|
||||||
r2.close();
|
r2.close();
|
||||||
|
|
|
@ -147,7 +147,7 @@ public class TestIndexClose extends LuceneTestCase {
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected IndexReader openIndexReader(Directory dir) throws CorruptIndexException, IOException {
|
protected IndexReader openIndexReader(Directory dir) throws CorruptIndexException, IOException {
|
||||||
return new InstrumentedIndexReader(IndexReader.open(dir,true));
|
return new InstrumentedIndexReader(IndexReader.open(dir));
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -231,14 +231,11 @@ public class TestScoredDocIDsUtils extends LuceneTestCase {
|
||||||
for (int docNum = 0; docNum < nDocs; docNum++) {
|
for (int docNum = 0; docNum < nDocs; docNum++) {
|
||||||
writer.addDocument(docFactory.getDoc(docNum));
|
writer.addDocument(docFactory.getDoc(docNum));
|
||||||
}
|
}
|
||||||
|
// Delete documents marked for deletion
|
||||||
|
writer.deleteDocuments(new Term(DocumentFactory.field, DocumentFactory.delTxt));
|
||||||
writer.close();
|
writer.close();
|
||||||
|
|
||||||
// Delete documents marked for deletion
|
|
||||||
IndexReader reader = IndexReader.open(dir, false);
|
|
||||||
reader.deleteDocuments(new Term(DocumentFactory.field, DocumentFactory.delTxt));
|
|
||||||
reader.close();
|
|
||||||
|
|
||||||
// Open a fresh read-only reader with the deletions in place
|
// Open a fresh read-only reader with the deletions in place
|
||||||
return IndexReader.open(dir, true);
|
return IndexReader.open(dir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue