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 [2/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/Test2BTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java Sun Jun 10 18:27:08 2012
@@ -17,22 +17,21 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import org.apache.lucene.util.*;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
-import org.apache.lucene.store.*;
-import org.apache.lucene.search.*;
-import org.apache.lucene.analysis.*;
-import org.apache.lucene.analysis.tokenattributes.*;
-import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.document.*;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
-import org.junit.Ignore;
+
+import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.tokenattributes.*;
+import org.apache.lucene.codecs.Codec;
+import org.apache.lucene.document.*;
+import org.apache.lucene.index.FieldInfo.IndexOptions;
+import org.apache.lucene.search.*;
+import org.apache.lucene.store.*;
+import org.apache.lucene.util.*;
+import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
// NOTE: this test will fail w/ PreFlexRW codec! (Because
// this test uses full binary term space, but PreFlex cannot
@@ -178,7 +177,7 @@ public class Test2BTerms extends LuceneT
Document doc = new Document();
final MyTokenStream ts = new MyTokenStream(random(), TERMS_PER_DOC);
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setIndexOptions(IndexOptions.DOCS_ONLY);
customType.setOmitNorms(true);
Field field = new Field("field", ts, customType);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java Sun Jun 10 18:27:08 2012
@@ -45,7 +45,6 @@ import org.apache.lucene.codecs.pulsing.
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.PackedLongDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -179,8 +178,8 @@ public class TestAddIndexes extends Luce
// docs, so 10 pending deletes:
for (int i = 0; i < 20; i++) {
Document doc = new Document();
- doc.add(newField("id", "" + (i % 10), StringField.TYPE_UNSTORED));
- doc.add(newField("content", "bbb " + i, TextField.TYPE_UNSTORED));
+ doc.add(newStringField("id", "" + (i % 10), Field.Store.NO));
+ doc.add(newTextField("content", "bbb " + i, Field.Store.NO));
writer.updateDocument(new Term("id", "" + (i%10)), doc);
}
// Deletes one of the 10 added docs, leaving 9:
@@ -214,8 +213,8 @@ public class TestAddIndexes extends Luce
// docs, so 10 pending deletes:
for (int i = 0; i < 20; i++) {
Document doc = new Document();
- doc.add(newField("id", "" + (i % 10), StringField.TYPE_UNSTORED));
- doc.add(newField("content", "bbb " + i, TextField.TYPE_UNSTORED));
+ doc.add(newStringField("id", "" + (i % 10), Field.Store.NO));
+ doc.add(newTextField("content", "bbb " + i, Field.Store.NO));
writer.updateDocument(new Term("id", "" + (i%10)), doc);
}
@@ -252,8 +251,8 @@ public class TestAddIndexes extends Luce
// docs, so 10 pending deletes:
for (int i = 0; i < 20; i++) {
Document doc = new Document();
- doc.add(newField("id", "" + (i % 10), StringField.TYPE_UNSTORED));
- doc.add(newField("content", "bbb " + i, TextField.TYPE_UNSTORED));
+ doc.add(newStringField("id", "" + (i % 10), Field.Store.NO));
+ doc.add(newTextField("content", "bbb " + i, Field.Store.NO));
writer.updateDocument(new Term("id", "" + (i%10)), doc);
}
@@ -527,7 +526,7 @@ public class TestAddIndexes extends Luce
private void addDocs(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
writer.addDocument(doc);
}
}
@@ -535,7 +534,7 @@ public class TestAddIndexes extends Luce
private void addDocs2(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(newField("content", "bbb", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "bbb", Field.Store.NO));
writer.addDocument(doc);
}
}
@@ -654,7 +653,7 @@ public class TestAddIndexes extends Luce
private void addDoc(IndexWriter writer) throws IOException
{
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
writer.addDocument(doc);
}
@@ -974,7 +973,7 @@ public class TestAddIndexes extends Luce
IndexWriterConfig conf = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
IndexWriter writer = new IndexWriter(dirs[i], conf);
Document doc = new Document();
- doc.add(new StringField("id", "myid"));
+ doc.add(new StringField("id", "myid", Field.Store.NO));
writer.addDocument(doc);
writer.close();
}
@@ -1004,8 +1003,8 @@ public class TestAddIndexes extends Luce
private void addDocsWithID(IndexWriter writer, int numDocs, int docStart) throws IOException {
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
- doc.add(newField("id", "" + (docStart + i), TextField.TYPE_STORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
+ doc.add(newTextField("id", "" + (docStart + i), Field.Store.YES));
writer.addDocument(doc);
}
}
@@ -1219,8 +1218,8 @@ public class TestAddIndexes extends Luce
Directory d1 = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), d1);
Document doc = new Document();
- doc.add(newField("f1", "doc1 field1", StringField.TYPE_STORED));
- doc.add(newField("id", "1", StringField.TYPE_STORED));
+ doc.add(newStringField("f1", "doc1 field1", Field.Store.YES));
+ doc.add(newStringField("id", "1", Field.Store.YES));
w.addDocument(doc);
IndexReader r1 = w.getReader();
w.close();
@@ -1228,8 +1227,8 @@ public class TestAddIndexes extends Luce
Directory d2 = newDirectory();
w = new RandomIndexWriter(random(), d2);
doc = new Document();
- doc.add(newField("f2", "doc2 field2", StringField.TYPE_STORED));
- doc.add(newField("id", "2", StringField.TYPE_STORED));
+ doc.add(newStringField("f2", "doc2 field2", Field.Store.YES));
+ doc.add(newStringField("id", "2", Field.Store.YES));
w.addDocument(doc);
IndexReader r2 = w.getReader();
w.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java Sun Jun 10 18:27:08 2012
@@ -89,8 +89,8 @@ public class TestAtomicUpdate extends Lu
// Update all 100 docs...
for(int i=0; i<100; i++) {
Document d = new Document();
- d.add(new Field("id", Integer.toString(i), StringField.TYPE_STORED));
- d.add(new TextField("contents", English.intToEnglish(i+10*count)));
+ d.add(new StringField("id", Integer.toString(i), Field.Store.YES));
+ d.add(new TextField("contents", English.intToEnglish(i+10*count), Field.Store.NO));
writer.updateDocument(new Term("id", Integer.toString(i)), d);
}
}
@@ -129,8 +129,8 @@ public class TestAtomicUpdate extends Lu
// Establish a base index of 100 docs:
for(int i=0;i<100;i++) {
Document d = new Document();
- d.add(newField("id", Integer.toString(i), StringField.TYPE_STORED));
- d.add(newField("contents", English.intToEnglish(i), TextField.TYPE_UNSTORED));
+ d.add(newStringField("id", Integer.toString(i), Field.Store.YES));
+ d.add(newTextField("contents", English.intToEnglish(i), Field.Store.NO));
if ((i-1)%7 == 0) {
writer.commit();
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Sun Jun 10 18:27:08 2012
@@ -50,8 +50,8 @@ import org.apache.lucene.store.RAMDirect
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.Constants;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -555,8 +555,8 @@ public class TestBackwardsCompatibility
private void addDoc(IndexWriter writer, int id) throws IOException
{
Document doc = new Document();
- doc.add(new TextField("content", "aaa"));
- doc.add(new Field("id", Integer.toString(id), StringField.TYPE_STORED));
+ doc.add(new TextField("content", "aaa", Field.Store.NO));
+ doc.add(new StringField("id", Integer.toString(id), Field.Store.YES));
FieldType customType2 = new FieldType(TextField.TYPE_STORED);
customType2.setStoreTermVectors(true);
customType2.setStoreTermVectorPositions(true);
@@ -566,8 +566,8 @@ public class TestBackwardsCompatibility
doc.add(new Field("content2", "here is more content with aaa aaa aaa", customType2));
doc.add(new Field("fie\u2C77ld", "field with non-ascii name", customType2));
// add numeric fields, to test if flex preserves encoding
- doc.add(new IntField("trieInt", id));
- doc.add(new LongField("trieLong", (long) id));
+ doc.add(new IntField("trieInt", id, Field.Store.NO));
+ doc.add(new LongField("trieLong", (long) id, Field.Store.NO));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Sun Jun 10 18:27:08 2012
@@ -45,7 +45,6 @@ import org.apache.lucene.util.Constants;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.OpenBitSet;
-import org.apache.lucene.util.Version;
import org.apache.lucene.util._TestUtil;
import org.junit.BeforeClass;
@@ -352,7 +351,7 @@ public class TestCodecs extends LuceneTe
pq.add(new Term("content", "ccc"));
final Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setOmitNorms(true);
doc.add(newField("content", "aaa bbb ccc ddd", customType));
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Sun Jun 10 18:27:08 2012
@@ -22,8 +22,6 @@ 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.StringField;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase;
@@ -75,7 +73,7 @@ public class TestConcurrentMergeSchedule
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2));
Document doc = new Document();
- Field idField = newField("id", "", StringField.TYPE_STORED);
+ Field idField = newStringField("id", "", Field.Store.YES);
doc.add(idField);
int extraCount = 0;
@@ -134,7 +132,7 @@ public class TestConcurrentMergeSchedule
.setMergePolicy(mp));
Document doc = new Document();
- Field idField = newField("id", "", StringField.TYPE_STORED);
+ Field idField = newStringField("id", "", Field.Store.YES);
doc.add(idField);
for(int i=0;i<10;i++) {
if (VERBOSE) {
@@ -178,7 +176,7 @@ public class TestConcurrentMergeSchedule
for(int j=0;j<21;j++) {
Document doc = new Document();
- doc.add(newField("content", "a b c", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "a b c", Field.Store.NO));
writer.addDocument(doc);
}
@@ -199,7 +197,7 @@ public class TestConcurrentMergeSchedule
public void testNoWaitClose() throws IOException {
MockDirectoryWrapper directory = newDirectory();
Document doc = new Document();
- Field idField = newField("id", "", StringField.TYPE_STORED);
+ Field idField = newStringField("id", "", Field.Store.YES);
doc.add(idField);
IndexWriter writer = new IndexWriter(
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java Sun Jun 10 18:27:08 2012
@@ -26,9 +26,7 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.FailOnNonBulkMergesInfoStream;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -43,8 +41,8 @@ public class TestConsistentFieldNumbers
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
Document d1 = new Document();
- d1.add(new Field("f1", "first field", StringField.TYPE_STORED));
- d1.add(new Field("f2", "second field", StringField.TYPE_STORED));
+ d1.add(new StringField("f1", "first field", Field.Store.YES));
+ d1.add(new StringField("f2", "second field", Field.Store.YES));
writer.addDocument(d1);
if (i == 1) {
@@ -57,10 +55,10 @@ public class TestConsistentFieldNumbers
Document d2 = new Document();
FieldType customType2 = new FieldType(TextField.TYPE_STORED);
customType2.setStoreTermVectors(true);
- d2.add(new TextField("f2", "second field"));
+ d2.add(new TextField("f2", "second field", Field.Store.NO));
d2.add(new Field("f1", "first field", customType2));
- d2.add(new TextField("f3", "third field"));
- d2.add(new TextField("f4", "fourth field"));
+ d2.add(new TextField("f3", "third field", Field.Store.NO));
+ d2.add(new TextField("f4", "fourth field", Field.Store.NO));
writer.addDocument(d2);
writer.close();
@@ -106,8 +104,8 @@ public class TestConsistentFieldNumbers
IndexWriter writer = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(NoMergePolicy.COMPOUND_FILES));
Document d1 = new Document();
- d1.add(new Field("f1", "first field", TextField.TYPE_STORED));
- d1.add(new Field("f2", "second field", TextField.TYPE_STORED));
+ d1.add(new TextField("f1", "first field", Field.Store.YES));
+ d1.add(new TextField("f2", "second field", Field.Store.YES));
writer.addDocument(d1);
writer.close();
@@ -116,10 +114,10 @@ public class TestConsistentFieldNumbers
Document d2 = new Document();
FieldType customType2 = new FieldType(TextField.TYPE_STORED);
customType2.setStoreTermVectors(true);
- d2.add(new Field("f2", "second field", TextField.TYPE_STORED));
+ d2.add(new TextField("f2", "second field", Field.Store.YES));
d2.add(new Field("f1", "first field", customType2));
- d2.add(new Field("f3", "third field", TextField.TYPE_STORED));
- d2.add(new Field("f4", "fourth field", TextField.TYPE_STORED));
+ d2.add(new TextField("f3", "third field", Field.Store.YES));
+ d2.add(new TextField("f4", "fourth field", Field.Store.YES));
writer.addDocument(d2);
writer.close();
@@ -156,8 +154,8 @@ public class TestConsistentFieldNumbers
TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(
NoMergePolicy.NO_COMPOUND_FILES));
Document d = new Document();
- d.add(new Field("f1", "d1 first field", TextField.TYPE_STORED));
- d.add(new Field("f2", "d1 second field", TextField.TYPE_STORED));
+ d.add(new TextField("f1", "d1 first field", Field.Store.YES));
+ d.add(new TextField("f2", "d1 second field", Field.Store.YES));
writer.addDocument(d);
writer.close();
SegmentInfos sis = new SegmentInfos();
@@ -175,7 +173,7 @@ public class TestConsistentFieldNumbers
random().nextBoolean() ? NoMergePolicy.NO_COMPOUND_FILES
: NoMergePolicy.COMPOUND_FILES));
Document d = new Document();
- d.add(new Field("f1", "d2 first field", TextField.TYPE_STORED));
+ d.add(new TextField("f1", "d2 first field", Field.Store.YES));
d.add(new StoredField("f3", new byte[] { 1, 2, 3 }));
writer.addDocument(d);
writer.close();
@@ -197,8 +195,8 @@ public class TestConsistentFieldNumbers
random().nextBoolean() ? NoMergePolicy.NO_COMPOUND_FILES
: NoMergePolicy.COMPOUND_FILES));
Document d = new Document();
- d.add(new Field("f1", "d3 first field", TextField.TYPE_STORED));
- d.add(new Field("f2", "d3 second field", TextField.TYPE_STORED));
+ d.add(new TextField("f1", "d3 first field", Field.Store.YES));
+ d.add(new TextField("f2", "d3 second field", Field.Store.YES));
d.add(new StoredField("f3", new byte[] { 1, 2, 3, 4, 5 }));
writer.addDocument(d);
writer.close();
@@ -297,15 +295,15 @@ public class TestConsistentFieldNumbers
FieldType customType2 = new FieldType(TextField.TYPE_STORED);
customType2.setTokenized(false);
- FieldType customType3 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType3 = new FieldType(TextField.TYPE_NOT_STORED);
customType3.setTokenized(false);
- FieldType customType4 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType4 = new FieldType(TextField.TYPE_NOT_STORED);
customType4.setTokenized(false);
customType4.setStoreTermVectors(true);
customType4.setStoreTermVectorOffsets(true);
- FieldType customType5 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType5 = new FieldType(TextField.TYPE_NOT_STORED);
customType5.setStoreTermVectors(true);
customType5.setStoreTermVectorOffsets(true);
@@ -314,7 +312,7 @@ public class TestConsistentFieldNumbers
customType6.setStoreTermVectors(true);
customType6.setStoreTermVectorOffsets(true);
- FieldType customType7 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType7 = new FieldType(TextField.TYPE_NOT_STORED);
customType7.setTokenized(false);
customType7.setStoreTermVectors(true);
customType7.setStoreTermVectorOffsets(true);
@@ -324,7 +322,7 @@ public class TestConsistentFieldNumbers
customType8.setStoreTermVectors(true);
customType8.setStoreTermVectorPositions(true);
- FieldType customType9 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType9 = new FieldType(TextField.TYPE_NOT_STORED);
customType9.setStoreTermVectors(true);
customType9.setStoreTermVectorPositions(true);
@@ -333,7 +331,7 @@ public class TestConsistentFieldNumbers
customType10.setStoreTermVectors(true);
customType10.setStoreTermVectorPositions(true);
- FieldType customType11 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType11 = new FieldType(TextField.TYPE_NOT_STORED);
customType11.setTokenized(false);
customType11.setStoreTermVectors(true);
customType11.setStoreTermVectorPositions(true);
@@ -343,7 +341,7 @@ public class TestConsistentFieldNumbers
customType12.setStoreTermVectorOffsets(true);
customType12.setStoreTermVectorPositions(true);
- FieldType customType13 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType13 = new FieldType(TextField.TYPE_NOT_STORED);
customType13.setStoreTermVectors(true);
customType13.setStoreTermVectorOffsets(true);
customType13.setStoreTermVectorPositions(true);
@@ -354,7 +352,7 @@ public class TestConsistentFieldNumbers
customType14.setStoreTermVectorOffsets(true);
customType14.setStoreTermVectorPositions(true);
- FieldType customType15 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType15 = new FieldType(TextField.TYPE_NOT_STORED);
customType15.setTokenized(false);
customType15.setStoreTermVectors(true);
customType15.setStoreTermVectorOffsets(true);
@@ -362,7 +360,7 @@ public class TestConsistentFieldNumbers
switch (mode) {
case 0: return new Field(fieldName, "some text", customType);
- case 1: return new TextField(fieldName, "some text");
+ case 1: return new TextField(fieldName, "some text", Field.Store.NO);
case 2: return new Field(fieldName, "some text", customType2);
case 3: return new Field(fieldName, "some text", customType3);
case 4: return new Field(fieldName, "some text", customType4);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrash.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrash.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrash.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrash.java Sun Jun 10 18:27:08 2012
@@ -20,12 +20,12 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.util.Random;
+import org.apache.lucene.document.Field;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.NoLockFactory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
public class TestCrash extends LuceneTestCase {
@@ -44,8 +44,8 @@ public class TestCrash extends LuceneTes
}
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
- doc.add(newField("id", "0", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
+ doc.add(newTextField("id", "0", Field.Store.NO));
for(int i=0;i<157;i++)
writer.addDocument(doc);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java Sun Jun 10 18:27:08 2012
@@ -23,7 +23,7 @@ import java.util.Collection;
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.IndexSearcher;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
@@ -137,7 +137,7 @@ public class TestCrashCausesCorruptIndex
*/
private Document getDocument() {
Document document = new Document();
- document.add(newField(TEXT_FIELD, "my dog has fleas", TextField.TYPE_UNSTORED));
+ document.add(newTextField(TEXT_FIELD, "my dog has fleas", Field.Store.NO));
return document;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java Sun Jun 10 18:27:08 2012
@@ -57,7 +57,7 @@ public class TestCustomNorms extends Luc
for (int i = 0; i < num; i++) {
Document doc = docs.nextDoc();
float nextFloat = random().nextFloat();
- Field f = new Field(floatTestField, "" + nextFloat, TextField.TYPE_STORED);
+ Field f = new TextField(floatTestField, "" + nextFloat, Field.Store.YES);
f.setBoost(nextFloat);
doc.add(f);
@@ -99,8 +99,7 @@ public class TestCustomNorms extends Luc
for (int i = 0; i < num; i++) {
Document doc = docs.nextDoc();
float nextFloat = random().nextFloat();
- Field f = new Field(exceptionTestField, "" + nextFloat,
- TextField.TYPE_STORED);
+ Field f = new TextField(exceptionTestField, "" + nextFloat, Field.Store.YES);
f.setBoost(nextFloat);
doc.add(f);
@@ -128,8 +127,8 @@ public class TestCustomNorms extends Luc
config.setSimilarity(similarity);
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, config);
Document doc = new Document();
- Field foo = newField("foo", "", TextField.TYPE_UNSTORED);
- Field bar = newField("bar", "", TextField.TYPE_UNSTORED);
+ Field foo = newTextField("foo", "", Field.Store.NO);
+ Field bar = newTextField("bar", "", Field.Store.NO);
doc.add(foo);
doc.add(bar);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java Sun Jun 10 18:27:08 2012
@@ -27,8 +27,7 @@ import java.util.Set;
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.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
@@ -728,15 +727,15 @@ public class TestDeletionPolicy extends
private void addDocWithID(IndexWriter writer, int id) throws IOException {
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
- doc.add(newField("id", "" + id, StringField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
+ doc.add(newStringField("id", "" + id, Field.Store.NO));
writer.addDocument(doc);
}
private void addDoc(IndexWriter writer) throws IOException
{
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
writer.addDocument(doc);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java Sun Jun 10 18:27:08 2012
@@ -131,7 +131,7 @@ public class TestDirectoryReader extends
new MockAnalyzer(random)).setOpenMode(
create ? OpenMode.CREATE : OpenMode.APPEND));
Document doc = new Document();
- doc.add(newField("body", s, TextField.TYPE_UNSTORED));
+ doc.add(newTextField("body", s, Field.Store.NO));
iw.addDocument(doc);
iw.close();
}
@@ -178,10 +178,10 @@ public class TestDirectoryReader extends
FieldType customType3 = new FieldType();
customType3.setStored(true);
- doc.add(new Field("keyword", "test1", StringField.TYPE_STORED));
- doc.add(new Field("text", "test1", TextField.TYPE_STORED));
+ doc.add(new StringField("keyword", "test1", Field.Store.YES));
+ doc.add(new TextField("text", "test1", Field.Store.YES));
doc.add(new Field("unindexed", "test1", customType3));
- doc.add(new TextField("unstored","test1"));
+ doc.add(new TextField("unstored","test1", Field.Store.NO));
writer.addDocument(doc);
writer.close();
@@ -204,19 +204,19 @@ public class TestDirectoryReader extends
int mergeFactor = ((LogMergePolicy) writer.getConfig().getMergePolicy()).getMergeFactor();
for (int i = 0; i < 5*mergeFactor; i++) {
doc = new Document();
- doc.add(new Field("keyword", "test1", StringField.TYPE_STORED));
- doc.add(new Field("text", "test1", TextField.TYPE_STORED));
+ doc.add(new StringField("keyword", "test1", Field.Store.YES));
+ doc.add(new TextField("text", "test1", Field.Store.YES));
doc.add(new Field("unindexed", "test1", customType3));
- doc.add(new TextField("unstored","test1"));
+ doc.add(new TextField("unstored","test1", Field.Store.NO));
writer.addDocument(doc);
}
// new fields are in some different segments (we hope)
for (int i = 0; i < 5*mergeFactor; i++) {
doc = new Document();
- doc.add(new Field("keyword2", "test1", StringField.TYPE_STORED));
- doc.add(new Field("text2", "test1", TextField.TYPE_STORED));
+ doc.add(new StringField("keyword2", "test1", Field.Store.YES));
+ doc.add(new TextField("text2", "test1", Field.Store.YES));
doc.add(new Field("unindexed2", "test1", customType3));
- doc.add(new TextField("unstored2","test1"));
+ doc.add(new TextField("unstored2","test1", Field.Store.NO));
writer.addDocument(doc);
}
// new termvector fields
@@ -236,7 +236,7 @@ public class TestDirectoryReader extends
for (int i = 0; i < 5*mergeFactor; i++) {
doc = new Document();
- doc.add(new Field("tvnot", "tvnot", TextField.TYPE_STORED));
+ doc.add(new TextField("tvnot", "tvnot", Field.Store.YES));
doc.add(new Field("termvector", "termvector", customType5));
doc.add(new Field("tvoffset", "tvoffset", customType6));
doc.add(new Field("tvposition", "tvposition", customType7));
@@ -334,7 +334,7 @@ public void testTermVectors() throws Exc
customType8.setStoreTermVectorPositions(true);
for (int i = 0; i < 5 * mergeFactor; i++) {
Document doc = new Document();
- doc.add(new Field("tvnot", "one two two three three three", TextField.TYPE_STORED));
+ doc.add(new TextField("tvnot", "one two two three three three", Field.Store.YES));
doc.add(new Field("termvector", "one two two three three three", customType5));
doc.add(new Field("tvoffset", "one two two three three three", customType6));
doc.add(new Field("tvposition", "one two two three three three", customType7));
@@ -383,7 +383,7 @@ void assertTermDocsCount(String msg,
writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.APPEND).setMergePolicy(newLogMergePolicy()));
Document doc = new Document();
doc.add(new StoredField("bin1", bin));
- doc.add(new TextField("junk", "junk text"));
+ doc.add(new TextField("junk", "junk text", Field.Store.NO));
writer.addDocument(doc);
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
@@ -495,10 +495,10 @@ public void testFilesOpenClose() throws
FieldType customType3 = new FieldType();
customType3.setStored(true);
- doc.add(newField("keyword", "test1", StringField.TYPE_STORED));
- doc.add(newField("text", "test1", TextField.TYPE_STORED));
+ doc.add(newStringField("keyword", "test1", Field.Store.YES));
+ doc.add(newTextField("text", "test1", Field.Store.YES));
doc.add(newField("unindexed", "test1", customType3));
- doc.add(new TextField("unstored","test1"));
+ doc.add(new TextField("unstored","test1", Field.Store.NO));
writer.addDocument(doc);
}
@@ -508,10 +508,10 @@ public void testFilesOpenClose() throws
FieldType customType3 = new FieldType();
customType3.setStored(true);
- doc.add(newField("keyword2", "test1", StringField.TYPE_STORED));
- doc.add(newField("text2", "test1", TextField.TYPE_STORED));
+ doc.add(newStringField("keyword2", "test1", Field.Store.YES));
+ doc.add(newTextField("text2", "test1", Field.Store.YES));
doc.add(newField("unindexed2", "test1", customType3));
- doc.add(new TextField("unstored2","test1"));
+ doc.add(new TextField("unstored2","test1", Field.Store.NO));
writer.addDocument(doc);
}
@@ -530,7 +530,7 @@ public void testFilesOpenClose() throws
customType8.setStoreTermVectors(true);
customType8.setStoreTermVectorOffsets(true);
customType8.setStoreTermVectorPositions(true);
- doc.add(newField("tvnot","tvnot",TextField.TYPE_STORED));
+ doc.add(newTextField("tvnot", "tvnot", Field.Store.YES));
doc.add(newField("termvector","termvector",customType5));
doc.add(newField("tvoffset","tvoffset", customType6));
doc.add(newField("tvposition","tvposition", customType7));
@@ -541,7 +541,7 @@ public void testFilesOpenClose() throws
static 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);
}
@@ -766,7 +766,7 @@ public void testFilesOpenClose() throws
setMergePolicy(newLogMergePolicy(10))
);
Document doc = new Document();
- doc.add(newField("number", "17", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("number", "17", Field.Store.NO));
writer.addDocument(doc);
writer.commit();
@@ -799,8 +799,8 @@ public void testFilesOpenClose() throws
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- doc.add(newField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", TextField.TYPE_UNSTORED));
- doc.add(newField("number", "0 1 2 3 4 5 6 7 8 9", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO));
+ doc.add(newTextField("number", "0 1 2 3 4 5 6 7 8 9", Field.Store.NO));
writer.addDocument(doc);
writer.addDocument(doc);
writer.commit();
@@ -828,8 +828,8 @@ public void testFilesOpenClose() throws
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
- doc.add(newField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", TextField.TYPE_UNSTORED));
- doc.add(newField("number", "0 1 2 3 4 5 6 7 8 9", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO));
+ doc.add(newTextField("number", "0 1 2 3 4 5 6 7 8 9", Field.Store.NO));
writer.addDocument(doc);
writer.addDocument(doc);
writer.close();
@@ -936,7 +936,7 @@ public void testFilesOpenClose() throws
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document d = new Document();
- d.add(newField("f", "a a b", TextField.TYPE_UNSTORED));
+ d.add(newTextField("f", "a a b", Field.Store.NO));
writer.addDocument(d);
DirectoryReader r = writer.getReader();
writer.close();
@@ -1073,8 +1073,8 @@ public void testFilesOpenClose() throws
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
- doc.add(newField("field1", "foobar", StringField.TYPE_STORED));
- doc.add(newField("field2", "foobaz", StringField.TYPE_STORED));
+ doc.add(newStringField("field1", "foobar", Field.Store.YES));
+ doc.add(newStringField("field2", "foobaz", Field.Store.YES));
writer.addDocument(doc);
DirectoryReader r = writer.getReader();
writer.close();
@@ -1096,8 +1096,8 @@ public void testFilesOpenClose() throws
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
- doc.add(newField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", TextField.TYPE_UNSTORED));
- doc.add(newField("number", "0 1 2 3 4 5 6 7 8 9", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", "a b c d e f g h i j k l m n o p q r s t u v w x y z", Field.Store.NO));
+ doc.add(newTextField("number", "0 1 2 3 4 5 6 7 8 9", Field.Store.NO));
writer.addDocument(doc);
// open(IndexWriter, boolean)
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java Sun Jun 10 18:27:08 2012
@@ -32,7 +32,6 @@ import org.apache.lucene.analysis.MockAn
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.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.IndexSearcher;
@@ -487,13 +486,13 @@ public class TestDirectoryReaderReopen e
customType2.setOmitNorms(true);
FieldType customType3 = new FieldType();
customType3.setStored(true);
- doc.add(new Field("field1", sb.toString(), TextField.TYPE_STORED));
+ doc.add(new TextField("field1", sb.toString(), Field.Store.YES));
doc.add(new Field("fielda", sb.toString(), customType2));
doc.add(new Field("fieldb", sb.toString(), customType3));
sb.append(" b");
sb.append(n);
for (int i = 1; i < numFields; i++) {
- doc.add(new Field("field" + (i+1), sb.toString(), TextField.TYPE_STORED));
+ doc.add(new TextField("field" + (i+1), sb.toString(), Field.Store.YES));
}
return doc;
}
@@ -591,7 +590,7 @@ public class TestDirectoryReaderReopen e
);
for(int i=0;i<4;i++) {
Document doc = new Document();
- doc.add(newField("id", ""+i, StringField.TYPE_UNSTORED));
+ doc.add(newStringField("id", ""+i, Field.Store.NO));
writer.addDocument(doc);
Map<String,String> data = new HashMap<String,String>();
data.put("index", i+"");
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDoc.java Sun Jun 10 18:27:08 2012
@@ -25,11 +25,11 @@ import java.io.StringWriter;
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedList;
-import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
@@ -182,7 +182,7 @@ public class TestDoc extends LuceneTestC
{
File file = new File(workDir, fileName);
Document doc = new Document();
- doc.add(new TextField("contents", new FileReader(file)));
+ doc.add(new TextField("contents", new FileReader(file), Field.Store.NO));
writer.addDocument(doc);
writer.commit();
return writer.newestSegment();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java Sun Jun 10 18:27:08 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.Field;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.FixedBitSet;
@@ -53,7 +53,7 @@ public class TestDocCount extends Lucene
Document doc = new Document();
int numFields = _TestUtil.nextInt(random(), 1, 10);
for (int i = 0; i < numFields; i++) {
- doc.add(newField("" + _TestUtil.nextInt(random(), 'a', 'z'), "" + _TestUtil.nextInt(random(), 'a', 'z'), StringField.TYPE_UNSTORED));
+ doc.add(newStringField("" + _TestUtil.nextInt(random(), 'a', 'z'), "" + _TestUtil.nextInt(random(), 'a', 'z'), Field.Store.NO));
}
return doc;
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java Sun Jun 10 18:27:08 2012
@@ -29,8 +29,6 @@ import org.apache.lucene.codecs.Postings
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.index.DocTermOrds.TermOrdsIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.store.Directory;
@@ -52,7 +50,7 @@ public class TestDocTermOrds extends Luc
Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy()));
Document doc = new Document();
- Field field = newField("field", "", TextField.TYPE_UNSTORED);
+ Field field = newTextField("field", "", Field.Store.NO);
doc.add(field);
field.setStringValue("a b c");
w.addDocument(doc);
@@ -124,7 +122,7 @@ public class TestDocTermOrds extends Luc
for(int id=0;id<NUM_DOCS;id++) {
Document doc = new Document();
- doc.add(new IntField("id", id));
+ doc.add(new IntField("id", id, Field.Store.NO));
final int termCount = _TestUtil.nextInt(random(), 0, 20*RANDOM_MULTIPLIER);
while(ordsForDocSet.size() < termCount) {
@@ -137,7 +135,7 @@ public class TestDocTermOrds extends Luc
}
for(int ord : ordsForDocSet) {
ordsForDoc[upto++] = ord;
- Field field = newField("field", termsArray[ord].utf8ToString(), StringField.TYPE_UNSTORED);
+ Field field = newStringField("field", termsArray[ord].utf8ToString(), Field.Store.NO);
if (VERBOSE) {
System.out.println(" f=" + termsArray[ord].utf8ToString());
}
@@ -221,7 +219,7 @@ public class TestDocTermOrds extends Luc
for(int id=0;id<NUM_DOCS;id++) {
Document doc = new Document();
- doc.add(new IntField("id", id));
+ doc.add(new IntField("id", id, Field.Store.NO));
final int termCount = _TestUtil.nextInt(random(), 0, 20*RANDOM_MULTIPLIER);
while(ordsForDocSet.size() < termCount) {
@@ -234,7 +232,7 @@ public class TestDocTermOrds extends Luc
}
for(int ord : ordsForDocSet) {
ordsForDoc[upto++] = ord;
- Field field = newField("field", termsArray[ord].utf8ToString(), StringField.TYPE_UNSTORED);
+ Field field = newStringField("field", termsArray[ord].utf8ToString(), Field.Store.NO);
if (VERBOSE) {
System.out.println(" f=" + termsArray[ord].utf8ToString());
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Sun Jun 10 18:27:08 2012
@@ -71,7 +71,7 @@ public class TestDocValuesIndexing exten
for (int i = 0; i < 5; i++) {
Document doc = new Document();
doc.add(new PackedLongDocValuesField("docId", i));
- doc.add(new TextField("docId", "" + i));
+ doc.add(new TextField("docId", "" + i, Field.Store.NO));
writer.addDocument(doc);
}
writer.commit();
@@ -124,7 +124,7 @@ public class TestDocValuesIndexing exten
Directory d1 = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), d1);
Document doc = new Document();
- doc.add(newField("id", "1", StringField.TYPE_STORED));
+ doc.add(newStringField("id", "1", Field.Store.YES));
doc.add(new PackedLongDocValuesField("dv", 1));
w.addDocument(doc);
IndexReader r1 = w.getReader();
@@ -133,7 +133,7 @@ public class TestDocValuesIndexing exten
Directory d2 = newDirectory();
w = new RandomIndexWriter(random(), d2);
doc = new Document();
- doc.add(newField("id", "2", StringField.TYPE_STORED));
+ doc.add(newStringField("id", "2", Field.Store.YES));
doc.add(new PackedLongDocValuesField("dv", 2));
w.addDocument(doc);
IndexReader r2 = w.getReader();
@@ -703,7 +703,7 @@ public class TestDocValuesIndexing exten
}
}
doc.removeFields("id");
- doc.add(new Field("id", idBase + i, StringField.TYPE_STORED));
+ doc.add(new StringField("id", idBase + i, Field.Store.YES));
w.addDocument(doc);
if (i % 7 == 0) {
@@ -799,7 +799,7 @@ public class TestDocValuesIndexing exten
int len = 1 + random().nextInt(50);
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(newField("id", "" + i, TextField.TYPE_STORED));
+ doc.add(newTextField("id", "" + i, Field.Store.YES));
String string = fixed ? _TestUtil.randomFixedByteLengthUnicodeString(random(),
len) : _TestUtil.randomRealisticUnicodeString(random(), 1, len);
BytesRef br = new BytesRef(string);
@@ -814,7 +814,7 @@ public class TestDocValuesIndexing exten
int numDocsNoValue = atLeast(10);
for (int i = 0; i < numDocsNoValue; i++) {
Document doc = new Document();
- doc.add(newField("id", "noValue", TextField.TYPE_STORED));
+ doc.add(newTextField("id", "noValue", Field.Store.YES));
w.addDocument(doc);
}
BytesRef bytesRef = new BytesRef(fixed ? len : 0);
@@ -827,7 +827,7 @@ public class TestDocValuesIndexing exten
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
String id = "" + i + numDocs;
- doc.add(newField("id", id, TextField.TYPE_STORED));
+ doc.add(newTextField("id", id, Field.Store.YES));
String string = fixed ? _TestUtil.randomFixedByteLengthUnicodeString(random(),
len) : _TestUtil.randomRealisticUnicodeString(random(), 1, len);
BytesRef br = new BytesRef(string);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java Sun Jun 10 18:27:08 2012
@@ -22,8 +22,8 @@ import java.util.Arrays;
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.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
@@ -50,7 +50,7 @@ public class TestDocsAndPositions extend
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
for (int i = 0; i < 39; i++) {
Document doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setOmitNorms(true);
doc.add(newField(fieldName, "1 2 3 4 5 6 7 8 9 10 "
+ "1 2 3 4 5 6 7 8 9 10 " + "1 2 3 4 5 6 7 8 9 10 "
@@ -110,7 +110,7 @@ public class TestDocsAndPositions extend
int max = 1051;
int term = random().nextInt(max);
Integer[][] positionsInDoc = new Integer[numDocs][];
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setOmitNorms(true);
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
@@ -193,7 +193,7 @@ public class TestDocsAndPositions extend
int max = 15678;
int term = random().nextInt(max);
int[] freqInDoc = new int[numDocs];
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setOmitNorms(true);
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
@@ -270,7 +270,7 @@ public class TestDocsAndPositions extend
RandomIndexWriter writer = new RandomIndexWriter(random(), dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
int howMany = 1000;
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setOmitNorms(true);
for (int i = 0; i < 39; i++) {
Document doc = new Document();
@@ -326,7 +326,7 @@ public class TestDocsAndPositions extend
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
- doc.add(newField("foo", "bar", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("foo", "bar", Field.Store.NO));
writer.addDocument(doc);
DirectoryReader reader = writer.getReader();
AtomicReader r = getOnlySegmentReader(reader);
@@ -351,7 +351,7 @@ public class TestDocsAndPositions extend
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
Document doc = new Document();
- doc.add(newField("foo", "bar", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("foo", "bar", Field.Store.NO));
writer.addDocument(doc);
DirectoryReader reader = writer.getReader();
AtomicReader r = getOnlySegmentReader(reader);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java Sun Jun 10 18:27:08 2012
@@ -119,8 +119,8 @@ public class TestDocumentWriter extends
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
- doc.add(newField("repeated", "repeated one", TextField.TYPE_STORED));
- doc.add(newField("repeated", "repeated two", TextField.TYPE_STORED));
+ doc.add(newTextField("repeated", "repeated one", Field.Store.YES));
+ doc.add(newTextField("repeated", "repeated two", Field.Store.YES));
writer.addDocument(doc);
writer.commit();
@@ -192,7 +192,7 @@ public class TestDocumentWriter extends
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer));
Document doc = new Document();
- doc.add(newField("f1", "a 5 a a", TextField.TYPE_STORED));
+ doc.add(newTextField("f1", "a 5 a a", Field.Store.YES));
writer.addDocument(doc);
writer.commit();
@@ -235,8 +235,7 @@ public class TestDocumentWriter extends
return true;
}
}
-
- }));
+ }));
writer.addDocument(doc);
writer.commit();
@@ -269,7 +268,7 @@ public class TestDocumentWriter extends
public void testMixedTermVectorSettingsSameField() throws Exception {
Document doc = new Document();
// f1 first without tv then with tv
- doc.add(newField("f1", "v1", StringField.TYPE_STORED));
+ doc.add(newStringField("f1", "v1", Field.Store.YES));
FieldType customType2 = new FieldType(StringField.TYPE_STORED);
customType2.setStoreTermVectors(true);
customType2.setStoreTermVectorOffsets(true);
@@ -277,7 +276,7 @@ public class TestDocumentWriter extends
doc.add(newField("f1", "v2", customType2));
// f2 first with tv then without tv
doc.add(newField("f2", "v1", customType2));
- doc.add(newField("f2", "v2", StringField.TYPE_STORED));
+ doc.add(newStringField("f2", "v2", Field.Store.YES));
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random())));
@@ -306,14 +305,14 @@ public class TestDocumentWriter extends
public void testLUCENE_1590() throws Exception {
Document doc = new Document();
// f1 has no norms
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setOmitNorms(true);
FieldType customType2 = new FieldType();
customType2.setStored(true);
doc.add(newField("f1", "v1", customType));
doc.add(newField("f1", "v2", customType2));
// f2 has no TF
- FieldType customType3 = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType3 = new FieldType(TextField.TYPE_NOT_STORED);
customType3.setIndexOptions(IndexOptions.DOCS_ONLY);
Field f = newField("f2", "v1", customType3);
doc.add(f);
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java Sun Jun 10 18:27:08 2012
@@ -249,13 +249,13 @@ public class TestFieldsReader extends Lu
if (random().nextBoolean()) {
final float f = random().nextFloat();
answer = Float.valueOf(f);
- nf = new FloatField("nf", f);
+ nf = new FloatField("nf", f, Field.Store.NO);
sf = new StoredField("nf", f);
typeAnswer = NumericType.FLOAT;
} else {
final double d = random().nextDouble();
answer = Double.valueOf(d);
- nf = new DoubleField("nf", d);
+ nf = new DoubleField("nf", d, Field.Store.NO);
sf = new StoredField("nf", d);
typeAnswer = NumericType.DOUBLE;
}
@@ -264,13 +264,13 @@ public class TestFieldsReader extends Lu
if (random().nextBoolean()) {
final int i = random().nextInt();
answer = Integer.valueOf(i);
- nf = new IntField("nf", i);
+ nf = new IntField("nf", i, Field.Store.NO);
sf = new StoredField("nf", i);
typeAnswer = NumericType.INT;
} else {
final long l = random().nextLong();
answer = Long.valueOf(l);
- nf = new LongField("nf", l);
+ nf = new LongField("nf", l, Field.Store.NO);
sf = new StoredField("nf", l);
typeAnswer = NumericType.LONG;
}
@@ -279,7 +279,7 @@ public class TestFieldsReader extends Lu
doc.add(sf);
answers[id] = answer;
typeAnswers[id] = typeAnswer;
- FieldType ft = new FieldType(IntField.TYPE);
+ FieldType ft = new FieldType(IntField.TYPE_NOT_STORED);
ft.setNumericPrecisionStep(Integer.MAX_VALUE);
doc.add(new IntField("id", id, ft));
w.addDocument(doc);
@@ -309,7 +309,7 @@ public class TestFieldsReader extends Lu
FieldType onlyStored = new FieldType();
onlyStored.setStored(true);
doc.add(new Field("field", "value", onlyStored));
- doc.add(new Field("field2", "value", StringField.TYPE_STORED));
+ doc.add(new StringField("field2", "value", Field.Store.YES));
w.addDocument(doc);
IndexReader r = w.getReader();
w.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java Sun Jun 10 18:27:08 2012
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
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.store.MockDirectoryWrapper;
@@ -132,15 +132,15 @@ public class TestFilterAtomicReader exte
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document d1 = new Document();
- d1.add(newField("default","one two", TextField.TYPE_STORED));
+ d1.add(newTextField("default", "one two", Field.Store.YES));
writer.addDocument(d1);
Document d2 = new Document();
- d2.add(newField("default","one three", TextField.TYPE_STORED));
+ d2.add(newTextField("default", "one three", Field.Store.YES));
writer.addDocument(d2);
Document d3 = new Document();
- d3.add(newField("default","two four", TextField.TYPE_STORED));
+ d3.add(newTextField("default", "two four", Field.Store.YES));
writer.addDocument(d3);
writer.close();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlex.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestFlex.java Sun Jun 10 18:27:08 2012
@@ -40,10 +40,10 @@ public class TestFlex extends LuceneTest
for(int iter=0;iter<2;iter++) {
if (iter == 0) {
Document doc = new Document();
- doc.add(newField("field1", "this is field1", TextField.TYPE_UNSTORED));
- doc.add(newField("field2", "this is field2", TextField.TYPE_UNSTORED));
- doc.add(newField("field3", "aaa", TextField.TYPE_UNSTORED));
- doc.add(newField("field4", "bbb", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field1", "this is field1", Field.Store.NO));
+ doc.add(newTextField("field2", "this is field2", Field.Store.NO));
+ doc.add(newTextField("field3", "aaa", Field.Store.NO));
+ doc.add(newTextField("field4", "bbb", Field.Store.NO));
for(int i=0;i<DOC_COUNT;i++) {
w.addDocument(doc);
}
@@ -67,7 +67,7 @@ public class TestFlex extends LuceneTest
IndexWriter w = new IndexWriter(d, newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random())).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat())));
Document doc = new Document();
- doc.add(newField("f", "a b c", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("f", "a b c", Field.Store.NO));
w.addDocument(doc);
w.forceMerge(1);
DirectoryReader r = w.getReader();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java Sun Jun 10 18:27:08 2012
@@ -19,6 +19,7 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermRangeQuery;
@@ -49,7 +50,7 @@ public class TestForTooMuchCloning exten
sb.append(' ');
}
final Document doc = new Document();
- doc.add(new TextField("field", sb.toString()));
+ doc.add(new TextField("field", sb.toString(), Field.Store.NO));
w.addDocument(doc);
}
final IndexReader r = w.getReader();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java Sun Jun 10 18:27:08 2012
@@ -22,15 +22,10 @@ import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.FieldInfosReader;
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.search.similarities.DefaultSimilarity;
-import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -196,8 +191,8 @@ public class TestIndexFileDeleter extend
private void addDoc(IndexWriter writer, int id) throws IOException
{
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
- doc.add(newField("id", Integer.toString(id), StringField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
+ doc.add(newStringField("id", Integer.toString(id), Field.Store.NO));
writer.addDocument(doc);
}
}
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Sun Jun 10 18:27:08 2012
@@ -23,10 +23,8 @@ import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -37,21 +35,16 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.PhraseQuery;
-import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.search.spans.SpanTermQuery;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.Lock;
import org.apache.lucene.store.LockFactory;
import org.apache.lucene.store.LockObtainFailedException;
@@ -68,7 +61,7 @@ import org.apache.lucene.util.packed.Pac
public class TestIndexWriter extends LuceneTestCase {
- private static final FieldType storedTextType = new FieldType(TextField.TYPE_UNSTORED);
+ private static final FieldType storedTextType = new FieldType(TextField.TYPE_NOT_STORED);
public void testDocCount() throws IOException {
Directory dir = newDirectory();
@@ -129,7 +122,7 @@ public class TestIndexWriter extends Luc
static void addDoc(IndexWriter writer) throws IOException
{
Document doc = new Document();
- doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content", "aaa", Field.Store.NO));
writer.addDocument(doc);
}
@@ -658,7 +651,7 @@ public class TestIndexWriter extends Luc
TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
document.add(newField("tvtest", "", customType));
iw.addDocument(document);
@@ -677,7 +670,7 @@ public class TestIndexWriter extends Luc
((LogMergePolicy) conf.getMergePolicy()).setMergeFactor(2);
IndexWriter iw = new IndexWriter(dir, conf);
Document document = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setStoreTermVectors(true);
document.add(newField("tvtest", "a b c", customType));
Thread.currentThread().setPriority(Thread.MAX_PRIORITY);
@@ -707,14 +700,14 @@ public class TestIndexWriter extends Luc
FieldType type = null;
if (i == 7) {
// Add empty docs here
- doc.add(newField("content3", "", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("content3", "", Field.Store.NO));
} else {
if (i%2 == 0) {
doc.add(newField("content4", contents, customType));
type = customType;
} else
- type = TextField.TYPE_UNSTORED;
- doc.add(newField("content1", contents, TextField.TYPE_UNSTORED));
+ type = TextField.TYPE_NOT_STORED;
+ doc.add(newTextField("content1", contents, Field.Store.NO));
doc.add(newField("content3", "", customType));
doc.add(newField("content5", "", type));
}
@@ -746,7 +739,7 @@ public class TestIndexWriter extends Luc
for(int i=0;i<10000;i++)
b.append(" a");
b.append(" x");
- doc.add(newField("field", b.toString(), TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", b.toString(), Field.Store.NO));
writer.addDocument(doc);
writer.close();
@@ -764,7 +757,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- doc.add(newField("", "a b c", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("", "a b c", Field.Store.NO));
writer.addDocument(doc);
writer.close();
dir.close();
@@ -774,7 +767,7 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- doc.add(newField("", "a b c", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("", "a b c", Field.Store.NO));
writer.addDocument(doc);
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
@@ -792,10 +785,10 @@ public class TestIndexWriter extends Luc
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- doc.add(newField("", "", StringField.TYPE_UNSTORED));
- doc.add(newField("", "a", StringField.TYPE_UNSTORED));
- doc.add(newField("", "b", StringField.TYPE_UNSTORED));
- doc.add(newField("", "c", StringField.TYPE_UNSTORED));
+ doc.add(newStringField("", "", Field.Store.NO));
+ doc.add(newStringField("", "a", Field.Store.NO));
+ doc.add(newStringField("", "b", Field.Store.NO));
+ doc.add(newStringField("", "c", Field.Store.NO));
writer.addDocument(doc);
writer.close();
DirectoryReader reader = DirectoryReader.open(dir);
@@ -931,7 +924,7 @@ public class TestIndexWriter extends Luc
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, analyzer));
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);
Field f = newField("field", "", customType);
@@ -1256,7 +1249,7 @@ public class TestIndexWriter extends Luc
s.append(' ').append(i);
}
Document d = new Document();
- Field f = newField("field", s.toString(), TextField.TYPE_UNSTORED);
+ Field f = newTextField("field", s.toString(), Field.Store.NO);
d.add(f);
w.addDocument(d);
@@ -1288,7 +1281,7 @@ public class TestIndexWriter extends Luc
setMergePolicy(mergePolicy)
);
Document doc = new Document();
- doc.add(newField("field", "go", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("field", "go", Field.Store.NO));
w.addDocument(doc);
DirectoryReader r;
if (iter == 0) {
@@ -1574,12 +1567,12 @@ public class TestIndexWriter extends Luc
// This contents produces a too-long term:
String contents = "abc xyz x" + bigTerm + " another term";
- doc.add(new TextField("content", contents));
+ doc.add(new TextField("content", contents, Field.Store.NO));
w.addDocument(doc);
// Make sure we can add another normal document
doc = new Document();
- doc.add(new TextField("content", "abc bbb ccc"));
+ doc.add(new TextField("content", "abc bbb ccc", Field.Store.NO));
w.addDocument(doc);
IndexReader reader = w.getReader();
@@ -1609,7 +1602,7 @@ public class TestIndexWriter extends Luc
// Make sure we can add a document with exactly the
// maximum length term, and search on that term:
doc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType customType = new FieldType(TextField.TYPE_NOT_STORED);
customType.setTokenized(false);
Field contentField = new Field("content", "", customType);
doc.add(contentField);
@@ -1648,7 +1641,7 @@ public class TestIndexWriter extends Luc
iwc.setReaderTermsIndexDivisor(1);
IndexWriter writer = new IndexWriter(dir, iwc);
Document doc = new Document();
- doc.add(newField("", "a b c", TextField.TYPE_UNSTORED));
+ doc.add(newTextField("", "a b c", Field.Store.NO));
writer.addDocument(doc);
writer.close();
dir.close();
@@ -1682,7 +1675,7 @@ public class TestIndexWriter extends Luc
Directory d = new MockDirectoryWrapper(random(), new RAMDirectory());
IndexWriter w = new IndexWriter(d, new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
Document doc = new Document();
- doc.add(newField("id", "0", StringField.TYPE_STORED));
+ doc.add(newStringField("id", "0", Field.Store.YES));
w.addDocument(doc);
DirectoryReader r = w.getReader();
long version = r.getVersion();
@@ -1726,10 +1719,10 @@ public class TestIndexWriter extends Luc
IndexWriter w = new IndexWriter(dir,
new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
- FieldType docsAndFreqs = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType docsAndFreqs = new FieldType(TextField.TYPE_NOT_STORED);
docsAndFreqs.setIndexOptions(IndexOptions.DOCS_AND_FREQS);
- FieldType docsOnly = new FieldType(TextField.TYPE_UNSTORED);
+ FieldType docsOnly = new FieldType(TextField.TYPE_NOT_STORED);
docsOnly.setIndexOptions(IndexOptions.DOCS_ONLY);
Document doc = new Document();
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java Sun Jun 10 18:27:08 2012
@@ -26,7 +26,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.*;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
@@ -340,7 +339,7 @@ public class TestIndexWriterCommit exten
try {
final Document doc = new Document();
DirectoryReader r = DirectoryReader.open(dir);
- Field f = newField("f", "", StringField.TYPE_UNSTORED);
+ Field f = newStringField("f", "", Field.Store.NO);
doc.add(f);
int count = 0;
do {
Modified: lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java?rev=1348639&r1=1348638&r2=1348639&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java Sun Jun 10 18:27:08 2012
@@ -26,7 +26,7 @@ import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
+import org.apache.lucene.document.Field.Store;
import org.apache.lucene.index.DocumentsWriterPerThread.IndexingChain;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.IndexSearcher;
@@ -280,7 +280,7 @@ public class TestIndexWriterConfig exten
IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random()));
Directory dir = newDirectory();
Document doc = new Document();
- doc.add(newField("foo", "bar", TextField.TYPE_STORED));
+ doc.add(newTextField("foo", "bar", Store.YES));
RandomIndexWriter riw = new RandomIndexWriter(random(), dir, iwc);
riw.addDocument(doc);
riw.close();