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 [11/19] - in /lucene/dev/branches/lucene6005/lucene:
analysis/common/src/java/org/apache/lucene/collation/
analysis/common/src/test/org/apache/lucene/analysis/core/
analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/...
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java Sun Nov 30 11:07:09 2014
@@ -21,10 +21,8 @@ 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.FieldType;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -49,7 +47,6 @@ public class TestTermVectors extends Luc
//writer.setNoCFSRatio(1.0);
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
- FieldType ft = new FieldType(TextField.TYPE_STORED);
int mod3 = i % 3;
int mod2 = i % 2;
if (mod2 == 0 && mod3 == 0) {
@@ -65,7 +62,7 @@ public class TestTermVectors extends Luc
} else {
fieldTypes.enableTermVectors("field");
}
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", English.intToEnglish(i));
//test no term vectors too
doc.addLargeText("noTV", English.intToEnglish(i));
@@ -94,13 +91,13 @@ public class TestTermVectors extends Luc
writer.close();
}
- private Document2 createDoc(IndexWriter writer) {
+ private Document createDoc(IndexWriter writer) {
FieldTypes fieldTypes = writer.getFieldTypes();
fieldTypes.enableTermVectors("c");
fieldTypes.enableTermVectorOffsets("c");
fieldTypes.enableTermVectorPositions("c");
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("c", "aaa");
return doc;
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java Sun Nov 30 11:07:09 2014
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.BitSet;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -117,7 +117,7 @@ public class TestTimeLimitingCollector e
}
private void add(String value, RandomIndexWriter iw) throws IOException {
- Document2 d = iw.newDocument();
+ Document d = iw.newDocument();
d.addLargeText(FIELD_NAME, value);
iw.addDocument(d);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java Sun Nov 30 11:07:09 2014
@@ -22,9 +22,7 @@ import java.util.ArrayList;
import java.util.Collections;
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.CompositeReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
@@ -33,7 +31,6 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.ReaderUtil;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -101,7 +98,7 @@ public class TestTopDocsMerge extends Lu
}
for(int docIDX=0;docIDX<numDocs;docIDX++) {
- final Document2 doc = w.newDocument();
+ final Document doc = w.newDocument();
doc.addAtom("string", TestUtil.randomRealisticUnicodeString(random()));
doc.addLargeText("text", content[random().nextInt(content.length)]);
doc.addFloat("float", random().nextFloat());
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java Sun Nov 30 11:07:09 2014
@@ -17,7 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
@@ -29,7 +29,7 @@ public class TestTotalHitCountCollector
Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
for(int i=0; i<5; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("string", "a"+i);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search;
import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -241,7 +241,7 @@ public class TestWildcard
Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
for (int i = 0; i < contents.length; ++i) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(field, contents[i]);
writer.addDocument(doc);
}
@@ -340,7 +340,7 @@ public class TestWildcard
newIndexWriterConfig(new MockAnalyzer(random()))
.setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docs.length; i++) {
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText(field, docs[i]);
iw.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java Sun Nov 30 11:07:09 2014
@@ -23,7 +23,7 @@ import java.text.NumberFormat;
import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -51,7 +51,7 @@ public class TestWildcardRandom extends
NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ROOT));
for (int i = 0; i < 1000; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("field", df.format(i));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/PayloadHelper.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -119,7 +119,7 @@ public class PayloadHelper {
analyzer).setSimilarity(similarity));
// writer.infoStream = System.out;
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(FIELD, English.intToEnglish(i));
doc.addLargeText(MULTI_FIELD, English.intToEnglish(i) + " " + English.intToEnglish(i));
doc.addLargeText(NO_PAYLOAD_FIELD, English.intToEnglish(i));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -109,7 +109,7 @@ public class TestPayloadNearQuery extend
.setSimilarity(similarity));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", English.intToEnglish(i));
String txt = English.intToEnglish(i) +' '+English.intToEnglish(i+1);
doc.addLargeText("field2", txt);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Sun Nov 30 11:07:09 2014
@@ -20,9 +20,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.*;
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.index.DirectoryReader;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
@@ -121,7 +119,7 @@ public class TestPayloadTermQuery extend
.setSimilarity(similarity).setMergePolicy(newLogMergePolicy()));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(PayloadHelper.NO_PAYLOAD_FIELD, English.intToEnglish(i));
doc.addLargeText("field", English.intToEnglish(i));
doc.addLargeText("multiField", English.intToEnglish(i) + " " + English.intToEnglish(i));
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search.similar
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexReader;
@@ -91,7 +91,7 @@ public class TestSimilarity2 extends Luc
public void testEmptyField() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
@@ -113,7 +113,7 @@ public class TestSimilarity2 extends Luc
public void testEmptyTerm() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
@@ -137,7 +137,7 @@ public class TestSimilarity2 extends Luc
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = iw.getFieldTypes();
fieldTypes.disableNorms("foo");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
@@ -162,7 +162,7 @@ public class TestSimilarity2 extends Luc
fieldTypes.setIndexOptions("foo", IndexOptions.DOCS);
fieldTypes.disableHighlighting("foo");
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
@@ -185,7 +185,7 @@ public class TestSimilarity2 extends Luc
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
FieldTypes fieldTypes = iw.getFieldTypes();
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
fieldTypes.setIndexOptions("foo", IndexOptions.DOCS);
fieldTypes.disableNorms("foo");
fieldTypes.disableHighlighting("foo");
@@ -213,7 +213,7 @@ public class TestSimilarity2 extends Luc
// inner queries are not real queries, their boosts are ignored, etc.
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java Sun Nov 30 11:07:09 2014
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -106,7 +106,7 @@ public class TestSimilarityBase extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < docs.length; i++) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addStored(FIELD_ID, Integer.toString(i));
d.addLargeText(FIELD_BODY, docs[i]);
writer.addDocument(d);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java Sun Nov 30 11:07:09 2014
@@ -27,7 +27,7 @@ import java.util.List;
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.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -113,7 +113,7 @@ public class TestBasics extends LuceneTe
.setMaxBufferedDocs(TestUtil.nextInt(random(), 100, 1000)).setMergePolicy(newLogMergePolicy()));
//writer.infoStream = System.out;
for (int i = 0; i < 2000; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", English.intToEnglish(i));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Sun Nov 30 11:07:09 2014
@@ -21,8 +21,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -39,8 +38,8 @@ import org.junit.BeforeClass;
public class TestFieldMaskingSpanQuery extends LuceneTestCase {
- protected static Document2 doc(RandomIndexWriter w, String... nameAndValues) {
- Document2 doc = w.newDocument();
+ protected static Document doc(RandomIndexWriter w, String... nameAndValues) {
+ Document doc = w.newDocument();
int upto = 0;
while (upto < nameAndValues.length) {
doc.addLargeText(nameAndValues[upto],
@@ -50,10 +49,6 @@ public class TestFieldMaskingSpanQuery e
return doc;
}
- protected static Field field(String name, String value) {
- return newTextField(name, value, Field.Store.NO);
- }
-
protected static IndexSearcher searcher;
protected static Directory directory;
protected static IndexReader reader;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Sun Nov 30 11:07:09 2014
@@ -18,7 +18,7 @@ package org.apache.lucene.search.spans;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.LeafReaderContext;
@@ -52,7 +52,7 @@ public class TestNearSpansOrdered extend
directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random(), directory, newIndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(FIELD, docFields[i]);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Sun Nov 30 11:07:09 2014
@@ -31,7 +31,7 @@ import org.apache.lucene.analysis.Tokeni
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -110,7 +110,7 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new PayloadAnalyzer()).setSimilarity(similarity));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(PayloadHelper.FIELD, "one two three one four three");
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -253,7 +253,7 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new TestPayloadAnalyzer()));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", new StringReader("a b c d e f g h i j a k"));
writer.addDocument(doc);
@@ -290,7 +290,7 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new TestPayloadAnalyzer()));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", new StringReader("a b a d k f a h i k a k"));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -325,7 +325,7 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new TestPayloadAnalyzer()));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", new StringReader("j k a l f k k p a t a k l k t a"));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -366,7 +366,7 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new PayloadAnalyzer()).setSimilarity(similarity));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(PayloadHelper.FIELD, "xx rr yy mm pp");
writer.addDocument(doc);
@@ -427,7 +427,7 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(new PayloadAnalyzer()).setSimilarity(similarity));
for(int i = 0; i < docs.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
String docText = docs[i];
doc.addLargeText(PayloadHelper.FIELD, docText);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.search.spans;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -39,10 +39,10 @@ public class TestSpanFirstQuery extends
Analyzer analyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, stopSet);
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, analyzer);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("field", "the quick brown fox");
writer.addDocument(doc);
- Document2 doc2 = writer.newDocument();
+ Document doc2 = writer.newDocument();
doc2.addLargeText("field", "quick brown fox");
writer.addDocument(doc2);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java Sun Nov 30 11:07:09 2014
@@ -17,9 +17,7 @@ package org.apache.lucene.search.spans;
* 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.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -44,7 +42,7 @@ public class TestSpanMultiTermQueryWrapp
super.setUp();
directory = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), directory);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("field", "quick brown fox");
iw.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java Sun Nov 30 11:07:09 2014
@@ -21,9 +21,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
@@ -57,7 +55,7 @@ public class TestSpans extends LuceneTes
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory, newIndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText(field, docFields[i]);
writer.addDocument(doc);
}
@@ -447,7 +445,7 @@ public class TestSpans extends LuceneTes
// LUCENE-1404
private void addDoc(IndexWriter writer, String id, String text) throws IOException {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", id);
doc.addLargeText("text", text);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansAdvanced.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.io.IOException;
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.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -86,7 +86,7 @@ public class TestSpansAdvanced extends L
protected void addDocument(final RandomIndexWriter writer, final String id,
final String text) throws IOException {
- Document2 document = writer.newDocument();
+ Document document = writer.newDocument();
document.addUniqueAtom(FIELD_ID, id);
document.addLargeText(FIELD_TEXT, text);
writer.addDocument(document);
@@ -150,7 +150,7 @@ public class TestSpansAdvanced extends L
int id = topdocs.scoreDocs[i].doc;
float score = topdocs.scoreDocs[i].score;
- Document2 doc = s.doc(id);
+ Document doc = s.doc(id);
assertEquals(expectedIds[i], doc.getString(FIELD_ID));
boolean scoreEq = Math.abs(expectedScores[i] - score) < tolerance;
if (!scoreEq) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java Sun Nov 30 11:07:09 2014
@@ -24,7 +24,7 @@ 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.FieldTypes;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -221,7 +221,7 @@ public class TestBufferedIndexInput exte
FieldTypes fieldTypes = writer.getFieldTypes();
for(int i=0;i<37;i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", "aaa bbb ccc ddd" + i);
doc.addUniqueInt("id", i);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java Sun Nov 30 11:07:09 2014
@@ -25,7 +25,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -332,7 +332,7 @@ public class TestLockFactory extends Luc
}
private void addDoc(IndexWriter writer) throws IOException {
- 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/store/TestMultiMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.nio.file.Path;
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.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.util.BytesRef;
@@ -346,7 +346,7 @@ public class TestMultiMMap extends BaseD
int numDocs = 100;
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueInt("docid", i);
doc.addAtom("junk", TestUtil.randomUnicodeString(random));
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java Sun Nov 30 11:07:09 2014
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
@@ -67,7 +66,7 @@ public class TestNRTCachingDirectory ext
final List<BytesRef> ids = new ArrayList<>();
DirectoryReader r = null;
for(int docCount=0;docCount<numDocs;docCount++) {
- final Document2 doc = docs.nextDoc();
+ final Document doc = docs.nextDoc();
ids.add(new BytesRef(doc.getString("docid")));
w.addDocument(doc);
if (random().nextInt(20) == 17) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -54,7 +54,7 @@ public class TestRAMDirectory extends Ba
new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE));
// add some documents
for (int i = 0; i < docsToAdd; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("content", English.intToEnglish(i).trim());
writer.addDocument(doc);
}
@@ -100,7 +100,7 @@ public class TestRAMDirectory extends Ba
// search for all documents
for (int i = 0; i < docsToAdd; i++) {
- Document2 doc = searcher.doc(i);
+ Document doc = searcher.doc(i);
assertTrue(doc.get("content") != null);
}
@@ -132,7 +132,7 @@ public class TestRAMDirectory extends Ba
@Override
public void run() {
for (int j=1; j<docsPerThread; j++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("sizeContent", English.intToEnglish(num*docsPerThread+j).trim());
try {
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java Sun Nov 30 11:07:09 2014
@@ -20,7 +20,7 @@ package org.apache.lucene.store;
import java.nio.file.Path;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -78,7 +78,7 @@ public class TestWindowsMMap extends Luc
int num = atLeast(1000);
for(int dx = 0; dx < num; dx ++) {
String f = randomField();
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("data", f);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Sun Nov 30 11:07:09 2014
@@ -41,7 +41,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -315,7 +314,7 @@ public class TestFSTs extends LuceneTest
final IndexWriter writer = new IndexWriter(dir, conf);
final LineFileDocs docs = new LineFileDocs(writer, random());
final long stopTime = System.currentTimeMillis() + RUN_TIME_MSEC;
- Document2 doc;
+ Document doc;
int docCount = 0;
while((doc = docs.nextDoc()) != null && System.currentTimeMillis() < stopTime) {
writer.addDocument(doc);
@@ -874,7 +873,7 @@ public class TestFSTs extends LuceneTest
}
}
allIDs.add(idString);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", idString);
w.addDocument(doc);
}
@@ -991,7 +990,7 @@ public class TestFSTs extends LuceneTest
}
for(String term : allTerms) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", term);
w.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java Sun Nov 30 11:07:09 2014
@@ -32,11 +32,7 @@ import java.util.Date;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.IndexWriterConfig;
@@ -168,7 +164,7 @@ public class IndexFiles {
static void indexDoc(IndexWriter writer, Path file, long lastModified) throws IOException {
try (InputStream stream = Files.newInputStream(file)) {
// make a new, empty document
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
// Add the path of the file as a field named "path". Use a
// field that is indexed (i.e. searchable), but don't tokenize
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java Sun Nov 30 11:07:09 2014
@@ -27,7 +27,7 @@ import java.util.Date;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.queryparser.classic.QueryParser;
@@ -178,7 +178,7 @@ public class SearchFiles {
continue;
}
- Document2 doc = searcher.doc(hits[i].doc);
+ Document doc = searcher.doc(hits[i].doc);
String path = doc.getString("path");
if (path != null) {
System.out.println((i+1) + ". " + path);
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.DrillDownQuery;
import org.apache.lucene.facet.FacetResult;
@@ -69,7 +68,7 @@ public class AssociationsFacetsExample {
// Writes facet ords to a separate directory from the main index
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
- Document2 doc = indexWriter.newDocument();
+ Document doc = indexWriter.newDocument();
// 3 occurrences for tag 'lucene'
doc.add(new IntAssociationFacetField(3, "tags", "lucene"));
// 87% confidence level of genre 'computing'
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java Sun Nov 30 11:07:09 2014
@@ -22,11 +22,8 @@ import java.io.IOException;
import java.text.ParseException;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-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.expressions.Expression;
import org.apache.lucene.expressions.SimpleBindings;
import org.apache.lucene.expressions.js.JavascriptCompiler;
@@ -49,7 +46,6 @@ import org.apache.lucene.search.BooleanC
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.NumericRangeFilter;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
@@ -94,7 +90,7 @@ public class DistanceFacetsExample imple
// Add documents with latitude/longitude location:
// we index these both as DoubleFields (for bounding box/ranges) and as NumericDocValuesFields (for scoring)
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addDouble("latitude", 40.759011);
doc.addDouble("longitude", -73.9844722);
writer.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java Sun Nov 30 11:07:09 2014
@@ -5,9 +5,6 @@ import java.text.ParseException;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.NumericDocValuesField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.expressions.Expression;
import org.apache.lucene.expressions.SimpleBindings;
import org.apache.lucene.expressions.js.JavascriptCompiler;
@@ -22,8 +19,8 @@ import org.apache.lucene.facet.taxonomy.
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.SortField;
@@ -65,15 +62,15 @@ public class ExpressionAggregationFacets
// Writes facet ords to a separate directory from the main index
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
- Document doc = new Document();
- doc.add(new TextField("c", "foo bar", Store.NO));
- doc.add(new NumericDocValuesField("popularity", 5L));
+ Document doc = indexWriter.newDocument();
+ doc.addLargeText("c", "foo bar");
+ doc.addLong("popularity", 5L);
doc.add(new FacetField("A", "B"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- doc = new Document();
- doc.add(new TextField("c", "foo foo bar", Store.NO));
- doc.add(new NumericDocValuesField("popularity", 3L));
+ doc = indexWriter.newDocument();
+ doc.addLargeText("c", "foo foo bar");
+ doc.addLong("popularity", 3L);
doc.add(new FacetField("A", "C"));
indexWriter.addDocument(config.build(taxoWriter, doc));
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java Sun Nov 30 11:07:09 2014
@@ -34,8 +34,8 @@ import org.apache.lucene.facet.taxonomy.
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.store.Directory;
@@ -63,27 +63,27 @@ public class MultiCategoryListsFacetsExa
// Writes facet ords to a separate directory from the main index
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
- Document doc = new Document();
+ Document doc = indexWriter.newDocument();
doc.add(new FacetField("Author", "Bob"));
doc.add(new FacetField("Publish Date", "2010", "10", "15"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- doc = new Document();
+ doc = indexWriter.newDocument();
doc.add(new FacetField("Author", "Lisa"));
doc.add(new FacetField("Publish Date", "2010", "10", "20"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- doc = new Document();
+ doc = indexWriter.newDocument();
doc.add(new FacetField("Author", "Lisa"));
doc.add(new FacetField("Publish Date", "2012", "1", "1"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- doc = new Document();
+ doc = indexWriter.newDocument();
doc.add(new FacetField("Author", "Susan"));
doc.add(new FacetField("Publish Date", "2012", "1", "7"));
indexWriter.addDocument(config.build(taxoWriter, doc));
- doc = new Document();
+ doc = indexWriter.newDocument();
doc.add(new FacetField("Author", "Frank"));
doc.add(new FacetField("Publish Date", "1999", "5", "5"));
indexWriter.addDocument(config.build(taxoWriter, doc));
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java Sun Nov 30 11:07:09 2014
@@ -21,11 +21,8 @@ import java.io.Closeable;
import java.io.IOException;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-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.facet.DrillDownQuery;
import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.Facets;
@@ -40,7 +37,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
-import org.apache.lucene.search.NumericRangeQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.RAMDirectory;
@@ -68,7 +64,7 @@ public class RangeFacetsExample implemen
// Add documents with a fake timestamp, 1000 sec before
// "now", 2000 sec before "now", ...:
for(int i=0;i<100;i++) {
- Document2 doc = indexWriter.newDocument();
+ Document doc = indexWriter.newDocument();
long then = nowSec - i * 1000;
// Add as numeric field, so we can compute range facets and drill down:
doc.addLong("timestamp", then);
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.DrillDownQuery;
import org.apache.lucene.facet.DrillSideways.DrillSidewaysResult;
@@ -65,7 +64,7 @@ public class SimpleFacetsExample {
// Writes facet ords to a separate directory from the main index
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
- Document2 doc = indexWriter.newDocument();
+ Document doc = indexWriter.newDocument();
doc.add(new FacetField("Author", "Bob"));
doc.add(new FacetField("Publish Date", "2010", "10", "15"));
indexWriter.addDocument(config.build(taxoWriter, doc));
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java Sun Nov 30 11:07:09 2014
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.DrillDownQuery;
import org.apache.lucene.facet.FacetResult;
@@ -59,7 +58,7 @@ public class SimpleSortedSetFacetsExampl
private void index() throws IOException {
IndexWriter indexWriter = new IndexWriter(indexDir, new IndexWriterConfig(
new WhitespaceAnalyzer()).setOpenMode(OpenMode.CREATE));
- Document2 doc = indexWriter.newDocument();
+ Document doc = indexWriter.newDocument();
doc.add(new SortedSetDocValuesFacetField("Author", "Bob"));
doc.add(new SortedSetDocValuesFacetField("Publish Year", "2010"));
indexWriter.addDocument(config.build(doc));
Modified: lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (original)
+++ lucene/dev/branches/lucene6005/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java Sun Nov 30 11:07:09 2014
@@ -34,11 +34,8 @@ import javax.servlet.http.HttpServletRes
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -115,7 +112,7 @@ public class FormBasedXmlQueryDemo exten
//and package the results and forward to JSP
if (topDocs != null) {
ScoreDoc[] sd = topDocs.scoreDocs;
- Document2[] results = new Document2[sd.length];
+ Document[] results = new Document[sd.length];
for (int i = 0; i < results.length; i++) {
results[i] = searcher.doc(sd[i].doc);
request.setAttribute("results", results);
@@ -137,18 +134,20 @@ public class FormBasedXmlQueryDemo exten
InputStream dataIn = getServletContext().getResourceAsStream("/WEB-INF/data.tsv");
BufferedReader br = new BufferedReader(new InputStreamReader(dataIn, StandardCharsets.UTF_8));
String line = br.readLine();
- final FieldType textNoNorms = new FieldType(TextField.TYPE_STORED);
- textNoNorms.setOmitNorms(true);
+ FieldTypes fieldTypes = writer.getFieldTypes();
+ for (String fieldName : new String[] {"location", "salary", "type", "description"}) {
+ fieldTypes.disableNorms(fieldName);
+ }
while (line != null) {
line = line.trim();
if (line.length() > 0) {
//parse row and create a document
StringTokenizer st = new StringTokenizer(line, "\t");
- Document doc = new Document();
- doc.add(new Field("location", st.nextToken(), textNoNorms));
- doc.add(new Field("salary", st.nextToken(), textNoNorms));
- doc.add(new Field("type", st.nextToken(), textNoNorms));
- doc.add(new Field("description", st.nextToken(), textNoNorms));
+ Document doc = writer.newDocument();
+ doc.addLargeText("location", st.nextToken());
+ doc.addLargeText("salary", st.nextToken());
+ doc.addLargeText("type", st.nextToken());
+ doc.addLargeText("description", st.nextToken());
writer.addDocument(doc);
}
line = br.readLine();
Modified: lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java (original)
+++ lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java Sun Nov 30 11:07:09 2014
@@ -1,9 +1,6 @@
package org.apache.lucene.expressions;
-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.expressions.js.JavascriptCompiler;
import org.apache.lucene.expressions.js.VariableContext;
import org.apache.lucene.index.DirectoryReader;
@@ -57,7 +54,7 @@ public class TestDemoExpressions extend
dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addUniqueAtom("id", "1");
doc.addLargeText("body", "some contents and more contents");
doc.addInt("popularity", 5);
Modified: lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java Sun Nov 30 11:07:09 2014
@@ -18,8 +18,6 @@ package org.apache.lucene.expressions;
*/
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.expressions.js.JavascriptCompiler;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -45,22 +43,22 @@ public class TestExpressionRescorer exte
dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newStringField("id", "1", Field.Store.YES));
- doc.add(newTextField("body", "some contents and more contents", Field.Store.NO));
- doc.add(new NumericDocValuesField("popularity", 5));
+ Document doc = iw.newDocument();
+ doc.addUniqueAtom("id", "1");
+ doc.addLargeText("body", "some contents and more contents");
+ doc.addInt("popularity", 5);
iw.addDocument(doc);
- doc = new Document();
- doc.add(newStringField("id", "2", Field.Store.YES));
- doc.add(newTextField("body", "another document with different contents", Field.Store.NO));
- doc.add(new NumericDocValuesField("popularity", 20));
+ doc = iw.newDocument();
+ doc.addUniqueAtom("id", "2");
+ doc.addLargeText("body", "another document with different contents");
+ doc.addInt("popularity", 20);
iw.addDocument(doc);
- doc = new Document();
- doc.add(newStringField("id", "3", Field.Store.YES));
- doc.add(newTextField("body", "crappy contents", Field.Store.NO));
- doc.add(new NumericDocValuesField("popularity", 2));
+ doc = iw.newDocument();
+ doc.addUniqueAtom("id", "3");
+ doc.addLargeText("body", "crappy contents");
+ doc.addInt("popularity", 2);
iw.addDocument(doc);
reader = iw.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java (original)
+++ lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java Sun Nov 30 11:07:09 2014
@@ -20,11 +20,7 @@ package org.apache.lucene.expressions;
import java.util.Arrays;
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.FloatDocValuesField;
-import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.expressions.js.JavascriptCompiler;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -62,7 +58,7 @@ public class TestExpressionSorts extends
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
int numDocs = TestUtil.nextInt(random(), 2049, 4000);
for (int i = 0; i < numDocs; i++) {
- Document2 document = iw.newDocument();
+ Document document = iw.newDocument();
document.addLargeText("english", English.intToEnglish(i));
document.addLargeText("oddeven", (i % 2 == 0) ? "even" : "odd");
document.addInt("int", random().nextInt());
Modified: lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java (original)
+++ lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java Sun Nov 30 11:07:09 2014
@@ -21,12 +21,10 @@ import java.util.HashMap;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.expressions.js.JavascriptCompiler;
-import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.ValueSource;
@@ -48,22 +46,22 @@ public class TestExpressionValueSource e
iwc.setMergePolicy(newLogMergePolicy());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
- doc.add(newStringField("id", "1", Field.Store.YES));
- doc.add(newTextField("body", "some contents and more contents", Field.Store.NO));
- doc.add(new NumericDocValuesField("popularity", 5));
+ Document doc = iw.newDocument();
+ doc.addAtom("id", "1");
+ doc.addLargeText("body", "some contents and more contents");
+ doc.addInt("popularity", 5);
iw.addDocument(doc);
- doc = new Document();
- doc.add(newStringField("id", "2", Field.Store.YES));
- doc.add(newTextField("body", "another document with different contents", Field.Store.NO));
- doc.add(new NumericDocValuesField("popularity", 20));
+ doc = iw.newDocument();
+ doc.addAtom("id", "2");
+ doc.addLargeText("body", "another document with different contents");
+ doc.addInt("popularity", 20);
iw.addDocument(doc);
- doc = new Document();
- doc.add(newStringField("id", "3", Field.Store.YES));
- doc.add(newTextField("body", "crappy contents", Field.Store.NO));
- doc.add(new NumericDocValuesField("popularity", 2));
+ doc = iw.newDocument();
+ doc.addAtom("id", "3");
+ doc.addLargeText("body", "crappy contents");
+ doc.addInt("popularity", 2);
iw.addDocument(doc);
iw.forceMerge(1);
Modified: lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetField.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetField.java (original)
+++ lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetField.java Sun Nov 30 11:07:09 2014
@@ -19,10 +19,13 @@ package org.apache.lucene.facet;
import java.util.Arrays;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
+import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.IndexOptions;
+import org.apache.lucene.index.IndexableField;
+import org.apache.lucene.index.IndexableFieldType;
+import org.apache.lucene.util.BytesRef;
/**
* Add an instance of this to your {@link Document} for every facet label.
@@ -31,11 +34,18 @@ import org.apache.lucene.index.IndexOpti
* <b>NOTE:</b> you must call {@link FacetsConfig#build(Document)} before
* you add the document to IndexWriter.
*/
-public class FacetField extends Field {
- static final FieldType TYPE = new FieldType();
- static {
- TYPE.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS);
- TYPE.freeze();
+public class FacetField implements IndexableField {
+
+ public static final IndexableFieldType TYPE = new IndexableFieldType() {
+ };
+
+ @Override
+ public String name() {
+ return "dummy";
+ }
+
+ public IndexableFieldType fieldType() {
+ return TYPE;
}
/** Dimension for this field. */
@@ -47,7 +57,6 @@ public class FacetField extends Field {
/** Creates the this from {@code dim} and
* {@code path}. */
public FacetField(String dim, String... path) {
- super("dummy", TYPE);
verifyLabel(dim);
for(String label : path) {
verifyLabel(label);
Modified: lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java (original)
+++ lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java Sun Nov 30 11:07:09 2014
@@ -27,14 +27,8 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-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.FieldType;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.facet.sortedset.SortedSetDocValuesFacetField;
import org.apache.lucene.facet.taxonomy.AssociationFacetField;
import org.apache.lucene.facet.taxonomy.FacetLabel;
@@ -196,19 +190,6 @@ public class FacetsConfig {
}
/**
- * Translates any added {@link FacetField}s into normal fields for indexing;
- * only use this version if you did not add any taxonomy-based fields (
- * {@link FacetField} or {@link AssociationFacetField}).
- *
- * <p>
- * <b>NOTE:</b> you should add the returned document to IndexWriter, not the
- * input one!
- */
- public Document2 build(Document2 doc) throws IOException {
- return build(null, doc);
- }
-
- /**
* Translates any added {@link FacetField}s into normal fields for indexing.
*
* <p>
@@ -299,119 +280,7 @@ public class FacetsConfig {
}
}
- Document result = new Document();
-
- processFacetFields(taxoWriter, byField, result);
- processSSDVFacetFields(dvByField, result);
- processAssocFacetFields(taxoWriter, assocByField, result);
-
- //System.out.println("add stored: " + addedStoredFields);
-
- for (IndexableField field : doc.getFields()) {
- IndexableFieldType ft = field.fieldType();
- if (ft != FacetField.TYPE && ft != SortedSetDocValuesFacetField.TYPE && ft != AssociationFacetField.TYPE) {
- result.add(field);
- }
- }
-
- //System.out.println("all indexed: " + allIndexedFields);
- //System.out.println("all stored: " + allStoredFields);
-
- return result;
- }
-
- /**
- * Translates any added {@link FacetField}s into normal fields for indexing.
- *
- * <p>
- * <b>NOTE:</b> you should add the returned document to IndexWriter, not the
- * input one!
- */
- public Document2 build(TaxonomyWriter taxoWriter, Document2 doc) throws IOException {
- // Find all FacetFields, collated by the actual field:
- Map<String,List<FacetField>> byField = new HashMap<>();
-
- // ... and also all SortedSetDocValuesFacetFields:
- Map<String,List<SortedSetDocValuesFacetField>> dvByField = new HashMap<>();
-
- // ... and also all AssociationFacetFields
- Map<String,List<AssociationFacetField>> assocByField = new HashMap<>();
-
- Set<String> seenDims = new HashSet<>();
-
- for (IndexableField field : doc) {
- if (field.fieldType() == FacetField.TYPE) {
- FacetField facetField = (FacetField) field;
- FacetsConfig.DimConfig dimConfig = getDimConfig(facetField.dim);
- if (dimConfig.multiValued == false) {
- checkSeen(seenDims, facetField.dim);
- }
- String indexFieldName = dimConfig.indexFieldName;
- List<FacetField> fields = byField.get(indexFieldName);
- if (fields == null) {
- fields = new ArrayList<>();
- byField.put(indexFieldName, fields);
- }
- fields.add(facetField);
- }
-
- if (field.fieldType() == SortedSetDocValuesFacetField.TYPE) {
- SortedSetDocValuesFacetField facetField = (SortedSetDocValuesFacetField) field;
- FacetsConfig.DimConfig dimConfig = getDimConfig(facetField.dim);
- if (dimConfig.multiValued == false) {
- checkSeen(seenDims, facetField.dim);
- }
- String indexFieldName = dimConfig.indexFieldName;
- List<SortedSetDocValuesFacetField> fields = dvByField.get(indexFieldName);
- if (fields == null) {
- fields = new ArrayList<>();
- dvByField.put(indexFieldName, fields);
- }
- fields.add(facetField);
- }
-
- if (field.fieldType() == AssociationFacetField.TYPE) {
- AssociationFacetField facetField = (AssociationFacetField) field;
- FacetsConfig.DimConfig dimConfig = getDimConfig(facetField.dim);
- if (dimConfig.multiValued == false) {
- checkSeen(seenDims, facetField.dim);
- }
- if (dimConfig.hierarchical) {
- throw new IllegalArgumentException("AssociationFacetField cannot be hierarchical (dim=\"" + facetField.dim + "\")");
- }
- if (dimConfig.requireDimCount) {
- throw new IllegalArgumentException("AssociationFacetField cannot requireDimCount (dim=\"" + facetField.dim + "\")");
- }
-
- String indexFieldName = dimConfig.indexFieldName;
- List<AssociationFacetField> fields = assocByField.get(indexFieldName);
- if (fields == null) {
- fields = new ArrayList<>();
- assocByField.put(indexFieldName, fields);
- }
- fields.add(facetField);
-
- // Best effort: detect mis-matched types in same
- // indexed field:
- String type;
- if (facetField instanceof IntAssociationFacetField) {
- type = "int";
- } else if (facetField instanceof FloatAssociationFacetField) {
- type = "float";
- } else {
- type = "bytes";
- }
- // NOTE: not thread safe, but this is just best effort:
- String curType = assocDimTypes.get(indexFieldName);
- if (curType == null) {
- assocDimTypes.put(indexFieldName, type);
- } else if (!curType.equals(type)) {
- throw new IllegalArgumentException("mixing incompatible types of AssocationFacetField (" + curType + " and " + type + ") in indexed field \"" + indexFieldName + "\"; use FacetsConfig to change the indexFieldName for each dimension");
- }
- }
- }
-
- Document2 result = new Document2(doc.getFieldTypes());
+ Document result = new Document(doc.getFieldTypes());
processFacetFields(taxoWriter, byField, result);
processSSDVFacetFields(dvByField, result);
@@ -434,56 +303,6 @@ public class FacetsConfig {
private void processFacetFields(TaxonomyWriter taxoWriter, Map<String,List<FacetField>> byField, Document doc) throws IOException {
- for(Map.Entry<String,List<FacetField>> ent : byField.entrySet()) {
-
- String indexFieldName = ent.getKey();
- //System.out.println(" indexFieldName=" + indexFieldName + " fields=" + ent.getValue());
-
- IntsRefBuilder ordinals = new IntsRefBuilder();
- for(FacetField facetField : ent.getValue()) {
-
- FacetsConfig.DimConfig ft = getDimConfig(facetField.dim);
- if (facetField.path.length > 1 && ft.hierarchical == false) {
- throw new IllegalArgumentException("dimension \"" + facetField.dim + "\" is not hierarchical yet has " + facetField.path.length + " components");
- }
-
- FacetLabel cp = new FacetLabel(facetField.dim, facetField.path);
-
- checkTaxoWriter(taxoWriter);
- int ordinal = taxoWriter.addCategory(cp);
- ordinals.append(ordinal);
- //System.out.println("ords[" + (ordinals.length-1) + "]=" + ordinal);
- //System.out.println(" add cp=" + cp);
-
- if (ft.multiValued && (ft.hierarchical || ft.requireDimCount)) {
- //System.out.println(" add parents");
- // Add all parents too:
- int parent = taxoWriter.getParent(ordinal);
- while (parent > 0) {
- ordinals.append(parent);
- parent = taxoWriter.getParent(parent);
- }
-
- if (ft.requireDimCount == false) {
- // Remove last (dimension) ord:
- ordinals.setLength(ordinals.length() - 1);
- }
- }
-
- // Drill down:
- for (int i=1;i<=cp.length;i++) {
- doc.add(new StringField(indexFieldName, pathToString(cp.components, i), Field.Store.NO));
- }
- }
-
- // Facet counts:
- // DocValues are considered stored fields:
- doc.add(new BinaryDocValuesField(indexFieldName, dedupAndEncode(ordinals.get())));
- }
- }
-
- private void processFacetFields(TaxonomyWriter taxoWriter, Map<String,List<FacetField>> byField, Document2 doc) throws IOException {
-
FieldTypes fieldTypes = doc.getFieldTypes();
for(Map.Entry<String,List<FacetField>> ent : byField.entrySet()) {
@@ -542,28 +361,6 @@ public class FacetsConfig {
private void processSSDVFacetFields(Map<String,List<SortedSetDocValuesFacetField>> byField, Document doc) throws IOException {
//System.out.println("process SSDV: " + byField);
- for(Map.Entry<String,List<SortedSetDocValuesFacetField>> ent : byField.entrySet()) {
-
- String indexFieldName = ent.getKey();
- //System.out.println(" field=" + indexFieldName);
-
- for(SortedSetDocValuesFacetField facetField : ent.getValue()) {
- FacetLabel cp = new FacetLabel(facetField.dim, facetField.label);
- String fullPath = pathToString(cp.components, cp.length);
- //System.out.println("add " + fullPath);
-
- // For facet counts:
- doc.add(new SortedSetDocValuesField(indexFieldName, new BytesRef(fullPath)));
-
- // For drill-down:
- doc.add(new StringField(indexFieldName, fullPath, Field.Store.NO));
- doc.add(new StringField(indexFieldName, facetField.dim, Field.Store.NO));
- }
- }
- }
-
- private void processSSDVFacetFields(Map<String,List<SortedSetDocValuesFacetField>> byField, Document2 doc) throws IOException {
- //System.out.println("process SSDV: " + byField);
FieldTypes fieldTypes = doc.getFieldTypes();
for(Map.Entry<String,List<SortedSetDocValuesFacetField>> ent : byField.entrySet()) {
@@ -600,41 +397,6 @@ public class FacetsConfig {
private void processAssocFacetFields(TaxonomyWriter taxoWriter,
Map<String,List<AssociationFacetField>> byField, Document doc)
throws IOException {
- for (Map.Entry<String,List<AssociationFacetField>> ent : byField.entrySet()) {
- byte[] bytes = new byte[16];
- int upto = 0;
- String indexFieldName = ent.getKey();
- for(AssociationFacetField field : ent.getValue()) {
- // NOTE: we don't add parents for associations
- checkTaxoWriter(taxoWriter);
- FacetLabel label = new FacetLabel(field.dim, field.path);
- int ordinal = taxoWriter.addCategory(label);
- if (upto + 4 > bytes.length) {
- bytes = ArrayUtil.grow(bytes, upto+4);
- }
- // big-endian:
- bytes[upto++] = (byte) (ordinal >> 24);
- bytes[upto++] = (byte) (ordinal >> 16);
- bytes[upto++] = (byte) (ordinal >> 8);
- bytes[upto++] = (byte) ordinal;
- if (upto + field.assoc.length > bytes.length) {
- bytes = ArrayUtil.grow(bytes, upto+field.assoc.length);
- }
- System.arraycopy(field.assoc.bytes, field.assoc.offset, bytes, upto, field.assoc.length);
- upto += field.assoc.length;
-
- // Drill down:
- for (int i = 1; i <= label.length; i++) {
- doc.add(new StringField(indexFieldName, pathToString(label.components, i), Field.Store.NO));
- }
- }
- doc.add(new BinaryDocValuesField(indexFieldName, new BytesRef(bytes, 0, upto)));
- }
- }
-
- private void processAssocFacetFields(TaxonomyWriter taxoWriter,
- Map<String,List<AssociationFacetField>> byField, Document2 doc)
- throws IOException {
FieldTypes fieldTypes = doc.getFieldTypes();
Modified: lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java Sun Nov 30 11:07:09 2014
@@ -242,7 +242,7 @@ public class RandomSamplingFacetsCollect
for (int i = 0; i < res.labelValues.length; i++) {
childPath[res.path.length + 1] = res.labelValues[i].label;
String fullPath = FacetsConfig.pathToString(childPath, childPath.length);
- int max = reader.docFreq(new Term(dimConfig.indexFieldName, fullPath));
+ int max = reader.docFreq(new Term(FacetsConfig.drillDownFieldName(dimConfig.indexFieldName), fullPath));
int correctedCount = (int) (res.labelValues[i].value.doubleValue() / samplingRate);
correctedCount = Math.min(max, correctedCount);
fixedLabelValues[i] = new LabelAndValue(res.labelValues[i].label, correctedCount);