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 20:27:17 UTC
svn commit: r1348639 [4/8] - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneou...
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Sun Jun 10 18:27:08 2012
@@ -61,7 +61,7 @@ public class TestPostingsOffsets extends
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
Document doc = new Document();
- FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
ft.setIndexOptions(FieldInfo.IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS);
if (random().nextBoolean()) {
ft.setStoreTermVectors(true);
@@ -142,7 +142,7 @@ public class TestPostingsOffsets extends
Document doc = new Document();
doc.add(new Field("numbers", English.intToEnglish(i), ft));
doc.add(new Field("oddeven", (i % 2) == 0 ? "even" : "odd", ft));
- doc.add(new StringField("id", "" + i));
+ doc.add(new StringField("id", "" + i, Field.Store.NO));
w.addDocument(doc);
}
@@ -224,7 +224,7 @@ public class TestPostingsOffsets extends
final int numDocs = atLeast(20);
//final int numDocs = atLeast(5);
- FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType ft = new FieldType(TextField.TYPE_NOT_STORED);
// TODO: randomize what IndexOptions we use; also test
// changing this up in one IW buffered segment...:
@@ -237,7 +237,7 @@ public class TestPostingsOffsets extends
for(int docCount=0;docCount<numDocs;docCount++) {
Document doc = new Document();
- doc.add(new IntField("id", docCount));
+ doc.add(new IntField("id", docCount, Field.Store.NO));
List<Token> tokens = new ArrayList<Token>();
final int numTokens = atLeast(100);
//final int numTokens = atLeast(20);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java Sun Jun 10 18:27:08 2012
@@ -21,7 +21,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.store.AlreadyClosedException;
@@ -42,7 +41,7 @@ public class TestReaderClosed extends Lu
.setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
- Field field = newField("field", "", StringField.TYPE_UNSTORED);
+ Field field = newStringField("field", "", Field.Store.NO);
doc.add(field);
// we generate aweful prefixes: good for testing.
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollback.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollback.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollback.java Sun Jun 10 18:27:08 2012
@@ -19,7 +19,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.Field;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -31,7 +31,7 @@ public class TestRollback extends Lucene
RandomIndexWriter rw = new RandomIndexWriter(random(), dir);
for (int i = 0; i < 5; i++) {
Document doc = new Document();
- doc.add(newField("pk", Integer.toString(i), StringField.TYPE_STORED));
+ doc.add(newStringField("pk", Integer.toString(i), Field.Store.YES));
rw.addDocument(doc);
}
rw.close();
@@ -42,8 +42,8 @@ public class TestRollback extends Lucene
for (int i = 0; i < 3; i++) {
Document doc = new Document();
String value = Integer.toString(i);
- doc.add(newField("pk", value, StringField.TYPE_STORED));
- doc.add(newField("text", "foo", StringField.TYPE_STORED));
+ doc.add(newStringField("pk", value, Field.Store.YES));
+ doc.add(newStringField("text", "foo", Field.Store.YES));
w.updateDocument(new Term("pk", value), doc);
}
w.rollback();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java Sun Jun 10 18:27:08 2012
@@ -134,7 +134,7 @@ public class TestRollingUpdates extends
DirectoryReader open = null;
for (int i = 0; i < num; i++) {
Document doc = new Document();// docs.nextDoc();
- doc.add(newField("id", "test", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("id", "test", Field.Store.NO));
writer.updateDocument(new Term("id", "test"), doc);
if (random().nextInt(3) == 0) {
if (open == null) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Sun Jun 10 18:27:08 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -280,7 +280,7 @@ public class TestSegmentTermDocs extends
private void addDoc(IndexWriter writer, String value) throws IOException
{
Document doc = new Document();
- doc.add(newField("content", value, TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", value, Field.Store.NO));
writer.addDocument(doc);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java Sun Jun 10 18:27:08 2012
@@ -19,13 +19,13 @@ package org.apache.lucene.index;
import java.io.IOException;
+import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
@@ -135,7 +135,7 @@ public class TestSegmentTermEnum extends
private void addDoc(IndexWriter writer, String value) throws IOException
{
Document doc = new Document();
- doc.add(newField("content", value, TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", value, Field.Store.NO));
writer.addDocument(doc);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java Sun Jun 10 18:27:08 2012
@@ -36,7 +36,7 @@ public class TestSizeBoundedForceMerge e
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
if (withID) {
- doc.add(new Field("id", "" + i, StringField.TYPE_UNSTORED));
+ doc.add(new StringField("id", "" + i, Field.Store.NO));
}
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java Sun Jun 10 18:27:08 2012
@@ -37,9 +37,9 @@ public class TestStressAdvance extends L
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
final Set<Integer> aDocs = new HashSet<Integer>();
final Document doc = new Document();
- final Field f = newField("field", "", StringField.TYPE_UNSTORED);
+ final Field f = newStringField("field", "", Field.Store.NO);
doc.add(f);
- final Field idField = newField("id", "", StringField.TYPE_STORED);
+ final Field idField = newStringField("id", "", Field.Store.YES);
doc.add(idField);
int num = atLeast(4097);
if (VERBOSE) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java Sun Jun 10 18:27:08 2012
@@ -78,8 +78,8 @@ public class TestStressIndexing extends
for(int j=0; j<10; j++) {
Document d = new Document();
int n = random().nextInt();
- d.add(newField("id", Integer.toString(nextID++), StringField.TYPE_STORED));
- d.add(newField("contents", English.intToEnglish(n), TextField.TYPE_UNSTORED));
+ d.add(newStringField("id", Integer.toString(nextID++), Field.Store.YES));
+ d.add(newTextField("contents", English.intToEnglish(n), Field.Store.NO));
writer.addDocument(d);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java Sun Jun 10 18:27:08 2012
@@ -28,8 +28,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
@@ -232,7 +232,7 @@ public class TestStressNRT extends Lucen
// add tombstone first
if (tombstones) {
Document d = new Document();
- d.add(newField("id", "-"+Integer.toString(id), StringField.TYPE_STORED));
+ d.add(newStringField("id", "-"+Integer.toString(id), Field.Store.YES));
d.add(newField(field, Long.toString(nextVal), storedOnlyType));
writer.updateDocument(new Term("id", "-"+Integer.toString(id)), d);
}
@@ -248,7 +248,7 @@ public class TestStressNRT extends Lucen
// add tombstone first
if (tombstones) {
Document d = new Document();
- d.add(newField("id", "-"+Integer.toString(id), StringField.TYPE_STORED));
+ d.add(newStringField("id", "-"+Integer.toString(id), Field.Store.YES));
d.add(newField(field, Long.toString(nextVal), storedOnlyType));
writer.updateDocument(new Term("id", "-"+Integer.toString(id)), d);
}
@@ -261,7 +261,7 @@ public class TestStressNRT extends Lucen
} else {
// assertU(adoc("id",Integer.toString(id), field, Long.toString(nextVal)));
Document d = new Document();
- d.add(newField("id", Integer.toString(id), StringField.TYPE_STORED));
+ d.add(newStringField("id", Integer.toString(id), Field.Store.YES));
d.add(newField(field, Long.toString(nextVal), storedOnlyType));
if (VERBOSE) {
System.out.println("TEST: " + Thread.currentThread().getName() + ": u id:" + id + " val=" + nextVal);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java Sun Jun 10 18:27:08 2012
@@ -19,8 +19,6 @@ package org.apache.lucene.index;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -38,9 +36,9 @@ public class TestSumDocFreq extends Luce
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
- Field id = newField("id", "", StringField.TYPE_UNSTORED);
- Field field1 = newField("foo", "", TextField.TYPE_UNSTORED);
- Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
+ Field id = newStringField("id", "", Field.Store.NO);
+ Field field1 = newTextField("foo", "", Field.Store.NO);
+ Field field2 = newTextField("bar", "", Field.Store.NO);
doc.add(id);
doc.add(field1);
doc.add(field2);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Sun Jun 10 18:27:08 2012
@@ -20,8 +20,6 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.io.Reader;
import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -99,7 +97,7 @@ public class TestTermVectorsReader exten
Document doc = new Document();
for(int i=0;i<testFields.length;i++) {
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
if (testFieldsStorePos[i] && testFieldsStoreOff[i]) {
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java Sun Jun 10 18:27:08 2012
@@ -46,7 +46,7 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(StringField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -105,7 +105,7 @@ public class TestTermVectorsWriter exten
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -140,7 +140,7 @@ public class TestTermVectorsWriter exten
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -179,7 +179,7 @@ public class TestTermVectorsWriter exten
TokenStream stream = analyzer.tokenStream("field", new StringReader("abcd "));
stream.reset(); // TODO: weird to reset before wrapping with CachingTokenFilter... correct?
stream = new CachingTokenFilter(stream);
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -215,7 +215,7 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true)));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -251,7 +251,7 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -296,7 +296,7 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -335,7 +335,7 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
customType.setStoreTermVectorPositions(true);
customType.setStoreTermVectorOffsets(true);
@@ -396,7 +396,7 @@ public class TestTermVectorsWriter exten
document = new Document();
document.add(storedField);
- FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType2 = new FieldType(StringField.TYPE_NOT_STORED);
customType2.setStoreTermVectors(true);
customType2.setStoreTermVectorPositions(true);
customType2.setStoreTermVectorOffsets(true);
@@ -451,7 +451,7 @@ public class TestTermVectorsWriter exten
document = new Document();
document.add(storedField);
- FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType2 = new FieldType(StringField.TYPE_NOT_STORED);
customType2.setStoreTermVectors(true);
customType2.setStoreTermVectorPositions(true);
customType2.setStoreTermVectorOffsets(true);
@@ -485,7 +485,7 @@ public class TestTermVectorsWriter exten
Field storedField = newField("stored", "stored", customType);
document.add(storedField);
- FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType2 = new FieldType(StringField.TYPE_NOT_STORED);
customType2.setStoreTermVectors(true);
customType2.setStoreTermVectorPositions(true);
customType2.setStoreTermVectorOffsets(true);
@@ -521,19 +521,19 @@ public class TestTermVectorsWriter exten
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document document = new Document();
- FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType2 = new FieldType(StringField.TYPE_NOT_STORED);
customType2.setStoreTermVectors(true);
customType2.setStoreTermVectorPositions(true);
customType2.setStoreTermVectorOffsets(true);
document.add(newField("tvtest", "a b c", customType2));
iw.addDocument(document);
document = new Document();
- document.add(newField("tvtest", "x y z", TextField.TYPE_UNSTORED));
+ document.add(newTextField("tvtest", "x y z", Field.Store.NO));
iw.addDocument(document);
// Make first segment
iw.commit();
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(StringField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
document.add(newField("tvtest", "a b c", customType));
iw.addDocument(document);
@@ -551,21 +551,21 @@ public class TestTermVectorsWriter exten
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document document = new Document();
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(StringField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
document.add(newField("tvtest", "a b c", customType));
iw.addDocument(document);
iw.commit();
document = new Document();
- document.add(newField("tvtest", "x y z", TextField.TYPE_UNSTORED));
+ document.add(newTextField("tvtest", "x y z", Field.Store.NO));
iw.addDocument(document);
// Make first segment
iw.commit();
iw.forceMerge(1);
- FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType2 = new FieldType(StringField.TYPE_NOT_STORED);
customType2.setStoreTermVectors(true);
document.add(newField("tvtest", "a b c", customType2));
iw.addDocument(document);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java Sun Jun 10 18:27:08 2012
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
@@ -87,7 +87,7 @@ public class TestTermdocPerf extends Luc
Document doc = new Document();
- doc.add(newField(field,val, StringField.TYPE_UNSTORED));
+ doc.add(newStringField(field, val, Field.Store.NO));
IndexWriter writer = new IndexWriter(
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java Sun Jun 10 18:27:08 2012
@@ -24,8 +24,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.store.Directory;
@@ -159,12 +157,12 @@ public class TestTermsEnum extends Lucen
private void addDoc(RandomIndexWriter w, Collection<String> terms, Map<BytesRef,Integer> termToID, int id) throws IOException {
Document doc = new Document();
- doc.add(new IntField("id", id));
+ doc.add(new IntField("id", id, Field.Store.NO));
if (VERBOSE) {
System.out.println("TEST: addDoc id:" + id + " terms=" + terms);
}
for (String s2 : terms) {
- doc.add(newField("f", s2, StringField.TYPE_UNSTORED));
+ doc.add(newStringField("f", s2, Field.Store.NO));
termToID.put(new BytesRef(s2), id);
}
w.addDocument(doc);
@@ -368,7 +366,7 @@ public class TestTermsEnum extends Lucen
final RandomIndexWriter w = new RandomIndexWriter(random(), d, iwc);
for(String term : terms) {
Document doc = new Document();
- Field f = newField(FIELD, term, StringField.TYPE_UNSTORED);
+ Field f = newStringField(FIELD, term, Field.Store.NO);
doc.add(f);
w.addDocument(doc);
}
@@ -507,9 +505,9 @@ public class TestTermsEnum extends Lucen
d = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), d);
Document doc = new Document();
- doc.add(newField("field", "one two three", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", "one two three", Field.Store.NO));
doc = new Document();
- doc.add(newField("field2", "one two three", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field2", "one two three", Field.Store.NO));
w.addDocument(doc);
w.commit();
w.deleteDocuments(new Term("field", "one"));
@@ -730,15 +728,15 @@ public class TestTermsEnum extends Lucen
iwc.setMergePolicy(new LogDocMergePolicy());
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
Document doc = new Document();
- doc.add(newField("field", "aaa", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", "aaa", Field.Store.NO));
w.addDocument(doc);
doc = new Document();
- doc.add(newField("field", "bbb", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("field", "bbb", Field.Store.NO));
w.addDocument(doc);
doc = new Document();
- doc.add(newField("field", "ccc", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", "ccc", Field.Store.NO));
w.addDocument(doc);
w.forceMerge(1);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java Sun Jun 10 18:27:08 2012
@@ -28,7 +28,6 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.TermsEnum.SeekStatus;
import org.apache.lucene.search.AutomatonQuery;
import org.apache.lucene.search.CheckHits;
@@ -64,7 +63,7 @@ public class TestTermsEnum2 extends Luce
new MockAnalyzer(random(), MockTokenizer.KEYWORD, false))
.setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
- Field field = newField("field", "", StringField.TYPE_STORED);
+ Field field = newStringField("field", "", Field.Store.YES);
doc.add(field);
terms = new TreeSet<BytesRef>();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java Sun Jun 10 18:27:08 2012
@@ -19,8 +19,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.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -39,7 +38,7 @@ public class TestTieredMergePolicy exten
IndexWriter w = new IndexWriter(dir, conf);
for(int i=0;i<80;i++) {
Document doc = new Document();
- doc.add(newField("content", "aaa " + (i%4), TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa " + (i%4), Field.Store.NO));
w.addDocument(doc);
}
assertEquals(80, w.maxDoc());
@@ -85,7 +84,7 @@ public class TestTieredMergePolicy exten
final int numDocs = _TestUtil.nextInt(random(), 20, 100);
for(int i=0;i<numDocs;i++) {
Document doc = new Document();
- doc.add(newField("content", "aaa " + (i%4), TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa " + (i%4), Field.Store.NO));
w.addDocument(doc);
int count = w.getSegmentCount();
maxCount = Math.max(count, maxCount);
@@ -121,8 +120,8 @@ public class TestTieredMergePolicy exten
final int numDocs = atLeast(200);
for(int i=0;i<numDocs;i++) {
Document doc = new Document();
- doc.add(newField("id", "" + i, StringField.TYPE_UNSTORED));
- doc.add(newField("content", "aaa " + i, TextField.TYPE_UNSTORED));
+ doc.add(newStringField("id", "" + i, Field.Store.NO));
+ doc.add(newTextField("content", "aaa " + i, Field.Store.NO));
w.addDocument(doc);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java Sun Jun 10 18:27:08 2012
@@ -26,10 +26,10 @@ import java.util.List;
import java.util.Map;
import java.util.HashMap;
+import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
@@ -131,7 +131,7 @@ public class TestTransactionRollback ext
for(int currentRecordId=1;currentRecordId<=100;currentRecordId++) {
Document doc=new Document();
- doc.add(newField(FIELD_RECORD_ID,""+currentRecordId,TextField.TYPE_STORED));
+ doc.add(newTextField(FIELD_RECORD_ID, ""+currentRecordId, Field.Store.YES));
w.addDocument(doc);
if (currentRecordId%10 == 0) {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java Sun Jun 10 18:27:08 2012
@@ -21,9 +21,9 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
@@ -148,13 +148,13 @@ public class TestTransactions extends Lu
public void update(IndexWriter writer) throws IOException {
// Add 10 docs:
- FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(StringField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
for(int j=0; j<10; j++) {
Document d = new Document();
int n = random().nextInt();
d.add(newField("id", Integer.toString(nextID++), customType));
- d.add(newField("contents", English.intToEnglish(n), TextField.TYPE_UNSTORED));
+ d.add(newTextField("contents", English.intToEnglish(n), Field.Store.NO));
writer.addDocument(d);
}
@@ -198,7 +198,7 @@ public class TestTransactions extends Lu
for(int j=0; j<7; j++) {
Document d = new Document();
int n = random().nextInt();
- d.add(newField("contents", English.intToEnglish(n), TextField.TYPE_UNSTORED));
+ d.add(newTextField("contents", English.intToEnglish(n), Field.Store.NO));
writer.addDocument(d);
}
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java Sun Jun 10 18:27:08 2012
@@ -235,7 +235,7 @@ public class TestTypePromotion extends L
for (int i = offset; i < offset + num; i++) {
Document doc = new Document();
- doc.add(new Field("id", i + "", TextField.TYPE_STORED));
+ doc.add(new TextField("id", i + "", Field.Store.YES));
sourceTypes[i] = valueType;
switch (valueType) {
case VAR_INTS:
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Sun Jun 10 18:27:08 2012
@@ -24,9 +24,7 @@ import org.apache.lucene.analysis.MockAn
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.search.similarities.DefaultSimilarity;
-import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -49,7 +47,7 @@ public class TestUniqueTermCount extends
config.setSimilarity(new TestSimilarity());
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, config);
Document doc = new Document();
- Field foo = newField("foo", "", TextField.TYPE_UNSTORED);
+ Field foo = newTextField("foo", "", Field.Store.NO);
doc.add(foo);
for (int i = 0; i < 100; i++) {
foo.setStringValue(addValue());
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Sun Jun 10 18:27:08 2012
@@ -23,7 +23,6 @@ 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.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.RandomIndexWriter;
@@ -117,9 +116,9 @@ public class BaseTestRangeFilter extends
/* build an index */
Document doc = new Document();
- Field idField = newField(random, "id", "", StringField.TYPE_STORED);
- Field randField = newField(random, "rand", "", StringField.TYPE_STORED);
- Field bodyField = newField(random, "body", "", StringField.TYPE_UNSTORED);
+ Field idField = newStringField(random, "id", "", Field.Store.YES);
+ Field randField = newStringField(random, "rand", "", Field.Store.YES);
+ Field bodyField = newStringField(random, "body", "", Field.Store.NO);
doc.add(idField);
doc.add(randField);
doc.add(bodyField);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java Sun Jun 10 18:27:08 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
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.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
@@ -48,9 +47,9 @@ public class TestAutomatonQuery extends
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
Document doc = new Document();
- Field titleField = newField("title", "some title", TextField.TYPE_UNSTORED);
- Field field = newField(FN, "this is document one 2345", TextField.TYPE_UNSTORED);
- Field footerField = newField("footer", "a footer", TextField.TYPE_UNSTORED);
+ Field titleField = newTextField("title", "some title", Field.Store.NO);
+ Field field = newTextField(FN, "this is document one 2345", Field.Store.NO);
+ Field footerField = newTextField("footer", "a footer", Field.Store.NO);
doc.add(titleField);
doc.add(field);
doc.add(footerField);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java Sun Jun 10 18:27:08 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
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;
import org.apache.lucene.index.Term;
@@ -48,9 +47,9 @@ public class TestAutomatonQueryUnicode e
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
Document doc = new Document();
- Field titleField = newField("title", "some title", TextField.TYPE_UNSTORED);
- Field field = newField(FN, "", TextField.TYPE_UNSTORED);
- Field footerField = newField("footer", "a footer", TextField.TYPE_UNSTORED);
+ Field titleField = newTextField("title", "some title", Field.Store.NO);
+ Field field = newTextField(FN, "", Field.Store.NO);
+ Field footerField = newTextField("footer", "a footer", Field.Store.NO);
doc.add(titleField);
doc.add(field);
doc.add(footerField);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java Sun Jun 10 18:27:08 2012
@@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
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.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -60,7 +60,7 @@ public class TestBoolean2 extends Lucene
RandomIndexWriter writer= new RandomIndexWriter(random(), directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
- doc.add(newField(field, docFields[i], TextField.TYPE_UNSTORED));
+ doc.add(newTextField(field, docFields[i], Field.Store.NO));
writer.addDocument(doc);
}
writer.close();
@@ -92,12 +92,12 @@ public class TestBoolean2 extends Lucene
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()))
.setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000)));
Document doc = new Document();
- doc.add(newField("field2", "xxx", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field2", "xxx", Field.Store.NO));
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
w.addDocument(doc);
}
doc = new Document();
- doc.add(newField("field2", "big bad bug", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field2", "big bad bug", Field.Store.NO));
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
w.addDocument(doc);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Sun Jun 10 18:27:08 2012
@@ -17,10 +17,9 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -57,10 +56,10 @@ public class TestBooleanMinShouldMatch e
for (int i = 0; i < data.length; i++) {
Document doc = new Document();
- doc.add(newField("id", String.valueOf(i), StringField.TYPE_STORED));//Field.Keyword("id",String.valueOf(i)));
- doc.add(newField("all", "all", StringField.TYPE_STORED));//Field.Keyword("all","all"));
+ doc.add(newStringField("id", String.valueOf(i), Field.Store.YES));//Field.Keyword("id",String.valueOf(i)));
+ doc.add(newStringField("all", "all", Field.Store.YES));//Field.Keyword("all","all"));
if (null != data[i]) {
- doc.add(newField("data", data[i], TextField.TYPE_STORED));//Field.Text("data",data[i]));
+ doc.add(newTextField("data", data[i], Field.Store.YES));//Field.Text("data",data[i]));
}
w.addDocument(doc);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java Sun Jun 10 18:27:08 2012
@@ -25,13 +25,13 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
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.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.similarities.DefaultSimilarity;
-import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.NamedThreadFactory;
@@ -73,7 +73,7 @@ public class TestBooleanQuery extends Lu
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
Document doc = new Document();
- doc.add(newField("field", "a b c d", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", "a b c d", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
@@ -137,7 +137,7 @@ public class TestBooleanQuery extends Lu
Directory dir1 = newDirectory();
RandomIndexWriter iw1 = new RandomIndexWriter(random(), dir1);
Document doc1 = new Document();
- doc1.add(newField("field", "foo bar", TextField.TYPE_UNSTORED));
+ doc1.add(newTextField("field", "foo bar", Field.Store.NO));
iw1.addDocument(doc1);
IndexReader reader1 = iw1.getReader();
iw1.close();
@@ -145,7 +145,7 @@ public class TestBooleanQuery extends Lu
Directory dir2 = newDirectory();
RandomIndexWriter iw2 = new RandomIndexWriter(random(), dir2);
Document doc2 = new Document();
- doc2.add(newField("field", "foo baz", TextField.TYPE_UNSTORED));
+ doc2.add(newTextField("field", "foo baz", Field.Store.NO));
iw2.addDocument(doc2);
IndexReader reader2 = iw2.getReader();
iw2.close();
@@ -197,7 +197,7 @@ public class TestBooleanQuery extends Lu
contents += " f";
}
Document doc = new Document();
- doc.add(new TextField("field", contents));
+ doc.add(new TextField("field", contents, Field.Store.NO));
w.addDocument(doc);
}
w.forceMerge(1);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java Sun Jun 10 18:27:08 2012
@@ -23,7 +23,7 @@ import java.util.Arrays;
import java.util.List;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
@@ -45,7 +45,7 @@ public class TestBooleanScorer extends L
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
for (int i = 0; i < values.length; i++) {
Document doc = new Document();
- doc.add(newField(FIELD, values[i], StringField.TYPE_STORED));
+ doc.add(newStringField(FIELD, values[i], Field.Store.YES));
writer.addDocument(doc);
}
IndexReader ir = writer.getReader();
@@ -129,10 +129,10 @@ public class TestBooleanScorer extends L
final Directory d = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), d);
Document doc = new Document();
- doc.add(new TextField("field", "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33"));
+ doc.add(new TextField("field", "0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33", Field.Store.NO));
w.addDocument(doc);
doc = new Document();
- doc.add(new TextField("field", "33"));
+ doc.add(new TextField("field", "33", Field.Store.NO));
w.addDocument(doc);
final IndexReader r = w.getReader();
w.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Sun Jun 10 18:27:08 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
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.index.AtomicReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -178,7 +178,7 @@ public class TestCachingWrapperFilter ex
// add a doc, refresh the reader, and check that it's there
Document doc = new Document();
- doc.add(newField("id", "1", StringField.TYPE_STORED));
+ doc.add(newStringField("id", "1", Field.Store.YES));
writer.addDocument(doc);
reader = refreshReader(reader);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java Sun Jun 10 18:27:08 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
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.RandomIndexWriter;
@@ -90,7 +90,7 @@ public class TestConstantScoreQuery exte
RandomIndexWriter writer = new RandomIndexWriter (random(), directory);
Document doc = new Document();
- doc.add(newField("field", "term", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("field", "term", Field.Store.NO));
writer.addDocument(doc);
reader = writer.getReader();
@@ -134,10 +134,10 @@ public class TestConstantScoreQuery exte
Directory d = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), d);
Document doc = new Document();
- doc.add(newField("field", "a", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("field", "a", Field.Store.NO));
w.addDocument(doc);
doc = new Document();
- doc.add(newField("field", "b", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("field", "b", Field.Store.NO));
w.addDocument(doc);
IndexReader r = w.getReader();
w.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Sun Jun 10 18:27:08 2012
@@ -25,8 +25,7 @@ import java.util.TreeMap;
import org.apache.lucene.document.DateTools;
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.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -57,13 +56,13 @@ public class TestCustomSearcherSort exte
Document doc = new Document();
if ((i % 5) != 0) { // some documents must not have an entry in the first
// sort field
- doc.add(newField("publicationDate_", random.getLuceneDate(), StringField.TYPE_STORED));
+ doc.add(newStringField("publicationDate_", random.getLuceneDate(), Field.Store.YES));
}
if ((i % 7) == 0) { // some documents to match the query (see below)
- doc.add(newField("content", "test", TextField.TYPE_STORED));
+ doc.add(newTextField("content", "test", Field.Store.YES));
}
// every document has a defined 'mandant' field
- doc.add(newField("mandant", Integer.toString(i % 3), StringField.TYPE_STORED));
+ doc.add(newStringField("mandant", Integer.toString(i % 3), Field.Store.YES));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateFilter.java Sun Jun 10 18:27:08 2012
@@ -17,12 +17,11 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+import org.apache.lucene.document.Field;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -48,10 +47,8 @@ public class TestDateFilter extends Luce
Document doc = new Document();
// add time that is in the past
- doc.add(newField("datefield", DateTools.timeToString(now - 1000,
- DateTools.Resolution.MILLISECOND), StringField.TYPE_STORED));
- doc.add(newField("body", "Today is a very sunny day in New York City",
- TextField.TYPE_STORED));
+ doc.add(newStringField("datefield", DateTools.timeToString(now - 1000, DateTools.Resolution.MILLISECOND), Field.Store.YES));
+ doc.add(newTextField("body", "Today is a very sunny day in New York City", Field.Store.YES));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -113,10 +110,8 @@ public class TestDateFilter extends Luce
Document doc = new Document();
// add time that is in the future
- doc.add(newField("datefield", DateTools.timeToString(now + 888888,
- DateTools.Resolution.MILLISECOND), StringField.TYPE_STORED));
- doc.add(newField("body", "Today is a very sunny day in New York City",
- TextField.TYPE_STORED));
+ doc.add(newStringField("datefield", DateTools.timeToString(now + 888888, DateTools.Resolution.MILLISECOND), Field.Store.YES));
+ doc.add(newTextField("body", "Today is a very sunny day in New York City", Field.Store.YES));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java Sun Jun 10 18:27:08 2012
@@ -25,8 +25,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
@@ -104,12 +102,12 @@ public class TestDateSort extends Lucene
Document document = new Document();
// Add the text field.
- Field textField = newField(TEXT_FIELD, text, TextField.TYPE_STORED);
+ Field textField = newTextField(TEXT_FIELD, text, Field.Store.YES);
document.add(textField);
// Add the date/time field.
String dateTimeString = DateTools.timeToString(time, DateTools.Resolution.SECOND);
- Field dateTimeField = newField(DATE_TIME_FIELD, dateTimeString, StringField.TYPE_STORED);
+ Field dateTimeField = newStringField(DATE_TIME_FIELD, dateTimeString, Field.Store.YES);
document.add(dateTimeField);
return document;
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Sun Jun 10 18:27:08 2012
@@ -17,6 +17,7 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -103,9 +104,9 @@ public class TestDisjunctionMaxQuery ext
d1.add(newField("id", "d1", nonAnalyzedType));// Field.Keyword("id",
// "d1"));
d1
- .add(newField("hed", "elephant", TextField.TYPE_STORED));// Field.Text("hed", "elephant"));
+ .add(newTextField("hed", "elephant", Field.Store.YES));// Field.Text("hed", "elephant"));
d1
- .add(newField("dek", "elephant", TextField.TYPE_STORED));// Field.Text("dek", "elephant"));
+ .add(newTextField("dek", "elephant", Field.Store.YES));// Field.Text("dek", "elephant"));
writer.addDocument(d1);
}
@@ -115,11 +116,11 @@ public class TestDisjunctionMaxQuery ext
d2.add(newField("id", "d2", nonAnalyzedType));// Field.Keyword("id",
// "d2"));
d2
- .add(newField("hed", "elephant", TextField.TYPE_STORED));// Field.Text("hed", "elephant"));
- d2.add(newField("dek", "albino", TextField.TYPE_STORED));// Field.Text("dek",
+ .add(newTextField("hed", "elephant", Field.Store.YES));// Field.Text("hed", "elephant"));
+ d2.add(newTextField("dek", "albino", Field.Store.YES));// Field.Text("dek",
// "albino"));
d2
- .add(newField("dek", "elephant", TextField.TYPE_STORED));// Field.Text("dek", "elephant"));
+ .add(newTextField("dek", "elephant", Field.Store.YES));// Field.Text("dek", "elephant"));
writer.addDocument(d2);
}
@@ -128,10 +129,10 @@ public class TestDisjunctionMaxQuery ext
Document d3 = new Document();
d3.add(newField("id", "d3", nonAnalyzedType));// Field.Keyword("id",
// "d3"));
- d3.add(newField("hed", "albino", TextField.TYPE_STORED));// Field.Text("hed",
+ d3.add(newTextField("hed", "albino", Field.Store.YES));// Field.Text("hed",
// "albino"));
d3
- .add(newField("hed", "elephant", TextField.TYPE_STORED));// Field.Text("hed", "elephant"));
+ .add(newTextField("hed", "elephant", Field.Store.YES));// Field.Text("hed", "elephant"));
writer.addDocument(d3);
}
@@ -140,11 +141,11 @@ public class TestDisjunctionMaxQuery ext
Document d4 = new Document();
d4.add(newField("id", "d4", nonAnalyzedType));// Field.Keyword("id",
// "d4"));
- d4.add(newField("hed", "albino", TextField.TYPE_STORED));// Field.Text("hed",
+ d4.add(newTextField("hed", "albino", Field.Store.YES));// Field.Text("hed",
// "albino"));
d4
.add(newField("hed", "elephant", nonAnalyzedType));// Field.Text("hed", "elephant"));
- d4.add(newField("dek", "albino", TextField.TYPE_STORED));// Field.Text("dek",
+ d4.add(newTextField("dek", "albino", Field.Store.YES));// Field.Text("dek",
// "albino"));
writer.addDocument(d4);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java Sun Jun 10 18:27:08 2012
@@ -38,8 +38,8 @@ public class TestDocBoost extends Lucene
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), store, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
- Field f1 = newField("field", "word", TextField.TYPE_STORED);
- Field f2 = newField("field", "word", TextField.TYPE_STORED);
+ Field f1 = newTextField("field", "word", Field.Store.YES);
+ Field f2 = newTextField("field", "word", Field.Store.YES);
f2.setBoost(2.0f);
Document d1 = new Document();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocIdSet.java Sun Jun 10 18:27:08 2012
@@ -25,7 +25,7 @@ import java.util.Iterator;
import junit.framework.Assert;
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.RandomIndexWriter;
@@ -103,7 +103,7 @@ public class TestDocIdSet extends Lucene
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
- doc.add(newField("c", "val", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("c", "val", Field.Store.NO));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
@@ -129,7 +129,7 @@ public class TestDocIdSet extends Lucene
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
- doc.add(newField("c", "val", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("c", "val", Field.Store.NO));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java Sun Jun 10 18:27:08 2012
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FloatDocValuesField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DocValues.Source;
import org.apache.lucene.index.FieldInvertState;
@@ -34,8 +33,8 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
+import org.apache.lucene.util.LuceneTestCase;
/**
* Tests the use of indexdocvalues in scoring.
@@ -51,11 +50,11 @@ public class TestDocValuesScoring extend
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
Document doc = new Document();
- Field field = newField("foo", "", TextField.TYPE_UNSTORED);
+ Field field = newTextField("foo", "", Field.Store.NO);
doc.add(field);
Field dvField = new FloatDocValuesField("foo_boost", 0.0f);
doc.add(dvField);
- Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
+ Field field2 = newTextField("bar", "", Field.Store.NO);
doc.add(field2);
field.setStringValue("quick brown fox");
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java Sun Jun 10 18:27:08 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.*;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
import org.apache.lucene.search.similarities.DefaultSimilarity;
@@ -125,7 +125,7 @@ public class TestElevationComparator ext
private Document adoc(String[] vals) {
Document doc = new Document();
for (int i = 0; i < vals.length - 2; i += 2) {
- doc.add(newField(vals[i], vals[i + 1], TextField.TYPE_STORED));
+ doc.add(newTextField(vals[i], vals[i + 1], Field.Store.YES));
}
return doc;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestExplanations.java Sun Jun 10 18:27:08 2012
@@ -20,8 +20,6 @@ package org.apache.lucene.search;
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.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -74,11 +72,11 @@ public class TestExplanations extends Lu
RandomIndexWriter writer= new RandomIndexWriter(random(), directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
- doc.add(newField(KEY, ""+i, StringField.TYPE_UNSTORED));
- Field f = newField(FIELD, docFields[i], TextField.TYPE_UNSTORED);
+ doc.add(newStringField(KEY, ""+i, Field.Store.NO));
+ Field f = newTextField(FIELD, docFields[i], Field.Store.NO);
f.setBoost(i);
doc.add(f);
- doc.add(newField(ALTFIELD, docFields[i], TextField.TYPE_UNSTORED));
+ doc.add(newTextField(ALTFIELD, docFields[i], Field.Store.NO));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java Sun Jun 10 18:27:08 2012
@@ -29,8 +29,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
@@ -67,24 +67,24 @@ public class TestFieldCache extends Luce
}
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 (i%2 == 0) {
- doc.add(newField("sparse", String.valueOf(i), StringField.TYPE_UNSTORED));
+ doc.add(newStringField("sparse", String.valueOf(i), Field.Store.NO));
}
if (i%2 == 0) {
- doc.add(new IntField("numInt", i));
+ doc.add(new IntField("numInt", i, Field.Store.NO));
}
// sometimes skip the field:
if (random().nextInt(40) != 17) {
unicodeStrings[i] = generateString(i);
- doc.add(newField("theRandomUnicodeString", unicodeStrings[i], StringField.TYPE_STORED));
+ doc.add(newStringField("theRandomUnicodeString", unicodeStrings[i], Field.Store.YES));
}
// sometimes skip the field:
@@ -92,7 +92,7 @@ public class TestFieldCache extends Luce
for (int j = 0; j < NUM_ORDS; j++) {
String newValue = generateString(i);
multiValued[i][j] = new BytesRef(newValue);
- doc.add(newField("theRandomUnicodeMultiValuedField", newValue, StringField.TYPE_STORED));
+ doc.add(newStringField("theRandomUnicodeMultiValuedField", newValue, Field.Store.YES));
}
Arrays.sort(multiValued[i]);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java Sun Jun 10 18:27:08 2012
@@ -20,13 +20,13 @@ package org.apache.lucene.search;
import java.io.IOException;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.store.Directory;
import org.junit.Test;
@@ -529,8 +529,8 @@ public class TestFieldCacheRangeFilter e
for (int d = -20; d <= 20; d++) {
Document doc = new Document();
- doc.add(newField("id",Integer.toString(d), StringField.TYPE_UNSTORED));
- doc.add(newField("body","body", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("id", Integer.toString(d), Field.Store.NO));
+ doc.add(newStringField("body", "body", Field.Store.NO));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java Sun Jun 10 18:27:08 2012
@@ -17,10 +17,10 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
@@ -41,7 +41,7 @@ public class TestFieldCacheTermsFilter e
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 = w.getReader();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java Sun Jun 10 18:27:08 2012
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -96,10 +96,10 @@ public class TestFieldValueFilter extend
Document doc = new Document();
if (random().nextBoolean()) {
docStates[i] = 1;
- doc.add(newField("some", "value", TextField.TYPE_STORED));
+ doc.add(newTextField("some", "value", Field.Store.YES));
}
- doc.add(newField("all", "test", TextField.TYPE_UNSTORED));
- doc.add(newField("id", "" + i, TextField.TYPE_STORED));
+ doc.add(newTextField("all", "test", Field.Store.NO));
+ doc.add(newTextField("id", "" + i, Field.Store.YES));
writer.addDocument(doc);
}
writer.commit();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java Sun Jun 10 18:27:08 2012
@@ -21,7 +21,7 @@ import java.util.BitSet;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -55,23 +55,23 @@ public class TestFilteredQuery extends L
RandomIndexWriter writer = new RandomIndexWriter (random(), directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
Document doc = new Document();
- doc.add (newField("field", "one two three four five", TextField.TYPE_STORED));
- doc.add (newField("sorter", "b", TextField.TYPE_STORED));
+ doc.add (newTextField("field", "one two three four five", Field.Store.YES));
+ doc.add (newTextField("sorter", "b", Field.Store.YES));
writer.addDocument (doc);
doc = new Document();
- doc.add (newField("field", "one two three four", TextField.TYPE_STORED));
- doc.add (newField("sorter", "d", TextField.TYPE_STORED));
+ doc.add (newTextField("field", "one two three four", Field.Store.YES));
+ doc.add (newTextField("sorter", "d", Field.Store.YES));
writer.addDocument (doc);
doc = new Document();
- doc.add (newField("field", "one two three y", TextField.TYPE_STORED));
- doc.add (newField("sorter", "a", TextField.TYPE_STORED));
+ doc.add (newTextField("field", "one two three y", Field.Store.YES));
+ doc.add (newTextField("sorter", "a", Field.Store.YES));
writer.addDocument (doc);
doc = new Document();
- doc.add (newField("field", "one two x", TextField.TYPE_STORED));
- doc.add (newField("sorter", "c", TextField.TYPE_STORED));
+ doc.add (newTextField("field", "one two x", Field.Store.YES));
+ doc.add (newTextField("sorter", "c", Field.Store.YES));
writer.addDocument (doc);
// tests here require single segment (eg try seed