You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/11/30 12:07:19 UTC
svn commit: r1642535 [9/19] - in /lucene/dev/branches/lucene6005/lucene:
analysis/common/src/java/org/apache/lucene/collation/
analysis/common/src/test/org/apache/lucene/analysis/core/
analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/ ...
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java Sun Nov 30 11:07:09 2014
@@ -25,15 +25,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -47,17 +40,17 @@ public class TestTermVectorsWriter exten
public void testDoubleOffsetCounting() throws Exception {
Directory dir = newDirectory();
// nocommit sneaky behavior change ...
- MockAnalyzer a = new MockAnalyzer(random());
- a.setOffsetGap(0);
- a.setPositionIncrementGap(0);
- IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(a));
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.setIndexOptions("field", IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
+ fieldTypes.setMultiValued("field");
+ fieldTypes.setAnalyzerOffsetGap("field", 0);
+ fieldTypes.setAnalyzerPositionGap("field", 0);
fieldTypes.setDocValuesType("field", DocValuesType.NONE);
fieldTypes.enableTermVectors("field");
fieldTypes.enableTermVectorOffsets("field");
fieldTypes.enableTermVectorPositions("field");
- fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", "abcd");
doc.addAtom("field", "abcd");
doc.addAtom("field", "");
@@ -115,7 +108,7 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectorOffsets("field");
fieldTypes.enableTermVectorPositions("field");
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "abcd");
doc.addLargeText("field", "abcd");
w.addDocument(doc);
@@ -150,7 +143,7 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectorOffsets("field");
fieldTypes.enableTermVectorPositions("field");
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "abcd ");
doc.addLargeText("field", "abcd ");
w.addDocument(doc);
@@ -186,7 +179,7 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectorOffsets("field");
fieldTypes.enableTermVectorPositions("field");
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
try (TokenStream stream = analyzer.tokenStream("field", "abcd ")) {
stream.reset(); // TODO: weird to reset before wrapping with CachingTokenFilter... correct?
TokenStream cachedStream = new CachingTokenFilter(stream);
@@ -225,7 +218,7 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectorOffsets("field");
fieldTypes.enableTermVectorPositions("field");
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "abcd the");
doc.addLargeText("field", "abcd the");
w.addDocument(doc);
@@ -260,7 +253,7 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectorOffsets("field");
fieldTypes.enableTermVectorPositions("field");
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "abcd the ");
doc.addLargeText("field", "crunch man");
w.addDocument(doc);
@@ -298,7 +291,7 @@ public class TestTermVectorsWriter exten
public void testEndOffsetPositionStandardEmptyField() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.enableTermVectors("field");
fieldTypes.enableTermVectorOffsets("field");
@@ -335,7 +328,7 @@ public class TestTermVectorsWriter exten
public void testEndOffsetPositionStandardEmptyField2() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.enableTermVectors("field");
fieldTypes.enableTermVectorOffsets("field");
@@ -386,7 +379,7 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectorOffsets("termVector");
fieldTypes.enableTermVectorPositions("termVector");
- Document2 document = writer.newDocument();
+ Document document = writer.newDocument();
document.addStored("stored", "stored");
writer.addDocument(document);
writer.addDocument(document);
@@ -434,7 +427,7 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectorOffsets("termVector");
fieldTypes.enableTermVectorPositions("termVector");
- Document2 document = writer.newDocument();
+ Document document = writer.newDocument();
document.addStored("stored", "stored");
writer.addDocument(document);
writer.addDocument(document);
@@ -468,7 +461,7 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectorOffsets("termVector");
fieldTypes.enableTermVectorPositions("termVector");
- Document2 document = writer.newDocument();
+ Document document = writer.newDocument();
document.addStored("stored", "stored");
document.addLargeText("termVector", "termVector");
for(int i=0;i<10;i++) {
@@ -507,8 +500,9 @@ public class TestTermVectorsWriter exten
fieldTypes.enableTermVectors("tvtest");
fieldTypes.enableTermVectorOffsets("tvtest");
fieldTypes.enableTermVectorPositions("tvtest");
+ fieldTypes.setMultiValued("tvtest");
- Document2 document = iw.newDocument();
+ Document document = iw.newDocument();
document.addLargeText("tvtest", "a b c");
iw.addDocument(document);
document = iw.newDocument();
@@ -517,9 +511,6 @@ public class TestTermVectorsWriter exten
// Make first segment
iw.commit();
- FieldType customType = new FieldType(StringField.TYPE_NOT_STORED);
- customType.setStoreTermVectors(true);
- document = iw.newDocument();
document.addStored("tvtest", "a b c");
iw.addDocument(document);
// Make 2nd segment
@@ -539,7 +530,7 @@ public class TestTermVectorsWriter exten
FieldTypes fieldTypes = iw.getFieldTypes();
fieldTypes.enableTermVectors("field");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
iw.addDocument(doc);
try {
doc.addStored("field", "value");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java Sun Nov 30 11:07:09 2014
@@ -23,9 +23,7 @@ import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
@@ -92,7 +90,7 @@ public class TestTermdocPerf extends Luc
.setMaxBufferedDocs(100)
.setMergePolicy(newLogMergePolicy(100))
);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom(field, val);
for (int i=0; i<ndocs; i++) {
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTerms.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTerms.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTerms.java Sun Nov 30 11:07:09 2014
@@ -20,14 +20,10 @@ package org.apache.lucene.index;
import java.util.*;
import org.apache.lucene.analysis.CannedBinaryTokenStream;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util.TestUtil;
public class TestTerms extends LuceneTestCase {
@@ -35,7 +31,7 @@ public class TestTerms extends LuceneTes
public void testTermMinMaxBasic() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addShortText("field", "a b c cc ddd");
w.addDocument(doc);
IndexReader r = w.getReader();
@@ -72,7 +68,7 @@ public class TestTerms extends LuceneTes
tokens[j] = new CannedBinaryTokenStream.BinaryToken(tokenBytes);
}
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", new CannedBinaryTokenStream(tokens));
w.addDocument(doc);
}
@@ -94,7 +90,7 @@ public class TestTerms extends LuceneTes
int minValue = Integer.MAX_VALUE;
int maxValue = Integer.MIN_VALUE;
for(int i=0;i<numDocs;i++ ){
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
int num = random().nextInt();
minValue = Math.min(num, minValue);
maxValue = Math.max(num, maxValue);
@@ -104,8 +100,8 @@ public class TestTerms extends LuceneTes
IndexReader r = w.getReader();
Terms terms = MultiFields.getTerms(r, "field");
- assertEquals(minValue, Document2.bytesToInt(terms.getMin()));
- assertEquals(maxValue, Document2.bytesToInt(terms.getMax()));
+ assertEquals(minValue, Document.bytesToInt(terms.getMin()));
+ assertEquals(maxValue, Document.bytesToInt(terms.getMax()));
r.close();
w.close();
@@ -119,7 +115,7 @@ public class TestTerms extends LuceneTes
long minValue = Long.MAX_VALUE;
long maxValue = Long.MIN_VALUE;
for(int i=0;i<numDocs;i++ ){
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
long num = random().nextLong();
minValue = Math.min(num, minValue);
maxValue = Math.max(num, maxValue);
@@ -130,8 +126,8 @@ public class TestTerms extends LuceneTes
IndexReader r = w.getReader();
Terms terms = MultiFields.getTerms(r, "field");
- assertEquals(minValue, Document2.bytesToLong(terms.getMin()));
- assertEquals(maxValue, Document2.bytesToLong(terms.getMax()));
+ assertEquals(minValue, Document.bytesToLong(terms.getMin()));
+ assertEquals(maxValue, Document.bytesToLong(terms.getMax()));
r.close();
w.close();
@@ -145,7 +141,7 @@ public class TestTerms extends LuceneTes
float minValue = Float.POSITIVE_INFINITY;
float maxValue = Float.NEGATIVE_INFINITY;
for(int i=0;i<numDocs;i++ ){
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
float num = random().nextFloat();
minValue = Math.min(num, minValue);
maxValue = Math.max(num, maxValue);
@@ -155,8 +151,8 @@ public class TestTerms extends LuceneTes
IndexReader r = w.getReader();
Terms terms = MultiFields.getTerms(r, "field");
- assertEquals(minValue, Document2.bytesToFloat(terms.getMin()), 0.0f);
- assertEquals(maxValue, Document2.bytesToFloat(terms.getMax()), 0.0f);
+ assertEquals(minValue, Document.bytesToFloat(terms.getMin()), 0.0f);
+ assertEquals(maxValue, Document.bytesToFloat(terms.getMax()), 0.0f);
r.close();
w.close();
@@ -170,7 +166,7 @@ public class TestTerms extends LuceneTes
double minValue = Double.POSITIVE_INFINITY;
double maxValue = Double.NEGATIVE_INFINITY;
for(int i=0;i<numDocs;i++ ){
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
double num = random().nextDouble();
minValue = Math.min(num, minValue);
maxValue = Math.max(num, maxValue);
@@ -182,8 +178,8 @@ public class TestTerms extends LuceneTes
Terms terms = MultiFields.getTerms(r, "field");
- assertEquals(minValue, Document2.bytesToDouble(terms.getMin()), 0.0);
- assertEquals(maxValue, Document2.bytesToDouble(terms.getMax()), 0.0);
+ assertEquals(minValue, Document.bytesToDouble(terms.getMin()), 0.0);
+ assertEquals(maxValue, Document.bytesToDouble(terms.getMax()), 0.0);
r.close();
w.close();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java Sun Nov 30 11:07:09 2014
@@ -21,11 +21,8 @@ import java.io.IOException;
import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -158,7 +155,7 @@ public class TestTermsEnum extends Lucen
}
private void addDoc(RandomIndexWriter w, Collection<String> terms, Map<BytesRef,Integer> termToID, int id) throws IOException {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueInt("id", id);
if (VERBOSE) {
System.out.println("TEST: addDoc id:" + id + " terms=" + terms);
@@ -359,7 +356,7 @@ public class TestTermsEnum extends Lucen
final RandomIndexWriter w = new RandomIndexWriter(random(), d, iwc);
for(String term : terms) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom(FIELD, term);
w.addDocument(doc);
}
@@ -497,7 +494,7 @@ public class TestTermsEnum extends Lucen
public void testZeroTerms() throws Exception {
d = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), d);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "one two three");
doc = w.newDocument();
doc.addLargeText("field2", "one two three");
@@ -720,7 +717,7 @@ public class TestTermsEnum extends Lucen
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setMergePolicy(new LogDocMergePolicy());
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", "aaa");
w.addDocument(doc);
@@ -770,7 +767,7 @@ public class TestTermsEnum extends Lucen
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setMergePolicy(new LogDocMergePolicy());
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", "abc");
w.addDocument(doc);
@@ -831,7 +828,7 @@ public class TestTermsEnum extends Lucen
fieldTypes.disableSorting("field");
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", "");
doc.addAtom("field", "abc");
w.addDocument(doc);
@@ -898,7 +895,7 @@ public class TestTermsEnum extends Lucen
terms.add(prefix + TestUtil.randomRealisticUnicodeString(random(), 1, 20));
}
for(String term : terms) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("id", term);
w.addDocument(doc);
}
@@ -938,7 +935,7 @@ public class TestTermsEnum extends Lucen
int docID = docsEnum.nextDoc();
assertTrue(docID != DocsEnum.NO_MORE_DOCS);
assertEquals(docID, pkLookup.lookup(termBytesRef));
- Document2 doc = r.document(docID);
+ Document doc = r.document(docID);
assertEquals(term, doc.getString("id"));
if (random().nextInt(7) == 1) {
@@ -983,7 +980,7 @@ public class TestTermsEnum extends Lucen
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setOpenMode(IndexWriterConfig.OpenMode.CREATE);
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", sb.toString());
w.addDocument(doc);
IndexReader r = w.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java Sun Nov 30 11:07:09 2014
@@ -25,7 +25,7 @@ import java.util.TreeSet;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.TermsEnum.SeekStatus;
import org.apache.lucene.search.AutomatonQuery;
import org.apache.lucene.search.CheckHits;
@@ -60,7 +60,7 @@ public class TestTermsEnum2 extends Luce
int num = atLeast(200);
for (int i = 0; i < num; i++) {
String s = TestUtil.randomUnicodeString(random());
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("field", s);
terms.add(new BytesRef(s));
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java Sun Nov 30 11:07:09 2014
@@ -22,10 +22,7 @@ import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.English;
@@ -70,7 +67,7 @@ public class TestThreadedForceMerge exte
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
for(int i=0;i<200;i++) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addAtom("id", Integer.toString(i));
d.addAtom("contents", English.intToEnglish(i));
writer.addDocument(d);
@@ -90,7 +87,7 @@ public class TestThreadedForceMerge exte
for(int j=0;j<NUM_ITER2;j++) {
writerFinal.forceMerge(1, false);
for(int k=0;k<17*(1+iFinal);k++) {
- Document2 d = writerFinal.newDocument();
+ Document d = writerFinal.newDocument();
d.addAtom("id", iterFinal + "_" + iFinal + "_" + j + "_" + k);
d.addAtom("contents", English.intToEnglish(iFinal+k));
writerFinal.addDocument(d);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java Sun Nov 30 11:07:09 2014
@@ -18,9 +18,7 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.TestUtil;
@@ -42,7 +40,7 @@ public class TestTieredMergePolicy exten
tmp.setForceMergeDeletesPctAllowed(30.0);
IndexWriter w = new IndexWriter(dir, conf);
for(int i=0;i<80;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("content", "aaa " + (i%4));
w.addDocument(doc);
}
@@ -88,7 +86,7 @@ public class TestTieredMergePolicy exten
int maxCount = 0;
final int numDocs = TestUtil.nextInt(random(), 20, 100);
for(int i=0;i<numDocs;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("content", "aaa " + (i%4));
w.addDocument(doc);
int count = w.getSegmentCount();
@@ -124,7 +122,7 @@ public class TestTieredMergePolicy exten
final int numDocs = atLeast(200);
for(int i=0;i<numDocs;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueInt("id", i);
doc.addLargeText("content", "aaa " + i);
w.addDocument(doc);
@@ -229,7 +227,7 @@ public class TestTieredMergePolicy exten
IndexWriter w = new IndexWriter(dir, iwc);
FieldTypes fieldTypes = w.getFieldTypes();
for(int i=0;i<15000*RANDOM_MULTIPLIER;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", random().nextLong() + "" + random().nextLong());
w.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java Sun Nov 30 11:07:09 2014
@@ -27,9 +27,7 @@ import java.util.List;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.LuceneTestCase;
@@ -135,7 +133,7 @@ public class TestTransactionRollback ext
.setIndexDeletionPolicy(sdp));
for(int currentRecordId=1;currentRecordId<=100;currentRecordId++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueInt(FIELD_RECORD_ID, currentRecordId);
w.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java Sun Nov 30 11:07:09 2014
@@ -20,12 +20,8 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
@@ -158,7 +154,7 @@ public class TestTransactions extends Lu
fieldTypes.enableTermVectors("id");
for(int j=0; j<10; j++) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
int n = random().nextInt();
d.addUniqueInt("id", nextID++);
d.addLargeText("contents", English.intToEnglish(n));
@@ -217,7 +213,7 @@ public class TestTransactions extends Lu
public void initIndex(Directory dir) throws Throwable {
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
for(int j=0; j<7; j++) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
int n = random().nextInt();
d.addLargeText("contents", English.intToEnglish(n));
writer.addDocument(d);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java Sun Nov 30 11:07:09 2014
@@ -20,17 +20,13 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ReferenceManager;
import org.apache.lucene.search.SearcherFactory;
import org.apache.lucene.search.SearcherManager;
-import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
@@ -60,7 +56,7 @@ public class TestTryDelete extends Lucen
IndexWriter writer = getWriter(directory);
for (int i = 0; i < 10; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueInt("foo", i);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestUniqueAtom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestUniqueAtom.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestUniqueAtom.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestUniqueAtom.java Sun Nov 30 11:07:09 2014
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.ReferenceManager;
import org.apache.lucene.store.Directory;
@@ -37,7 +37,7 @@ public class TestUniqueAtom extends Luce
public void testBasic1() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("field", new BytesRef("one"));
w.addDocument(doc);
@@ -58,7 +58,7 @@ public class TestUniqueAtom extends Luce
public void testBasic2() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("field", new BytesRef("one"));
w.addDocument(doc);
ReferenceManager<DirectoryReader> mgr = w.getReaderManager();
@@ -102,7 +102,7 @@ public class TestUniqueAtom extends Luce
ReferenceManager<DirectoryReader> mgr = w.getReaderManager();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("field", new BytesRef("one"));
w.addDocument(doc);
if (random().nextBoolean()) {
@@ -136,7 +136,7 @@ public class TestUniqueAtom extends Luce
ReferenceManager<DirectoryReader> mgr = w.getReaderManager();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("field", new BytesRef("one"));
w.addDocument(doc);
if (random().nextBoolean()) {
@@ -188,7 +188,7 @@ public class TestUniqueAtom extends Luce
// First add randomly for a while:
for(int iter=0;iter<3*numTerms;iter++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
BytesRef term = termsList.get(random().nextInt(termsList.size()));
doc.addUniqueAtom("field", term);
if (random().nextBoolean()) {
@@ -204,7 +204,7 @@ public class TestUniqueAtom extends Luce
// Then add every single term, so we know all will be added:
for(BytesRef term : termsList) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("field", term);
if (random().nextBoolean()) {
w.updateDocument(new Term("field", term), doc);
@@ -244,7 +244,7 @@ public class TestUniqueAtom extends Luce
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("field", new BytesRef("one"));
w.close();
SegmentInfos infos = SegmentInfos.readLatestCommit(dir);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Sun Nov 30 11:07:09 2014
@@ -23,9 +23,7 @@ import java.util.HashSet;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.search.similarities.Similarity;
@@ -52,7 +50,7 @@ public class TestUniqueTermCount extends
config.setSimilarity(new TestSimilarity());
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, config);
for (int i = 0; i < 100; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("foo", addValue());
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Sun Nov 30 11:07:09 2014
@@ -21,18 +21,12 @@ import java.io.IOException;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.junit.AfterClass;
@@ -132,7 +126,7 @@ public class BaseTestRangeFilter extends
int maxCount = 0;
for (int d = minId; d <= maxId; d++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", pad(d));
doc.addInt("id_int", d);
doc.addFloat("id_float", d);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/FuzzyTermOnShortTermsTest.java Sun Nov 30 11:07:09 2014
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -84,7 +84,7 @@ public class FuzzyTermOnShortTermsTest e
.setMaxBufferedDocs(TestUtil.nextInt(random(), 100, 1000)).setMergePolicy(newLogMergePolicy()));
for (String s : vals){
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText(FIELD, s);
writer.addDocument(d);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java Sun Nov 30 11:07:09 2014
@@ -23,9 +23,7 @@ import java.util.Collections;
import java.util.List;
import java.util.concurrent.CountDownLatch;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
@@ -58,7 +56,7 @@ public class TestAutomatonQuery extends
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(FN, "this is document one 2345");
doc.addShortText("title", "some title");
doc.addShortText("footer", "a footer");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java Sun Nov 30 11:07:09 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -60,7 +60,7 @@ public class TestAutomatonQueryUnicode e
"\uFFFD\uD866\uDF05",
"\uFFFD\uFFFD" }) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(FN, body);
doc.addShortText("title", "some title");
doc.addShortText("footer", "a footer");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java Sun Nov 30 11:07:09 2014
@@ -21,9 +21,7 @@ package org.apache.lucene.search;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -60,7 +58,7 @@ public class TestBoolean2 extends Lucene
directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random(), directory, newIndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(field, docFields[i]);
writer.addDocument(doc);
}
@@ -94,7 +92,7 @@ public class TestBoolean2 extends Lucene
RandomIndexWriter w = new RandomIndexWriter(random(), dir2,
newIndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(TestUtil.nextInt(random(), 50, 1000)));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field2", "xxx");
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
w.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInvertState;
@@ -55,7 +55,7 @@ public class TestBooleanCoord extends Lu
// the second document has 3 negative terms 1,2,3 that exist in the segment (for non-null scorers)
// to test terms that don't exist (null scorers), we use X,Y,Z
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addAtom("field", "A");
doc.addAtom("field", "B");
doc.addAtom("field", "C");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.text.DecimalFormatSymbols;
import java.util.Locale;
import java.util.Random;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -58,7 +58,7 @@ public class TestBooleanMinShouldMatch e
RandomIndexWriter w = new RandomIndexWriter(random(), index);
for (int i = 0; i < data.length; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("id", String.valueOf(i));//Field.Keyword("id",String.valueOf(i)));
doc.addLargeText("all", "all");//Field.Keyword("all","all"));
if (null != data[i]) {
@@ -445,7 +445,7 @@ public class TestBooleanMinShouldMatch e
DecimalFormat f = new DecimalFormat("0.000000", DecimalFormatSymbols.getInstance(Locale.ROOT));
for (int i = 0; i < h.length; i++) {
- Document2 d = searcher.doc(h[i].doc);
+ Document d = searcher.doc(h[i].doc);
float score = h[i].score;
System.err.println("#" + i + ": " + f.format(score) + " - " +
d.get("id") + " - " + d.get("data"));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java Sun Nov 30 11:07:09 2014
@@ -19,9 +19,7 @@ import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -133,7 +131,7 @@ public class TestBooleanOr extends Lucen
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
//
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText(
FIELD_T,
"Optimize not deleting all files");
@@ -164,7 +162,7 @@ public class TestBooleanOr extends Lucen
int docCount = atLeast(10000);
for(int i=0;i<docCount;i++) {
- Document2 doc = riw.newDocument();
+ Document doc = riw.newDocument();
doc.addLargeText("field", "a");
riw.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Sun Nov 30 11:07:09 2014
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -79,7 +79,7 @@ public class TestBooleanQuery extends Lu
public void testNullOrSubScorer() throws Throwable {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "a b c d");
w.addDocument(doc);
@@ -143,7 +143,7 @@ public class TestBooleanQuery extends Lu
public void testDeMorgan() throws Exception {
Directory dir1 = newDirectory();
RandomIndexWriter iw1 = new RandomIndexWriter(random(), dir1);
- Document2 doc1 = iw1.newDocument();
+ Document doc1 = iw1.newDocument();
doc1.addLargeText("field", "foo bar");
iw1.addDocument(doc1);
IndexReader reader1 = iw1.getReader();
@@ -151,7 +151,7 @@ public class TestBooleanQuery extends Lu
Directory dir2 = newDirectory();
RandomIndexWriter iw2 = new RandomIndexWriter(random(), dir2);
- Document2 doc2 = iw2.newDocument();
+ Document doc2 = iw2.newDocument();
doc2.addLargeText("field", "foo baz");
iw2.addDocument(doc2);
IndexReader reader2 = iw2.getReader();
@@ -203,7 +203,7 @@ public class TestBooleanQuery extends Lu
if (random().nextInt(20) <= 1) {
contents += " f";
}
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", contents);
w.addDocument(doc);
}
@@ -299,7 +299,7 @@ public class TestBooleanQuery extends Lu
IndexWriterConfig config = new IndexWriterConfig(indexerAnalyzer);
IndexWriter writer = new IndexWriter(directory, config);
String FIELD = "content";
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText(FIELD, "clockwork orange");
writer.addDocument(d);
writer.close();
@@ -328,7 +328,7 @@ public class TestBooleanQuery extends Lu
public void testInOrderWithMinShouldMatch() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "some text here");
w.addDocument(doc);
IndexReader r = w.getReader();
@@ -391,7 +391,7 @@ public class TestBooleanQuery extends Lu
public void testMinShouldMatchLeniency() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "a b c d");
w.addDocument(doc);
IndexReader r = DirectoryReader.open(w, true);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java Sun Nov 30 11:07:09 2014
@@ -27,10 +27,7 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.LeafReaderContext;
@@ -112,8 +109,8 @@ public class TestBooleanQueryVisitSubsco
assertEquals(3, tfs.get(2).intValue()); // f2:is + f2:is + f2:lucene
}
- static Document2 doc(RandomIndexWriter w, String v1, String v2) {
- Document2 doc = w.newDocument();
+ static Document doc(RandomIndexWriter w, String v1, String v2) {
+ Document doc = w.newDocument();
doc.addLargeText(F1, v1);
doc.addLargeText(F2, v2);
return doc;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java Sun Nov 30 11:07:09 2014
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -43,7 +43,7 @@ public class TestBooleanScorer extends L
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
for (int i = 0; i < values.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom(FIELD, values[i]);
writer.addDocument(doc);
}
@@ -128,7 +128,7 @@ public class TestBooleanScorer extends L
public void testMoreThan32ProhibitedClauses() throws Exception {
final Directory d = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), d);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33");
w.addDocument(doc);
doc = w.newDocument();
@@ -230,7 +230,7 @@ public class TestBooleanScorer extends L
public void testEmbeddedBooleanScorer() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "doctors are people who prescribe medicines of which they know little, to cure diseases of which they know less, in human beings of whom they know nothing");
w.addDocument(doc);
IndexReader r = w.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanUnevenly.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanUnevenly.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanUnevenly.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanUnevenly.java Sun Nov 30 11:07:09 2014
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -45,7 +45,7 @@ public class TestBooleanUnevenly extends
public static void beforeClass() throws Exception {
directory = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), directory, new MockAnalyzer(random()));
- Document2 doc;
+ Document doc;
count1 = 0;
for (int i=0;i<2;i++) {
for (int j=0;j<2048;j++) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Sun Nov 30 11:07:09 2014
@@ -20,11 +20,8 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
@@ -55,7 +52,7 @@ public class TestCachingWrapperFilter ex
// add 500 docs with id 0..499
for (int i = 0; i < 500; i++) {
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addUniqueInt("id", i);
iw.addDocument(doc);
}
@@ -295,7 +292,7 @@ public class TestCachingWrapperFilter ex
IndexSearcher searcher = newSearcher(reader, false);
// add a doc, refresh the reader, and check that it's there
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "1");
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java Sun Nov 30 11:07:09 2014
@@ -21,11 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
@@ -63,8 +59,8 @@ public class TestConjunctions extends Lu
searcher.setSimilarity(new TFSimilarity());
}
- static Document2 doc(RandomIndexWriter writer, String v1, String v2) {
- Document2 doc = writer.newDocument();
+ static Document doc(RandomIndexWriter writer, String v1, String v2) {
+ Document doc = writer.newDocument();
doc.addAtom(F1, v1);
doc.addLargeText(F2, v2);
return doc;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java Sun Nov 30 11:07:09 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -83,7 +83,7 @@ public class TestConstantScoreQuery exte
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter (random(), directory);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("field", "term");
writer.addDocument(doc);
@@ -128,7 +128,7 @@ public class TestConstantScoreQuery exte
public void testConstantScoreQueryAndFilter() throws Exception {
Directory d = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), d);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", "a");
w.addDocument(doc);
doc = w.newDocument();
@@ -157,7 +157,7 @@ public class TestConstantScoreQuery exte
public void testQueryWrapperFilter() throws IOException {
Directory d = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), d);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", "a");
w.addDocument(doc);
IndexReader r = w.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java Sun Nov 30 11:07:09 2014
@@ -24,12 +24,8 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexCommit;
import org.apache.lucene.index.IndexReader;
@@ -311,7 +307,7 @@ public class TestControlledRealTimeReope
LatchedIndexWriter _writer = new LatchedIndexWriter(d, conf, latch, signal);
final TrackingIndexWriter writer = new TrackingIndexWriter(_writer);
final SearcherManager manager = new SearcherManager(_writer, false, null);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("test", "test");
writer.addDocument(doc);
manager.maybeRefresh();
@@ -512,7 +508,7 @@ public class TestControlledRealTimeReope
commitThread.start();
commitThreads.add(commitThread);
}
- Document2 d = iw.newDocument();
+ Document d = iw.newDocument();
d.addLargeText("count", i + "");
d.addLargeText("content", content);
long start = System.currentTimeMillis();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Sun Nov 30 11:07:09 2014
@@ -26,15 +26,11 @@ import java.util.TimeZone;
import java.util.TreeMap;
import org.apache.lucene.document.DateTools;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
/** Unit test for sorting code. */
@@ -58,7 +54,7 @@ public class TestCustomSearcherSort exte
RandomGen random = new RandomGen(random());
for (int i = 0; i < INDEX_SIZE; ++i) { // don't decrease; if to low the
// problem doesn't show up
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
if ((i % 5) != 0) { // some documents must not have an entry in the first
// sort field
doc.addAtom("publicationDate_", random.getLuceneDate());
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.document.DateTools;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -44,7 +44,7 @@ public class TestDateFilter extends Luce
long now = System.currentTimeMillis();
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
// add time that is in the past
doc.addAtom("datefield", DateTools.timeToString(now - 1000, DateTools.Resolution.MILLISECOND));
doc.addLargeText("body", "Today is a very sunny day in New York City");
@@ -107,7 +107,7 @@ public class TestDateFilter extends Luce
long now = System.currentTimeMillis();
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
// add time that is in the future
doc.addAtom("datefield", DateTools.timeToString(now + 888888, DateTools.Resolution.MILLISECOND));
doc.addLargeText("body", "Today is a very sunny day in New York City");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.util.Arrays;
import org.apache.lucene.document.DateTools;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -80,7 +80,7 @@ public class TestDateSort extends Lucene
String[] actualOrder = new String[5];
ScoreDoc[] hits = searcher.search(query, null, 1000, sort).scoreDocs;
for (int i = 0; i < hits.length; i++) {
- Document2 document = searcher.doc(hits[i].doc);
+ Document document = searcher.doc(hits[i].doc);
String text = document.getString(TEXT_FIELD);
actualOrder[i] = text;
}
@@ -96,8 +96,8 @@ public class TestDateSort extends Lucene
assertEquals(Arrays.asList(expectedOrder), Arrays.asList(actualOrder));
}
- private Document2 createDocument(RandomIndexWriter writer, String text, long time) {
- Document2 document = writer.newDocument();
+ private Document createDocument(RandomIndexWriter writer, String text, long time) {
+ Document document = writer.newDocument();
// Add the text field.
document.addLargeText(TEXT_FIELD, text);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Sun Nov 30 11:07:09 2014
@@ -24,12 +24,8 @@ import java.util.Locale;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
@@ -91,11 +87,6 @@ public class TestDisjunctionMaxQuery ext
public IndexReader r;
public IndexSearcher s;
- private static final FieldType nonAnalyzedType = new FieldType(TextField.TYPE_STORED);
- static {
- nonAnalyzedType.setTokenized(false);
- }
-
@Override
public void setUp() throws Exception {
super.setUp();
@@ -113,7 +104,7 @@ public class TestDisjunctionMaxQuery ext
// d1 is an "ok" match for: albino elephant
{
- Document2 d1 = writer.newDocument();
+ Document d1 = writer.newDocument();
d1.addUniqueAtom("id", "d1");
d1.addLargeText("hed", "elephant");
d1.addLargeText("dek", "elephant");
@@ -122,7 +113,7 @@ public class TestDisjunctionMaxQuery ext
// d2 is a "good" match for: albino elephant
{
- Document2 d2 = writer.newDocument();
+ Document d2 = writer.newDocument();
d2.addUniqueAtom("id", "d2");
d2.addLargeText("hed", "elephant");
d2.addLargeText("dek", "albino");
@@ -132,7 +123,7 @@ public class TestDisjunctionMaxQuery ext
// d3 is a "better" match for: albino elephant
{
- Document2 d3 = writer.newDocument();
+ Document d3 = writer.newDocument();
d3.addUniqueAtom("id", "d3");
d3.addLargeText("hed", "albino");
d3.addLargeText("hed", "elephant");
@@ -141,7 +132,7 @@ public class TestDisjunctionMaxQuery ext
// d4 is the "best" match for: albino elephant
{
- Document2 d4 = writer.newDocument();
+ Document d4 = writer.newDocument();
d4.addUniqueAtom("id", "d4");
d4.addLargeText("hed", "albino");
d4.addLargeText("hed", "elephant");
@@ -476,7 +467,7 @@ public class TestDisjunctionMaxQuery ext
IndexWriterConfig config = new IndexWriterConfig(indexerAnalyzer);
IndexWriter writer = new IndexWriter(directory, config);
String FIELD = "content";
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText(FIELD, "clockwork orange");
writer.addDocument(d);
writer.close();
@@ -520,7 +511,7 @@ public class TestDisjunctionMaxQuery ext
DecimalFormat f = new DecimalFormat("0.000000000", DecimalFormatSymbols.getInstance(Locale.ROOT));
for (int i = 0; i < h.length; i++) {
- Document2 d = searcher.doc(h[i].doc);
+ Document d = searcher.doc(h[i].doc);
float score = h[i].score;
System.err.println("#" + i + ": " + f.format(score) + " - " + d.get("id"));
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java Sun Nov 30 11:07:09 2014
@@ -38,11 +38,11 @@ public class TestDocBoost extends Lucene
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), store, newIndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
- Document2 d1 = writer.newDocument();
+ Document d1 = writer.newDocument();
d1.addLargeText("field", "word"); // boost = 1
writer.addDocument(d1);
- Document2 d2 = writer.newDocument();
+ Document d2 = writer.newDocument();
d2.addLargeText("field", "word", 2.0f); // boost = 2
writer.addDocument(d2);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -110,7 +110,7 @@ public class TestDocIdSet extends Lucene
// IndexSearcher, everything works fine. This came up in LUCENE-1754.
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("c", "val");
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -136,7 +136,7 @@ public class TestDocIdSet extends Lucene
public void testNullIteratorFilteredDocIdSet() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("c", "val");
writer.addDocument(doc);
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java Sun Nov 30 11:07:09 2014
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -58,7 +58,7 @@ public class TestDocTermOrdsRangeFilter
List<String> terms = new ArrayList<>();
int num = atLeast(200);
for (int i = 0; i < num; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", Integer.toString(i));
int numTerms = random().nextInt(4);
for (int j = 0; j < numTerms; j++) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java Sun Nov 30 11:07:09 2014
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -59,7 +59,7 @@ public class TestDocTermOrdsRewriteMetho
List<String> terms = new ArrayList<>();
int num = atLeast(200);
for (int i = 0; i < num; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", Integer.toString(i));
int numTerms = random().nextInt(4);
for (int j = 0; j < numTerms; j++) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java Sun Nov 30 11:07:09 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
@@ -46,7 +46,7 @@ public class TestDocValuesScoring extend
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("foo", "quick brown fox");
doc.addLargeText("bar", "quick brown fox");
doc.addFloat("foo_boost", 2f);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.*;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
import org.apache.lucene.search.similarities.DefaultSimilarity;
@@ -123,7 +123,7 @@ public class TestElevationComparator ext
}
private void adoc(IndexWriter w, String[] vals) throws IOException {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
for (int i = 0; i < vals.length - 2; i += 2) {
if (vals[i].equals("id")) {
doc.addUniqueAtom(vals[i], new BytesRef(vals[i+1]));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Sun Nov 30 11:07:09 2014
@@ -20,18 +20,13 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRefBuilder;
-import org.apache.lucene.util.NumericUtils;
import org.junit.Test;
/**
@@ -441,7 +436,7 @@ public class TestFieldCacheRangeFilter e
FieldTypes fieldTypes = writer.getFieldTypes();
for (int d = -20; d <= 20; d++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("id_int", d);
doc.addAtom("body", "body");
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
@@ -37,7 +37,7 @@ public class TestFieldCacheTermsFilter e
Directory rd = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), rd);
for (int i = 0; i < 100; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
int term = i * 10; //terms are units of 10;
doc.addAtom(fieldName, "" + term);
w.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java Sun Nov 30 11:07:09 2014
@@ -19,23 +19,18 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FilterLeafReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.BitSet;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.SparseFixedBitSet;
@@ -147,7 +142,7 @@ public class TestFieldValueFilter extend
FieldTypes fieldTypes = writer.getFieldTypes();
int[] docStates = new int[docs];
for (int i = 0; i < docs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
if (random().nextBoolean()) {
docStates[i] = 1;
doc.addShortText("some", "value");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java Sun Nov 30 11:07:09 2014
@@ -22,9 +22,7 @@ import java.util.BitSet;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -65,7 +63,7 @@ public class TestFilteredQuery extends L
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter (random(), directory, newIndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", "one two three four five");
doc.addAtom("sorter", new BytesRef("b"));
writer.addDocument (doc);
@@ -411,7 +409,7 @@ public class TestFilteredQuery extends L
int numDocs = atLeast(50);
int totalDocsWithZero = 0;
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
int num = random().nextInt(5);
if (num == 0) {
totalDocsWithZero++;
@@ -495,7 +493,7 @@ public class TestFilteredQuery extends L
int numDocs = atLeast(50);
int totalDocsWithZero = 0;
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
int num = random().nextInt(10);
if (num == 0) {
totalDocsWithZero++;