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 [16/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/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java (original)
+++ lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java Sun Nov 30 11:07:09 2014
@@ -23,11 +23,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.IndexReader;
@@ -71,7 +68,7 @@ public class TestFieldCacheSort extends
fieldTypes.setDocValuesType("value", DocValuesType.NONE);
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "foo");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -111,7 +108,7 @@ public class TestFieldCacheSort extends
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addAtom("value", "foo");
@@ -152,7 +149,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "bar");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -192,7 +189,7 @@ public class TestFieldCacheSort extends
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addAtom("value", "foo");
@@ -236,7 +233,7 @@ public class TestFieldCacheSort extends
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addAtom("value", "foo");
@@ -280,7 +277,7 @@ public class TestFieldCacheSort extends
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addAtom("value", "foo");
@@ -324,7 +321,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addAtom("value", "foo");
@@ -359,7 +356,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "foo");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -388,7 +385,7 @@ public class TestFieldCacheSort extends
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "foo");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -414,7 +411,7 @@ public class TestFieldCacheSort extends
public void testFieldScore() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("value", "foo bar bar bar bar");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -444,7 +441,7 @@ public class TestFieldCacheSort extends
public void testFieldScoreReverse() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("value", "foo bar bar bar bar");
writer.addDocument(doc);
doc = writer.newDocument();
@@ -475,7 +472,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", 300000);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -508,7 +505,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addInt("value", -1);
@@ -540,7 +537,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addInt("value", -1);
@@ -574,7 +571,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", 300000);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -607,7 +604,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLong("value", 3000000000L);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -640,7 +637,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addLong("value", -1);
@@ -672,7 +669,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addLong("value", -1);
@@ -706,7 +703,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLong("value", 3000000000L);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -739,7 +736,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addFloat("value", 30.1f);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -772,7 +769,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addFloat("value", -1.3f);
@@ -803,7 +800,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addFloat("value", -1.3f);
@@ -837,7 +834,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addFloat("value", 30.1f);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -870,7 +867,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", 30.1);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -907,7 +904,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", +0d);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -942,7 +939,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addDouble("value", -1.3);
@@ -978,7 +975,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
writer.addDocument(doc);
doc = writer.newDocument();
doc.addDouble("value", -1.3);
@@ -1016,7 +1013,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("value", 30.1);
writer.addDocument(doc);
doc = writer.newDocument();
@@ -1053,7 +1050,7 @@ public class TestFieldCacheSort extends
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.disableSorting("f");
fieldTypes.disableSorting("t");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("f", "");
doc.addAtom("t", "1");
w.addDocument(doc);
@@ -1084,7 +1081,7 @@ public class TestFieldCacheSort extends
fieldTypes.setMultiValued("string");
fieldTypes.disableSorting("string");
for(int i=0; i<5; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("string", "a"+i);
doc.addAtom("string", "b"+i);
writer.addDocument(doc);
@@ -1112,7 +1109,7 @@ public class TestFieldCacheSort extends
int id = 0;
for(int seg=0;seg<2;seg++) {
for(int docIDX=0;docIDX<10;docIDX++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("id", docIDX);
StringBuilder sb = new StringBuilder();
for(int i=0;i<id;i++) {
@@ -1177,7 +1174,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "foo");
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
@@ -1201,7 +1198,7 @@ public class TestFieldCacheSort extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("value", "foo");
writer.addDocument(doc);
IndexReader ir = UninvertingReader.wrap(writer.getReader(),
@@ -1229,7 +1226,7 @@ public class TestFieldCacheSort extends
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.disableSorting("value");
fieldTypes.disableSorting("tievalue");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("tievalue", "tied");
doc.addAtom("value", "foo");
writer.addDocument(doc);
@@ -1262,7 +1259,7 @@ public class TestFieldCacheSort extends
public void testScore() 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);
doc = writer.newDocument();
Modified: lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java (original)
+++ lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java Sun Nov 30 11:07:09 2014
@@ -28,11 +28,8 @@ import java.util.Map;
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.Field;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
@@ -90,7 +87,7 @@ public class TestFieldCacheSortRandom ex
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:
final BytesRef br;
Modified: lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java (original)
+++ lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java Sun Nov 30 11:07:09 2014
@@ -24,15 +24,8 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-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.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValues;
@@ -161,7 +154,7 @@ public class TestFieldCacheVsDocValues e
byte[] bytes = new byte[numBytes];
random().nextBytes(bytes);
docBytes.add(bytes);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
BytesRef b = new BytesRef(bytes);
b.length = bytes.length;
doc.addBinary("field", b);
@@ -204,7 +197,7 @@ public class TestFieldCacheVsDocValues e
BinaryDocValues s = FieldCache.DEFAULT.getTerms(ar, "field", false);
for(int docID=0;docID<docBytes.size();docID++) {
- Document2 doc = ar.document(docID);
+ Document doc = ar.document(docID);
BytesRef bytes = s.get(docID);
byte[] expected = docBytes.get(Integer.parseInt(doc.getString("id")));
assertEquals(expected.length, bytes.length);
@@ -265,7 +258,7 @@ public class TestFieldCacheVsDocValues e
byte[] bytes = new byte[numBytes];
random().nextBytes(bytes);
docBytes.add(bytes);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
BytesRef b = new BytesRef(bytes);
b.length = bytes.length;
doc.addBinary("field", b);
@@ -280,7 +273,7 @@ public class TestFieldCacheVsDocValues e
BinaryDocValues s = FieldCache.DEFAULT.getTerms(ar, "field", false);
for(int docID=0;docID<docBytes.size();docID++) {
- Document2 doc = ar.document(docID);
+ Document doc = ar.document(docID);
BytesRef bytes = s.get(docID);
byte[] expected = docBytes.get(Integer.parseInt(doc.getString("id")));
assertEquals(expected.length, bytes.length);
@@ -299,7 +292,7 @@ public class TestFieldCacheVsDocValues e
// index some docs
int numDocs = atLeast(300);
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", Integer.toString(i));
final int length;
if (minLength == maxLength) {
@@ -340,11 +333,14 @@ public class TestFieldCacheVsDocValues e
Directory dir = newDirectory();
IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()));
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, conf);
-
+ FieldTypes fieldTypes = writer.getFieldTypes();
+ fieldTypes.setMultiValued("dv");
+ fieldTypes.setMultiValued("indexed");
+
// index some docs
int numDocs = atLeast(300);
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", Integer.toString(i));
final int length = TestUtil.nextInt(random(), minLength, maxLength);
int numValues = random().nextInt(17);
@@ -361,14 +357,14 @@ public class TestFieldCacheVsDocValues e
ArrayList<String> unordered = new ArrayList<>(values);
Collections.shuffle(unordered, random());
for (String v : values) {
- doc.add(newStringField("indexed", v, Field.Store.NO));
+ doc.addAtom("indexed", v);
}
// add in any order to the dv field
ArrayList<String> unordered2 = new ArrayList<>(values);
Collections.shuffle(unordered2, random());
for (String v : unordered2) {
- doc.add(new SortedSetDocValuesField("dv", new BytesRef(v)));
+ doc.addAtom("dv", new BytesRef(v));
}
writer.addDocument(doc);
@@ -420,7 +416,7 @@ public class TestFieldCacheVsDocValues e
assert numDocs > 256;
for (int i = 0; i < numDocs; i++) {
long value = longs.next();
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", Integer.toString(i));
// 1/4 of the time we neglect to add the fields
if (random().nextInt(4) > 0) {
@@ -632,6 +628,6 @@ public class TestFieldCacheVsDocValues e
protected boolean codecAcceptsHugeBinaryValues(String field) {
String name = TestUtil.getDocValuesFormat(field);
- return !(name.equals("Memory") || name.equals("Direct"));
+ return !(name.equals("Memory")); // Direct has a different type of limit
}
}
Modified: lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java (original)
+++ lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java Sun Nov 30 11:07:09 2014
@@ -26,15 +26,13 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SortedDocValues;
@@ -48,20 +46,21 @@ public class TestFieldCacheWithThreads e
public void test() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
-
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableSorting("bytes");
final List<Long> numbers = new ArrayList<>();
final List<BytesRef> binary = new ArrayList<>();
final List<BytesRef> sorted = new ArrayList<>();
final int numDocs = atLeast(100);
for(int i=0;i<numDocs;i++) {
- Document d = new Document();
+ Document d = w.newDocument();
long number = random().nextLong();
- d.add(new NumericDocValuesField("number", number));
+ d.addLong("number", number);
BytesRef bytes = new BytesRef(TestUtil.randomRealisticUnicodeString(random()));
- d.add(new BinaryDocValuesField("bytes", bytes));
+ d.addBinary("bytes", bytes);
binary.add(bytes);
bytes = new BytesRef(TestUtil.randomRealisticUnicodeString(random()));
- d.add(new SortedDocValuesField("sorted", bytes));
+ d.addBinary("sorted", bytes);
sorted.add(bytes);
w.addDocument(d);
numbers.add(number);
@@ -164,9 +163,9 @@ public class TestFieldCacheWithThreads e
System.out.println(" " + numDocs + ": s=" + s);
}
- final Document doc = new Document();
- doc.add(new SortedDocValuesField("stringdv", br));
- doc.add(new NumericDocValuesField("id", numDocs));
+ final Document doc = writer.newDocument();
+ doc.addAtom("stringdv", br);
+ doc.addInt("id", numDocs);
docValues.add(br);
writer.addDocument(doc);
numDocs++;
Modified: lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java (original)
+++ lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java Sun Nov 30 11:07:09 2014
@@ -21,20 +21,16 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.NumericRangeQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.uninverting.UninvertingReader.Type;
@@ -70,7 +66,7 @@ public class TestNumericTerms32 extends
// Add a series of noDocs docs with increasing int values
for (int l=0; l<noDocs; l++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
int val=distance*l+startOffset;
doc.addInt("field", val);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java (original)
+++ lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java Sun Nov 30 11:07:09 2014
@@ -21,15 +21,12 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.NumericRangeQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Sort;
@@ -41,7 +38,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Test;
public class TestNumericTerms64 extends LuceneTestCase {
// distance of entries
@@ -69,7 +65,7 @@ public class TestNumericTerms64 extends
// Add a series of noDocs docs with increasing long values, by updating the fields
for (int l=0; l<noDocs; l++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
long val=distance*l+startOffset;
doc.addLong("field", val);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java Sun Nov 30 11:07:09 2014
@@ -20,9 +20,7 @@ package org.apache.lucene.uninverting;
import java.io.IOException;
import java.util.Collections;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
@@ -32,7 +30,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.uninverting.UninvertingReader.Type;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util.TestUtil;
public class TestUninvertingReader extends LuceneTestCase {
@@ -45,7 +42,7 @@ public class TestUninvertingReader exten
fieldTypes.disableSorting("foo");
fieldTypes.setMultiValued("foo");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addInt("foo", 5);
iw.addDocument(doc);
@@ -73,10 +70,10 @@ public class TestUninvertingReader exten
assertEquals(SortedSetDocValues.NO_MORE_ORDS, v.nextOrd());
BytesRef value = v.lookupOrd(0);
- assertEquals(-3, Document2.bytesToInt(value));
+ assertEquals(-3, Document.bytesToInt(value));
value = v.lookupOrd(1);
- assertEquals(5, Document2.bytesToInt(value));
+ assertEquals(5, Document.bytesToInt(value));
TestUtil.checkReader(ir);
ir.close();
dir.close();
@@ -89,7 +86,7 @@ public class TestUninvertingReader exten
fieldTypes.disableSorting("foo");
fieldTypes.setMultiValued("foo");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addFloat("foo", 5f);
iw.addDocument(doc);
@@ -118,10 +115,10 @@ public class TestUninvertingReader exten
assertEquals(SortedSetDocValues.NO_MORE_ORDS, v.nextOrd());
BytesRef value = v.lookupOrd(0);
- assertEquals(-3f, Document2.bytesToFloat(value), 0.0f);
+ assertEquals(-3f, Document.bytesToFloat(value), 0.0f);
value = v.lookupOrd(1);
- assertEquals(5f, Document2.bytesToFloat(value), 0.0f);
+ assertEquals(5f, Document.bytesToFloat(value), 0.0f);
TestUtil.checkReader(ir);
ir.close();
dir.close();
@@ -134,7 +131,7 @@ public class TestUninvertingReader exten
fieldTypes.disableSorting("foo");
fieldTypes.setMultiValued("foo");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLong("foo", 5);
iw.addDocument(doc);
@@ -162,10 +159,10 @@ public class TestUninvertingReader exten
assertEquals(SortedSetDocValues.NO_MORE_ORDS, v.nextOrd());
BytesRef value = v.lookupOrd(0);
- assertEquals(-3, Document2.bytesToLong(value));
+ assertEquals(-3, Document.bytesToLong(value));
value = v.lookupOrd(1);
- assertEquals(5, Document2.bytesToLong(value));
+ assertEquals(5, Document.bytesToLong(value));
TestUtil.checkReader(ir);
ir.close();
dir.close();
@@ -178,7 +175,7 @@ public class TestUninvertingReader exten
fieldTypes.disableSorting("foo");
fieldTypes.setMultiValued("foo");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addDouble("foo", 5d);
iw.addDocument(doc);
@@ -206,10 +203,10 @@ public class TestUninvertingReader exten
assertEquals(SortedSetDocValues.NO_MORE_ORDS, v.nextOrd());
BytesRef value = v.lookupOrd(0);
- assertEquals(-3d, Document2.bytesToDouble(value), 0.0);
+ assertEquals(-3d, Document.bytesToDouble(value), 0.0);
value = v.lookupOrd(1);
- assertEquals(5d, Document2.bytesToDouble(value), 0.0);
+ assertEquals(5d, Document.bytesToDouble(value), 0.0);
TestUtil.checkReader(ir);
ir.close();
dir.close();
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java Sun Nov 30 11:07:09 2014
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
@@ -737,7 +737,7 @@ public final class MoreLikeThis {
// field does not store term vector info
if (vector == null) {
- Document2 d = ir.document(docNum);
+ Document d = ir.document(docNum);
for (IndexableField field : d.getFields(fieldName)) {
final String stringValue = field.stringValue();
if (stringValue != null) {
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.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.LeafReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -70,7 +68,7 @@ public class BooleanFilterTest extends L
}
private void addDoc(RandomIndexWriter writer, String accessRights, String price, String date, String inStock) throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("accessRights", accessRights);
doc.addLargeText("price", price);
doc.addLargeText("date", date);
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java Sun Nov 30 11:07:09 2014
@@ -26,9 +26,7 @@ import java.util.Random;
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.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -67,7 +65,7 @@ public class CommonTermsQueryTest extend
"this is the end of the universe as we know it",
"there is the famous restaurant at the end of the universe",};
for (int i = 0; i < docs.length; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "" + i);
doc.addLargeText("field", docs[i]);
w.addDocument(doc);
@@ -197,7 +195,7 @@ public class CommonTermsQueryTest extend
"this is the end of the universe as we know it",
"there is the famous restaurant at the end of the universe",};
for (int i = 0; i < docs.length; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "" + i);
doc.addLargeText("field", docs[i]);
w.addDocument(doc);
@@ -356,7 +354,7 @@ public class CommonTermsQueryTest extend
"this is the end of the universe as we know it",
"there is the famous restaurant at the end of the universe",};
for (int i = 0; i < docs.length; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "" + i);
doc.addLargeText("field", docs[i]);
w.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermFilterTest.java Sun Nov 30 11:07:09 2014
@@ -22,9 +22,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-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;
@@ -57,7 +55,7 @@ public class TermFilterTest extends Luce
String fieldName = "field1";
Directory rd = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), rd);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom(fieldName, "value1");
w.addDocument(doc);
IndexReader reader = SlowCompositeReaderWrapper.wrap(w.getReader());
@@ -90,7 +88,7 @@ public class TermFilterTest extends Luce
String field = "field" + i;
String string = TestUtil.randomRealisticUnicodeString(random());
terms.add(new Term(field, string));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom(field, string);
w.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java Sun Nov 30 11:07:09 2014
@@ -26,9 +26,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.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.MultiReader;
@@ -49,7 +47,6 @@ import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -71,7 +68,7 @@ public class TermsFilterTest extends Luc
Directory rd = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), rd);
for (int i = 0; i < 100; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
int term = i * 10; //terms are units of 10;
doc.addAtom(fieldName, "" + term);
w.addDocument(doc);
@@ -106,7 +103,7 @@ public class TermsFilterTest extends Luc
String fieldName = "field1";
Directory rd1 = newDirectory();
RandomIndexWriter w1 = new RandomIndexWriter(random(), rd1);
- Document2 doc = w1.newDocument();
+ Document doc = w1.newDocument();
doc.addAtom(fieldName, "content1");
w1.addDocument(doc);
IndexReader reader1 = w1.getReader();
@@ -147,7 +144,7 @@ public class TermsFilterTest extends Luc
List<Term> terms = new ArrayList<>();
for (int i = 0; i < num; i++) {
terms.add(new Term("field" + i, "content1"));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
if (skip == i) {
continue;
}
@@ -179,7 +176,7 @@ public class TermsFilterTest extends Luc
for (int i = 0; i < num; i++) {
String field = "field" + random().nextInt(100);
terms.add(new Term(field, "content1"));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom(field, "content1");
w.addDocument(doc);
}
@@ -217,7 +214,7 @@ public class TermsFilterTest extends Luc
String field = "field" + (singleField ? "1" : random().nextInt(100));
String string = TestUtil.randomRealisticUnicodeString(random());
terms.add(new Term(field, string));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom(field, string);
w.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java Sun Nov 30 11:07:09 2014
@@ -2,20 +2,12 @@ package org.apache.lucene.queries.functi
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queries.function.valuesource.FloatFieldSource;
import org.apache.lucene.queries.function.valuesource.IntFieldSource;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.junit.AfterClass;
@@ -124,8 +116,7 @@ public abstract class FunctionTestSetup
}
private static void addDoc(RandomIndexWriter iw, int i) throws Exception {
- Document2 d = iw.newDocument();
- Field f;
+ Document d = iw.newDocument();
int scoreAndID = i + 1;
d.addAtom(ID_FIELD, id2String(scoreAndID)); // for debug purposes
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java Sun Nov 30 11:07:09 2014
@@ -3,8 +3,6 @@ package org.apache.lucene.queries.functi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
@@ -55,9 +53,8 @@ public class TestBoostedQuery extends Lu
IndexWriterConfig iwConfig = newIndexWriterConfig(new MockAnalyzer(random()));
iwConfig.setMergePolicy(newLogMergePolicy());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConfig);
- Document document = new Document();
- Field idField = new SortedDocValuesField("id", new BytesRef());
- document.add(idField);
+ Document document = iw.newDocument();
+ document.addAtom("id", new BytesRef());
iw.addDocument(document);
ir = iw.getReader();
is = newSearcher(ir);
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java Sun Nov 30 11:07:09 2014
@@ -20,15 +20,12 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource;
import org.apache.lucene.queries.function.valuesource.LongFieldSource;
@@ -38,7 +35,6 @@ import org.apache.lucene.util.BytesRefBu
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.packed.PackedInts;
-
import com.carrotsearch.randomizedtesting.generators.RandomInts;
@@ -48,42 +44,33 @@ public class TestDocValuesFieldSources e
Directory d = newDirectory();
IndexWriterConfig iwConfig = newIndexWriterConfig(new MockAnalyzer(random()));
final int nDocs = atLeast(50);
- final Field id = new NumericDocValuesField("id", 0);
- final Field f;
- switch (type) {
- case BINARY:
- f = new BinaryDocValuesField("dv", new BytesRef());
- break;
- case SORTED:
- f = new SortedDocValuesField("dv", new BytesRef());
- break;
- case NUMERIC:
- f = new NumericDocValuesField("dv", 0);
- break;
- default:
- throw new AssertionError();
+ RandomIndexWriter iw = new RandomIndexWriter(random(), d, iwConfig);
+ if (type == DocValuesType.BINARY) {
+ FieldTypes fieldTypes = iw.getFieldTypes();
+ fieldTypes.disableSorting("dv");
}
- Document document = new Document();
- document.add(id);
- document.add(f);
-
final Object[] vals = new Object[nDocs];
- RandomIndexWriter iw = new RandomIndexWriter(random(), d, iwConfig);
for (int i = 0; i < nDocs; ++i) {
- id.setLongValue(i);
+ Document document = iw.newDocument();
+ document.addInt("id", i);
switch (type) {
- case SORTED:
case BINARY:
do {
vals[i] = TestUtil.randomSimpleString(random(), 20);
} while (((String) vals[i]).isEmpty());
- f.setBytesValue(new BytesRef((String) vals[i]));
+ document.addBinary("dv", new BytesRef((String) vals[i]));
+ break;
+ case SORTED:
+ do {
+ vals[i] = TestUtil.randomSimpleString(random(), 20);
+ } while (((String) vals[i]).isEmpty());
+ document.addAtom("dv", new BytesRef((String) vals[i]));
break;
case NUMERIC:
final int bitsPerValue = RandomInts.randomIntBetween(random(), 1, 31); // keep it an int
vals[i] = (long) random().nextInt((int) PackedInts.maxValue(bitsPerValue));
- f.setLongValue((Long) vals[i]);
+ document.addLong("dv", (Long) vals[i]);
break;
}
iw.addDocument(document);
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java Sun Nov 30 11:07:09 2014
@@ -19,10 +19,7 @@ package org.apache.lucene.queries.functi
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.NumericDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
@@ -50,7 +47,7 @@ public class TestFunctionQuerySort exten
// Save docs unsorted (decreasing value n, n-1, ...)
final int NUM_VALS = 5;
for (int val = NUM_VALS; val > 0; val--) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addInt("value", val);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java Sun Nov 30 11:07:09 2014
@@ -19,8 +19,6 @@ package org.apache.lucene.queries.functi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
@@ -56,12 +54,12 @@ public class TestLongNormValueSource ext
iwConfig.setSimilarity(sim);
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConfig);
- Document doc = new Document();
- doc.add(new TextField("text", "this is a test test test", Field.Store.NO));
+ Document doc = iw.newDocument();
+ doc.addLargeText("text", "this is a test test test");
iw.addDocument(doc);
- doc = new Document();
- doc.add(new TextField("text", "second test", Field.Store.NO));
+ doc = iw.newDocument();
+ doc.addLargeText("text", "second test");
iw.addDocument(doc);
reader = iw.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java Sun Nov 30 11:07:09 2014
@@ -19,11 +19,8 @@ package org.apache.lucene.queries.functi
import java.util.Collections;
-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.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.LeafReader;
@@ -38,7 +35,7 @@ public class TestSortedSetFieldSource ex
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(null));
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("value");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addBinary("value", new BytesRef("baz"));
doc.addAtom("id", "2");
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java Sun Nov 30 11:07:09 2014
@@ -23,13 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.SortedDocValuesField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.LeafReaderContext;
@@ -110,7 +104,7 @@ public class TestValueSources extends Lu
iwConfig.setMergePolicy(newLogMergePolicy());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConfig);
for (String [] data : documents) {
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addAtom("id", data[0]);
doc.addDouble("double", Double.valueOf(data[1]));
doc.addFloat("float", Float.valueOf(data[2]));
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java Sun Nov 30 11:07:09 2014
@@ -26,9 +26,7 @@ import java.util.Map;
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.FieldTypes;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -72,7 +70,7 @@ public class TestMoreLikeThis extends Lu
}
private void addDoc(RandomIndexWriter writer, String text) throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("text", text);
writer.addDocument(doc);
}
@@ -80,7 +78,7 @@ public class TestMoreLikeThis extends Lu
private void addDoc(RandomIndexWriter writer, String[] texts) throws IOException {
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.setMultiValued("text");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
for (String text : texts) {
doc.addLargeText("text", text);
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java Sun Nov 30 11:07:09 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.fl
* limitations under the License.
*/
-import org.apache.lucene.document.FieldType.NumericType;
+import org.apache.lucene.document.NumericType;
import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;
import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java Sun Nov 30 11:07:09 2014
@@ -19,7 +19,7 @@ package org.apache.lucene.queryparser.fl
import java.text.NumberFormat;
-import org.apache.lucene.document.FieldType.NumericType;
+import org.apache.lucene.document.NumericType;
import org.apache.lucene.search.NumericRangeQuery;
/**
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java Sun Nov 30 11:07:09 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.queryparser.fl
* the License.
*/
-import org.apache.lucene.document.FieldType.NumericType;
+import org.apache.lucene.document.NumericType;
import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages;
import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode;
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java Sun Nov 30 11:07:09 2014
@@ -31,10 +31,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.queryparser.classic.QueryParser;
@@ -271,13 +268,8 @@ public class TestAnalyzingQueryParser ex
private boolean isAHit(Query q, String content, Analyzer analyzer) throws IOException{
Directory ramDir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), ramDir, analyzer);
- Document doc = new Document();
- FieldType fieldType = new FieldType();
- fieldType.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
- fieldType.setTokenized(true);
- fieldType.setStored(true);
- Field field = new Field(FIELD, content, fieldType);
- doc.add(field);
+ Document doc = writer.newDocument();
+ doc.addLargeText(FIELD, content);
writer.addDocument(doc);
writer.close();
DirectoryReader ir = DirectoryReader.open(ramDir);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java Sun Nov 30 11:07:09 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.lucene.analysis.*;
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;
@@ -287,8 +286,8 @@ public class TestMultiFieldQueryParser e
Analyzer analyzer = new MockAnalyzer(random());
Directory ramDir = newDirectory();
IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(analyzer));
- Document doc = new Document();
- doc.add(newTextField("body", "blah the footest blah", Field.Store.NO));
+ Document doc = iw.newDocument();
+ doc.addLargeText("body", "blah the footest blah");
iw.addDocument(doc);
iw.close();
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java Sun Nov 30 11:07:09 2014
@@ -21,9 +21,7 @@ import java.util.HashSet;
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.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -116,7 +114,7 @@ public class TestComplexPhraseQuery exte
TopDocs td = searcher.search(q, 10);
ScoreDoc[] sd = td.scoreDocs;
for (int i = 0; i < sd.length; i++) {
- Document2 doc = searcher.doc(sd[i].doc);
+ Document doc = searcher.doc(sd[i].doc);
String id = doc.getString("id");
assertTrue(qString + "matched doc#" + id + " not expected", expecteds
.contains(id));
@@ -172,10 +170,10 @@ public class TestComplexPhraseQuery exte
rd = newDirectory();
IndexWriter w = new IndexWriter(rd, newIndexWriterConfig(analyzer));
for (int i = 0; i < docsContent.length; i++) {
- Document doc = new Document();
- doc.add(newTextField("name", docsContent[i].name, Field.Store.YES));
- doc.add(newTextField("id", docsContent[i].id, Field.Store.YES));
- doc.add(newTextField("role", docsContent[i].role, Field.Store.YES));
+ Document doc = w.newDocument();
+ doc.addLargeText("name", docsContent[i].name);
+ doc.addLargeText("id", docsContent[i].id);
+ doc.addLargeText("role", docsContent[i].role);
w.addDocument(doc);
}
w.close();
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java Sun Nov 30 11:07:09 2014
@@ -24,7 +24,6 @@ import java.util.Map;
import org.apache.lucene.analysis.*;
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;
@@ -321,8 +320,8 @@ public class TestMultiFieldQPHelper exte
Analyzer analyzer = new MockAnalyzer(random());
Directory ramDir = newDirectory();
IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(analyzer));
- Document doc = new Document();
- doc.add(newTextField("body", "blah the footest blah", Field.Store.NO));
+ Document doc = iw.newDocument();
+ doc.addLargeText("body", "blah the footest blah");
iw.addDocument(doc);
iw.close();
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java Sun Nov 30 11:07:09 2014
@@ -32,10 +32,7 @@ import java.util.TimeZone;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType.NumericType;
-import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.NumericType;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
@@ -192,10 +189,10 @@ public class TestNumericQueryParser exte
.setMaxBufferedDocs(TestUtil.nextInt(random(), 50, 1000))
.setMergePolicy(newLogMergePolicy()));
- Document doc = new Document();
+ //Document doc = new Document();
HashMap<String,NumericConfig> numericConfigMap = new HashMap<>();
- HashMap<String,Field> numericFieldMap = new HashMap<>();
- qp.setNumericConfigMap(numericConfigMap);
+ //HashMap<String,Field> numericFieldMap = new HashMap<>();
+ //qp.setNumericConfigMap(numericConfigMap);
for (NumericType type : NumericType.values()) {
numericConfigMap.put(type.name(), new NumericConfig(PRECISION_STEP,
@@ -209,6 +206,7 @@ public class TestNumericQueryParser exte
ft.freeze();
*/
// nocommit fixme
+ /*
FieldType ft = null;
final Field field;
@@ -239,6 +237,7 @@ public class TestNumericQueryParser exte
}
numericFieldMap.put(type.name(), field);
doc.add(field);
+ */
}
numericConfigMap.put(DATE_FIELD_NAME, new NumericConfig(PRECISION_STEP,
@@ -253,9 +252,9 @@ public class TestNumericQueryParser exte
// doc.add(dateField);
for (NumberType numberType : NumberType.values()) {
- setFieldValues(numberType, numericFieldMap);
- if (VERBOSE) System.out.println("Indexing document: " + doc);
- writer.addDocument(doc);
+ //setFieldValues(numberType, numericFieldMap);
+ //if (VERBOSE) System.out.println("Indexing document: " + doc);
+ //writer.addDocument(doc);
}
reader = writer.getReader();
@@ -304,7 +303,9 @@ public class TestNumericQueryParser exte
}
}
-
+
+ // nocommit fixme
+ /*
private static void setFieldValues(NumberType numberType,
HashMap<String,Field> numericFieldMap) {
@@ -328,6 +329,7 @@ public class TestNumericQueryParser exte
number = getNumberType(numberType, DATE_FIELD_NAME);
numericFieldMap.get(DATE_FIELD_NAME).setLongValue(number.longValue());
}
+ */
private static int randomDateStyle(Random random) {
return DATE_STYLES[random.nextInt(DATE_STYLES.length)];
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java Sun Nov 30 11:07:09 2014
@@ -34,7 +34,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.DateTools;
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;
@@ -1045,36 +1044,6 @@ public class TestQPHelper extends Lucene
assertEquals(query1, query2);
}
-// Todo: Convert from DateField to DateUtil
-// public void testLocalDateFormat() throws IOException, QueryNodeException {
-// Directory ramDir = newDirectory();
-// IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(new MockAnalyzer(random, MockTokenizer.WHITESPACE, false)));
-// addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw);
-// addDateDoc("b", 2005, 12, 4, 22, 15, 00, iw);
-// iw.close();
-// IndexSearcher is = new IndexSearcher(ramDir, true);
-// assertHits(1, "[12/1/2005 TO 12/3/2005]", is);
-// assertHits(2, "[12/1/2005 TO 12/4/2005]", is);
-// assertHits(1, "[12/3/2005 TO 12/4/2005]", is);
-// assertHits(1, "{12/1/2005 TO 12/3/2005}", is);
-// assertHits(1, "{12/1/2005 TO 12/4/2005}", is);
-// assertHits(0, "{12/3/2005 TO 12/4/2005}", is);
-// is.close();
-// ramDir.close();
-// }
-//
-// private void addDateDoc(String content, int year, int month, int day,
-// int hour, int minute, int second, IndexWriter iw) throws IOException {
-// Document d = new Document();
-// d.add(newField("f", content, Field.Store.YES, Field.Index.ANALYZED));
-// Calendar cal = Calendar.getInstance(Locale.ENGLISH);
-// cal.set(year, month - 1, day, hour, minute, second);
-// d.add(newField("date", DateField.dateToString(cal.getTime()),
-// Field.Store.YES, Field.Index.NOT_ANALYZED));
-// iw.addDocument(d);
-// }
-
-
public void testStarParsing() throws Exception {
// final int[] type = new int[1];
// StandardQueryParser qp = new StandardQueryParser("field", new
@@ -1310,8 +1279,8 @@ public class TestQPHelper extends Lucene
public void testMultiPhraseQuery() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(new CannedAnalyzer()));
- Document doc = new Document();
- doc.add(newTextField("field", "", Field.Store.NO));
+ Document doc = w.newDocument();
+ doc.addLargeText("field", "");
w.addDocument(doc);
IndexReader r = DirectoryReader.open(w, true);
IndexSearcher s = newSearcher(r);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java Sun Nov 30 11:07:09 2014
@@ -19,15 +19,13 @@ package org.apache.lucene.queryparser.su
import java.util.Random;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockDirectoryWrapper;
-import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.MockDirectoryWrapper;
+import org.apache.lucene.store.RAMDirectory;
public class SingleFieldTestDb {
private Directory db;
@@ -41,8 +39,8 @@ public class SingleFieldTestDb {
fieldName = fName;
IndexWriter writer = new IndexWriter(db, new IndexWriterConfig(new MockAnalyzer(random)));
for (int j = 0; j < docs.length; j++) {
- Document d = new Document();
- d.add(new TextField(fieldName, docs[j], Field.Store.NO));
+ Document d = writer.newDocument();
+ d.addLargeText(fieldName, docs[j]);
writer.addDocument(d);
}
writer.close();
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java Sun Nov 30 11:07:09 2014
@@ -31,7 +31,6 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.DateTools;
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;
@@ -938,34 +937,6 @@ public abstract class QueryParserTestBas
assertEquals(query1, query2);
}
-// Todo: convert this from DateField to DateUtil
-// public void testLocalDateFormat() throws IOException, ParseException {
-// Directory ramDir = newDirectory();
-// IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(new MockAnalyzer(random, MockTokenizer.WHITESPACE, false)));
-// addDateDoc("a", 2005, 12, 2, 10, 15, 33, iw);
-// addDateDoc("b", 2005, 12, 4, 22, 15, 00, iw);
-// iw.close();
-// IndexSearcher is = new IndexSearcher(ramDir, true);
-// assertHits(1, "[12/1/2005 TO 12/3/2005]", is);
-// assertHits(2, "[12/1/2005 TO 12/4/2005]", is);
-// assertHits(1, "[12/3/2005 TO 12/4/2005]", is);
-// assertHits(1, "{12/1/2005 TO 12/3/2005}", is);
-// assertHits(1, "{12/1/2005 TO 12/4/2005}", is);
-// assertHits(0, "{12/3/2005 TO 12/4/2005}", is);
-// is.close();
-// ramDir.close();
-// }
-//
-// private void addDateDoc(String content, int year, int month,
-// int day, int hour, int minute, int second, IndexWriter iw) throws IOException {
-// Document d = new Document();
-// d.add(newField("f", content, Field.Store.YES, Field.Index.ANALYZED));
-// Calendar cal = Calendar.getInstance(Locale.ENGLISH);
-// cal.set(year, month - 1, day, hour, minute, second);
-// d.add(newField("date", DateField.dateToString(cal.getTime()), Field.Store.YES, Field.Index.NOT_ANALYZED));
-// iw.addDocument(d);
-// }
-
public abstract void testStarParsing() throws Exception;
public void testEscapedWildcard() throws Exception {
@@ -1090,8 +1061,8 @@ public abstract class QueryParserTestBas
Directory dir = newDirectory();
Analyzer a = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET);
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(a));
- Document doc = new Document();
- doc.add(newTextField("field", "the wizard of ozzy", Field.Store.NO));
+ Document doc = w.newDocument();
+ doc.addLargeText("field", "the wizard of ozzy");
w.addDocument(doc);
IndexReader r = DirectoryReader.open(w, true);
w.close();
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Sun Nov 30 11:07:09 2014
@@ -28,9 +28,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
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.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -71,7 +69,7 @@ public class TestParser extends LuceneTe
int endOfDate = line.indexOf('\t');
String date = line.substring(0, endOfDate).trim();
String content = line.substring(endOfDate).trim();
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("date", date);
doc.addLargeText("contents", content);
doc.addInt("date2", Integer.valueOf(date));
@@ -237,7 +235,7 @@ public class TestParser extends LuceneTe
System.out.println("=========" + qType + "============");
ScoreDoc[] scoreDocs = hits.scoreDocs;
for (int i = 0; i < Math.min(numDocs, hits.totalHits); i++) {
- Document2 ldoc = searcher.doc(scoreDocs[i].doc);
+ Document ldoc = searcher.doc(scoreDocs[i].doc);
System.out.println("[" + ldoc.getString("date") + "]" + ldoc.getString("contents"));
}
System.out.println();
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java Sun Nov 30 11:07:09 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.queryparser.xm
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -122,14 +121,14 @@ public class TestQueryTemplateManager ex
}
//Helper method to construct Lucene documents used in our tests
- org.apache.lucene.document.Document getDocumentFromString(String nameValuePairs) {
- org.apache.lucene.document.Document result = new org.apache.lucene.document.Document();
+ org.apache.lucene.document.Document getDocumentFromString(IndexWriter w, String nameValuePairs) {
+ org.apache.lucene.document.Document result = w.newDocument();
StringTokenizer st = new StringTokenizer(nameValuePairs, "\t=");
while (st.hasMoreTokens()) {
String name = st.nextToken().trim();
if (st.hasMoreTokens()) {
String value = st.nextToken().trim();
- result.add(newTextField(name, value, Field.Store.YES));
+ result.addLargeText(name, value);
}
}
return result;
@@ -147,7 +146,7 @@ public class TestQueryTemplateManager ex
dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(analyzer));
for (String docFieldValue : docFieldValues) {
- w.addDocument(getDocumentFromString(docFieldValue));
+ w.addDocument(getDocumentFromString(w, docFieldValue));
}
w.forceMerge(1);
w.close();
Modified: lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java Sun Nov 30 11:07:09 2014
@@ -27,7 +27,6 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.DrillDownQuery;
import org.apache.lucene.facet.FacetField;
@@ -183,8 +182,8 @@ public class IndexAndTaxonomyReplication
return new IndexAndTaxonomyRevision(publishIndexWriter, publishTaxoWriter);
}
- private Document2 newDocument(TaxonomyWriter taxoWriter, int id) throws IOException {
- Document2 doc = publishIndexWriter.newDocument();
+ private Document newDocument(TaxonomyWriter taxoWriter, int id) throws IOException {
+ Document doc = publishIndexWriter.newDocument();
doc.add(new FacetField("A", Integer.toString(id, 16)));
return config.build(taxoWriter, doc);
}