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 [8/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/TestNoDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java Sun Nov 30 11:07:09 2014
@@ -23,9 +23,7 @@ import java.lang.reflect.Modifier;
import java.util.Arrays;
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.LuceneTestCase;
import org.junit.Test;
@@ -73,7 +71,7 @@ public class TestNoDeletionPolicy extend
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random()))
.setIndexDeletionPolicy(NoDeletionPolicy.INSTANCE));
for (int i = 0; i < 10; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("c", "a" + i);
writer.addDocument(doc);
writer.commit();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNorms.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNorms.java Sun Nov 30 11:07:09 2014
@@ -21,10 +21,7 @@ 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;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.search.similarities.DefaultSimilarity;
@@ -83,7 +80,7 @@ public class TestNorms extends LuceneTes
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", "");
doc.addLargeText("bar", "singleton");
writer.addDocument(doc);
@@ -113,7 +110,7 @@ public class TestNorms extends LuceneTes
NumericDocValues normValues = open.getNormValues(byteTestField);
assertNotNull(normValues);
for (int i = 0; i < open.maxDoc(); i++) {
- Document2 document = open.document(i);
+ Document document = open.document(i);
int expected = Integer.parseInt(document.getString(byteTestField));
assertEquals(expected, normValues.get(i));
}
@@ -134,7 +131,7 @@ public class TestNorms extends LuceneTes
final LineFileDocs docs = new LineFileDocs(writer.w, random);
int num = atLeast(100);
for (int i = 0; i < num; i++) {
- Document2 doc = docs.nextDoc();
+ Document doc = docs.nextDoc();
int boost = random().nextInt(255);
doc.addLargeText(byteTestField, "" + boost, boost);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java Sun Nov 30 11:07:09 2014
@@ -12,21 +12,13 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.asserting.AssertingCodec;
import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat;
-import org.apache.lucene.document.BinaryDocValuesField;
-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.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.search.FieldDoc;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TopFieldDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -35,7 +27,6 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.Nightly;
import org.apache.lucene.util.TestUtil;
import org.junit.Test;
import org.junit.Ignore;
@@ -61,8 +52,8 @@ import com.carrotsearch.randomizedtestin
@SuppressWarnings("resource")
public class TestNumericDocValuesUpdates extends LuceneTestCase {
- private Document2 doc(IndexWriter w, int id) {
- Document2 doc = w.newDocument();
+ private Document doc(IndexWriter w, int id) {
+ Document doc = w.newDocument();
doc.addAtom("id", "doc-" + id);
// make sure we don't set the doc's value to 0, to not confuse with a document that's missing values
doc.addInt("val", id + 1);
@@ -341,7 +332,7 @@ public class TestNumericDocValuesUpdates
fieldTypes.disableSorting("bdv");
for (int i = 0; i < 4; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("dvUpdateKey", "dv");
doc.addInt("ndv", i);
doc.addBinary("bdv", new BytesRef(Integer.toString(i)));
@@ -392,7 +383,7 @@ public class TestNumericDocValuesUpdates
IndexWriter writer = new IndexWriter(dir, conf);
for (int i = 0; i < 2; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("dvUpdateKey", "dv");
doc.addInt("ndv1", i);
doc.addInt("ndv2", i);
@@ -424,7 +415,7 @@ public class TestNumericDocValuesUpdates
IndexWriter writer = new IndexWriter(dir, conf);
for (int i = 0; i < 2; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("dvUpdateKey", "dv");
if (i == 0) { // index only one document with value
doc.addInt("ndv", 5);
@@ -456,7 +447,7 @@ public class TestNumericDocValuesUpdates
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dir, conf);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("key", "doc");
doc.addAtom("foo", "bar");
writer.addDocument(doc); // flushed document
@@ -495,7 +486,7 @@ public class TestNumericDocValuesUpdates
});
IndexWriter writer = new IndexWriter(dir, conf);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("key", "doc");
doc.addInt("ndv", 5);
doc.addShortText("sorted", "value");
@@ -527,7 +518,7 @@ public class TestNumericDocValuesUpdates
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dir, conf);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("key", "doc");
doc.addInt("ndv", 5);
writer.addDocument(doc); // flushed document
@@ -561,7 +552,7 @@ public class TestNumericDocValuesUpdates
for (int rnd = 0; rnd < numRounds; rnd++) {
int numDocs = atLeast(30);
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("key", "doc");
doc.addLong("ndv", -1);
doc.addUniqueInt("id", docid++);
@@ -590,7 +581,7 @@ public class TestNumericDocValuesUpdates
// forceMerge is called, the index will be with one segment and deletes
// and some MPs might now merge it, thereby invalidating test's
// assumption that the reader has no deletes).
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueInt("id", docid++);
doc.addAtom("key", "doc");
doc.addLong("ndv", value);
@@ -627,7 +618,7 @@ public class TestNumericDocValuesUpdates
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dir, conf);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("k1", "v1");
doc.addAtom("k2", "v2");
doc.addInt("ndv", 5);
@@ -680,7 +671,7 @@ public class TestNumericDocValuesUpdates
int numDocs = atLeast(5);
// System.out.println("[" + Thread.currentThread().getName() + "]: round=" + i + ", numDocs=" + numDocs);
for (int j = 0; j < numDocs; j++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "doc-" + docID);
doc.addAtom("key", "all"); // update key
// add all fields with their current value
@@ -756,7 +747,7 @@ public class TestNumericDocValuesUpdates
fieldTypes.disableExistsFilters();
// first segment with NDV
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "doc0");
doc.addInt("ndv", 3);
writer.addDocument(doc);
@@ -804,7 +795,7 @@ public class TestNumericDocValuesUpdates
}
// nocommit fixme LUCENE-6062
- @Ignore
+ // @Ignore
@Test
public void testUpdateSegmentWithNoDocValues2() throws Exception {
Directory dir = newDirectory();
@@ -816,22 +807,22 @@ public class TestNumericDocValuesUpdates
IndexWriter writer = new IndexWriter(dir, conf);
// first segment with NDV
- Document doc = new Document();
- doc.add(new StringField("id", "doc0", Store.NO));
- doc.add(new NumericDocValuesField("ndv", 3));
+ Document doc = writer.newDocument();
+ doc.addAtom("id", "doc0");
+ doc.addInt("ndv", 3);
writer.addDocument(doc);
- doc = new Document();
- doc.add(new StringField("id", "doc4", Store.NO)); // document without 'ndv' field
+ doc = writer.newDocument();
+ doc.addAtom("id", "doc4"); // document without 'ndv' field
writer.addDocument(doc);
writer.commit();
// second segment with no NDV, but another dv field "foo"
- doc = new Document();
- doc.add(new StringField("id", "doc1", Store.NO));
- doc.add(new NumericDocValuesField("foo", 3));
+ doc = writer.newDocument();
+ doc.addAtom("id", "doc1");
+ doc.addInt("foo", 3);
writer.addDocument(doc);
- doc = new Document();
- doc.add(new StringField("id", "doc2", Store.NO)); // document that isn't updated
+ doc = writer.newDocument();
+ doc.addAtom("id", "doc2"); // document that isn't updated
writer.addDocument(doc);
writer.commit();
@@ -902,7 +893,7 @@ public class TestNumericDocValuesUpdates
IndexWriter writer = new IndexWriter(dir, conf);
// first segment with NDV
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "doc0");
doc.addAtom("ndvmock", "mock-value");
doc.addInt("ndv", 5);
@@ -942,7 +933,7 @@ public class TestNumericDocValuesUpdates
IndexWriter writer = new IndexWriter(dir, conf);
// nocommit use low schema API
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("fmock", "mock-value");
doc.addInt("f", 5);
writer.addDocument(doc);
@@ -968,7 +959,7 @@ public class TestNumericDocValuesUpdates
final int numFields = TestUtil.nextInt(random(), 1, 4);
final int numDocs = atLeast(2000);
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "doc" + i);
double group = random().nextDouble();
String g;
@@ -1012,7 +1003,7 @@ public class TestNumericDocValuesUpdates
final String cf = "cf" + field;
// System.out.println("[" + Thread.currentThread().getName() + "] numUpdates=" + numUpdates + " updateTerm=" + t + " field=" + field);
long updValue = random.nextInt();
- Document2 update = writer.newDocument();
+ Document update = writer.newDocument();
update.disableExistsField();
update.addLong(f, updValue);
update.addLong(cf, updValue*2);
@@ -1100,7 +1091,7 @@ public class TestNumericDocValuesUpdates
IndexWriter writer = new IndexWriter(dir, conf);
final int numDocs = atLeast(10);
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "doc" + i);
long value = random().nextInt();
doc.addLong("f", value);
@@ -1113,7 +1104,7 @@ public class TestNumericDocValuesUpdates
int doc = random().nextInt(numDocs);
Term t = new Term("id", "doc" + doc);
long value = random().nextLong();
- Document2 update = writer.newDocument();
+ Document update = writer.newDocument();
update.disableExistsField();
update.addLong("f", value);
update.addLong("cf", value*2);
@@ -1145,7 +1136,7 @@ public class TestNumericDocValuesUpdates
}
});
IndexWriter writer = new IndexWriter(dir, conf);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "d0");
doc.addLong("f1", 5L);
doc.addLong("f2", 13L);
@@ -1197,7 +1188,7 @@ public class TestNumericDocValuesUpdates
// create first index
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", RandomPicks.randomFrom(random(), randomTerms));
doc.addLong("ndv", 4L);
doc.addLong("control", 8L);
@@ -1211,7 +1202,7 @@ public class TestNumericDocValuesUpdates
// update some docs to a random value
long value = random().nextInt();
Term term = new Term("id", RandomPicks.randomFrom(random(), randomTerms));
- Document2 update = writer.newDocument();
+ Document update = writer.newDocument();
update.disableExistsField();
update.addLong("ndv", value);
update.addLong("control", value*2);
@@ -1254,7 +1245,7 @@ public class TestNumericDocValuesUpdates
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dir, conf);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "d0");
doc.addLong("f1", 1L);
doc.addLong("f2", 1L);
@@ -1304,7 +1295,7 @@ public class TestNumericDocValuesUpdates
// build a large index with many NDV fields and update terms
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
int numUpdateTerms = TestUtil.nextInt(random, 1, numTerms / 10);
for (int j = 0; j < numUpdateTerms; j++) {
doc.addAtom("upd", RandomPicks.randomFrom(random, updateTerms));
@@ -1328,7 +1319,7 @@ public class TestNumericDocValuesUpdates
int field = random.nextInt(numNumericFields);
Term updateTerm = new Term("upd", RandomPicks.randomFrom(random, updateTerms));
long value = random.nextInt();
- Document2 update = writer.newDocument();
+ Document update = writer.newDocument();
update.disableExistsField();
update.addLong("f"+field, value);
update.addLong("cf"+field, value*2);
@@ -1362,7 +1353,7 @@ public class TestNumericDocValuesUpdates
fieldTypes.disableSorting("upd");
fieldTypes.setMultiValued("upd");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("upd", "t1");
doc.addAtom("upd", "t2");
doc.addLong("f1", 1L);
@@ -1389,7 +1380,7 @@ public class TestNumericDocValuesUpdates
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dir, conf);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "doc");
doc.addLong("f1", 1L);
writer.addDocument(doc);
@@ -1414,7 +1405,7 @@ public class TestNumericDocValuesUpdates
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dir, conf);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "doc");
doc.addLong("f1", 1L);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java Sun Nov 30 11:07:09 2014
@@ -21,15 +21,10 @@ 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;
-import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
public class TestOmitNorms extends LuceneTestCase {
// Tests whether the DocumentWriter correctly enable the
@@ -40,7 +35,7 @@ public class TestOmitNorms extends Lucen
IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(analyzer));
FieldTypes fieldTypes = writer.getFieldTypes();
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
// this field will have norms
d.addLargeText("f1", "This field has norms");
@@ -90,7 +85,7 @@ public class TestOmitNorms extends Lucen
);
FieldTypes fieldTypes = writer.getFieldTypes();
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
// this field will have norms
d.addLargeText("f1", "This field has norms");
@@ -144,7 +139,7 @@ public class TestOmitNorms extends Lucen
);
FieldTypes fieldTypes = writer.getFieldTypes();
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
// this field will have norms
d.addLargeText("f1", "This field has norms");
@@ -197,7 +192,7 @@ public class TestOmitNorms extends Lucen
lmp.setMergeFactor(2);
lmp.setNoCFSRatio(0.0);
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
fieldTypes.disableNorms("f1");
d.addLargeText("f1", "This field has no norms");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java Sun Nov 30 11:07:09 2014
@@ -17,17 +17,10 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-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.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -45,7 +38,7 @@ public class TestOmitPositions extends L
fieldTypes.disableHighlighting("foo");
fieldTypes.setIndexOptions("foo", IndexOptions.DOCS_AND_FREQS);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("foo", "this is a test test");
for (int i = 0; i < 100; i++) {
w.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java Sun Nov 30 11:07:09 2014
@@ -21,10 +21,8 @@ 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.FieldType;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.CollectionStatistics;
@@ -60,13 +58,6 @@ public class TestOmitTf extends LuceneTe
@Override public float scorePayload(int doc, int start, int end, BytesRef payload) { return 1.0f; }
}
- private static final FieldType omitType = new FieldType(TextField.TYPE_NOT_STORED);
- private static final FieldType normalType = new FieldType(TextField.TYPE_NOT_STORED);
-
- static {
- omitType.setIndexOptions(IndexOptions.DOCS);
- }
-
// Tests whether the DocumentWriter correctly enable the
// omitTermFreqAndPositions bit in the FieldInfo
public void testOmitTermFreqAndPositions() throws Exception {
@@ -74,7 +65,7 @@ public class TestOmitTf extends LuceneTe
Analyzer analyzer = new MockAnalyzer(random());
IndexWriter writer = new IndexWriter(ram, newIndexWriterConfig(analyzer));
FieldTypes fieldTypes = writer.getFieldTypes();
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
// this field will have Tf
d.addLargeText("f1", "This field has term freqs");
@@ -125,7 +116,7 @@ public class TestOmitTf extends LuceneTe
FieldTypes fieldTypes = writer.getFieldTypes();
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
// this field will have Tf
d.addLargeText("f1", "This field has term freqs");
@@ -179,7 +170,7 @@ public class TestOmitTf extends LuceneTe
setMaxBufferedDocs(10).
setMergePolicy(newLogMergePolicy(2))
);
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
FieldTypes fieldTypes = writer.getFieldTypes();
// this field will have Tf
@@ -236,7 +227,7 @@ public class TestOmitTf extends LuceneTe
LogMergePolicy lmp = (LogMergePolicy) writer.getConfig().getMergePolicy();
lmp.setMergeFactor(2);
lmp.setNoCFSRatio(0.0);
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableHighlighting("f1");
fieldTypes.setIndexOptions("f1", IndexOptions.DOCS);
@@ -286,7 +277,7 @@ public class TestOmitTf extends LuceneTe
fieldTypes.setIndexOptions("noTf", IndexOptions.DOCS);
String term = "term";
for(int i = 0; i<30; i++){
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
sb.append(term).append(" ");
String content = sb.toString();
d.addLargeText("noTf", content + (i%2==0 ? "" : " notf"));
@@ -456,7 +447,7 @@ public class TestOmitTf extends LuceneTe
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(new MockAnalyzer(random())));
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addAtom("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java Sun Nov 30 11:07:09 2014
@@ -22,16 +22,12 @@ import java.lang.reflect.Field;
import java.util.HashMap;
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.document.SortedDocValuesField;
-import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.MultiDocValues.MultiSortedDocValues;
import org.apache.lucene.index.MultiDocValues.MultiSortedSetDocValues;
import org.apache.lucene.index.MultiDocValues.OrdinalMap;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LongValues;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.RamUsageTester;
@@ -72,7 +68,7 @@ public class TestOrdinalMap extends Luce
final int maxDoc = TestUtil.nextInt(random(), 10, 1000);
final int maxTermLength = TestUtil.nextInt(random(), 1, 4);
for (int i = 0; i < maxDoc; ++i) {
- Document2 d = iw.newDocument();
+ Document d = iw.newDocument();
if (random().nextBoolean()) {
d.addShortText("sdv", TestUtil.randomSimpleString(random(), maxTermLength));
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java Sun Nov 30 11:07:09 2014
@@ -21,9 +21,7 @@ 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;
import org.apache.lucene.index.IndexReader.ReaderClosedListener;
import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanClause.Occur;
@@ -222,7 +220,7 @@ public class TestParallelCompositeReader
// one document only:
Directory dir2 = newDirectory();
IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(new MockAnalyzer(random())));
- Document2 d3 = w2.newDocument();
+ Document d3 = w2.newDocument();
d3.addLargeText("f3", "v1");
w2.addDocument(d3);
@@ -408,8 +406,8 @@ public class TestParallelCompositeReader
assertEquals(parallelHits.length, singleHits.length);
for(int i = 0; i < parallelHits.length; i++) {
assertEquals(parallelHits[i].score, singleHits[i].score, 0.001f);
- Document2 docParallel = parallel.doc(parallelHits[i].doc);
- Document2 docSingle = single.doc(singleHits[i].doc);
+ Document docParallel = parallel.doc(parallelHits[i].doc);
+ Document docSingle = single.doc(singleHits[i].doc);
assertEquals(docParallel.getString("f1"), docSingle.getString("f1"));
assertEquals(docParallel.getString("f2"), docSingle.getString("f2"));
assertEquals(docParallel.getString("f3"), docSingle.getString("f3"));
@@ -421,25 +419,25 @@ public class TestParallelCompositeReader
private IndexSearcher single(Random random, boolean compositeComposite) throws IOException {
dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random)));
- Document2 d1 = w.newDocument();
+ Document d1 = w.newDocument();
d1.addLargeText("f1", "v1");
d1.addLargeText("f2", "v1");
d1.addLargeText("f3", "v1");
d1.addLargeText("f4", "v1");
w.addDocument(d1);
- Document2 d2 = w.newDocument();
+ Document d2 = w.newDocument();
d2.addLargeText("f1", "v2");
d2.addLargeText("f2", "v2");
d2.addLargeText("f3", "v2");
d2.addLargeText("f4", "v2");
w.addDocument(d2);
- Document2 d3 = w.newDocument();
+ Document d3 = w.newDocument();
d3.addLargeText("f1", "v3");
d3.addLargeText("f2", "v3");
d3.addLargeText("f3", "v3");
d3.addLargeText("f4", "v3");
w.addDocument(d3);
- Document2 d4 = w.newDocument();
+ Document d4 = w.newDocument();
d4.addLargeText("f1", "v4");
d4.addLargeText("f2", "v4");
d4.addLargeText("f3", "v4");
@@ -481,21 +479,21 @@ public class TestParallelCompositeReader
Directory dir1 = newDirectory();
IndexWriter w1 = new IndexWriter(dir1, newIndexWriterConfig(new MockAnalyzer(random))
.setMergePolicy(NoMergePolicy.INSTANCE));
- Document2 d1 = w1.newDocument();
+ Document d1 = w1.newDocument();
d1.addLargeText("f1", "v1");
d1.addLargeText("f2", "v1");
w1.addDocument(d1);
w1.commit();
- Document2 d2 = w1.newDocument();
+ Document d2 = w1.newDocument();
d2.addLargeText("f1", "v2");
d2.addLargeText("f2", "v2");
w1.addDocument(d2);
- Document2 d3 = w1.newDocument();
+ Document d3 = w1.newDocument();
d3.addLargeText("f1", "v3");
d3.addLargeText("f2", "v3");
w1.addDocument(d3);
w1.commit();
- Document2 d4 = w1.newDocument();
+ Document d4 = w1.newDocument();
d4.addLargeText("f1", "v4");
d4.addLargeText("f2", "v4");
w1.addDocument(d4);
@@ -508,21 +506,21 @@ public class TestParallelCompositeReader
Directory dir2 = newDirectory();
IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(new MockAnalyzer(random))
.setMergePolicy(NoMergePolicy.INSTANCE));
- Document2 d1 = w2.newDocument();
+ Document d1 = w2.newDocument();
d1.addLargeText("f3", "v1");
d1.addLargeText("f4", "v1");
w2.addDocument(d1);
w2.commit();
- Document2 d2 = w2.newDocument();
+ Document d2 = w2.newDocument();
d2.addLargeText("f3", "v2");
d2.addLargeText("f4", "v2");
w2.addDocument(d2);
- Document2 d3 = w2.newDocument();
+ Document d3 = w2.newDocument();
d3.addLargeText("f3", "v3");
d3.addLargeText("f4", "v3");
w2.addDocument(d3);
w2.commit();
- Document2 d4 = w2.newDocument();
+ Document d4 = w2.newDocument();
d4.addLargeText("f3", "v4");
d4.addLargeText("f4", "v4");
w2.addDocument(d4);
@@ -535,21 +533,21 @@ public class TestParallelCompositeReader
Directory dir2 = newDirectory();
IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(new MockAnalyzer(random))
.setMergePolicy(NoMergePolicy.INSTANCE));
- Document2 d1 = w2.newDocument();
+ Document d1 = w2.newDocument();
d1.addLargeText("f3", "v1");
d1.addLargeText("f4", "v1");
w2.addDocument(d1);
w2.commit();
- Document2 d2 = w2.newDocument();
+ Document d2 = w2.newDocument();
d2.addLargeText("f3", "v2");
d2.addLargeText("f4", "v2");
w2.addDocument(d2);
w2.commit();
- Document2 d3 = w2.newDocument();
+ Document d3 = w2.newDocument();
d3.addLargeText("f3", "v3");
d3.addLargeText("f4", "v3");
w2.addDocument(d3);
- Document2 d4 = w2.newDocument();
+ Document d4 = w2.newDocument();
d4.addLargeText("f3", "v4");
d4.addLargeText("f4", "v4");
w2.addDocument(d4);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java Sun Nov 30 11:07:09 2014
@@ -21,9 +21,7 @@ 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;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.*;
import org.apache.lucene.search.BooleanClause.Occur;
@@ -147,7 +145,7 @@ public class TestParallelLeafReader exte
// one document only:
Directory dir2 = newDirectory();
IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(new MockAnalyzer(random())));
- Document2 d3 = w2.newDocument();
+ Document d3 = w2.newDocument();
d3.addLargeText("f3", "v1");
w2.addDocument(d3);
@@ -251,8 +249,8 @@ public class TestParallelLeafReader exte
assertEquals(parallelHits.length, singleHits.length);
for(int i = 0; i < parallelHits.length; i++) {
assertEquals(parallelHits[i].score, singleHits[i].score, 0.001f);
- Document2 docParallel = parallel.doc(parallelHits[i].doc);
- Document2 docSingle = single.doc(singleHits[i].doc);
+ Document docParallel = parallel.doc(parallelHits[i].doc);
+ Document docSingle = single.doc(singleHits[i].doc);
assertEquals(docParallel.getString("f1"), docSingle.getString("f1"));
assertEquals(docParallel.getString("f2"), docSingle.getString("f2"));
assertEquals(docParallel.getString("f3"), docSingle.getString("f3"));
@@ -264,13 +262,13 @@ public class TestParallelLeafReader exte
private IndexSearcher single(Random random) throws IOException {
dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random)));
- Document2 d1 = w.newDocument();
+ Document d1 = w.newDocument();
d1.addShortText("f1", "v1");
d1.addShortText("f2", "v1");
d1.addShortText("f3", "v1");
d1.addShortText("f4", "v1");
w.addDocument(d1);
- Document2 d2 = w.newDocument();
+ Document d2 = w.newDocument();
d2.addShortText("f1", "v2");
d2.addShortText("f2", "v2");
d2.addShortText("f3", "v2");
@@ -299,11 +297,11 @@ public class TestParallelLeafReader exte
FieldTypes fieldTypes = w1.getFieldTypes();
fieldTypes.disableExistsFilters();
- Document2 d1 = w1.newDocument();
+ Document d1 = w1.newDocument();
d1.addShortText("f1", "v1");
d1.addShortText("f2", "v1");
w1.addDocument(d1);
- Document2 d2 = w1.newDocument();
+ Document d2 = w1.newDocument();
d2.addShortText("f1", "v2");
d2.addShortText("f2", "v2");
w1.addDocument(d2);
@@ -316,11 +314,11 @@ public class TestParallelLeafReader exte
IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(new MockAnalyzer(random)));
FieldTypes fieldTypes = w2.getFieldTypes();
fieldTypes.disableExistsFilters();
- Document2 d3 = w2.newDocument();
+ Document d3 = w2.newDocument();
d3.addShortText("f3", "v1");
d3.addShortText("f4", "v1");
w2.addDocument(d3);
- Document2 d4 = w2.newDocument();
+ Document d4 = w2.newDocument();
d4.addShortText("f3", "v2");
d4.addShortText("f4", "v2");
w2.addDocument(d4);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.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.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -95,7 +91,7 @@ public class TestParallelReaderEmptyInde
FieldTypes fieldTypes = iw.getFieldTypes();
fieldTypes.enableTermVectors("test");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("test", "");
doc.addUniqueInt("id", 1);
iw.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java Sun Nov 30 11:07:09 2014
@@ -21,9 +21,7 @@ import java.io.IOException;
import java.util.Iterator;
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.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
@@ -41,7 +39,7 @@ public class TestParallelTermEnum extend
@Override
public void setUp() throws Exception {
super.setUp();
- Document2 doc;
+ Document doc;
rd1 = newDirectory();
IndexWriter iw1 = new IndexWriter(rd1, newIndexWriterConfig(new MockAnalyzer(random())));
FieldTypes fieldTypes = iw1.getFieldTypes();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java Sun Nov 30 11:07:09 2014
@@ -29,11 +29,8 @@ import java.util.Map;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-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.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
@@ -66,7 +63,7 @@ public class TestPayloads extends Lucene
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("f2");
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
// this field won't have any payloads
d.addLargeText("f1", "This field has no payloads");
@@ -151,7 +148,7 @@ public class TestPayloads extends Lucene
int payloadDataLength = numTerms * numDocs * 2 + numTerms * numDocs * (numDocs - 1) / 2;
byte[] payloadData = generateRandomData(payloadDataLength);
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText(fieldName, content);
// add the same document multiple times to have the same payload lengths for all
// occurrences within two consecutive skip intervals
@@ -458,7 +455,7 @@ public class TestPayloads extends Lucene
public void run() {
try {
for (int j = 0; j < numDocs; j++) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText(field, new PoolingPayloadTokenStream(pool));
writer.addDocument(d);
}
@@ -559,7 +556,7 @@ public class TestPayloads extends Lucene
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
new MockAnalyzer(random(), MockTokenizer.WHITESPACE, true));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("hasMaybepayload", "here we go");
writer.addDocument(doc);
writer.close();
@@ -582,7 +579,7 @@ public class TestPayloads extends Lucene
IndexWriterConfig iwc = newIndexWriterConfig(null);
iwc.setMergePolicy(newLogMergePolicy());
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, iwc);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
TokenStream ts = new MockTokenizer(MockTokenizer.WHITESPACE, true);
((Tokenizer) ts).setReader(new StringReader("here we go"));
doc.addLargeText("field", ts);
@@ -616,7 +613,7 @@ public class TestPayloads extends Lucene
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("field");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
TokenStream ts = new MockTokenizer(MockTokenizer.WHITESPACE, true);
((Tokenizer)ts).setReader(new StringReader("here we go"));
doc.addLargeText("field", ts);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java Sun Nov 30 11:07:09 2014
@@ -26,12 +26,8 @@ import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-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.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -52,7 +48,7 @@ public class TestPayloadsOnVectors exten
fieldTypes.enableTermVectorOffsets("field");
}
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
TokenStream ts = new MockTokenizer(MockTokenizer.WHITESPACE, true);
((Tokenizer)ts).setReader(new StringReader("here we go"));
doc.addLargeText("field", ts);
@@ -91,7 +87,6 @@ public class TestPayloadsOnVectors exten
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.enableTermVectors("field");
fieldTypes.enableTermVectorPositions("field");
@@ -102,7 +97,7 @@ public class TestPayloadsOnVectors exten
fieldTypes.setMultiValued("field");
TokenStream ts = new MockTokenizer(MockTokenizer.WHITESPACE, true);
((Tokenizer)ts).setReader(new StringReader("here we go"));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", ts);
Token withPayload = new Token("withPayload", 0, 11);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java Sun Nov 30 11:07:09 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.index;
import java.io.IOException;
-import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Sun Nov 30 11:07:09 2014
@@ -30,14 +30,8 @@ import org.apache.lucene.analysis.MockPa
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Token;
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.NumericDocValuesField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -64,7 +58,7 @@ public class TestPostingsOffsets extends
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
FieldTypes fieldTypes = w.getFieldTypes();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
if (random().nextBoolean()) {
fieldTypes.enableTermVectors("content");
@@ -153,7 +147,7 @@ public class TestPostingsOffsets extends
int numDocs = atLeast(500);
for (int i = 0; i < numDocs; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("numbers", English.intToEnglish(i));
doc.addLargeText("oddeven", (i % 2) == 0 ? "even" : "odd");
doc.addAtom("id", "" + i);
@@ -239,8 +233,6 @@ public class TestPostingsOffsets extends
final int numDocs = atLeast(20);
//final int numDocs = atLeast(5);
- FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
-
// TODO: randomize what IndexOptions we use; also test
// changing this up in one IW buffered segment...:
if (random().nextBoolean()) {
@@ -254,7 +246,7 @@ public class TestPostingsOffsets extends
}
for(int docCount=0;docCount<numDocs;docCount++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("id", docCount);
List<Token> tokens = new ArrayList<>();
final int numTokens = atLeast(100);
@@ -376,7 +368,7 @@ public class TestPostingsOffsets extends
fieldTypes.enableTermVectorOffsets("content3");
fieldTypes.setMultiValued("content3");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("content3", "here is more content with aaa aaa aaa");
doc.addLargeText("content3", "here is more content with aaa aaa aaa");
iw.addDocument(doc);
@@ -453,7 +445,7 @@ public class TestPostingsOffsets extends
};
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(analyzer));
// add good document
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
iw.addDocument(doc);
try {
doc.addLargeText("foo", "bar");
@@ -473,7 +465,7 @@ public class TestPostingsOffsets extends
public void testLegalbutVeryLargeOffsets() throws Exception {
Directory dir = newDirectory();
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(null));
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
Token t1 = new Token("foo", 0, Integer.MAX_VALUE-500);
if (random().nextBoolean()) {
t1.setPayload(new BytesRef("test"));
@@ -506,7 +498,7 @@ public class TestPostingsOffsets extends
fieldTypes.enableTermVectorPositions("body");
fieldTypes.enableTermVectorOffsets("body");
- Document2 doc = riw.newDocument();
+ Document doc = riw.newDocument();
doc.addLargeText("body", new CannedTokenStream(field1));
doc.addLargeText("body", new CannedTokenStream(field2));
riw.addDocument(doc);
@@ -532,7 +524,7 @@ public class TestPostingsOffsets extends
fieldTypes.enableTermVectorPositions("body");
fieldTypes.enableTermVectorOffsets("body");
- Document2 doc = riw.newDocument();
+ Document doc = riw.newDocument();
doc.addLargeText("body", new CannedTokenStream(tokens));
riw.addDocument(doc);
riw.close();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java Sun Nov 30 11:07:09 2014
@@ -22,9 +22,7 @@ import java.util.concurrent.RejectedExec
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.IndexSearcher;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.store.AlreadyClosedException;
@@ -48,7 +46,7 @@ public class TestReaderClosed extends Lu
// but for preflex codec, the test can be very slow, so use less iterations.
int num = atLeast(10);
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/index/TestRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestRollback.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestRollback.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestRollback.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.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -31,7 +29,7 @@ public class TestRollback extends Lucene
Directory dir = newDirectory();
RandomIndexWriter rw = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 5; i++) {
- Document2 doc = rw.newDocument();
+ Document doc = rw.newDocument();
doc.addAtom("pk", Integer.toString(i));
rw.addDocument(doc);
}
@@ -43,7 +41,7 @@ public class TestRollback extends Lucene
.setOpenMode(IndexWriterConfig.OpenMode.APPEND));
for (int i = 0; i < 3; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
String value = Integer.toString(i);
doc.addAtom("pk", value);
doc.addAtom("text", "foo");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java Sun Nov 30 11:07:09 2014
@@ -64,7 +64,7 @@ public class TestRollingUpdates extends
int updateCount = 0;
// TODO: sometimes update ids not in order...
for(int docIter=0;docIter<numUpdates;docIter++) {
- final Document2 doc = w.newDocument();
+ final Document doc = w.newDocument();
final String myID = Integer.toString(id);
if (id == SIZE-1) {
id = 0;
@@ -201,7 +201,7 @@ public class TestRollingUpdates extends
try {
DirectoryReader open = null;
for (int i = 0; i < num; i++) {
- Document2 doc = writer.newDocument();// docs.nextDoc();
+ Document doc = writer.newDocument();// docs.nextDoc();
doc.addAtom("id", "test");
writer.updateDocument(new Term("id", "test"), doc);
if (random().nextInt(3) == 0) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java Sun Nov 30 11:07:09 2014
@@ -23,9 +23,7 @@ import org.apache.lucene.analysis.TokenS
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.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -38,7 +36,7 @@ public class TestSameTokenSamePosition e
public void test() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter riw = new RandomIndexWriter(random(), dir);
- Document2 doc = riw.newDocument();
+ Document doc = riw.newDocument();
doc.addLargeText("eng", new BugReproTokenStream());
riw.addDocument(doc);
riw.close();
@@ -52,7 +50,7 @@ public class TestSameTokenSamePosition e
Directory dir = newDirectory();
RandomIndexWriter riw = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 100; i++) {
- Document2 doc = riw.newDocument();
+ Document doc = riw.newDocument();
doc.addLargeText("eng", new BugReproTokenStream());
riw.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java Sun Nov 30 11:07:09 2014
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.DocIdSetIterator;
@@ -97,14 +96,14 @@ public class TestSegmentMerger extends L
newIOContext(random()));
assertTrue(mergedReader != null);
assertTrue(mergedReader.numDocs() == 2);
- Document2 newDoc1 = mergedReader.document(0);
+ Document newDoc1 = mergedReader.document(0);
assertTrue(newDoc1 != null);
Set<String> unstored = DocHelper.getUnstored(fieldTypes);
//There are 2 unstored fields on the document
assertEquals(DocHelper.numFields() - unstored.size() + 1, DocHelper.numFields(newDoc1));
- Document2 newDoc2 = mergedReader.document(1);
+ Document newDoc2 = mergedReader.document(1);
assertTrue(newDoc2 != null);
assertEquals(DocHelper.numFields() - unstored.size() + 1, DocHelper.numFields(newDoc2));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java Sun Nov 30 11:07:09 2014
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Set;
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.search.DocIdSetIterator;
@@ -65,7 +64,7 @@ public class TestSegmentReader extends L
public void testDocument() throws IOException {
assertTrue(reader.numDocs() == 1);
assertTrue(reader.maxDoc() >= 1);
- Document2 result = reader.document(0);
+ Document result = reader.document(0);
assertTrue(result != null);
//There are 2 unstored fields on the document that are not preserved across writing
assertEquals(DocHelper.numFields() - DocHelper.getUnstored(fieldTypes).size() + 1, DocHelper.numFields(result));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Sun Nov 30 11:07:09 2014
@@ -20,9 +20,7 @@ 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.FieldTypes;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
@@ -259,7 +257,7 @@ public class TestSegmentTermDocs extends
private void addDoc(IndexWriter writer, String value) throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", value);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Sun Nov 30 11:07:09 2014
@@ -20,9 +20,7 @@ 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.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -135,7 +133,7 @@ public class TestSegmentTermEnum extends
}
private void addDoc(IndexWriter writer, String value) throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", value);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java Sun Nov 30 11:07:09 2014
@@ -19,11 +19,8 @@ package org.apache.lucene.index;
import java.io.IOException;
-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.store.Directory;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.LuceneTestCase;
@@ -36,7 +33,7 @@ public class TestSizeBoundedForceMerge e
private void addDocs(IndexWriter writer, int numDocs, boolean withID) throws IOException {
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
if (withID) {
doc.addUniqueInt("id", i);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java Sun Nov 30 11:07:09 2014
@@ -24,11 +24,8 @@ import java.util.List;
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.FieldType;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -133,7 +130,7 @@ public class TestSnapshotDeletionPolicy
final Thread t = new Thread() {
@Override
public void run() {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", "aaa");
do {
for(int i=0;i<27;i++) {
@@ -174,7 +171,7 @@ public class TestSnapshotDeletionPolicy
// Add one more document to force writer to commit a
// final segment, so deletion policy has a chance to
// delete again:
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", "aaa");
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java Sun Nov 30 11:07:09 2014
@@ -41,7 +41,7 @@ public class TestStressAdvance extends L
System.out.println("\nTEST: numDocs=" + num);
}
for(int id=0;id<num;id++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
if (random().nextInt(4) == 3) {
doc.addAtom("field", "a");
aDocs.add(id);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java Sun Nov 30 11:07:09 2014
@@ -21,12 +21,9 @@ import java.util.concurrent.ConcurrentHa
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.document.Field;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -63,7 +60,7 @@ public class TestStressDeletes extends L
synchronized (locks[id]) {
Boolean v = exists.get(id);
if (v == null || v.booleanValue() == false) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueInt("id", id);
w.addDocument(doc);
exists.put(id, true);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java Sun Nov 30 11:07:09 2014
@@ -78,7 +78,7 @@ public class TestStressIndexing extends
// Add 10 docs:
for(int j=0; j<10; j++) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
int n = random().nextInt();
d.addInt("id", nextID++);
d.addLargeText("contents", English.intToEnglish(n));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java Sun Nov 30 11:07:09 2014
@@ -25,14 +25,11 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
+import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-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.LowSchemaField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.TermQuery;
@@ -282,7 +279,7 @@ public class TestStressIndexing2 extends
Bits liveDocs = sub.getLiveDocs();
System.out.println(" " + ((SegmentReader) sub).getSegmentInfo());
for(int docID=0;docID<sub.maxDoc();docID++) {
- Document2 doc = sub.document(docID);
+ Document doc = sub.document(docID);
if (liveDocs == null || liveDocs.get(docID)) {
System.out.println(" docID=" + docID + " id:" + doc.getString("id"));
} else {
@@ -569,7 +566,7 @@ public class TestStressIndexing2 extends
}
}
- public static void verifyEquals(Document2 d1, Document2 d2) {
+ public static void verifyEquals(Document d1, Document d2) {
List<IndexableField> ff1 = d1.getFields();
List<IndexableField> ff2 = d2.getFields();
@@ -785,11 +782,11 @@ public class TestStressIndexing2 extends
}
}
- public void indexDoc() throws IOException {
+ public void indexDoc(Analyzer a) throws IOException {
List<LowSchemaField> fields = new ArrayList<>();
String idString = getIdString();
- LowSchemaField idField = new LowSchemaField("id", idString, IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, false);
+ LowSchemaField idField = new LowSchemaField(a, "id", idString, IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, false);
idField.disableNorms();
fields.add(idField);
@@ -799,27 +796,26 @@ public class TestStressIndexing2 extends
for (int i=0; i<nFields; i++) {
String fieldName = "f" + nextInt(100);
- FieldType customType;
LowSchemaField field;
switch (nextInt(4)) {
case 0:
- field = new LowSchemaField(fieldName, getString(1), IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, true);
+ field = new LowSchemaField(a, fieldName, getString(1), IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, true);
field.disableNorms();
setTermVectors(field, prevField);
break;
case 1:
- field = new LowSchemaField(fieldName, getString(0), IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, true);
+ field = new LowSchemaField(a, fieldName, getString(0), IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, true);
field.doNotStore();
setTermVectors(field, prevField);
break;
case 2:
- field = new LowSchemaField(fieldName, getString(0), IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, true);
+ field = new LowSchemaField(a, fieldName, getString(0), IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, true);
// no term vectors
break;
case 3:
- field = new LowSchemaField(fieldName, getString(0), IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, true);
+ field = new LowSchemaField(a, fieldName, getString(0), IndexOptions.DOCS_AND_FREQS_AND_POSITIONS, true);
setTermVectors(field, prevField);
break;
}
@@ -860,6 +856,7 @@ public class TestStressIndexing2 extends
@Override
public void run() {
+ Analyzer a = new MockAnalyzer(random());
try {
r = new Random(base+range+seed);
for (int i=0; i<iterations; i++) {
@@ -869,7 +866,7 @@ public class TestStressIndexing2 extends
} else if (what < 10) {
deleteByQuery();
} else {
- indexDoc();
+ indexDoc(a);
}
}
} catch (Throwable e) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java Sun Nov 30 11:07:09 2014
@@ -27,10 +27,7 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicLong;
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.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
@@ -83,9 +80,6 @@ public class TestStressNRT extends Lucen
final int nReadThreads = TestUtil.nextInt(random(), 1, TEST_NIGHTLY ? 10 : 5);
initModel(ndocs);
- final FieldType storedOnlyType = new FieldType();
- storedOnlyType.setStored(true);
-
if (VERBOSE) {
System.out.println("\n");
System.out.println("TEST: commitPercent=" + commitPercent);
@@ -232,7 +226,7 @@ public class TestStressNRT extends Lucen
// add tombstone first
if (tombstones) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addAtom("id", "-"+Integer.toString(id));
d.addStored(field, Long.toString(nextVal));
writer.updateDocument(new Term("id", "-"+Integer.toString(id)), d);
@@ -248,7 +242,7 @@ public class TestStressNRT extends Lucen
// add tombstone first
if (tombstones) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addAtom("id", "-"+Integer.toString(id));
d.addStored(field, Long.toString(nextVal));
writer.updateDocument(new Term("id", "-"+Integer.toString(id)), d);
@@ -261,7 +255,7 @@ public class TestStressNRT extends Lucen
model.put(id, -nextVal);
} else {
// assertU(adoc("id",Integer.toString(id), field, Long.toString(nextVal)));
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addAtom("id", Integer.toString(id));
d.addStored(field, Long.toString(nextVal));
if (VERBOSE) {
@@ -357,12 +351,12 @@ public class TestStressNRT extends Lucen
if (results.totalHits != 1) {
System.out.println("FAIL: hits id:" + id + " val=" + val);
for(ScoreDoc sd : results.scoreDocs) {
- final Document2 doc = r.document(sd.doc);
+ final Document doc = r.document(sd.doc);
System.out.println(" docID=" + sd.doc + " id:" + doc.get("id") + " foundVal=" + doc.getString(field));
}
fail("id=" + id + " reader=" + r + " totalHits=" + results.totalHits);
}
- Document2 doc = searcher.doc(results.scoreDocs[0].doc);
+ Document doc = searcher.doc(results.scoreDocs[0].doc);
long foundVal = Long.parseLong(doc.getString(field));
if (foundVal < Math.abs(val)) {
fail("foundVal=" + foundVal + " val=" + val + " id=" + id + " reader=" + r);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java Sun Nov 30 11:07:09 2014
@@ -17,9 +17,7 @@ package org.apache.lucene.index;
* 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.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -39,7 +37,7 @@ public class TestSumDocFreq extends Luce
FieldTypes fieldTypes = writer.getFieldTypes();
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueInt("id", i);
char ch1 = (char) TestUtil.nextInt(random(), 'a', 'z');
char ch2 = (char) TestUtil.nextInt(random(), 'a', 'z');
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Sun Nov 30 11:07:09 2014
@@ -26,13 +26,8 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.TermVectorsReader;
-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.TextField;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -109,7 +104,7 @@ public class TestTermVectorsReader exten
}
}
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
for(int i=0;i<testFields.length;i++) {
// nocommit shouldn't it be testTerms[i] not ""?
doc.addLargeText(testFields[i], "");
@@ -379,7 +374,7 @@ public class TestTermVectorsReader exten
}
fieldTypes.enableTermVectors("field4");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
try {
doc.addStored("field4", "foo");
w.addDocument(doc);