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 [10/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/search/TestFilteredSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java Sun Nov 30 11:07:09 2014
@@ -20,9 +20,7 @@ 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.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -61,7 +59,7 @@ public class TestFilteredSearch extends
public void searchFiltered(IndexWriter writer, Directory directory, Filter filter, boolean fullMerge) throws IOException {
for (int i = 0; i < 60; i++) {//Simple docs
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom(FIELD, Integer.toString(i));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java Sun Nov 30 11:07:09 2014
@@ -23,9 +23,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.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -413,7 +411,7 @@ public class TestFuzzyQuery extends Luce
}
private void addDoc(String text, RandomIndexWriter writer) throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", text);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java Sun Nov 30 11:07:09 2014
@@ -22,8 +22,7 @@ import java.util.concurrent.LinkedBlocki
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.apache.lucene.document.Document2;
-import org.apache.lucene.document.SortedDocValuesField;
+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 +44,7 @@ public class TestIndexSearcher extends L
dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 100; i++) {
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addUniqueAtom("field", Integer.toString(i));
doc.addAtom("field2", Boolean.toString(i % 2 == 0));
iw.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestLRUFilterCache.java Sun Nov 30 11:07:09 2014
@@ -25,15 +25,12 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicReference;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DirectoryReader;
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.LuceneTestCase;
-
import com.carrotsearch.randomizedtesting.generators.RandomPicks;
public class TestLRUFilterCache extends LuceneTestCase {
@@ -61,11 +58,9 @@ public class TestLRUFilterCache extends
Thread[] threads = new Thread[3];
threads[0] = new Thread() {
public void run() {
- Document doc = new Document();
- StringField f = new StringField("color", "", Store.NO);
- doc.add(f);
for (int i = 0; indexing.get() && i < numDocs; ++i) {
- f.setStringValue(RandomPicks.randomFrom(random(), new String[] {"blue", "red", "yellow"}));
+ Document doc = w.newDocument();
+ doc.addAtom("color", RandomPicks.randomFrom(random(), new String[] {"blue", "red", "yellow"}));
try {
w.addDocument(doc);
if ((i & 63) == 0) {
@@ -135,13 +130,16 @@ public class TestLRUFilterCache extends
Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- StringField f = new StringField("color", "blue", Store.NO);
- doc.add(f);
+ Document doc = w.newDocument();
+ doc.addAtom("color", "blue");
w.addDocument(doc);
- f.setStringValue("red");
+
+ doc = w.newDocument();
+ doc.addAtom("color", "red");
w.addDocument(doc);
- f.setStringValue("green");
+
+ doc = w.newDocument();
+ doc.addAtom("color", "green");
w.addDocument(doc);
final DirectoryReader reader = w.getReader();
final IndexSearcher searcher = newSearcher(reader);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java Sun Nov 30 11:07:09 2014
@@ -28,7 +28,7 @@ import java.util.Random;
import java.util.concurrent.CountDownLatch;
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.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -63,7 +63,7 @@ public class TestLiveFieldValues extends
if (hits.totalHits == 0) {
return null;
} else {
- Document2 doc = s.doc(hits.scoreDocs[0].doc);
+ Document doc = s.doc(hits.scoreDocs[0].doc);
return (Integer) doc.getField("field").numericValue();
}
}
@@ -98,7 +98,7 @@ public class TestLiveFieldValues extends
startingGun.await();
for(int iter=0; iter<iters;iter++) {
// Add/update a document
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
// Threads must not update the same id at the
// same time:
if (threadRandom.nextDouble() <= addChance) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMatchAllDocsQuery.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,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.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -94,7 +94,7 @@ public class TestMatchAllDocsQuery exten
}
private void addDoc(String text, IndexWriter iw, float boost) throws IOException {
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("key", text, boost);
iw.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java Sun Nov 30 11:07:09 2014
@@ -25,7 +25,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-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.LeafReader;
@@ -65,7 +65,7 @@ public class TestMinShouldMatch2 extends
fieldTypes.setMultiValued("dv");
final int numDocs = atLeast(300);
for (int i = 0; i < numDocs; i++) {
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
addSome(doc, alwaysTerms);
@@ -103,7 +103,7 @@ public class TestMinShouldMatch2 extends
dir = null;
}
- private static void addSome(Document2 doc, String values[]) {
+ private static void addSome(Document doc, String values[]) {
List<String> list = Arrays.asList(values);
Collections.shuffle(list, random());
int howMany = TestUtil.nextInt(random(), 1, list.size());
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.util.LinkedList;
import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.Token;
-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;
@@ -193,7 +193,7 @@ public class TestMultiPhraseQuery extend
}
private void add(String s, RandomIndexWriter writer) throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("body", s);
writer.addDocument(doc);
}
@@ -313,7 +313,7 @@ public class TestMultiPhraseQuery extend
private void add(String s, String type, RandomIndexWriter writer)
throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("body", s);
doc.addAtom("type", type);
writer.addDocument(doc);
@@ -364,7 +364,7 @@ public class TestMultiPhraseQuery extend
tokens[2].setPositionIncrement(0);
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", new CannedTokenStream(tokens));
writer.addDocument(doc);
doc = writer.newDocument();
@@ -465,7 +465,7 @@ public class TestMultiPhraseQuery extend
Directory dir = newDirectory(); // random dir
IndexWriterConfig cfg = newIndexWriterConfig(null);
IndexWriter writer = new IndexWriter(dir, cfg);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", new CannedTokenStream(INCR_0_DOC_TOKENS));
writer.addDocument(doc);
IndexReader r = DirectoryReader.open(writer,false);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java Sun Nov 30 11:07:09 2014
@@ -23,11 +23,7 @@ import junit.framework.Assert;
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.document.FieldType;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -61,10 +57,8 @@ public class TestMultiTermConstantScore
newIndexWriterConfig(
new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)).setMergePolicy(newLogMergePolicy()));
- FieldType customType = new FieldType(TextField.TYPE_STORED);
- customType.setTokenized(false);
for (int i = 0; i < data.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", String.valueOf(i));
doc.addAtom("all", "all");
if (null != data[i]) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.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.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.MultiReader;
@@ -51,7 +51,7 @@ public class TestMultiTermQueryRewrites
final RandomIndexWriter swriter2 = new RandomIndexWriter(random(), sdir2, new MockAnalyzer(random()));
for (int i = 0; i < 10; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("data", Integer.toString(i));
writer.addDocument(doc);
RandomIndexWriter otherWriter = (i % 2 == 0) ? swriter1 : swriter2;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java Sun Nov 30 11:07:09 2014
@@ -48,7 +48,7 @@ public class TestMultiThreadTermVectors
fieldTypes.setIndexOptions("field", IndexOptions.DOCS);
fieldTypes.enableTermVectors("field");
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("field", English.intToEnglish(i));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.text.DecimalFormatSymbols;
import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
-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;
@@ -50,7 +50,7 @@ public class TestMultiValuedNumericRange
int num = atLeast(500);
for (int l = 0; l < num; l++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
for (int m=0, c=random().nextInt(10); m<=c; m++) {
int value = random().nextInt(Integer.MAX_VALUE);
doc.addAtom("asc", format.format(value));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNot.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNot.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNot.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNot.java Sun Nov 30 11:07:09 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-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;
@@ -34,7 +34,7 @@ public class TestNot extends LuceneTestC
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), store);
- Document2 d1 = writer.newDocument();
+ Document d1 = writer.newDocument();
d1.addLargeText("field", "a b");
writer.addDocument(d1);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeFilter.java Sun Nov 30 11:07:09 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-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.IndexReader;
@@ -33,7 +33,7 @@ public class TestNumericRangeFilter exte
public void testBasicDoubleRange() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addDouble("number", -103.0);
w.addDocument(doc);
IndexReader r = DirectoryReader.open(w, true);
@@ -42,7 +42,7 @@ public class TestNumericRangeFilter exte
Query q = new ConstantScoreQuery(fieldTypes.newRangeFilter("number", -110, true, 400, false));
assertEquals(1, s.search(q, 1).totalHits);
NumericDocValues ndv = MultiDocValues.getNumericValues(r, "number");
- assertEquals(-103.0, Document2.longToDouble(ndv.get(0)), .0000000001);
+ assertEquals(-103.0, Document.longToDouble(ndv.get(0)), .0000000001);
r.close();
w.close();
dir.close();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.LinkedList;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
@@ -41,11 +41,11 @@ public class TestPhrasePrefixQuery exten
public void testPhrasePrefix() throws IOException {
Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
- Document2 doc1 = writer.newDocument();
- Document2 doc2 = writer.newDocument();
- Document2 doc3 = writer.newDocument();
- Document2 doc4 = writer.newDocument();
- Document2 doc5 = writer.newDocument();
+ Document doc1 = writer.newDocument();
+ Document doc2 = writer.newDocument();
+ Document doc3 = writer.newDocument();
+ Document doc4 = writer.newDocument();
+ Document doc5 = writer.newDocument();
doc1.addLargeText("body", "blueberry pie");
doc2.addLargeText("body", "blueberry strudel");
doc3.addLargeText("body", "blueberry pizza");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java Sun Nov 30 11:07:09 2014
@@ -64,7 +64,7 @@ public class TestPhraseQuery extends Luc
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("repeated");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", "one two three four five");
doc.addLargeText("repeated", "this is a repeated field - first part");
doc.addLargeText("repeated", "second part of a repeated field");
@@ -217,7 +217,7 @@ public class TestPhraseQuery extends Luc
Analyzer stopAnalyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET);
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(stopAnalyzer));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", "the stop words are here");
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -241,7 +241,7 @@ public class TestPhraseQuery extends Luc
Directory directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("source", "marketing info");
writer.addDocument(doc);
@@ -329,15 +329,15 @@ public class TestPhraseQuery extends Luc
.setMergePolicy(newLogMergePolicy())
.setSimilarity(new DefaultSimilarity()));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", "foo firstname lastname foo");
writer.addDocument(doc);
- Document2 doc2 = writer.newDocument();
+ Document doc2 = writer.newDocument();
doc2.addLargeText("field", "foo firstname zzz lastname foo");
writer.addDocument(doc2);
- Document2 doc3 = writer.newDocument();
+ Document doc3 = writer.newDocument();
doc3.addLargeText("field", "foo firstname zzz yyy lastname foo");
writer.addDocument(doc3);
@@ -637,7 +637,7 @@ public class TestPhraseQuery extends Luc
}
docs.add(doc);
- Document2 d = w.newDocument();
+ Document d = w.newDocument();
d.addLargeText("f", sb.toString());
w.addDocument(d);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java Sun Nov 30 11:07:09 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReader;
@@ -89,7 +89,7 @@ public class TestPositionIncrement exten
};
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), store, analyzer);
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText("field", "bogus");
writer.addDocument(d);
IndexReader reader = writer.getReader();
@@ -202,7 +202,7 @@ public class TestPositionIncrement exten
public void testPayloadsPos0() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, new MockPayloadAnalyzer());
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", new StringReader("a a b c d e a f g h i j a b k k"));
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixFilter.java Sun Nov 30 11:07:09 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-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;
@@ -38,7 +38,7 @@ public class TestPrefixFilter extends Lu
"/Computers/Windows"};
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
for (int i = 0; i < categories.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("category", categories[i]);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Sun Nov 30 11:07:09 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-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;
@@ -47,7 +47,7 @@ public class TestPrefixInBooleanQuery ex
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom(FIELD, "meaninglessnames");
for (int i = 0; i < 5137; ++i) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java Sun Nov 30 11:07:09 2014
@@ -26,7 +26,7 @@ import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiFields;
@@ -52,7 +52,7 @@ public class TestPrefixQuery extends Luc
"/Computers/Windows"};
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
for (int i = 0; i < categories.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("category", categories[i]);
writer.addDocument(doc);
}
@@ -118,7 +118,7 @@ public class TestPrefixQuery extends Luc
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
for (String term : randomTerms) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", term);
w.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java Sun Nov 30 11:07:09 2014
@@ -21,9 +21,7 @@ import java.io.IOException;
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.index.FilteredTermsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -56,7 +54,7 @@ public class TestPrefixRandom extends Lu
int num = atLeast(1000);
for (int i = 0; i < num; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("field", TestUtil.randomUnicodeString(random(), 10));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java Sun Nov 30 11:07:09 2014
@@ -22,10 +22,7 @@ import java.util.Arrays;
import java.util.Comparator;
import java.util.Set;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -55,7 +52,7 @@ public class TestQueryRescorer extends L
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("id", "0");
doc.addLargeText("field", "wizard the the the the the oz");
w.addDocument(doc);
@@ -113,7 +110,7 @@ public class TestQueryRescorer extends L
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("id", "0");
doc.addLargeText("field", "wizard the the the the the oz");
w.addDocument(doc);
@@ -152,7 +149,7 @@ public class TestQueryRescorer extends L
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("id", "0");
doc.addLargeText("field", "wizard the the the the the oz");
w.addDocument(doc);
@@ -206,7 +203,7 @@ public class TestQueryRescorer extends L
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("id", "0");
doc.addLargeText("field", "wizard the the the the the oz");
w.addDocument(doc);
@@ -284,7 +281,7 @@ public class TestQueryRescorer extends L
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("id", "0");
doc.addLargeText("field", "wizard the the the the the oz");
w.addDocument(doc);
@@ -343,7 +340,7 @@ public class TestQueryRescorer extends L
final int[] idToNum = new int[numDocs];
int maxValue = TestUtil.nextInt(random(), 10, 1000000);
for(int i=0;i<numDocs;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueInt("id", i);
int numTokens = TestUtil.nextInt(random(), 1, 10);
StringBuilder b = new StringBuilder();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.util.HashSet;
import java.util.Set;
-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;
@@ -35,7 +35,7 @@ public class TestQueryWrapperFilter exte
public void testBasic() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", "value");
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -93,7 +93,7 @@ public class TestQueryWrapperFilter exte
final int numDocs = atLeast(100);
final Set<Integer> aDocs = new HashSet<>();
for(int i=0;i<numDocs;i++) {
- final Document2 doc = w.newDocument();
+ final Document doc = w.newDocument();
final String v;
if (random().nextInt(5) == 4) {
v = "a";
@@ -130,7 +130,7 @@ public class TestQueryWrapperFilter exte
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 1000; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("field", English.intToEnglish(i));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java Sun Nov 30 11:07:09 2014
@@ -20,9 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import java.util.Arrays;
-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.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -50,7 +48,7 @@ public class TestRegexpQuery extends Luc
super.setUp();
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(FN, "the quick brown fox jumps over the lazy ??? dog 493432 49344");
writer.addDocument(doc);
reader = writer.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java Sun Nov 30 11:07:09 2014
@@ -23,7 +23,7 @@ import java.text.NumberFormat;
import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
-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;
@@ -55,7 +55,7 @@ public class TestRegexpRandom extends Lu
NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ROOT));
for (int i = 0; i < 1000; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", df.format(i));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.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.index.FilteredTermsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -68,7 +68,7 @@ public class TestRegexpRandom2 extends L
String s = TestUtil.randomUnicodeString(random());
terms.add(s);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom(fieldName, s);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java Sun Nov 30 11:07:09 2014
@@ -25,7 +25,6 @@ import java.util.Map;
import java.util.concurrent.CountDownLatch;
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.IndexWriter;
@@ -52,7 +51,7 @@ public class TestSameScoresWithThreads e
int charsIndexed = 0;
//System.out.println("bytesToIndex=" + charsToIndex);
while(charsIndexed < charsToIndex) {
- Document2 doc = docs.nextDoc();
+ Document doc = docs.nextDoc();
charsIndexed += doc.getString("body").length();
w.addDocument(doc);
//System.out.println(" bytes=" + charsIndexed + " add: " + doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java Sun Nov 30 11:07:09 2014
@@ -4,9 +4,7 @@ import java.io.IOException;
import java.util.BitSet;
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.IndexWriter;
@@ -68,7 +66,7 @@ public class TestScorerPerf extends Luce
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
for (int i=0; i<nDocs; i++) {
- Document2 d = iw.newDocument();
+ Document d = iw.newDocument();
for (int j=0; j<nTerms; j++) {
if (random().nextInt(freq[j]) == 0) {
d.addAtom("f", terms[j].text());
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java Sun Nov 30 11:07:09 2014
@@ -23,15 +23,8 @@ import java.util.Arrays;
import java.util.List;
import java.util.Random;
-import org.apache.lucene.document.BinaryDocValuesField;
-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.FloatDocValuesField;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -133,7 +126,7 @@ public class TestSearchAfter extends Luc
int numDocs = atLeast(200);
Random r = random();
for (int i = 0; i < numDocs; i++) {
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
if (random().nextInt(5) != 4) {
doc.addLargeText("english", English.intToEnglish(i));
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-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;
@@ -56,7 +56,7 @@ public class TestSearchWithThreads exten
sb.append(random().nextBoolean() ? "aaa" : "bbb");
sb.append(' ');
}
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("body", sb.toString());
w.addDocument(doc);
sb.delete(0, sb.length());
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.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.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
@@ -56,10 +56,10 @@ public class TestSimilarity extends Luce
newIndexWriterConfig(new MockAnalyzer(random()))
.setSimilarity(new SimpleSimilarity()));
- Document2 d1 = writer.newDocument();
+ Document d1 = writer.newDocument();
d1.addLargeText("field", "a c");
- Document2 d2 = writer.newDocument();
+ Document d2 = writer.newDocument();
d2.addLargeText("field", "a b c");
writer.addDocument(d1);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java Sun Nov 30 11:07:09 2014
@@ -18,9 +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.document.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexWriterConfig;
@@ -49,7 +47,7 @@ public class TestSimilarityProvider exte
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random())).setSimilarity(sim);
RandomIndexWriter iw = new RandomIndexWriter(random(), directory, iwc);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("foo", "quick brown fox");
doc.addLargeText("bar", "quick brown fox");
iw.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Sun Nov 30 11:07:09 2014
@@ -22,12 +22,8 @@ import java.nio.file.Path;
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.document.FieldType;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -165,7 +161,7 @@ public class TestSloppyPhraseQuery exten
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.disableNorms("f");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("f", text);
w.addDocument(doc);
}
@@ -232,7 +228,7 @@ public class TestSloppyPhraseQuery exten
FieldTypes fieldTypes = iw.getFieldTypes();
fieldTypes.disableNorms("lyrics");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("lyrics", "drug drug");
iw.addDocument(doc);
@@ -271,7 +267,7 @@ public class TestSloppyPhraseQuery exten
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("lyrics", document);
iw.addDocument(doc);
IndexReader ir = iw.getReader();
@@ -324,7 +320,7 @@ public class TestSloppyPhraseQuery exten
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("lyrics", document);
iw.addDocument(doc);
IndexReader ir = iw.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSort.java Sun Nov 30 11:07:09 2014
@@ -19,21 +19,12 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.document.BinaryDocValuesField;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DoubleDocValuesField;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.FloatDocValuesField;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
/*
@@ -58,7 +49,7 @@ public class TestSort extends LuceneTest
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "foo");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -85,7 +76,7 @@ public class TestSort extends LuceneTest
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "bar");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -115,7 +106,7 @@ public class TestSort extends LuceneTest
fieldTypes.setDocValuesType("value", DocValuesType.BINARY);
fieldTypes.enableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "foo");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -145,7 +136,7 @@ public class TestSort extends LuceneTest
fieldTypes.setDocValuesType("value", DocValuesType.BINARY);
fieldTypes.enableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "bar");
writer.addDocument(doc);
@@ -172,7 +163,7 @@ public class TestSort extends LuceneTest
public void testStringValSorted() throws IOException {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "foo");
writer.addDocument(doc);
@@ -201,7 +192,7 @@ public class TestSort extends LuceneTest
public void testStringValReverseSorted() throws IOException {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "bar");
writer.addDocument(doc);
@@ -233,7 +224,7 @@ public class TestSort extends LuceneTest
FieldTypes fieldTypes = writer.getFieldTypes();
for(int value : new int[] {300000, -1, 4}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", value);
writer.addDocument(doc);
}
@@ -261,7 +252,7 @@ public class TestSort extends LuceneTest
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
for(int value : new int[] {300000, -1, 4}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", value);
writer.addDocument(doc);
}
@@ -290,7 +281,7 @@ public class TestSort extends LuceneTest
FieldTypes fieldTypes = writer.getFieldTypes();
writer.addDocument(writer.newDocument());
for(int value : new int[] {-1, 4}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", value);
writer.addDocument(doc);
}
@@ -320,7 +311,7 @@ public class TestSort extends LuceneTest
fieldTypes.setSortMissingLast("value");
writer.addDocument(writer.newDocument());
for(int value : new int[] {-1, 4}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", value);
writer.addDocument(doc);
}
@@ -347,7 +338,7 @@ public class TestSort extends LuceneTest
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
for(long value : new long[] {3000000000L, -1L, 4L}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLong("value", value);
writer.addDocument(doc);
}
@@ -374,7 +365,7 @@ public class TestSort extends LuceneTest
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
for(long value : new long[] {3000000000L, -1L, 4L}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLong("value", value);
writer.addDocument(doc);
}
@@ -402,7 +393,7 @@ public class TestSort extends LuceneTest
FieldTypes fieldTypes = writer.getFieldTypes();
writer.addDocument(writer.newDocument());
for(long value : new long[] {-1L, 4L}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLong("value", value);
writer.addDocument(doc);
}
@@ -432,7 +423,7 @@ public class TestSort extends LuceneTest
fieldTypes.setSortMissingLast("value");
writer.addDocument(writer.newDocument());
for(long value : new long[] {-1L, 4L}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLong("value", value);
writer.addDocument(doc);
}
@@ -459,7 +450,7 @@ public class TestSort extends LuceneTest
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
for(float value : new float[] {30.1F, -1.3F, 4.2F}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addFloat("value", value);
writer.addDocument(doc);
}
@@ -487,7 +478,7 @@ public class TestSort extends LuceneTest
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
for(float value : new float[] {30.1F, -1.3F, 4.2F}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addFloat("value", value);
writer.addDocument(doc);
}
@@ -516,7 +507,7 @@ public class TestSort extends LuceneTest
FieldTypes fieldTypes = writer.getFieldTypes();
writer.addDocument(writer.newDocument());
for(float value : new float[] {-1.3F, 4.2F}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addFloat("value", value);
writer.addDocument(doc);
}
@@ -547,7 +538,7 @@ public class TestSort extends LuceneTest
fieldTypes.setSortMissingLast("value");
writer.addDocument(writer.newDocument());
for(float value : new float[] {-1.3F, 4.2F}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addFloat("value", value);
writer.addDocument(doc);
}
@@ -576,7 +567,7 @@ public class TestSort extends LuceneTest
FieldTypes fieldTypes = writer.getFieldTypes();
for(double value : new double[] {30.1, -1.3, 4.2333333333333, 4.2333333333332}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", value);
writer.addDocument(doc);
}
@@ -604,7 +595,7 @@ public class TestSort extends LuceneTest
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
for(double value : new double[] {+0D, -0D}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", value);
writer.addDocument(doc);
}
@@ -632,7 +623,7 @@ public class TestSort extends LuceneTest
FieldTypes fieldTypes = writer.getFieldTypes();
for(double value : new double[] {30.1, -1.3, 4.2333333333333, 4.2333333333332}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", value);
writer.addDocument(doc);
}
@@ -661,7 +652,7 @@ public class TestSort extends LuceneTest
FieldTypes fieldTypes = writer.getFieldTypes();
writer.addDocument(writer.newDocument());
for(double value : new double[] {-1.3, 4.2333333333333, 4.2333333333332}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", value);
writer.addDocument(doc);
}
@@ -691,7 +682,7 @@ public class TestSort extends LuceneTest
FieldTypes fieldTypes = writer.getFieldTypes();
writer.addDocument(writer.newDocument());
for(double value : new double[] {-1.3, 4.2333333333333, 4.2333333333332}) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", value);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java Sun Nov 30 11:07:09 2014
@@ -26,11 +26,7 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.StoredField;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
@@ -73,7 +69,7 @@ public class TestSortRandom extends Luce
final List<BytesRef> docValues = new ArrayList<>();
// TODO: deletions
while (numDocs < NUM_DOCS) {
- final Document2 doc = writer.newDocument();
+ final Document doc = writer.newDocument();
// 10% of the time, the document is missing the value:
if (random().nextInt(10) != 7) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java Sun Nov 30 11:07:09 2014
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Comparator;
-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;
@@ -41,7 +41,7 @@ public class TestSortRescorer extends Lu
dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addUniqueAtom("id", "1");
doc.addLargeText("body", "some contents and more contents");
doc.addInt("popularity", 5);
@@ -114,7 +114,7 @@ public class TestSortRescorer extends Lu
final int[] idToNum = new int[numDocs];
int maxValue = TestUtil.nextInt(random(), 10, 1000000);
for(int i=0;i<numDocs;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueInt("id", i);
int numTokens = TestUtil.nextInt(random(), 1, 10);
StringBuilder b = new StringBuilder();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java Sun Nov 30 11:07:09 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-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.MultiReader;
@@ -68,7 +68,7 @@ public class TestSortedNumericSortField
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", 5);
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -98,7 +98,7 @@ public class TestSortedNumericSortField
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", 3);
doc.addInt("value", 7);
doc.addUniqueAtom("id", "1");
@@ -132,7 +132,7 @@ public class TestSortedNumericSortField
fieldTypes.enableSorting("value");
fieldTypes.setSortMissingFirst("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", 5);
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -167,7 +167,7 @@ public class TestSortedNumericSortField
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", 5);
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -201,7 +201,7 @@ public class TestSortedNumericSortField
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", 5);
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -231,7 +231,7 @@ public class TestSortedNumericSortField
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addFloat("value", -3f);
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -263,7 +263,7 @@ public class TestSortedNumericSortField
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", -3d);
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java Sun Nov 30 11:07:09 2014
@@ -17,11 +17,8 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-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.SortedSetDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
@@ -39,7 +36,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("foo"));
doc.addAtom("value", new BytesRef("bar"));
doc.addUniqueAtom("id", "1");
@@ -71,7 +68,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("foo"));
doc.addAtom("value", new BytesRef("bar"));
doc.addUniqueAtom("id", "1");
@@ -104,7 +101,7 @@ public class TestSortedSetSelector exten
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
fieldTypes.setSortMissingFirst("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", "1");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -143,7 +140,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", "1");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -182,7 +179,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("baz"));
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -212,7 +209,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("c"));
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -245,7 +242,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("a"));
doc.addAtom("value", new BytesRef("b"));
doc.addAtom("value", new BytesRef("c"));
@@ -278,7 +275,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", "3");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -318,7 +315,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", "3");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -358,7 +355,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("baz"));
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -388,7 +385,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("a"));
doc.addAtom("value", new BytesRef("b"));
doc.addAtom("value", new BytesRef("c"));
@@ -421,7 +418,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("b"));
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -454,7 +451,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", "3");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -494,7 +491,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", "3");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -534,7 +531,7 @@ public class TestSortedSetSelector exten
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("baz"));
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java Sun Nov 30 11:07:09 2014
@@ -17,11 +17,8 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-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.SortedSetDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -69,7 +66,7 @@ public class TestSortedSetSortField exte
public void testForward() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
doc.addAtom("value", new BytesRef("baz"));
@@ -100,7 +97,7 @@ public class TestSortedSetSortField exte
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("foo"));
doc.addAtom("value", new BytesRef("bar"));
doc.addUniqueAtom("id", "1");
@@ -131,7 +128,7 @@ public class TestSortedSetSortField exte
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
fieldTypes.setSortMissingFirst("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("baz"));
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -165,7 +162,7 @@ public class TestSortedSetSortField exte
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("baz"));
doc.addUniqueAtom("id", "2");
writer.addDocument(doc);
@@ -200,7 +197,7 @@ public class TestSortedSetSortField exte
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", new BytesRef("baz"));
doc.addUniqueAtom("id", "2");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Sun Nov 30 11:07:09 2014
@@ -44,7 +44,7 @@ public class TestSubScorerFreqs extends
// make sure we have more than one segment occationally
int num = atLeast(31);
for (int i = 0; i < num; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("f", "a b c d b c d c d d");
w.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java Sun Nov 30 11:07:09 2014
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat;
-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.IndexReader;
@@ -270,7 +270,7 @@ public class TestTermRangeQuery extends
}
private void insertDoc(IndexWriter writer, String content) throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "id" + docCount);
doc.addLargeText("content", content);
@@ -420,7 +420,7 @@ public class TestTermRangeQuery extends
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
for (String term : randomTerms) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", term);
w.addDocument(doc);
}
@@ -476,7 +476,7 @@ public class TestTermRangeQuery extends
IndexWriter w = new IndexWriter(dir, iwc);
for(int i=0;i<26;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
byte[] bytes = new byte[1];
bytes[0] = (byte) i;
doc.addAtom("field", new BytesRef(bytes));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java Sun Nov 30 11:07:09 2014
@@ -22,9 +22,7 @@ import java.util.ArrayList;
import java.util.List;
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.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -53,7 +51,7 @@ public class TestTermScorer extends Luce
.setMergePolicy(newLogMergePolicy())
.setSimilarity(new DefaultSimilarity()));
for (int i = 0; i < values.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(FIELD, values[i]);
writer.addDocument(doc);
}