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 2011/08/17 15:44:24 UTC
svn commit: r1158697 - in /lucene/dev/trunk/lucene: contrib/
contrib/misc/src/test/org/apache/lucene/index/
contrib/queries/src/java/org/apache/lucene/search/
contrib/queries/src/test/org/apache/lucene/search/
src/test-framework/org/apache/lucene/index...
Author: rmuir
Date: Wed Aug 17 13:44:23 2011
New Revision: 1158697
URL: http://svn.apache.org/viewvc?rev=1158697&view=rev
Log:
LUCENE-3378: some contribs depend on core tests compiled
Added:
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/util/europarl.lines.txt.gz
- copied unchanged from r1158662, lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/europarl.lines.txt.gz
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
- copied unchanged from r1158662, lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/FieldCacheRewriteMethod.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java
- copied unchanged from r1158662, lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java
Removed:
lucene/dev/trunk/lucene/contrib/queries/src/java/org/apache/lucene/search/FieldCacheRewriteMethod.java
lucene/dev/trunk/lucene/contrib/queries/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/util/europarl.lines.txt.gz
Modified:
lucene/dev/trunk/lucene/contrib/CHANGES.txt
lucene/dev/trunk/lucene/contrib/contrib-build.xml
lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
Modified: lucene/dev/trunk/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/CHANGES.txt?rev=1158697&r1=1158696&r2=1158697&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/contrib/CHANGES.txt Wed Aug 17 13:44:23 2011
@@ -31,9 +31,6 @@ New Features
* LUCENE-2507: Added DirectSpellChecker, which retrieves correction candidates directly
from the term dictionary using levenshtein automata. (Robert Muir)
-
- * LUCENE-2836: Add FieldCacheRewriteMethod, which rewrites MultiTermQueries
- using the FieldCache's TermsEnum. (Robert Muir)
API Changes
Modified: lucene/dev/trunk/lucene/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/contrib-build.xml?rev=1158697&r1=1158696&r2=1158697&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/contrib-build.xml (original)
+++ lucene/dev/trunk/lucene/contrib/contrib-build.xml Wed Aug 17 13:44:23 2011
@@ -41,7 +41,6 @@
<path id="test.base.classpath">
<path refid="classpath"/>
<pathelement location="${common.dir}/build/classes/test-framework"/>
- <pathelement location="${common.dir}/build/classes/test"/>
<path refid="junit-path"/>
<pathelement location="${build.dir}/classes/java"/>
</path>
@@ -284,4 +283,4 @@
</ant>
<property name="suggest.uptodate" value="true"/>
</target>
-</project>
\ No newline at end of file
+</project>
Modified: lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java?rev=1158697&r1=1158696&r2=1158697&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java Wed Aug 17 13:44:23 2011
@@ -45,17 +45,17 @@ public class TestIndexSplitter extends L
setMergePolicy(mergePolicy)
);
for (int x=0; x < 100; x++) {
- Document doc = TestIndexWriterReader.createDocument(x, "index", 5);
+ Document doc = DocHelper.createDocument(x, "index", 5);
iw.addDocument(doc);
}
iw.commit();
for (int x=100; x < 150; x++) {
- Document doc = TestIndexWriterReader.createDocument(x, "index2", 5);
+ Document doc = DocHelper.createDocument(x, "index2", 5);
iw.addDocument(doc);
}
iw.commit();
for (int x=150; x < 200; x++) {
- Document doc = TestIndexWriterReader.createDocument(x, "index3", 5);
+ Document doc = DocHelper.createDocument(x, "index3", 5);
iw.addDocument(doc);
}
iw.commit();
Modified: lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java?rev=1158697&r1=1158696&r2=1158697&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java (original)
+++ lucene/dev/trunk/lucene/src/test-framework/org/apache/lucene/index/DocHelper.java Wed Aug 17 13:44:23 2011
@@ -29,6 +29,9 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.Field.TermVector;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.search.SimilarityProvider;
import org.apache.lucene.store.Directory;
@@ -251,4 +254,21 @@ class DocHelper {
public static int numFields(Document doc) {
return doc.getFields().size();
}
+
+ public static Document createDocument(int n, String indexName, int numFields) {
+ StringBuilder sb = new StringBuilder();
+ Document doc = new Document();
+ doc.add(new Field("id", Integer.toString(n), Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(new Field("indexname", indexName, Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ sb.append("a");
+ sb.append(n);
+ doc.add(new Field("field1", sb.toString(), Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ sb.append(" b");
+ sb.append(n);
+ for (int i = 1; i < numFields; i++) {
+ doc.add(new Field("field" + (i + 1), sb.toString(), Store.YES,
+ Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
+ }
+ return doc;
+ }
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1158697&r1=1158696&r2=1158697&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterReader.java Wed Aug 17 13:44:23 2011
@@ -74,7 +74,7 @@ public class TestIndexWriterReader exten
for (int i = 0; i < 97 ; i++) {
IndexReader reader = writer.getReader();
if (i == 0) {
- writer.addDocument(createDocument(i, "x", 1 + random.nextInt(5)));
+ writer.addDocument(DocHelper.createDocument(i, "x", 1 + random.nextInt(5)));
} else {
int previous = random.nextInt(i);
// a check if the reader is current here could fail since there might be
@@ -83,10 +83,10 @@ public class TestIndexWriterReader exten
case 0:
case 1:
case 2:
- writer.addDocument(createDocument(i, "x", 1 + random.nextInt(5)));
+ writer.addDocument(DocHelper.createDocument(i, "x", 1 + random.nextInt(5)));
break;
case 3:
- writer.updateDocument(new Term("id", "" + previous), createDocument(
+ writer.updateDocument(new Term("id", "" + previous), DocHelper.createDocument(
previous, "x", 1 + random.nextInt(5)));
break;
case 4:
@@ -105,7 +105,7 @@ public class TestIndexWriterReader exten
iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random));
writer = new IndexWriter(dir1, iwc);
assertTrue(reader.isCurrent());
- writer.addDocument(createDocument(1, "x", 1+random.nextInt(5)));
+ writer.addDocument(DocHelper.createDocument(1, "x", 1+random.nextInt(5)));
assertTrue(reader.isCurrent()); // segments in ram but IW is different to the readers one
writer.close();
assertFalse(reader.isCurrent()); // segments written
@@ -422,7 +422,7 @@ public class TestIndexWriterReader exten
addDir = newDirectory();
IndexWriter writer = new IndexWriter(addDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMaxBufferedDocs(2));
for (int i = 0; i < NUM_INIT_DOCS; i++) {
- Document doc = createDocument(i, "addindex", 4);
+ Document doc = DocHelper.createDocument(i, "addindex", 4);
writer.addDocument(doc);
}
@@ -543,7 +543,7 @@ public class TestIndexWriterReader exten
assertEquals(r2.maxDoc(), 100);
// add 100 documents
for (int x = 10000; x < 10000 + 100; x++) {
- Document d = createDocument(x, "index1", 5);
+ Document d = DocHelper.createDocument(x, "index1", 5);
writer.addDocument(d);
}
writer.flush(false, true);
@@ -575,25 +575,7 @@ public class TestIndexWriterReader exten
dir1.close();
}
-
-
- public static Document createDocument(int n, String indexName, int numFields) {
- StringBuilder sb = new StringBuilder();
- Document doc = new Document();
- doc.add(new Field("id", Integer.toString(n), Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
- doc.add(new Field("indexname", indexName, Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
- sb.append("a");
- sb.append(n);
- doc.add(new Field("field1", sb.toString(), Store.YES, Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
- sb.append(" b");
- sb.append(n);
- for (int i = 1; i < numFields; i++) {
- doc.add(new Field("field" + (i + 1), sb.toString(), Store.YES,
- Index.ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
- }
- return doc;
- }
-
+
/*
* Delete a document by term and return the doc id
*
@@ -609,7 +591,7 @@ public class TestIndexWriterReader exten
TEST_VERSION_CURRENT, new MockAnalyzer(random))
.setMergePolicy(new LogDocMergePolicy()));
for (int i = 0; i < 100; i++) {
- w.addDocument(createDocument(i, indexName, 4));
+ w.addDocument(DocHelper.createDocument(i, indexName, 4));
if (multiSegment && (i % 10) == 0) {
}
}
@@ -622,7 +604,7 @@ public class TestIndexWriterReader exten
public static void createIndexNoClose(boolean multiSegment, String indexName,
IndexWriter w) throws IOException {
for (int i = 0; i < 100; i++) {
- w.addDocument(createDocument(i, indexName, 4));
+ w.addDocument(DocHelper.createDocument(i, indexName, 4));
}
if (!multiSegment) {
w.optimize();
@@ -662,14 +644,14 @@ public class TestIndexWriterReader exten
int num = atLeast(100);
for (int i = 0; i < num; i++) {
- writer.addDocument(createDocument(i, "test", 4));
+ writer.addDocument(DocHelper.createDocument(i, "test", 4));
}
((ConcurrentMergeScheduler) writer.getConfig().getMergeScheduler()).sync();
assertTrue(warmer.warmCount > 0);
final int count = warmer.warmCount;
- writer.addDocument(createDocument(17, "test", 4));
+ writer.addDocument(DocHelper.createDocument(17, "test", 4));
writer.optimize();
assertTrue(warmer.warmCount > count);
@@ -695,7 +677,7 @@ public class TestIndexWriterReader exten
assertEquals(100, r1.numDocs());
for (int i = 0; i < 10; i++) {
- writer.addDocument(createDocument(i, "test", 4));
+ writer.addDocument(DocHelper.createDocument(i, "test", 4));
}
((ConcurrentMergeScheduler) writer.getConfig().getMergeScheduler()).sync();
@@ -857,7 +839,7 @@ public class TestIndexWriterReader exten
do {
try {
for(int docUpto=0;docUpto<10;docUpto++) {
- writer.addDocument(createDocument(10*count+docUpto, "test", 4));
+ writer.addDocument(DocHelper.createDocument(10*count+docUpto, "test", 4));
}
count++;
final int limit = count*10;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java?rev=1158697&r1=1158696&r2=1158697&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java Wed Aug 17 13:44:23 2011
@@ -91,7 +91,7 @@ public class TestNRTReaderWithThreads ex
//int n = random.nextInt(2);
if (type == 0) {
int i = seq.addAndGet(1);
- Document doc = TestIndexWriterReader.createDocument(i, "index1", 10);
+ Document doc = DocHelper.createDocument(i, "index1", 10);
writer.addDocument(doc);
addCount++;
} else if (type == 1) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java?rev=1158697&r1=1158696&r2=1158697&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java Wed Aug 17 13:44:23 2011
@@ -46,14 +46,14 @@ public class TestPerSegmentDeletes exten
IndexWriter writer = new IndexWriter(dir, iwc);
writer.setInfoStream(VERBOSE ? System.out : null);
for (int x = 0; x < 5; x++) {
- writer.addDocument(TestIndexWriterReader.createDocument(x, "1", 2));
+ writer.addDocument(DocHelper.createDocument(x, "1", 2));
//System.out.println("numRamDocs(" + x + ")" + writer.numRamDocs());
}
//System.out.println("commit1");
writer.commit();
assertEquals(1, writer.segmentInfos.size());
for (int x = 5; x < 10; x++) {
- writer.addDocument(TestIndexWriterReader.createDocument(x, "2", 2));
+ writer.addDocument(DocHelper.createDocument(x, "2", 2));
//System.out.println("numRamDocs(" + x + ")" + writer.numRamDocs());
}
//System.out.println("commit2");
@@ -61,7 +61,7 @@ public class TestPerSegmentDeletes exten
assertEquals(2, writer.segmentInfos.size());
for (int x = 10; x < 15; x++) {
- writer.addDocument(TestIndexWriterReader.createDocument(x, "3", 2));
+ writer.addDocument(DocHelper.createDocument(x, "3", 2));
//System.out.println("numRamDocs(" + x + ")" + writer.numRamDocs());
}
@@ -174,12 +174,12 @@ public class TestPerSegmentDeletes exten
**/
void part2(IndexWriter writer, RangeMergePolicy fsmp) throws Exception {
for (int x = 20; x < 25; x++) {
- writer.addDocument(TestIndexWriterReader.createDocument(x, "5", 2));
+ writer.addDocument(DocHelper.createDocument(x, "5", 2));
//System.out.println("numRamDocs(" + x + ")" + writer.numRamDocs());
}
writer.flush(false, false);
for (int x = 25; x < 30; x++) {
- writer.addDocument(TestIndexWriterReader.createDocument(x, "5", 2));
+ writer.addDocument(DocHelper.createDocument(x, "5", 2));
//System.out.println("numRamDocs(" + x + ")" + writer.numRamDocs());
}
writer.flush(false, false);