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/11 12:24:56 UTC
svn commit: r1638066 [4/4] - in
/lucene/dev/branches/lucene6005/lucene/core/src: java/
java/org/apache/lucene/document/ java/org/apache/lucene/index/
test/org/apache/lucene/codecs/lucene50/
test/org/apache/lucene/codecs/perfield/ test/org/apache/lucene...
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -21,9 +21,9 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -44,29 +44,31 @@ public class TestTermVectors extends Luc
public static void beforeClass() throws Exception {
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory, newIndexWriterConfig(new MockAnalyzer(random(), MockTokenizer.SIMPLE, true)).setMergePolicy(newLogMergePolicy()));
+ FieldTypes fieldTypes = writer.getFieldTypes();
+
//writer.setNoCFSRatio(1.0);
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
- Document doc = new Document();
FieldType ft = new FieldType(TextField.TYPE_STORED);
int mod3 = i % 3;
int mod2 = i % 2;
if (mod2 == 0 && mod3 == 0) {
- ft.setStoreTermVectors(true);
- ft.setStoreTermVectorOffsets(true);
- ft.setStoreTermVectorPositions(true);
+ fieldTypes.enableTermVectors("field");
+ fieldTypes.enableTermVectorOffsets("field");
+ fieldTypes.enableTermVectorPositions("field");
} else if (mod2 == 0) {
- ft.setStoreTermVectors(true);
- ft.setStoreTermVectorPositions(true);
+ fieldTypes.enableTermVectors("field");
+ fieldTypes.enableTermVectorPositions("field");
} else if (mod3 == 0) {
- ft.setStoreTermVectors(true);
- ft.setStoreTermVectorOffsets(true);
+ fieldTypes.enableTermVectors("field");
+ fieldTypes.enableTermVectorOffsets("field");
} else {
- ft.setStoreTermVectors(true);
+ fieldTypes.enableTermVectors("field");
}
- doc.add(new Field("field", English.intToEnglish(i), ft));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("field", English.intToEnglish(i));
//test no term vectors too
- doc.add(new TextField("noTV", English.intToEnglish(i), Field.Store.YES));
+ doc.addLargeText("noTV", English.intToEnglish(i));
writer.addDocument(doc);
}
reader = writer.getReader();
@@ -88,17 +90,18 @@ public class TestTermVectors extends Luc
private void createDir(Directory dir) throws IOException {
IndexWriter writer = createWriter(dir);
- writer.addDocument(createDoc());
+ writer.addDocument(createDoc(writer));
writer.close();
}
- private Document createDoc() {
- Document doc = new Document();
- final FieldType ft = new FieldType(TextField.TYPE_STORED);
- ft.setStoreTermVectors(true);
- ft.setStoreTermVectorOffsets(true);
- ft.setStoreTermVectorPositions(true);
- doc.add(newField("c", "aaa", ft));
+ private Document2 createDoc(IndexWriter writer) {
+ FieldTypes fieldTypes = writer.getFieldTypes();
+ fieldTypes.enableTermVectors("c");
+ fieldTypes.enableTermVectorOffsets("c");
+ fieldTypes.enableTermVectorPositions("c");
+
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("c", "aaa");
return doc;
}
@@ -117,7 +120,7 @@ public class TestTermVectors extends Luc
// with maxBufferedDocs=2, this results in two segments, so that forceMerge
// actually does something.
for (int i = 0; i < 4; i++) {
- writer.addDocument(createDoc());
+ writer.addDocument(createDoc(writer));
}
writer.forceMerge(1);
writer.close();
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -21,10 +21,9 @@ import java.io.IOException;
import java.util.BitSet;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.TimeLimitingCollector.TimeExceededException;
@@ -118,8 +117,8 @@ public class TestTimeLimitingCollector e
}
private void add(String value, RandomIndexWriter iw) throws IOException {
- Document d = new Document();
- d.add(newTextField(FIELD_NAME, value, Field.Store.NO));
+ Document2 d = iw.newDocument();
+ d.addLargeText(FIELD_NAME, value);
iw.addDocument(d);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java?rev=1638066&r1=1638065&r2=1638066&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java Tue Nov 11 11:24:51 2014
@@ -19,9 +19,8 @@ package org.apache.lucene.search;
import java.io.IOException;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -109,7 +108,7 @@ public class TestTopDocsCollector extend
dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 30; i++) {
- writer.addDocument(new Document());
+ writer.addDocument(writer.newDocument());
}
reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java?rev=1638066&r1=1638065&r2=1638066&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java Tue Nov 11 11:24:51 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.BooleanClause.Occur;
@@ -37,8 +36,7 @@ public class TestTopFieldCollector exten
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
int numDocs = atLeast(100);
for (int i = 0; i < numDocs; i++) {
- Document doc = new Document();
- iw.addDocument(doc);
+ iw.addDocument(iw.newDocument());
}
ir = iw.getReader();
iw.close();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java?rev=1638066&r1=1638065&r2=1638066&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopScoreDocCollector.java Tue Nov 11 11:24:51 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.search.BooleanClause.Occur;
@@ -30,7 +29,7 @@ public class TestTopScoreDocCollector ex
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 10; i++) {
- writer.addDocument(new Document());
+ writer.addDocument(writer.newDocument());
}
boolean[] inOrder = new boolean[] { false, true };
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -17,9 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
@@ -31,9 +29,8 @@ public class TestTotalHitCountCollector
Directory indexStore = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), indexStore);
for(int i=0; i<5; i++) {
- Document doc = new Document();
- doc.add(new StringField("string", "a"+i, Field.Store.NO));
- doc.add(new StringField("string", "b"+i, Field.Store.NO));
+ Document2 doc = writer.newDocument();
+ doc.addAtom("string", "a"+i);
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -23,8 +23,7 @@ import java.text.NumberFormat;
import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -50,13 +49,10 @@ public class TestWildcardRandom extends
newIndexWriterConfig(new MockAnalyzer(random()))
.setMaxBufferedDocs(TestUtil.nextInt(random(), 50, 1000)));
- Document doc = new Document();
- Field field = newStringField("field", "", Field.Store.NO);
- doc.add(field);
-
NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ROOT));
for (int i = 0; i < 1000; i++) {
- field.setStringValue(df.format(i));
+ Document2 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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -17,26 +17,24 @@ package org.apache.lucene.search.payload
* limitations under the License.
*/
+import java.io.IOException;
+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.index.DirectoryReader;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.English;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
-
-import java.io.IOException;
-import java.util.Random;
+import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.English;
+import org.apache.lucene.util.LuceneTestCase;
/**
*
@@ -121,10 +119,10 @@ public class PayloadHelper {
analyzer).setSimilarity(similarity));
// writer.infoStream = System.out;
for (int i = 0; i < numDocs; i++) {
- Document doc = new Document();
- doc.add(new TextField(FIELD, English.intToEnglish(i), Field.Store.YES));
- doc.add(new TextField(MULTI_FIELD, English.intToEnglish(i) + " " + English.intToEnglish(i), Field.Store.YES));
- doc.add(new TextField(NO_PAYLOAD_FIELD, English.intToEnglish(i), Field.Store.YES));
+ Document2 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));
writer.addDocument(doc);
}
reader = DirectoryReader.open(writer, true);
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -15,26 +15,26 @@ package org.apache.lucene.search.payload
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
import java.io.IOException;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.QueryUtils;
import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermStatistics;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.similarities.DefaultSimilarity;
-import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanNearQuery;
+import org.apache.lucene.search.spans.SpanQuery;
import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -43,7 +43,6 @@ import org.apache.lucene.util.LuceneTest
import org.junit.AfterClass;
import org.junit.BeforeClass;
-
public class TestPayloadNearQuery extends LuceneTestCase {
private static IndexSearcher searcher;
private static IndexReader reader;
@@ -110,10 +109,10 @@ public class TestPayloadNearQuery extend
.setSimilarity(similarity));
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
- Document doc = new Document();
- doc.add(newTextField("field", English.intToEnglish(i), Field.Store.YES));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("field", English.intToEnglish(i));
String txt = English.intToEnglish(i) +' '+English.intToEnglish(i+1);
- doc.add(newTextField("field2", txt, Field.Store.YES));
+ doc.addLargeText("field2", txt);
writer.addDocument(doc);
}
reader = writer.getReader();
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -20,10 +20,8 @@ package org.apache.lucene.search.similar
import java.util.ArrayList;
import java.util.List;
-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.Document2;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -93,8 +91,8 @@ public class TestSimilarity2 extends Luc
public void testEmptyField() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newTextField("foo", "bar", Field.Store.NO));
+ Document2 doc = iw.newDocument();
+ doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
@@ -115,8 +113,8 @@ public class TestSimilarity2 extends Luc
public void testEmptyTerm() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newTextField("foo", "bar", Field.Store.NO));
+ Document2 doc = iw.newDocument();
+ doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
@@ -137,11 +135,10 @@ public class TestSimilarity2 extends Luc
public void testNoNorms() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
- ft.setOmitNorms(true);
- ft.freeze();
- doc.add(newField("foo", "bar", ft));
+ FieldTypes fieldTypes = iw.getFieldTypes();
+ fieldTypes.disableNorms("foo");
+ Document2 doc = iw.newDocument();
+ doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
@@ -161,12 +158,12 @@ public class TestSimilarity2 extends Luc
public void testOmitTF() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
- ft.setIndexOptions(IndexOptions.DOCS);
- ft.freeze();
- Field f = newField("foo", "bar", ft);
- doc.add(f);
+ FieldTypes fieldTypes = iw.getFieldTypes();
+ fieldTypes.setIndexOptions("foo", IndexOptions.DOCS);
+ fieldTypes.disableHighlighting("foo");
+
+ Document2 doc = iw.newDocument();
+ doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
@@ -186,13 +183,13 @@ public class TestSimilarity2 extends Luc
public void testOmitTFAndNorms() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
- ft.setIndexOptions(IndexOptions.DOCS);
- ft.setOmitNorms(true);
- ft.freeze();
- Field f = newField("foo", "bar", ft);
- doc.add(f);
+ FieldTypes fieldTypes = iw.getFieldTypes();
+
+ Document2 doc = iw.newDocument();
+ fieldTypes.setIndexOptions("foo", IndexOptions.DOCS);
+ fieldTypes.disableNorms("foo");
+ fieldTypes.disableHighlighting("foo");
+ doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
@@ -216,9 +213,8 @@ 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);
- Document doc = new Document();
- FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
- doc.add(newField("foo", "bar", ft));
+ Document2 doc = iw.newDocument();
+ doc.addLargeText("foo", "bar");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -21,12 +21,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-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.Document2;
import org.apache.lucene.index.FieldInvertState;
-import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -110,11 +106,9 @@ public class TestSimilarityBase extends
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
for (int i = 0; i < docs.length; i++) {
- Document d = new Document();
- FieldType ft = new FieldType(TextField.TYPE_STORED);
- ft.setIndexOptions(IndexOptions.NONE);
- d.add(newField(FIELD_ID, Integer.toString(i), ft));
- d.add(newTextField(FIELD_BODY, docs[i], Field.Store.YES));
+ Document2 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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -27,8 +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.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -114,8 +113,8 @@ public class TestBasics extends LuceneTe
.setMaxBufferedDocs(TestUtil.nextInt(random(), 100, 1000)).setMergePolicy(newLogMergePolicy()));
//writer.infoStream = System.out;
for (int i = 0; i < 2000; i++) {
- Document doc = new Document();
- doc.add(newTextField("field", English.intToEnglish(i), Field.Store.YES));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("field", English.intToEnglish(i));
writer.addDocument(doc);
}
reader = writer.getReader();
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -21,7 +21,7 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -38,10 +38,13 @@ import org.junit.BeforeClass;
public class TestFieldMaskingSpanQuery extends LuceneTestCase {
- protected static Document doc(Field[] fields) {
- Document doc = new Document();
- for (int i = 0; i < fields.length; i++) {
- doc.add(fields[i]);
+ protected static Document2 doc(RandomIndexWriter w, String... nameAndValues) {
+ Document2 doc = w.newDocument();
+ int upto = 0;
+ while (upto < nameAndValues.length) {
+ doc.addLargeText(nameAndValues[upto],
+ nameAndValues[upto+1]);
+ upto += 2;
}
return doc;
}
@@ -59,59 +62,53 @@ public class TestFieldMaskingSpanQuery e
directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random(), directory, newIndexWriterConfig(new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
- writer.addDocument(doc(new Field[] { field("id", "0")
- ,
- field("gender", "male"),
- field("first", "james"),
- field("last", "jones") }));
+ writer.addDocument(doc(writer,
+ "id", "0",
+ "gender", "male",
+ "first", "james",
+ "last", "jones"));
- writer.addDocument(doc(new Field[] { field("id", "1")
- ,
- field("gender", "male"),
- field("first", "james"),
- field("last", "smith")
- ,
- field("gender", "female"),
- field("first", "sally"),
- field("last", "jones") }));
+ writer.addDocument(doc(writer,
+ "id", "1",
+ "gender", "male",
+ "first", "james",
+ "last", "smith",
+ "gender", "female",
+ "first", "sally",
+ "last", "jones"));
- writer.addDocument(doc(new Field[] { field("id", "2")
- ,
- field("gender", "female"),
- field("first", "greta"),
- field("last", "jones")
- ,
- field("gender", "female"),
- field("first", "sally"),
- field("last", "smith")
- ,
- field("gender", "male"),
- field("first", "james"),
- field("last", "jones") }));
+ writer.addDocument(doc(writer,
+ "id", "2",
+ "gender", "female",
+ "first", "greta",
+ "last", "jones",
+ "gender", "female",
+ "first", "sally",
+ "last", "smith",
+ "gender", "male",
+ "first", "james",
+ "last", "jones"));
- writer.addDocument(doc(new Field[] { field("id", "3")
- ,
- field("gender", "female"),
- field("first", "lisa"),
- field("last", "jones")
- ,
- field("gender", "male"),
- field("first", "bob"),
- field("last", "costas") }));
+ writer.addDocument(doc(writer,
+ "id", "3",
+ "gender", "female",
+ "first", "lisa",
+ "last", "jones",
+ "gender", "male",
+ "first", "bob",
+ "last", "costas"));
- writer.addDocument(doc(new Field[] { field("id", "4")
- ,
- field("gender", "female"),
- field("first", "sally"),
- field("last", "smith")
- ,
- field("gender", "female"),
- field("first", "linda"),
- field("last", "dixit")
- ,
- field("gender", "male"),
- field("first", "bubba"),
- field("last", "jones") }));
+ writer.addDocument(doc(writer,
+ "id", "4",
+ "gender", "female",
+ "first", "sally",
+ "last", "smith",
+ "gender", "female",
+ "first", "linda",
+ "last", "dixit",
+ "gender", "male",
+ "first", "bubba",
+ "last", "jones"));
reader = writer.getReader();
writer.close();
searcher = newSearcher(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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -18,18 +18,17 @@ package org.apache.lucene.search.spans;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexReaderContext;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.CheckHits;
import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Weight;
import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Weight;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -53,8 +52,8 @@ 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++) {
- Document doc = new Document();
- doc.add(newTextField(FIELD, docFields[i], Field.Store.NO));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText(FIELD, docFields[i]);
writer.addDocument(doc);
}
reader = writer.getReader();
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -28,14 +28,12 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
+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.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
@@ -112,8 +110,8 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new PayloadAnalyzer()).setSimilarity(similarity));
- Document doc = new Document();
- doc.add(newTextField(PayloadHelper.FIELD, "one two three one four three", Field.Store.YES));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText(PayloadHelper.FIELD, "one two three one four three");
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
@@ -255,8 +253,8 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new TestPayloadAnalyzer()));
- Document doc = new Document();
- doc.add(new TextField("content", new StringReader("a b c d e f g h i j a k")));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("content", new StringReader("a b c d e f g h i j a k"));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -292,8 +290,8 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new TestPayloadAnalyzer()));
- Document doc = new Document();
- doc.add(new TextField("content", new StringReader("a b a d k f a h i k a k")));
+ Document2 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();
IndexSearcher is = newSearcher(reader);
@@ -327,8 +325,8 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new TestPayloadAnalyzer()));
- Document doc = new Document();
- doc.add(new TextField("content", new StringReader("j k a l f k k p a t a k l k t a")));
+ Document2 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();
IndexSearcher is = newSearcher(reader);
@@ -368,8 +366,8 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new PayloadAnalyzer()).setSimilarity(similarity));
- Document doc = new Document();
- doc.add(newTextField(PayloadHelper.FIELD, "xx rr yy mm pp", Field.Store.YES));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText(PayloadHelper.FIELD, "xx rr yy mm pp");
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -428,11 +426,10 @@ public class TestPayloadSpans extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random(), directory,
newIndexWriterConfig(new PayloadAnalyzer()).setSimilarity(similarity));
- Document doc = null;
for(int i = 0; i < docs.length; i++) {
- doc = new Document();
+ Document2 doc = writer.newDocument();
String docText = docs[i];
- doc.add(newTextField(PayloadHelper.FIELD, docText, Field.Store.YES));
+ 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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -20,8 +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.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -40,11 +39,11 @@ public class TestSpanFirstQuery extends
Analyzer analyzer = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, stopSet);
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, analyzer);
- Document doc = new Document();
- doc.add(newTextField("field", "the quick brown fox", Field.Store.NO));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("field", "the quick brown fox");
writer.addDocument(doc);
- Document doc2 = new Document();
- doc2.add(newTextField("field", "quick brown fox", Field.Store.NO));
+ Document2 doc2 = writer.newDocument();
+ doc2.addLargeText("field", "quick brown fox");
writer.addDocument(doc2);
IndexReader reader = writer.getReader();
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=1638066&r1=1638065&r2=1638066&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 Tue Nov 11 11:24:51 2014
@@ -23,8 +23,6 @@ import org.apache.lucene.analysis.MockAn
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.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -88,9 +86,9 @@ public class TestSpansAdvanced extends L
protected void addDocument(final RandomIndexWriter writer, final String id,
final String text) throws IOException {
- final Document document = new Document();
- document.add(newStringField(FIELD_ID, id, Field.Store.YES));
- document.add(newTextField(FIELD_TEXT, text, Field.Store.YES));
+ Document2 document = writer.newDocument();
+ document.addUniqueAtom(FIELD_ID, id);
+ document.addLargeText(FIELD_TEXT, text);
writer.addDocument(document);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java?rev=1638066&r1=1638065&r2=1638066&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfUnreferencedFiles.java Tue Nov 11 11:24:51 2014
@@ -19,7 +19,8 @@ package org.apache.lucene.util.junitcomp
import java.util.Collections;
-import org.apache.lucene.document.Document;
+import com.carrotsearch.randomizedtesting.RandomizedTest;
+
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.IOContext;
@@ -30,7 +31,6 @@ import org.junit.Test;
import org.junit.runner.JUnitCore;
import org.junit.runner.Result;
import org.junit.runner.notification.Failure;
-import com.carrotsearch.randomizedtesting.RandomizedTest;
// LUCENE-4456: Test that we fail if there are unreferenced files
public class TestFailIfUnreferencedFiles extends WithNestedTests {
@@ -43,7 +43,7 @@ public class TestFailIfUnreferencedFiles
MockDirectoryWrapper dir = newMockDirectory();
dir.setAssertNoUnrefencedFilesOnClose(true);
IndexWriter iw = new IndexWriter(dir, new IndexWriterConfig(null));
- iw.addDocument(new Document());
+ iw.addDocument(iw.newDocument());
iw.close();
IndexOutput output = dir.createOutput("_hello.world", IOContext.DEFAULT);
output.writeString("i am unreferenced!");