Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-2578: cutover function query tests to RandomIndexWriter 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@982201 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael McCandless 2010-08-04 10:40:42 +00:00
parent aa28d25b54
commit 94040be77e
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lucene/src/test/org/apache/lucene/search/QueryUtils.java
View File

@ -378,7 +378,7 @@ public class QueryUtils {
// check that first skip on just created scorers always goes to the right doc // check that first skip on just created scorers always goes to the right doc
private static void checkFirstSkipTo(final Query q, final IndexSearcher s) throws IOException { private static void checkFirstSkipTo(final Query q, final IndexSearcher s) throws IOException {
//System.out.println("checkFirstSkipTo: "+q); //System.out.println("checkFirstSkipTo: "+q);
final float maxDiff = 1e-5f; final float maxDiff = 1e-3f;
final int lastDoc[] = {-1}; final int lastDoc[] = {-1};
final IndexReader lastReader[] = {null}; final IndexReader lastReader[] = {null};

19
lucene/src/test/org/apache/lucene/search/function/FunctionTestSetup.java
View File

@ -22,11 +22,13 @@ import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document; import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field; import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory; import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCaseJ4; import org.apache.lucene.util.LuceneTestCaseJ4;
import org.apache.lucene.util._TestUtil;
import java.util.Random;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
@ -95,7 +97,12 @@ public class FunctionTestSetup extends LuceneTestCaseJ4 {
// prepare a small index with just a few documents. // prepare a small index with just a few documents.
dir = new RAMDirectory(); dir = new RAMDirectory();
anlzr = new MockAnalyzer(); anlzr = new MockAnalyzer();
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, anlzr)); Random r = newRandom();
IndexWriterConfig iwc = newIndexWriterConfig(r, TEST_VERSION_CURRENT, anlzr);
if (doMultiSegment) {
iwc.setMaxBufferedDocs(_TestUtil.nextInt(r, 2, 7));
}
RandomIndexWriter iw = new RandomIndexWriter(r, dir, iwc);
// add docs not exactly in natural ID order, to verify we do check the order of docs by scores // add docs not exactly in natural ID order, to verify we do check the order of docs by scores
int remaining = N_DOCS; int remaining = N_DOCS;
boolean done[] = new boolean[N_DOCS]; boolean done[] = new boolean[N_DOCS];
@ -107,15 +114,15 @@ public class FunctionTestSetup extends LuceneTestCaseJ4 {
addDoc(iw, i); addDoc(iw, i);
done[i] = true; done[i] = true;
i = (i + 4) % N_DOCS; i = (i + 4) % N_DOCS;
if (doMultiSegment && remaining % 3 == 0) {
iw.commit();
}
remaining --; remaining --;
} }
if (!doMultiSegment) {
iw.optimize();
}
iw.close(); iw.close();
} }
private void addDoc(IndexWriter iw, int i) throws Exception { private void addDoc(RandomIndexWriter iw, int i) throws Exception {
Document d = new Document(); Document d = new Document();
Fieldable f; Fieldable f;
int scoreAndID = i + 1; int scoreAndID = i + 1;