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 2012/06/10 19:42:29 UTC
svn commit: r1348630 [6/7] - in /lucene/dev/trunk:
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/
lucene/analysis/common/src/test/org/apache/lucene/analysis/que...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java Sun Jun 10 17:42:19 2012
@@ -18,13 +18,11 @@ package org.apache.lucene.store;
*/
import java.io.File;
-import java.io.IOException;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.util.BytesRef;
@@ -154,8 +152,8 @@ public class TestMultiMMap extends Lucen
MockDirectoryWrapper dir = new MockDirectoryWrapper(random, mmapDir);
RandomIndexWriter writer = new RandomIndexWriter(random, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
Document doc = new Document();
- Field docid = newField("docid", "0", StringField.TYPE_STORED);
- Field junk = newField("junk", "", StringField.TYPE_STORED);
+ Field docid = newStringField("docid", "0", Field.Store.YES);
+ Field junk = newStringField("junk", "", Field.Store.YES);
doc.add(docid);
doc.add(junk);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java Sun Jun 10 17:42:19 2012
@@ -20,11 +20,11 @@ package org.apache.lucene.store;
import java.io.File;
import java.io.IOException;
+import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -57,7 +57,7 @@ public class TestRAMDirectory extends Lu
Document doc = null;
for (int i = 0; i < docsToAdd; i++) {
doc = new Document();
- doc.add(newField("content", English.intToEnglish(i).trim(), StringField.TYPE_STORED));
+ doc.add(newStringField("content", English.intToEnglish(i).trim(), Field.Store.YES));
writer.addDocument(doc);
}
assertEquals(docsToAdd, writer.maxDoc());
@@ -116,7 +116,7 @@ public class TestRAMDirectory extends Lu
public void run() {
for (int j=1; j<docsPerThread; j++) {
Document doc = new Document();
- doc.add(newField("sizeContent", English.intToEnglish(num*docsPerThread+j).trim(), StringField.TYPE_STORED));
+ doc.add(newStringField("sizeContent", English.intToEnglish(num*docsPerThread+j).trim(), Field.Store.YES));
try {
writer.addDocument(doc);
} catch (IOException e) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java Sun Jun 10 17:42:19 2012
@@ -19,12 +19,12 @@ package org.apache.lucene.store;
import java.io.File;
+import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -84,7 +84,7 @@ public class TestWindowsMMap extends Luc
for(int dx = 0; dx < num; dx ++) {
String f = randomField();
Document doc = new Document();
- doc.add(newField("data", f, TextField.TYPE_STORED));
+ doc.add(newTextField("data", f, Field.Store.YES));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java Sun Jun 10 17:42:19 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.util;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.DirectoryReader;
@@ -57,12 +57,12 @@ public class TestFieldCacheSanityChecker
float theFloat = Float.MAX_VALUE;
for (int i = 0; i < NUM_DOCS; i++){
Document doc = new Document();
- doc.add(newField("theLong", String.valueOf(theLong--), StringField.TYPE_UNSTORED));
- doc.add(newField("theDouble", String.valueOf(theDouble--), StringField.TYPE_UNSTORED));
- doc.add(newField("theByte", String.valueOf(theByte--), StringField.TYPE_UNSTORED));
- doc.add(newField("theShort", String.valueOf(theShort--), StringField.TYPE_UNSTORED));
- doc.add(newField("theInt", String.valueOf(theInt--), StringField.TYPE_UNSTORED));
- doc.add(newField("theFloat", String.valueOf(theFloat--), StringField.TYPE_UNSTORED));
+ doc.add(newStringField("theLong", String.valueOf(theLong--), Field.Store.NO));
+ doc.add(newStringField("theDouble", String.valueOf(theDouble--), Field.Store.NO));
+ doc.add(newStringField("theByte", String.valueOf(theByte--), Field.Store.NO));
+ doc.add(newStringField("theShort", String.valueOf(theShort--), Field.Store.NO));
+ doc.add(newStringField("theInt", String.valueOf(theInt--), Field.Store.NO));
+ doc.add(newStringField("theFloat", String.valueOf(theFloat--), Field.Store.NO));
if (0 == i % 3) {
wA.addDocument(doc);
} else {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Sun Jun 10 17:42:19 2012
@@ -33,7 +33,6 @@ import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -1622,7 +1621,7 @@ public class TestFSTs extends LuceneTest
RandomIndexWriter w = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(IndexWriterConfig.OpenMode.CREATE));
Document doc = new Document();
- Field idField = newField("id", "", StringField.TYPE_UNSTORED);
+ Field idField = newStringField("id", "", Field.Store.NO);
doc.add(idField);
final int NUM_IDS = atLeast(200);
@@ -1757,7 +1756,7 @@ public class TestFSTs extends LuceneTest
RandomIndexWriter w = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(IndexWriterConfig.OpenMode.CREATE));
Document doc = new Document();
- Field f = newField("field", "", StringField.TYPE_UNSTORED);
+ Field f = newStringField("field", "", Field.Store.NO);
doc.add(f);
final int NUM_TERMS = (int) (1000*RANDOM_MULTIPLIER * (1+random().nextDouble()));
Modified: lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (original)
+++ lucene/dev/trunk/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java Sun Jun 10 17:42:19 2012
@@ -174,7 +174,7 @@ public class IndexFiles {
// field that is indexed (i.e. searchable), but don't tokenize
// the field into separate words and don't index term frequency
// or positional information:
- Field pathField = new Field("path", file.getPath(), StringField.TYPE_STORED);
+ Field pathField = new StringField("path", file.getPath(), Field.Store.YES);
doc.add(pathField);
// Add the last modified date of the file a field named "modified".
@@ -184,13 +184,13 @@ public class IndexFiles {
// year/month/day/hour/minutes/seconds, down the resolution you require.
// For example the long value 2011021714 would mean
// February 17, 2011, 2-3 PM.
- doc.add(new LongField("modified", file.lastModified()));
+ doc.add(new LongField("modified", file.lastModified(), Field.Store.NO));
// Add the contents of the file to a field named "contents". Specify a Reader,
// so that the text of the file is tokenized and indexed, but not stored.
// Note that FileReader expects the file to be in UTF-8 encoding.
// If that's not the case searching for special characters will fail.
- doc.add(new TextField("contents", new BufferedReader(new InputStreamReader(fis, "UTF-8"))));
+ doc.add(new TextField("contents", new BufferedReader(new InputStreamReader(fis, "UTF-8")), Field.Store.NO));
if (writer.getConfig().getOpenMode() == OpenMode.CREATE) {
// New index, so we just add the document (no old document can be there):
Modified: lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java (original)
+++ lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java Sun Jun 10 17:42:19 2012
@@ -93,8 +93,8 @@ public class AssociationIndexer {
// create a plain Lucene document and add some regular Lucene fields
// to it
Document doc = new Document();
- doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], TextField.TYPE_STORED));
- doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum]));
+ doc.add(new TextField(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], Field.Store.YES));
+ doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum], Field.Store.NO));
// invoke the category document builder for adding categories to the
// document and,
Modified: lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java (original)
+++ lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java Sun Jun 10 17:42:19 2012
@@ -172,8 +172,8 @@ public class MultiCLIndexer {
// create a plain Lucene document and add some regular Lucene fields
// to it
Document doc = new Document();
- doc.add(new Field(SimpleUtils.TITLE, docTitles[docNum], TextField.TYPE_STORED));
- doc.add(new TextField(SimpleUtils.TEXT, docTexts[docNum]));
+ doc.add(new TextField(SimpleUtils.TITLE, docTitles[docNum], Field.Store.YES));
+ doc.add(new TextField(SimpleUtils.TEXT, docTexts[docNum], Field.Store.NO));
// finally add the document to the index
categoryDocBuilder.build(doc);
Modified: lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java (original)
+++ lucene/dev/trunk/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java Sun Jun 10 17:42:19 2012
@@ -69,8 +69,8 @@ public class SimpleIndexer {
// create a plain Lucene document and add some regular Lucene fields to it
Document doc = new Document();
- doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], TextField.TYPE_STORED));
- doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum]));
+ doc.add(new TextField(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], Field.Store.YES));
+ doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum], Field.Store.NO));
// invoke the category document builder for adding categories to the document and,
// as required, to the taxonomy index
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java Sun Jun 10 17:42:19 2012
@@ -184,7 +184,7 @@ public class CategoryDocumentBuilder {
// Finally creating a suitable field with stream and adding it to a
// master field-list, used during the build process (see
// super.build())
- FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.setOmitNorms(true);
fieldList.add(new Field(e.getKey(), stream, ft));
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Sun Jun 10 17:42:19 2012
@@ -215,10 +215,10 @@ public class DirectoryTaxonomyWriter imp
reader = null;
- FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.setOmitNorms(true);
parentStreamField = new Field(Consts.FIELD_PAYLOADS, parentStream, ft);
- fullPathField = new Field(Consts.FULL, "", StringField.TYPE_STORED);
+ fullPathField = new StringField(Consts.FULL, "", Field.Store.YES);
this.nextID = indexWriter.maxDoc();
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java Sun Jun 10 17:42:19 2012
@@ -263,7 +263,7 @@ public abstract class FacetTestBase exte
CategoryDocumentBuilder builder = new CategoryDocumentBuilder(tw, iParams);
builder.setCategoryPaths(categories);
builder.build(d);
- d.add(new Field("content", content, TextField.TYPE_STORED));
+ d.add(new TextField("content", content, Field.Store.YES));
iw.addDocument(d);
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java Sun Jun 10 17:42:19 2012
@@ -10,7 +10,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
@@ -129,7 +128,7 @@ public class FacetTestUtils {
cps.add(cp);
Document d = new Document();
new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d);
- d.add(new Field("content", "alpha", TextField.TYPE_STORED));
+ d.add(new TextField("content", "alpha", Field.Store.YES));
iw.addDocument(d);
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java Sun Jun 10 17:42:19 2012
@@ -12,6 +12,7 @@ import org.apache.lucene.analysis.TokenS
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.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -152,7 +153,7 @@ public class CategoryListIteratorTest ex
dts.setIdx(i);
doc.add(new TextField("f", dts)); // only doc 0 has payloads!
} else {
- doc.add(new TextField("f", "1"));
+ doc.add(new TextField("f", "1", Field.Store.NO));
}
writer.addDocument(doc);
writer.commit();
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java Sun Jun 10 17:42:19 2012
@@ -6,6 +6,7 @@ import java.util.ArrayList;
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.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
@@ -81,10 +82,10 @@ public class DrillDownTest extends Lucen
ArrayList<CategoryPath> paths = new ArrayList<CategoryPath>();
Document doc = new Document();
if (i % 2 == 0) { // 50
- doc.add(new TextField("content", "foo"));
+ doc.add(new TextField("content", "foo", Field.Store.NO));
}
if (i % 3 == 0) { // 33
- doc.add(new TextField("content", "bar"));
+ doc.add(new TextField("content", "bar", Field.Store.NO));
}
if (i % 4 == 0) { // 25
paths.add(new CategoryPath("a"));
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java Sun Jun 10 17:42:19 2012
@@ -328,7 +328,7 @@ public class TestTopKInEachNodeResultHan
cps.add(cp);
Document d = new Document();
new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d);
- d.add(new Field("content", "alpha", TextField.TYPE_STORED));
+ d.add(new TextField("content", "alpha", Field.Store.YES));
iw.addDocument(d);
}
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java Sun Jun 10 17:42:19 2012
@@ -189,8 +189,8 @@ public class TestScoredDocIDsUtils exten
protected final static String delTxt = "delete";
protected final static String alphaTxt = "alpha";
- private final static Field deletionMark = new StringField(field, delTxt);
- private final static Field alphaContent = new StringField(field, alphaTxt);
+ private final static Field deletionMark = new StringField(field, delTxt, Field.Store.NO);
+ private final static Field alphaContent = new StringField(field, alphaTxt, Field.Store.NO);
protected final int numDocs;
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java Sun Jun 10 17:42:19 2012
@@ -60,56 +60,56 @@ public class AllGroupHeadsCollectorTest
// 0
Document doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV, valueType);
- doc.add(newField("content", "random text", TextField.TYPE_STORED));
- doc.add(newField("id", "1", StringField.TYPE_STORED));
+ doc.add(newTextField("content", "random text", Field.Store.YES));
+ doc.add(newStringField("id", "1", Field.Store.YES));
w.addDocument(doc);
// 1
doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV, valueType);
- doc.add(newField("content", "some more random text blob", TextField.TYPE_STORED));
- doc.add(newField("id", "2", StringField.TYPE_STORED));
+ doc.add(newTextField("content", "some more random text blob", Field.Store.YES));
+ doc.add(newStringField("id", "2", Field.Store.YES));
w.addDocument(doc);
// 2
doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV, valueType);
- doc.add(newField("content", "some more random textual data", TextField.TYPE_STORED));
- doc.add(newField("id", "3", StringField.TYPE_STORED));
+ doc.add(newTextField("content", "some more random textual data", Field.Store.YES));
+ doc.add(newStringField("id", "3", Field.Store.YES));
w.addDocument(doc);
w.commit(); // To ensure a second segment
// 3
doc = new Document();
addGroupField(doc, groupField, "author2", canUseIDV, valueType);
- doc.add(newField("content", "some random text", TextField.TYPE_STORED));
- doc.add(newField("id", "4", StringField.TYPE_STORED));
+ doc.add(newTextField("content", "some random text", Field.Store.YES));
+ doc.add(newStringField("id", "4", Field.Store.YES));
w.addDocument(doc);
// 4
doc = new Document();
addGroupField(doc, groupField, "author3", canUseIDV, valueType);
- doc.add(newField("content", "some more random text", TextField.TYPE_STORED));
- doc.add(newField("id", "5", StringField.TYPE_STORED));
+ doc.add(newTextField("content", "some more random text", Field.Store.YES));
+ doc.add(newStringField("id", "5", Field.Store.YES));
w.addDocument(doc);
// 5
doc = new Document();
addGroupField(doc, groupField, "author3", canUseIDV, valueType);
- doc.add(newField("content", "random blob", TextField.TYPE_STORED));
- doc.add(newField("id", "6", StringField.TYPE_STORED));
+ doc.add(newTextField("content", "random blob", Field.Store.YES));
+ doc.add(newStringField("id", "6", Field.Store.YES));
w.addDocument(doc);
// 6 -- no author field
doc = new Document();
- doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
- doc.add(newField("id", "6", StringField.TYPE_STORED));
+ doc.add(newTextField("content", "random word stuck in alot of other text", Field.Store.YES));
+ doc.add(newStringField("id", "6", Field.Store.YES));
w.addDocument(doc);
// 7 -- no author field
doc = new Document();
- doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
- doc.add(newField("id", "7", StringField.TYPE_STORED));
+ doc.add(newTextField("content", "random word stuck in alot of other text", Field.Store.YES));
+ doc.add(newStringField("id", "7", Field.Store.YES));
w.addDocument(doc);
IndexReader reader = w.getReader();
@@ -207,7 +207,7 @@ public class AllGroupHeadsCollectorTest
Document doc = new Document();
Document docNoGroup = new Document();
- Field group = newField("group", "", StringField.TYPE_UNSTORED);
+ Field group = newStringField("group", "", Field.Store.NO);
doc.add(group);
Field valuesField = null;
if (canUseIDV) {
@@ -226,19 +226,19 @@ public class AllGroupHeadsCollectorTest
}
doc.add(valuesField);
}
- Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED);
+ Field sort1 = newStringField("sort1", "", Field.Store.NO);
doc.add(sort1);
docNoGroup.add(sort1);
- Field sort2 = newField("sort2", "", StringField.TYPE_UNSTORED);
+ Field sort2 = newStringField("sort2", "", Field.Store.NO);
doc.add(sort2);
docNoGroup.add(sort2);
- Field sort3 = newField("sort3", "", StringField.TYPE_UNSTORED);
+ Field sort3 = newStringField("sort3", "", Field.Store.NO);
doc.add(sort3);
docNoGroup.add(sort3);
- Field content = newField("content", "", TextField.TYPE_UNSTORED);
+ Field content = newTextField("content", "", Field.Store.NO);
doc.add(content);
docNoGroup.add(content);
- IntField id = new IntField("id", 0);
+ IntField id = new IntField("id", 0, Field.Store.NO);
doc.add(id);
docNoGroup.add(id);
final GroupDoc[] groupDocs = new GroupDoc[numDocs];
@@ -538,7 +538,7 @@ public class AllGroupHeadsCollectorTest
}
private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV, Type valueType) {
- doc.add(new Field(groupField, value, TextField.TYPE_STORED));
+ doc.add(new TextField(groupField, value, Field.Store.YES));
if (canUseIDV) {
Field valuesField = null;
switch(valueType) {
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java Sun Jun 10 17:42:19 2012
@@ -55,21 +55,21 @@ public class AllGroupsCollectorTest exte
// 0
Document doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random text", Field.Store.YES));
doc.add(new Field("id", "1", customType));
w.addDocument(doc);
// 1
doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "some more random text blob", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random text blob", Field.Store.YES));
doc.add(new Field("id", "2", customType));
w.addDocument(doc);
// 2
doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random textual data", Field.Store.YES));
doc.add(new Field("id", "3", customType));
w.addDocument(doc);
w.commit(); // To ensure a second segment
@@ -77,27 +77,27 @@ public class AllGroupsCollectorTest exte
// 3
doc = new Document();
addGroupField(doc, groupField, "author2", canUseIDV);
- doc.add(new Field("content", "some random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some random text", Field.Store.YES));
doc.add(new Field("id", "4", customType));
w.addDocument(doc);
// 4
doc = new Document();
addGroupField(doc, groupField, "author3", canUseIDV);
- doc.add(new Field("content", "some more random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random text", Field.Store.YES));
doc.add(new Field("id", "5", customType));
w.addDocument(doc);
// 5
doc = new Document();
addGroupField(doc, groupField, "author3", canUseIDV);
- doc.add(new Field("content", "random blob", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random blob", Field.Store.YES));
doc.add(new Field("id", "6", customType));
w.addDocument(doc);
// 6 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random word stuck in alot of other text", Field.Store.YES));
doc.add(new Field("id", "6", customType));
w.addDocument(doc);
@@ -121,7 +121,7 @@ public class AllGroupsCollectorTest exte
}
private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) {
- doc.add(new Field(groupField, value, TextField.TYPE_STORED));
+ doc.add(new TextField(groupField, value, Field.Store.YES));
if (canUseIDV) {
doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value)));
}
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java Sun Jun 10 17:42:19 2012
@@ -67,55 +67,55 @@ public class DistinctValuesCollectorTest
Document doc = new Document();
addField(doc, groupField, "1", dvType);
addField(doc, countField, "1", dvType);
- doc.add(new Field("content", "random text", TextField.TYPE_UNSTORED));
- doc.add(new Field("id", "1", StringField.TYPE_UNSTORED));
+ doc.add(new TextField("content", "random text", Field.Store.NO));
+ doc.add(new StringField("id", "1", Field.Store.NO));
w.addDocument(doc);
// 1
doc = new Document();
addField(doc, groupField, "1", dvType);
addField(doc, countField, "1", dvType);
- doc.add(new Field("content", "some more random text blob", TextField.TYPE_UNSTORED));
- doc.add(new Field("id", "2", StringField.TYPE_UNSTORED));
+ doc.add(new TextField("content", "some more random text blob", Field.Store.NO));
+ doc.add(new StringField("id", "2", Field.Store.NO));
w.addDocument(doc);
// 2
doc = new Document();
addField(doc, groupField, "1", dvType);
addField(doc, countField, "2", dvType);
- doc.add(new Field("content", "some more random textual data", TextField.TYPE_UNSTORED));
- doc.add(new Field("id", "3", StringField.TYPE_UNSTORED));
+ doc.add(new TextField("content", "some more random textual data", Field.Store.NO));
+ doc.add(new StringField("id", "3", Field.Store.NO));
w.addDocument(doc);
w.commit(); // To ensure a second segment
// 3
doc = new Document();
addField(doc, groupField, "2", dvType);
- doc.add(new Field("content", "some random text", TextField.TYPE_UNSTORED));
- doc.add(new Field("id", "4", StringField.TYPE_UNSTORED));
+ doc.add(new TextField("content", "some random text", Field.Store.NO));
+ doc.add(new StringField("id", "4", Field.Store.NO));
w.addDocument(doc);
// 4
doc = new Document();
addField(doc, groupField, "3", dvType);
addField(doc, countField, "1", dvType);
- doc.add(new Field("content", "some more random text", TextField.TYPE_UNSTORED));
- doc.add(new Field("id", "5", StringField.TYPE_UNSTORED));
+ doc.add(new TextField("content", "some more random text", Field.Store.NO));
+ doc.add(new StringField("id", "5", Field.Store.NO));
w.addDocument(doc);
// 5
doc = new Document();
addField(doc, groupField, "3", dvType);
addField(doc, countField, "1", dvType);
- doc.add(new Field("content", "random blob", TextField.TYPE_UNSTORED));
- doc.add(new Field("id", "6", StringField.TYPE_UNSTORED));
+ doc.add(new TextField("content", "random blob", Field.Store.NO));
+ doc.add(new StringField("id", "6", Field.Store.NO));
w.addDocument(doc);
// 6 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random word stuck in alot of other text", Field.Store.YES));
addField(doc, countField, "1", dvType);
- doc.add(new Field("id", "6", StringField.TYPE_UNSTORED));
+ doc.add(new StringField("id", "6", Field.Store.NO));
w.addDocument(doc);
IndexSearcher indexSearcher = newSearcher(w.getReader());
@@ -316,7 +316,7 @@ public class DistinctValuesCollectorTest
}
private void addField(Document doc, String field, String value, DocValues.Type type) {
- doc.add(new Field(field, value, StringField.TYPE_UNSTORED));
+ doc.add(new StringField(field, value, Field.Store.NO));
if (type == null) {
return;
}
@@ -450,14 +450,14 @@ public class DistinctValuesCollectorTest
countsVals.add(countValue);
Document doc = new Document();
- doc.add(new Field("id", String.format("%09d", i), StringField.TYPE_UNSTORED));
+ doc.add(new StringField("id", String.format("%09d", i), Field.Store.NO));
if (groupValue != null) {
addField(doc, groupField, groupValue, dvType);
}
if (countValue != null) {
addField(doc, countField, countValue, dvType);
}
- doc.add(new Field("content", content, TextField.TYPE_UNSTORED));
+ doc.add(new TextField("content", content, Field.Store.NO));
w.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java Sun Jun 10 17:42:19 2012
@@ -218,7 +218,7 @@ public class GroupFacetCollectorTest ext
}
private void addField(Document doc, String field, String value, boolean canUseIDV) {
- doc.add(new Field(field, value, StringField.TYPE_UNSTORED));
+ doc.add(new StringField(field, value, Field.Store.NO));
if (canUseIDV) {
doc.add(new SortedBytesDocValuesField(field, new BytesRef(value)));
}
@@ -367,7 +367,7 @@ public class GroupFacetCollectorTest ext
Document docNoGroup = new Document();
Document docNoFacet = new Document();
Document docNoGroupNoFacet = new Document();
- Field group = newField("group", "", StringField.TYPE_UNSTORED);
+ Field group = newStringField("group", "", Field.Store.NO);
Field groupDc = new SortedBytesDocValuesField("group", new BytesRef());
if (useDv) {
doc.add(groupDc);
@@ -378,7 +378,7 @@ public class GroupFacetCollectorTest ext
Field[] facetFields;
if (useDv) {
facetFields = new Field[2];
- facetFields[0] = newField("facet", "", StringField.TYPE_UNSTORED);
+ facetFields[0] = newStringField("facet", "", Field.Store.NO);
doc.add(facetFields[0]);
docNoGroup.add(facetFields[0]);
facetFields[1] = new SortedBytesDocValuesField("facet", new BytesRef());
@@ -387,12 +387,12 @@ public class GroupFacetCollectorTest ext
} else {
facetFields = multipleFacetValuesPerDocument ? new Field[2 + random.nextInt(6)] : new Field[1];
for (int i = 0; i < facetFields.length; i++) {
- facetFields[i] = newField("facet", "", StringField.TYPE_UNSTORED);
+ facetFields[i] = newStringField("facet", "", Field.Store.NO);
doc.add(facetFields[i]);
docNoGroup.add(facetFields[i]);
}
}
- Field content = newField("content", "", StringField.TYPE_UNSTORED);
+ Field content = newStringField("content", "", Field.Store.NO);
doc.add(content);
docNoGroup.add(content);
docNoFacet.add(content);
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java Sun Jun 10 17:42:19 2012
@@ -56,23 +56,23 @@ public class GroupingSearchTest extends
// 0
Document doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random text", Field.Store.YES));
doc.add(new Field("id", "1", customType));
documents.add(doc);
// 1
doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "some more random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random text", Field.Store.YES));
doc.add(new Field("id", "2", customType));
documents.add(doc);
// 2
doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random textual data", Field.Store.YES));
doc.add(new Field("id", "3", customType));
- doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED));
+ doc.add(new StringField("groupend", "x", Field.Store.NO));
documents.add(doc);
w.addDocuments(documents);
documents.clear();
@@ -80,33 +80,33 @@ public class GroupingSearchTest extends
// 3
doc = new Document();
addGroupField(doc, groupField, "author2", canUseIDV);
- doc.add(new Field("content", "some random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some random text", Field.Store.YES));
doc.add(new Field("id", "4", customType));
- doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED));
+ doc.add(new StringField("groupend", "x", Field.Store.NO));
w.addDocument(doc);
// 4
doc = new Document();
addGroupField(doc, groupField, "author3", canUseIDV);
- doc.add(new Field("content", "some more random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random text", Field.Store.YES));
doc.add(new Field("id", "5", customType));
documents.add(doc);
// 5
doc = new Document();
addGroupField(doc, groupField, "author3", canUseIDV);
- doc.add(new Field("content", "random", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random", Field.Store.YES));
doc.add(new Field("id", "6", customType));
- doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED));
+ doc.add(new StringField("groupend", "x", Field.Store.NO));
documents.add(doc);
w.addDocuments(documents);
documents.clear();
// 6 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random word stuck in alot of other text", Field.Store.YES));
doc.add(new Field("id", "6", customType));
- doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED));
+ doc.add(new StringField("groupend", "x", Field.Store.NO));
w.addDocument(doc);
@@ -166,7 +166,7 @@ public class GroupingSearchTest extends
}
private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) {
- doc.add(new Field(groupField, value, TextField.TYPE_STORED));
+ doc.add(new TextField(groupField, value, Field.Store.YES));
if (canUseIDV) {
doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value)));
}
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Sun Jun 10 17:42:19 2012
@@ -77,48 +77,48 @@ public class TestGrouping extends Lucene
// 0
Document doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random text", Field.Store.YES));
doc.add(new Field("id", "1", customType));
w.addDocument(doc);
// 1
doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "some more random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random text", Field.Store.YES));
doc.add(new Field("id", "2", customType));
w.addDocument(doc);
// 2
doc = new Document();
addGroupField(doc, groupField, "author1", canUseIDV);
- doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random textual data", Field.Store.YES));
doc.add(new Field("id", "3", customType));
w.addDocument(doc);
// 3
doc = new Document();
addGroupField(doc, groupField, "author2", canUseIDV);
- doc.add(new Field("content", "some random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some random text", Field.Store.YES));
doc.add(new Field("id", "4", customType));
w.addDocument(doc);
// 4
doc = new Document();
addGroupField(doc, groupField, "author3", canUseIDV);
- doc.add(new Field("content", "some more random text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "some more random text", Field.Store.YES));
doc.add(new Field("id", "5", customType));
w.addDocument(doc);
// 5
doc = new Document();
addGroupField(doc, groupField, "author3", canUseIDV);
- doc.add(new Field("content", "random", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random", Field.Store.YES));
doc.add(new Field("id", "6", customType));
w.addDocument(doc);
// 6 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
+ doc.add(new TextField("content", "random word stuck in alot of other text", Field.Store.YES));
doc.add(new Field("id", "6", customType));
w.addDocument(doc);
@@ -174,7 +174,7 @@ public class TestGrouping extends Lucene
}
private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) {
- doc.add(new Field(groupField, value, TextField.TYPE_STORED));
+ doc.add(new TextField(groupField, value, Field.Store.YES));
if (canUseIDV) {
doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value)));
}
@@ -582,7 +582,7 @@ public class TestGrouping extends Lucene
final List<List<Document>> updateDocs = new ArrayList<List<Document>>();
- FieldType groupEndType = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType groupEndType = new FieldType(StringField.TYPE_NOT_STORED);
groupEndType.setIndexOptions(IndexOptions.DOCS_ONLY);
groupEndType.setOmitNorms(true);
@@ -594,12 +594,12 @@ public class TestGrouping extends Lucene
Document doc = new Document();
docs.add(doc);
if (groupValue.group != null) {
- doc.add(newField("group", groupValue.group.utf8ToString(), StringField.TYPE_UNSTORED));
+ doc.add(newStringField("group", groupValue.group.utf8ToString(), Field.Store.NO));
}
- doc.add(newField("sort1", groupValue.sort1.utf8ToString(), StringField.TYPE_UNSTORED));
- doc.add(newField("sort2", groupValue.sort2.utf8ToString(), StringField.TYPE_UNSTORED));
- doc.add(new IntField("id", groupValue.id));
- doc.add(newField("content", groupValue.content, TextField.TYPE_UNSTORED));
+ doc.add(newStringField("sort1", groupValue.sort1.utf8ToString(), Field.Store.NO));
+ doc.add(newStringField("sort2", groupValue.sort2.utf8ToString(), Field.Store.NO));
+ doc.add(new IntField("id", groupValue.id, Field.Store.NO));
+ doc.add(newTextField("content", groupValue.content, Field.Store.NO));
//System.out.println("TEST: doc content=" + groupValue.content + " group=" + (groupValue.group == null ? "null" : groupValue.group.utf8ToString()) + " sort1=" + groupValue.sort1.utf8ToString() + " id=" + groupValue.id);
}
// So we can pull filter marking last doc in block:
@@ -712,18 +712,18 @@ public class TestGrouping extends Lucene
doc.add(idvGroupField);
}
- Field group = newField("group", "", StringField.TYPE_UNSTORED);
+ Field group = newStringField("group", "", Field.Store.NO);
doc.add(group);
- Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED);
+ Field sort1 = newStringField("sort1", "", Field.Store.NO);
doc.add(sort1);
docNoGroup.add(sort1);
- Field sort2 = newField("sort2", "", StringField.TYPE_UNSTORED);
+ Field sort2 = newStringField("sort2", "", Field.Store.NO);
doc.add(sort2);
docNoGroup.add(sort2);
- Field content = newField("content", "", TextField.TYPE_UNSTORED);
+ Field content = newTextField("content", "", Field.Store.NO);
doc.add(content);
docNoGroup.add(content);
- IntField id = new IntField("id", 0);
+ IntField id = new IntField("id", 0, Field.Store.NO);
doc.add(id);
docNoGroup.add(id);
final GroupDoc[] groupDocs = new GroupDoc[numDocs];
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java Sun Jun 10 17:42:19 2012
@@ -60,7 +60,7 @@ public class HighlighterPhraseTest exten
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)));
try {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectors(true);
@@ -103,7 +103,7 @@ public class HighlighterPhraseTest exten
try {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectors(true);
@@ -174,7 +174,7 @@ public class HighlighterPhraseTest exten
try {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectors(true);
@@ -256,7 +256,7 @@ public class HighlighterPhraseTest exten
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)));
try {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectors(true);
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Sun Jun 10 17:42:19 2012
@@ -1622,7 +1622,7 @@ public class HighlighterTest extends Bas
private Document doc( String f, String v ){
Document doc = new Document();
- doc.add( new Field( f, v, TextField.TYPE_STORED));
+ doc.add( new TextField( f, v, Field.Store.YES));
return doc;
}
@@ -1740,22 +1740,22 @@ public class HighlighterTest extends Bas
addDoc(writer, text);
}
Document doc = new Document();
- doc.add(new IntField(NUMERIC_FIELD_NAME, 1));
+ doc.add(new IntField(NUMERIC_FIELD_NAME, 1, Field.Store.NO));
doc.add(new StoredField(NUMERIC_FIELD_NAME, 1));
writer.addDocument(doc, analyzer);
doc = new Document();
- doc.add(new IntField(NUMERIC_FIELD_NAME, 3));
+ doc.add(new IntField(NUMERIC_FIELD_NAME, 3, Field.Store.NO));
doc.add(new StoredField(NUMERIC_FIELD_NAME, 3));
writer.addDocument(doc, analyzer);
doc = new Document();
- doc.add(new IntField(NUMERIC_FIELD_NAME, 5));
+ doc.add(new IntField(NUMERIC_FIELD_NAME, 5, Field.Store.NO));
doc.add(new StoredField(NUMERIC_FIELD_NAME, 5));
writer.addDocument(doc, analyzer);
doc = new Document();
- doc.add(new IntField(NUMERIC_FIELD_NAME, 7));
+ doc.add(new IntField(NUMERIC_FIELD_NAME, 7, Field.Store.NO));
doc.add(new StoredField(NUMERIC_FIELD_NAME, 7));
writer.addDocument(doc, analyzer);
@@ -1775,7 +1775,7 @@ public class HighlighterTest extends Bas
private void addDoc(IndexWriter writer, String text) throws IOException {
Document d = new Document();
- Field f = new Field(FIELD_NAME, text, TextField.TYPE_STORED);
+ Field f = new TextField(FIELD_NAME, text, Field.Store.YES);
d.add(f);
writer.addDocument(d);
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java Sun Jun 10 17:42:19 2012
@@ -93,7 +93,7 @@ public class TokenSourcesTest extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, null));
try {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorOffsets(true);
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
@@ -137,7 +137,7 @@ public class TokenSourcesTest extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, null));
try {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
@@ -182,7 +182,7 @@ public class TokenSourcesTest extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, null));
try {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorOffsets(true);
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
@@ -227,7 +227,7 @@ public class TokenSourcesTest extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, null));
try {
final Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorOffsets(true);
document.add(new Field(FIELD, new OverlappingTokenStream(), customType));
Modified: lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (original)
+++ lucene/dev/trunk/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java Sun Jun 10 17:42:19 2012
@@ -22,7 +22,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -139,7 +138,7 @@ public class SimpleFragmentsBuilderTest
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(
TEST_VERSION_CURRENT, analyzerW).setOpenMode(OpenMode.CREATE));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorOffsets(true);
customType.setStoreTermVectorPositions(true);
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Sun Jun 10 17:42:19 2012
@@ -38,17 +38,17 @@ public class TestBlockJoin extends Lucen
// One resume...
private Document makeResume(String name, String country) {
Document resume = new Document();
- resume.add(newField("docType", "resume", StringField.TYPE_UNSTORED));
- resume.add(newField("name", name, StringField.TYPE_STORED));
- resume.add(newField("country", country, StringField.TYPE_UNSTORED));
+ resume.add(newStringField("docType", "resume", Field.Store.NO));
+ resume.add(newStringField("name", name, Field.Store.YES));
+ resume.add(newStringField("country", country, Field.Store.NO));
return resume;
}
// ... has multiple jobs
private Document makeJob(String skill, int year) {
Document job = new Document();
- job.add(newField("skill", skill, StringField.TYPE_STORED));
- job.add(new IntField("year", year));
+ job.add(newStringField("skill", skill, Field.Store.YES));
+ job.add(new IntField("year", year, Field.Store.NO));
job.add(new StoredField("year", year));
return job;
}
@@ -56,8 +56,8 @@ public class TestBlockJoin extends Lucen
// ... has multiple qualifications
private Document makeQualification(String qualification, int year) {
Document job = new Document();
- job.add(newField("qualification", qualification, StringField.TYPE_STORED));
- job.add(new IntField("year", year));
+ job.add(newStringField("qualification", qualification, Field.Store.YES));
+ job.add(new IntField("year", year, Field.Store.NO));
return job;
}
@@ -341,23 +341,21 @@ public class TestBlockJoin extends Lucen
for(int parentDocID=0;parentDocID<numParentDocs;parentDocID++) {
Document parentDoc = new Document();
Document parentJoinDoc = new Document();
- Field id = newField("parentID", ""+parentDocID, StringField.TYPE_STORED);
+ Field id = newStringField("parentID", ""+parentDocID, Field.Store.YES);
parentDoc.add(id);
parentJoinDoc.add(id);
- parentJoinDoc.add(newField("isParent", "x", StringField.TYPE_UNSTORED));
+ parentJoinDoc.add(newStringField("isParent", "x", Field.Store.NO));
for(int field=0;field<parentFields.length;field++) {
if (random().nextDouble() < 0.9) {
- Field f = newField("parent" + field,
- parentFields[field][random().nextInt(parentFields[field].length)],
- StringField.TYPE_UNSTORED);
+ Field f = newStringField("parent" + field, parentFields[field][random().nextInt(parentFields[field].length)], Field.Store.NO);
parentDoc.add(f);
parentJoinDoc.add(f);
}
}
if (doDeletes) {
- parentDoc.add(newField("blockID", ""+parentDocID, StringField.TYPE_UNSTORED));
- parentJoinDoc.add(newField("blockID", ""+parentDocID, StringField.TYPE_UNSTORED));
+ parentDoc.add(newStringField("blockID", ""+parentDocID, Field.Store.NO));
+ parentJoinDoc.add(newStringField("blockID", ""+parentDocID, Field.Store.NO));
}
final List<Document> joinDocs = new ArrayList<Document>();
@@ -381,15 +379,13 @@ public class TestBlockJoin extends Lucen
Document joinChildDoc = new Document();
joinDocs.add(joinChildDoc);
- Field childID = newField("childID", ""+childDocID, StringField.TYPE_STORED);
+ Field childID = newStringField("childID", ""+childDocID, Field.Store.YES);
childDoc.add(childID);
joinChildDoc.add(childID);
for(int childFieldID=0;childFieldID<childFields.length;childFieldID++) {
if (random().nextDouble() < 0.9) {
- Field f = newField("child" + childFieldID,
- childFields[childFieldID][random().nextInt(childFields[childFieldID].length)],
- StringField.TYPE_UNSTORED);
+ Field f = newStringField("child" + childFieldID, childFields[childFieldID][random().nextInt(childFields[childFieldID].length)], Field.Store.NO);
childDoc.add(f);
joinChildDoc.add(f);
}
@@ -408,7 +404,7 @@ public class TestBlockJoin extends Lucen
}
if (doDeletes) {
- joinChildDoc.add(newField("blockID", ""+parentDocID, StringField.TYPE_UNSTORED));
+ joinChildDoc.add(newStringField("blockID", ""+parentDocID, Field.Store.NO));
}
w.addDocument(childDoc);
@@ -942,9 +938,9 @@ public class TestBlockJoin extends Lucen
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
Document childDoc = new Document();
- childDoc.add(newField("child", "1", StringField.TYPE_UNSTORED));
+ childDoc.add(newStringField("child", "1", Field.Store.NO));
Document parentDoc = new Document();
- parentDoc.add(newField("parent", "1", StringField.TYPE_UNSTORED));
+ parentDoc.add(newStringField("parent", "1", Field.Store.NO));
w.addDocuments(Arrays.asList(childDoc, parentDoc));
IndexReader r = w.getReader();
w.close();
@@ -966,16 +962,16 @@ public class TestBlockJoin extends Lucen
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(new LogDocMergePolicy()));
Document parentDoc = new Document();
- parentDoc.add(newField("parent", "1", StringField.TYPE_UNSTORED));
- parentDoc.add(newField("isparent", "yes", StringField.TYPE_UNSTORED));
+ parentDoc.add(newStringField("parent", "1", Field.Store.NO));
+ parentDoc.add(newStringField("isparent", "yes", Field.Store.NO));
w.addDocuments(Arrays.asList(parentDoc));
// Add another doc so scorer is not null
parentDoc = new Document();
- parentDoc.add(newField("parent", "2", StringField.TYPE_UNSTORED));
- parentDoc.add(newField("isparent", "yes", StringField.TYPE_UNSTORED));
+ parentDoc.add(newStringField("parent", "2", Field.Store.NO));
+ parentDoc.add(newStringField("isparent", "yes", Field.Store.NO));
Document childDoc = new Document();
- childDoc.add(newField("child", "2", StringField.TYPE_UNSTORED));
+ childDoc.add(newStringField("child", "2", Field.Store.NO));
w.addDocuments(Arrays.asList(childDoc, parentDoc));
// Need single seg:
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Sun Jun 10 17:42:19 2012
@@ -67,45 +67,45 @@ public class TestJoinUtil extends Lucene
// 0
Document doc = new Document();
- doc.add(new Field("description", "random text", TextField.TYPE_UNSTORED));
- doc.add(new Field("name", "name1", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "1", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("description", "random text", Field.Store.NO));
+ doc.add(new TextField("name", "name1", Field.Store.NO));
+ doc.add(new TextField(idField, "1", Field.Store.NO));
w.addDocument(doc);
// 1
doc = new Document();
- doc.add(new Field("price", "10.0", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "2", TextField.TYPE_UNSTORED));
- doc.add(new Field(toField, "1", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("price", "10.0", Field.Store.NO));
+ doc.add(new TextField(idField, "2", Field.Store.NO));
+ doc.add(new TextField(toField, "1", Field.Store.NO));
w.addDocument(doc);
// 2
doc = new Document();
- doc.add(new Field("price", "20.0", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "3", TextField.TYPE_UNSTORED));
- doc.add(new Field(toField, "1", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("price", "20.0", Field.Store.NO));
+ doc.add(new TextField(idField, "3", Field.Store.NO));
+ doc.add(new TextField(toField, "1", Field.Store.NO));
w.addDocument(doc);
// 3
doc = new Document();
- doc.add(new Field("description", "more random text", TextField.TYPE_UNSTORED));
- doc.add(new Field("name", "name2", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "4", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("description", "more random text", Field.Store.NO));
+ doc.add(new TextField("name", "name2", Field.Store.NO));
+ doc.add(new TextField(idField, "4", Field.Store.NO));
w.addDocument(doc);
w.commit();
// 4
doc = new Document();
- doc.add(new Field("price", "10.0", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "5", TextField.TYPE_UNSTORED));
- doc.add(new Field(toField, "4", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("price", "10.0", Field.Store.NO));
+ doc.add(new TextField(idField, "5", Field.Store.NO));
+ doc.add(new TextField(toField, "4", Field.Store.NO));
w.addDocument(doc);
// 5
doc = new Document();
- doc.add(new Field("price", "20.0", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "6", TextField.TYPE_UNSTORED));
- doc.add(new Field(toField, "4", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("price", "20.0", Field.Store.NO));
+ doc.add(new TextField(idField, "6", Field.Store.NO));
+ doc.add(new TextField(toField, "4", Field.Store.NO));
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
@@ -149,45 +149,45 @@ public class TestJoinUtil extends Lucene
// 0
Document doc = new Document();
- doc.add(new Field("description", "A random movie", TextField.TYPE_UNSTORED));
- doc.add(new Field("name", "Movie 1", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "1", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("description", "A random movie", Field.Store.NO));
+ doc.add(new TextField("name", "Movie 1", Field.Store.NO));
+ doc.add(new TextField(idField, "1", Field.Store.NO));
w.addDocument(doc);
// 1
doc = new Document();
- doc.add(new Field("subtitle", "The first subtitle of this movie", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "2", TextField.TYPE_UNSTORED));
- doc.add(new Field(toField, "1", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("subtitle", "The first subtitle of this movie", Field.Store.NO));
+ doc.add(new TextField(idField, "2", Field.Store.NO));
+ doc.add(new TextField(toField, "1", Field.Store.NO));
w.addDocument(doc);
// 2
doc = new Document();
- doc.add(new Field("subtitle", "random subtitle; random event movie", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "3", TextField.TYPE_UNSTORED));
- doc.add(new Field(toField, "1", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("subtitle", "random subtitle; random event movie", Field.Store.NO));
+ doc.add(new TextField(idField, "3", Field.Store.NO));
+ doc.add(new TextField(toField, "1", Field.Store.NO));
w.addDocument(doc);
// 3
doc = new Document();
- doc.add(new Field("description", "A second random movie", TextField.TYPE_UNSTORED));
- doc.add(new Field("name", "Movie 2", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "4", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("description", "A second random movie", Field.Store.NO));
+ doc.add(new TextField("name", "Movie 2", Field.Store.NO));
+ doc.add(new TextField(idField, "4", Field.Store.NO));
w.addDocument(doc);
w.commit();
// 4
doc = new Document();
- doc.add(new Field("subtitle", "a very random event happened during christmas night", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "5", TextField.TYPE_UNSTORED));
- doc.add(new Field(toField, "4", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("subtitle", "a very random event happened during christmas night", Field.Store.NO));
+ doc.add(new TextField(idField, "5", Field.Store.NO));
+ doc.add(new TextField(toField, "4", Field.Store.NO));
w.addDocument(doc);
// 5
doc = new Document();
- doc.add(new Field("subtitle", "movie end movie test 123 test 123 random", TextField.TYPE_UNSTORED));
- doc.add(new Field(idField, "6", TextField.TYPE_UNSTORED));
- doc.add(new Field(toField, "4", TextField.TYPE_UNSTORED));
+ doc.add(new TextField("subtitle", "movie end movie test 123 test 123 random", Field.Store.NO));
+ doc.add(new TextField(idField, "6", Field.Store.NO));
+ doc.add(new TextField(toField, "4", Field.Store.NO));
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
@@ -381,8 +381,8 @@ public class TestJoinUtil extends Lucene
int randomI = random().nextInt(context.randomUniqueValues.length);
String value = context.randomUniqueValues[randomI];
Document document = new Document();
- document.add(newField(random(), "id", id, TextField.TYPE_UNSTORED));
- document.add(newField(random(), "value", value, TextField.TYPE_UNSTORED));
+ document.add(newTextField(random(), "id", id, Field.Store.NO));
+ document.add(newTextField(random(), "value", value, Field.Store.NO));
boolean from = context.randomFrom[randomI];
int numberOfLinkValues = multipleValuesPerDocument ? 2 + random().nextInt(10) : 1;
@@ -400,7 +400,7 @@ public class TestJoinUtil extends Lucene
context.fromDocuments.get(linkValue).add(docs[i]);
context.randomValueFromDocs.get(value).add(docs[i]);
- document.add(newField(random(), "from", linkValue, TextField.TYPE_UNSTORED));
+ document.add(newTextField(random(), "from", linkValue, Field.Store.NO));
} else {
if (!context.toDocuments.containsKey(linkValue)) {
context.toDocuments.put(linkValue, new ArrayList<RandomDoc>());
@@ -411,7 +411,7 @@ public class TestJoinUtil extends Lucene
context.toDocuments.get(linkValue).add(docs[i]);
context.randomValueToDocs.get(value).add(docs[i]);
- document.add(newField(random(), "to", linkValue, TextField.TYPE_UNSTORED));
+ document.add(newTextField(random(), "to", linkValue, Field.Store.NO));
}
}
Modified: lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/trunk/lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Sun Jun 10 17:42:19 2012
@@ -33,7 +33,6 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
@@ -126,8 +125,8 @@ public class MemoryIndexTest extends Bas
IndexWriter writer = new IndexWriter(ramdir,
new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
- Field field1 = newField("foo", fooField.toString(), TextField.TYPE_UNSTORED);
- Field field2 = newField("term", termField.toString(), TextField.TYPE_UNSTORED);
+ Field field1 = newTextField("foo", fooField.toString(), Field.Store.NO);
+ Field field2 = newTextField("term", termField.toString(), Field.Store.NO);
doc.add(field1);
doc.add(field2);
writer.addDocument(doc);
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java Sun Jun 10 17:42:19 2012
@@ -18,8 +18,7 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -37,8 +36,8 @@ public class TestMultiPassIndexSplitter
Document doc;
for (int i = 0; i < NUM_DOCS; i++) {
doc = new Document();
- doc.add(newField("id", i + "", StringField.TYPE_STORED));
- doc.add(newField("f", i + " " + i, TextField.TYPE_STORED));
+ doc.add(newStringField("id", i + "", Field.Store.YES));
+ doc.add(newTextField("f", i + " " + i, Field.Store.YES));
w.addDocument(doc);
if (i%3==0) w.commit();
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java Sun Jun 10 17:42:19 2012
@@ -23,8 +23,7 @@ import java.text.NumberFormat;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
@@ -104,15 +103,15 @@ public class TestPKIndexSplitter extends
StringBuilder sb = new StringBuilder();
Document doc = new Document();
String id = format.format(n);
- doc.add(newField("id", id, StringField.TYPE_STORED));
- doc.add(newField("indexname", indexName, StringField.TYPE_STORED));
+ doc.add(newStringField("id", id, Field.Store.YES));
+ doc.add(newStringField("indexname", indexName, Field.Store.YES));
sb.append("a");
sb.append(n);
- doc.add(newField("field1", sb.toString(), TextField.TYPE_STORED));
+ doc.add(newTextField("field1", sb.toString(), Field.Store.YES));
sb.append(" b");
sb.append(n);
for (int i = 1; i < numFields; i++) {
- doc.add(newField("field" + (i + 1), sb.toString(), TextField.TYPE_STORED));
+ doc.add(newTextField("field" + (i + 1), sb.toString(), Field.Store.YES));
}
return doc;
}
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java Sun Jun 10 17:42:19 2012
@@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -206,9 +206,9 @@ public class TestHighFreqTerms extends L
Document doc = new Document();
String content = getContent(i);
- doc.add(newField(rnd, "FIELD_1", content, TextField.TYPE_STORED));
+ doc.add(newTextField(rnd, "FIELD_1", content, Field.Store.YES));
//add a different field
- doc.add(newField(rnd, "different_field", "diff", TextField.TYPE_STORED));
+ doc.add(newTextField(rnd, "different_field", "diff", Field.Store.YES));
writer.addDocument(doc);
}
@@ -216,7 +216,7 @@ public class TestHighFreqTerms extends L
//highest freq terms for a specific field.
for (int i = 1; i <= 10; i++) {
Document doc = new Document();
- doc.add(newField(rnd, "different_field", "diff", TextField.TYPE_STORED));
+ doc.add(newTextField(rnd, "different_field", "diff", Field.Store.YES));
writer.addDocument(doc);
}
// add some docs where tf < df so we can see if sorting works
@@ -227,7 +227,7 @@ public class TestHighFreqTerms extends L
for (int i = 0; i < highTF; i++) {
content += "highTF ";
}
- doc.add(newField(rnd, "FIELD_1", content, TextField.TYPE_STORED));
+ doc.add(newTextField(rnd, "FIELD_1", content, Field.Store.YES));
writer.addDocument(doc);
// highTF medium df =5
int medium_df = 5;
@@ -238,7 +238,7 @@ public class TestHighFreqTerms extends L
for (int j = 0; j < tf; j++) {
newcontent += "highTFmedDF ";
}
- newdoc.add(newField(rnd, "FIELD_1", newcontent, TextField.TYPE_STORED));
+ newdoc.add(newTextField(rnd, "FIELD_1", newcontent, Field.Store.YES));
writer.addDocument(newdoc);
}
// add a doc with high tf in field different_field
@@ -248,7 +248,7 @@ public class TestHighFreqTerms extends L
for (int i = 0; i < targetTF; i++) {
content += "TF150 ";
}
- doc.add(newField(rnd, "different_field", content, TextField.TYPE_STORED));
+ doc.add(newTextField(rnd, "different_field", content, Field.Store.YES));
writer.addDocument(doc);
writer.close();
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java Sun Jun 10 17:42:19 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -69,10 +69,10 @@ public class BooleanFilterTest extends L
private void addDoc(RandomIndexWriter writer, String accessRights, String price, String date, String inStock) throws IOException {
Document doc = new Document();
- doc.add(newField("accessRights", accessRights, TextField.TYPE_STORED));
- doc.add(newField("price", price, TextField.TYPE_STORED));
- doc.add(newField("date", date, TextField.TYPE_STORED));
- doc.add(newField("inStock", inStock, TextField.TYPE_STORED));
+ doc.add(newTextField("accessRights", accessRights, Field.Store.YES));
+ doc.add(newTextField("price", price, Field.Store.YES));
+ doc.add(newTextField("date", date, Field.Store.YES));
+ doc.add(newTextField("inStock", inStock, Field.Store.YES));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java Sun Jun 10 17:42:19 2012
@@ -21,7 +21,7 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -62,9 +62,9 @@ public class ChainedFilterTest extends L
for (int i = 0; i < MAX; i++) {
Document doc = new Document();
- doc.add(newField("key", "" + (i + 1), StringField.TYPE_STORED));
- doc.add(newField("owner", (i < MAX / 2) ? "bob" : "sue", StringField.TYPE_STORED));
- doc.add(newField("date", cal.getTime().toString(), StringField.TYPE_STORED));
+ doc.add(newStringField("key", "" + (i + 1), Field.Store.YES));
+ doc.add(newStringField("owner", (i < MAX / 2) ? "bob" : "sue", Field.Store.YES));
+ doc.add(newStringField("date", cal.getTime().toString(), Field.Store.YES));
writer.addDocument(doc);
cal.add(Calendar.DATE, 1);
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java?rev=1348630&r1=1348629&r2=1348630&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java Sun Jun 10 17:42:19 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.queries;
import java.util.HashSet;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
@@ -58,7 +58,7 @@ public class TermsFilterTest extends Luc
for (int i = 0; i < 100; i++) {
Document doc = new Document();
int term = i * 10; //terms are units of 10;
- doc.add(newField(fieldName, "" + term, StringField.TYPE_STORED));
+ doc.add(newStringField(fieldName, "" + term, Field.Store.YES));
w.addDocument(doc);
}
IndexReader reader = new SlowCompositeReaderWrapper(w.getReader());
@@ -92,7 +92,7 @@ public class TermsFilterTest extends Luc
Directory rd1 = newDirectory();
RandomIndexWriter w1 = new RandomIndexWriter(random(), rd1);
Document doc = new Document();
- doc.add(newField(fieldName, "content1", StringField.TYPE_STORED));
+ doc.add(newStringField(fieldName, "content1", Field.Store.YES));
w1.addDocument(doc);
IndexReader reader1 = w1.getReader();
w1.close();
@@ -101,7 +101,7 @@ public class TermsFilterTest extends Luc
Directory rd2 = newDirectory();
RandomIndexWriter w2 = new RandomIndexWriter(random(), rd2);
doc = new Document();
- doc.add(newField(fieldName, "content2", StringField.TYPE_STORED));
+ doc.add(newStringField(fieldName, "content2", Field.Store.YES));
w2.addDocument(doc);
IndexReader reader2 = w2.getReader();
w2.close();