Index: lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java =================================================================== --- lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java (working copy) @@ -69,12 +69,12 @@ ); Document doc = new Document(); // uses default codec: - doc.add(newField("field1", "this field uses the standard codec as the test", TextField.TYPE_UNSTORED)); + doc.add(newField("field1", "this field uses the standard codec as the test", TextField.TYPE)); // uses pulsing codec: - Field field2 = newField("field2", "this field uses the pulsing codec as the test", TextField.TYPE_UNSTORED); + Field field2 = newField("field2", "this field uses the pulsing codec as the test", TextField.TYPE); doc.add(field2); - Field idField = newField("id", "", StringField.TYPE_UNSTORED); + Field idField = newField("id", "", StringField.TYPE); doc.add(idField); for(int i=0;i terms = new ArrayList(); int num = atLeast(200); Index: lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java (working copy) @@ -44,7 +44,8 @@ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(newLogMergePolicy())); //writer.setUseCompoundFile(false); //writer.infoStream = System.out; - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setTokenized(false); customType.setStoreTermVectors(true); for (int i = 0; i < numDocs; i++) { Index: lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestFilteredSearch.java (working copy) @@ -19,21 +19,22 @@ import java.io.IOException; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.Term; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; +import org.apache.lucene.util.LuceneTestCase; @@ -67,7 +68,8 @@ try { for (int i = 0; i < 60; i++) {//Simple docs Document doc = new Document(); - doc.add(newField(FIELD, Integer.toString(i), StringField.TYPE_STORED)); + doc.add(newField(FIELD, Integer.toString(i), StringField.TYPE)); + doc.add(newField(FIELD, Integer.toString(i), StoredField.TYPE)); writer.addDocument(doc); } if (fullMerge) { Index: lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (working copy) @@ -17,25 +17,26 @@ * limitations under the License. */ -import org.apache.lucene.util.LuceneTestCase; +import java.io.IOException; +import java.text.DecimalFormat; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.AtomicReaderContext; +import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Norm; +import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SlowCompositeReaderWrapper; -import org.apache.lucene.index.FieldInvertState; -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 java.text.DecimalFormat; -import java.io.IOException; - /** * Test of the DisjunctionMaxQuery. * @@ -81,8 +82,9 @@ public IndexReader r; public IndexSearcher s; - private static final FieldType nonAnalyzedType = new FieldType(TextField.TYPE_STORED); + private static final FieldType nonAnalyzedType = new FieldType(TextField.TYPE); static { + nonAnalyzedType.setStored(true); nonAnalyzedType.setTokenized(false); } @@ -102,10 +104,10 @@ Document d1 = new Document(); d1.add(newField("id", "d1", nonAnalyzedType));// Field.Keyword("id", // "d1")); - d1 - .add(newField("hed", "elephant", TextField.TYPE_STORED));// Field.Text("hed", "elephant")); - d1 - .add(newField("dek", "elephant", TextField.TYPE_STORED));// Field.Text("dek", "elephant")); + d1.add(newField("hed", "elephant", TextField.TYPE));// Field.Text("hed", "elephant")); + d1.add(newField("hed", "elephant", StoredField.TYPE));// Field.Text("hed", "elephant")); + d1.add(newField("dek", "elephant", TextField.TYPE));// Field.Text("dek", "elephant")); + d1.add(newField("dek", "elephant", StoredField.TYPE));// Field.Text("dek", "elephant")); writer.addDocument(d1); } @@ -114,12 +116,13 @@ Document d2 = new Document(); 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", + d2.add(newField("hed", "elephant", TextField.TYPE));// Field.Text("hed", "elephant")); + d2.add(newField("hed", "elephant", StoredField.TYPE));// Field.Text("hed", "elephant")); + d2.add(newField("dek", "albino", TextField.TYPE));// Field.Text("dek", + d2.add(newField("dek", "albino", StoredField.TYPE));// Field.Text("dek", // "albino")); - d2 - .add(newField("dek", "elephant", TextField.TYPE_STORED));// Field.Text("dek", "elephant")); + d2.add(newField("dek", "elephant", TextField.TYPE));// Field.Text("dek", "elephant")); + d2.add(newField("dek", "elephant", StoredField.TYPE));// Field.Text("dek", "elephant")); writer.addDocument(d2); } @@ -128,10 +131,11 @@ 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(newField("hed", "albino", TextField.TYPE));// Field.Text("hed", + d3.add(newField("hed", "albino", StoredField.TYPE));// Field.Text("hed", // "albino")); - d3 - .add(newField("hed", "elephant", TextField.TYPE_STORED));// Field.Text("hed", "elephant")); + d3.add(newField("hed", "elephant", TextField.TYPE));// Field.Text("hed", "elephant")); + d3.add(newField("hed", "elephant", StoredField.TYPE));// Field.Text("hed", "elephant")); writer.addDocument(d3); } @@ -140,11 +144,12 @@ 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(newField("hed", "albino", TextField.TYPE));// Field.Text("hed", + d4.add(newField("hed", "albino", StoredField.TYPE));// 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(newField("hed", "elephant", nonAnalyzedType));// Field.Text("hed", "elephant")); + d4.add(newField("dek", "albino", TextField.TYPE));// Field.Text("dek", + d4.add(newField("dek", "albino", StoredField.TYPE));// Field.Text("dek", // "albino")); writer.addDocument(d4); } Index: lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java (working copy) @@ -64,17 +64,17 @@ int numDocs = atLeast(200); for (int i = 0; i < numDocs; i++) { Document document = new Document(); - document.add(newField("english", English.intToEnglish(i), TextField.TYPE_UNSTORED)); - document.add(newField("oddeven", (i % 2 == 0) ? "even" : "odd", TextField.TYPE_UNSTORED)); - document.add(newField("byte", "" + ((byte) random().nextInt()), StringField.TYPE_UNSTORED)); - document.add(newField("short", "" + ((short) random().nextInt()), StringField.TYPE_UNSTORED)); + document.add(newField("english", English.intToEnglish(i), TextField.TYPE)); + document.add(newField("oddeven", (i % 2 == 0) ? "even" : "odd", TextField.TYPE)); + document.add(newField("byte", "" + ((byte) random().nextInt()), StringField.TYPE)); + document.add(newField("short", "" + ((short) random().nextInt()), StringField.TYPE)); document.add(new IntField("int", random().nextInt())); document.add(new LongField("long", random().nextLong())); document.add(new FloatField("float", random().nextFloat())); document.add(new DoubleField("double", random().nextDouble())); - document.add(newField("bytes", _TestUtil.randomRealisticUnicodeString(random()), StringField.TYPE_UNSTORED)); - document.add(newField("bytesval", _TestUtil.randomRealisticUnicodeString(random()), StringField.TYPE_UNSTORED)); + document.add(newField("bytes", _TestUtil.randomRealisticUnicodeString(random()), StringField.TYPE)); + document.add(newField("bytesval", _TestUtil.randomRealisticUnicodeString(random()), StringField.TYPE)); document.add(new DoubleField("double", random().nextDouble())); if (supportsDocValues) { Index: lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (working copy) @@ -529,8 +529,8 @@ 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(newField("id",Integer.toString(d), StringField.TYPE)); + doc.add(newField("body","body", StringField.TYPE)); writer.addDocument(doc); } Index: lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java (working copy) @@ -53,7 +53,8 @@ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000))); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setOmitNorms(true); Field field = newField("field", "", customType); doc.add(field); Index: lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java (working copy) @@ -56,7 +56,7 @@ .setMaxBufferedDocs(_TestUtil.nextInt(random(), 50, 1000))); Document doc = new Document(); - Field field = newField("field", "", StringField.TYPE_UNSTORED); + Field field = newField("field", "", StringField.TYPE); doc.add(field); // we generate aweful prefixes: good for testing. Index: lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java (working copy) @@ -24,6 +24,7 @@ import org.apache.lucene.codecs.Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; @@ -109,10 +110,12 @@ for (int i = 0; i < docs.length; i++) { Document d = new Document(); - FieldType ft = new FieldType(TextField.TYPE_STORED); + FieldType ft = new FieldType(TextField.TYPE); + ft.setStored(true); ft.setIndexed(false); d.add(newField(FIELD_ID, Integer.toString(i), ft)); - d.add(newField(FIELD_BODY, docs[i], TextField.TYPE_STORED)); + d.add(newField(FIELD_BODY, docs[i], TextField.TYPE)); + d.add(newField(FIELD_BODY, docs[i], StoredField.TYPE)); writer.addDocument(d); } Index: lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java (working copy) @@ -99,7 +99,7 @@ Directory dir = newDirectory(); RandomIndexWriter iw = new RandomIndexWriter(random(), dir); Document doc = new Document(); - doc.add(newField("foo", "bar", TextField.TYPE_UNSTORED)); + doc.add(newField("foo", "bar", TextField.TYPE)); iw.addDocument(doc); IndexReader ir = iw.getReader(); iw.close(); @@ -121,7 +121,7 @@ Directory dir = newDirectory(); RandomIndexWriter iw = new RandomIndexWriter(random(), dir); Document doc = new Document(); - doc.add(newField("foo", "bar", TextField.TYPE_UNSTORED)); + doc.add(newField("foo", "bar", TextField.TYPE)); iw.addDocument(doc); IndexReader ir = iw.getReader(); iw.close(); @@ -143,7 +143,7 @@ Directory dir = newDirectory(); RandomIndexWriter iw = new RandomIndexWriter(random(), dir); Document doc = new Document(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setOmitNorms(true); ft.freeze(); doc.add(newField("foo", "bar", ft)); @@ -167,7 +167,7 @@ Directory dir = newDirectory(); RandomIndexWriter iw = new RandomIndexWriter(random(), dir); Document doc = new Document(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setIndexOptions(IndexOptions.DOCS_ONLY); ft.freeze(); Field f = newField("foo", "bar", ft); @@ -192,7 +192,7 @@ Directory dir = newDirectory(); RandomIndexWriter iw = new RandomIndexWriter(random(), dir); Document doc = new Document(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setIndexOptions(IndexOptions.DOCS_ONLY); ft.setOmitNorms(true); ft.freeze(); @@ -222,7 +222,7 @@ Directory dir = newDirectory(); RandomIndexWriter iw = new RandomIndexWriter(random(), dir); Document doc = new Document(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); doc.add(newField("foo", "bar", ft)); iw.addDocument(doc); IndexReader ir = iw.getReader(); Index: lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; @@ -197,7 +198,8 @@ private void add(String s, RandomIndexWriter writer) throws IOException { Document doc = new Document(); - doc.add(newField("body", s, TextField.TYPE_STORED)); + doc.add(newField("body", s, TextField.TYPE)); + doc.add(newField("body", s, StoredField.TYPE)); writer.addDocument(doc); } @@ -317,8 +319,9 @@ private void add(String s, String type, RandomIndexWriter writer) throws IOException { Document doc = new Document(); - doc.add(newField("body", s, TextField.TYPE_STORED)); - doc.add(newField("type", type, StringField.TYPE_UNSTORED)); + doc.add(newField("body", s, TextField.TYPE)); + doc.add(newField("body", s, StoredField.TYPE)); + doc.add(newField("type", type, StringField.TYPE)); writer.addDocument(doc); } Index: lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java (working copy) @@ -17,15 +17,16 @@ * limitations under the License. */ -import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; +import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.StringField; +import org.apache.lucene.store.Directory; +import org.apache.lucene.util.LuceneTestCase; /** * Tests {@link PrefixQuery} class. @@ -41,7 +42,8 @@ RandomIndexWriter writer = new RandomIndexWriter(random(), directory); for (int i = 0; i < categories.length; i++) { Document doc = new Document(); - doc.add(newField("category", categories[i], StringField.TYPE_STORED)); + doc.add(newField("category", categories[i], StringField.TYPE)); + doc.add(newField("category", categories[i], StoredField.TYPE)); writer.addDocument(doc); } IndexReader reader = writer.getReader(); Index: lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.IndexReader; @@ -55,23 +56,31 @@ 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 (newField("field", "one two three four five", TextField.TYPE)); + doc.add (newField("field", "one two three four five", StoredField.TYPE)); + doc.add (newField("sorter", "b", TextField.TYPE)); + doc.add (newField("sorter", "b", StoredField.TYPE)); 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 (newField("field", "one two three four", TextField.TYPE)); + doc.add (newField("field", "one two three four", StoredField.TYPE)); + doc.add (newField("sorter", "d", TextField.TYPE)); + doc.add (newField("sorter", "d", StoredField.TYPE)); 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 (newField("field", "one two three y", TextField.TYPE)); + doc.add (newField("field", "one two three y", StoredField.TYPE)); + doc.add (newField("sorter", "a", TextField.TYPE)); + doc.add (newField("sorter", "a", StoredField.TYPE)); 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 (newField("field", "one two x", TextField.TYPE)); + doc.add (newField("field", "one two x", StoredField.TYPE)); + doc.add (newField("sorter", "c", TextField.TYPE)); + doc.add (newField("sorter", "c", StoredField.TYPE)); writer.addDocument (doc); // tests here require single segment (eg try seed Index: lucene/core/src/test/org/apache/lucene/search/TestNot.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestNot.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestNot.java (working copy) @@ -17,14 +17,14 @@ * limitations under the License. */ -import org.apache.lucene.index.Term; -import org.apache.lucene.util.LuceneTestCase; - +import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; +import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.TextField; +import org.apache.lucene.util.LuceneTestCase; /** Similarity unit test. * @@ -37,7 +37,8 @@ RandomIndexWriter writer = new RandomIndexWriter(random(), store); Document d1 = new Document(); - d1.add(newField("field", "a b", TextField.TYPE_STORED)); + d1.add(newField("field", "a b", TextField.TYPE)); + d1.add(newField("field", "a b", StoredField.TYPE)); writer.addDocument(d1); IndexReader reader = writer.getReader(); Index: lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java (working copy) @@ -72,19 +72,26 @@ RandomIndexWriter writer = new RandomIndexWriter(random(), directory, analyzer); Document doc = new Document(); - doc.add(newField("field", "one two three four five", TextField.TYPE_STORED)); - doc.add(newField("repeated", "this is a repeated field - first part", TextField.TYPE_STORED)); - IndexableField repeatedField = newField("repeated", "second part of a repeated field", TextField.TYPE_STORED); + doc.add(newField("field", "one two three four five", TextField.TYPE)); + doc.add(newField("field", "one two three four five", StoredField.TYPE)); + doc.add(newField("repeated", "this is a repeated field - first part", TextField.TYPE)); + doc.add(newField("repeated", "this is a repeated field - first part", StoredField.TYPE)); + IndexableField repeatedField = newField("repeated", "second part of a repeated field", TextField.TYPE); + IndexableField repeatedFieldStored = newField("repeated", "second part of a repeated field", StoredField.TYPE); doc.add(repeatedField); - doc.add(newField("palindrome", "one two three two one", TextField.TYPE_STORED)); + doc.add(repeatedFieldStored); + doc.add(newField("palindrome", "one two three two one", TextField.TYPE)); + doc.add(newField("palindrome", "one two three two one", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("nonexist", "phrase exist notexist exist found", TextField.TYPE_STORED)); + doc.add(newField("nonexist", "phrase exist notexist exist found", TextField.TYPE)); + doc.add(newField("nonexist", "phrase exist notexist exist found", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("nonexist", "phrase exist notexist exist found", TextField.TYPE_STORED)); + doc.add(newField("nonexist", "phrase exist notexist exist found", TextField.TYPE)); + doc.add(newField("nonexist", "phrase exist notexist exist found", StoredField.TYPE)); writer.addDocument(doc); reader = writer.getReader(); @@ -226,7 +233,8 @@ RandomIndexWriter writer = new RandomIndexWriter(random(), directory, newIndexWriterConfig( Version.LUCENE_40, stopAnalyzer)); Document doc = new Document(); - doc.add(newField("field", "the stop words are here", TextField.TYPE_STORED)); + doc.add(newField("field", "the stop words are here", TextField.TYPE)); + doc.add(newField("field", "the stop words are here", StoredField.TYPE)); writer.addDocument(doc); IndexReader reader = writer.getReader(); writer.close(); @@ -260,12 +268,15 @@ RandomIndexWriter writer = new RandomIndexWriter(random(), directory); Document doc = new Document(); - doc.add(newField("source", "marketing info", TextField.TYPE_STORED)); + doc.add(newField("source", "marketing info", TextField.TYPE)); + doc.add(newField("source", "marketing info", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("contents", "foobar", TextField.TYPE_STORED)); - doc.add(newField("source", "marketing info", TextField.TYPE_STORED)); + doc.add(newField("contents", "foobar", TextField.TYPE)); + doc.add(newField("contents", "foobar", StoredField.TYPE)); + doc.add(newField("source", "marketing info", TextField.TYPE)); + doc.add(newField("source", "marketing info", StoredField.TYPE)); writer.addDocument(doc); IndexReader reader = writer.getReader(); @@ -295,15 +306,18 @@ writer = new RandomIndexWriter(random(), directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(OpenMode.CREATE)); doc = new Document(); - doc.add(newField("contents", "map entry woo", TextField.TYPE_STORED)); + doc.add(newField("contents", "map entry woo", TextField.TYPE)); + doc.add(newField("contents", "map entry woo", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("contents", "woo map entry", TextField.TYPE_STORED)); + doc.add(newField("contents", "woo map entry", TextField.TYPE)); + doc.add(newField("contents", "woo map entry", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("contents", "map foobarword entry woo", TextField.TYPE_STORED)); + doc.add(newField("contents", "map foobarword entry woo", TextField.TYPE)); + doc.add(newField("contents", "map foobarword entry woo", StoredField.TYPE)); writer.addDocument(doc); reader = writer.getReader(); @@ -348,15 +362,18 @@ .setSimilarity(new DefaultSimilarity())); Document doc = new Document(); - doc.add(newField("field", "foo firstname lastname foo", TextField.TYPE_STORED)); + doc.add(newField("field", "foo firstname lastname foo", TextField.TYPE)); + doc.add(newField("field", "foo firstname lastname foo", StoredField.TYPE)); writer.addDocument(doc); Document doc2 = new Document(); - doc2.add(newField("field", "foo firstname zzz lastname foo", TextField.TYPE_STORED)); + doc2.add(newField("field", "foo firstname zzz lastname foo", TextField.TYPE)); + doc2.add(newField("field", "foo firstname zzz lastname foo", StoredField.TYPE)); writer.addDocument(doc2); Document doc3 = new Document(); - doc3.add(newField("field", "foo firstname zzz yyy lastname foo", TextField.TYPE_STORED)); + doc3.add(newField("field", "foo firstname zzz yyy lastname foo", TextField.TYPE)); + doc3.add(newField("field", "foo firstname zzz yyy lastname foo", StoredField.TYPE)); writer.addDocument(doc3); IndexReader reader = writer.getReader(); @@ -611,7 +628,7 @@ RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setMergePolicy(newLogMergePolicy())); List> docs = new ArrayList>(); Document d = new Document(); - Field f = newField("f", "", TextField.TYPE_UNSTORED); + Field f = newField("f", "", TextField.TYPE); d.add(f); Random r = random(); Index: lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java (working copy) @@ -23,27 +23,28 @@ import java.util.Collection; import org.apache.lucene.analysis.*; +import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.AtomicReader; -import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SlowCompositeReaderWrapper; import org.apache.lucene.index.Term; -import org.apache.lucene.store.Directory; import org.apache.lucene.search.payloads.PayloadSpanUtil; import org.apache.lucene.search.spans.MultiSpansWrapper; import org.apache.lucene.search.spans.SpanNearQuery; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.search.spans.SpanTermQuery; import org.apache.lucene.search.spans.Spans; +import org.apache.lucene.store.Directory; +import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.BytesRef; /** * Term position unit test. @@ -91,7 +92,8 @@ Directory store = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), store, analyzer); Document d = new Document(); - d.add(newField("field", "bogus", TextField.TYPE_STORED)); + d.add(newField("field", "bogus", TextField.TYPE)); + d.add(newField("field", "bogus", StoredField.TYPE)); writer.addDocument(d); IndexReader reader = writer.getReader(); writer.close(); Index: lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java (working copy) @@ -24,14 +24,15 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.Terms; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -263,8 +264,9 @@ private void insertDoc(IndexWriter writer, String content) throws IOException { Document doc = new Document(); - doc.add(newField("id", "id" + docCount, StringField.TYPE_STORED)); - doc.add(newField("content", content, TextField.TYPE_UNSTORED)); + doc.add(newField("id", "id" + docCount, StringField.TYPE)); + doc.add(newField("id", "id" + docCount, StoredField.TYPE)); + doc.add(newField("content", content, TextField.TYPE)); writer.addDocument(doc); docCount++; Index: lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java =================================================================== --- lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java (working copy) @@ -53,7 +53,7 @@ // TODO: replace w/ the @nightly test data; make this // into an optional @nightly stress test final Document doc = new Document(); - final Field body = newField("body", "", TextField.TYPE_UNSTORED); + final Field body = newField("body", "", TextField.TYPE); doc.add(body); final StringBuilder sb = new StringBuilder(); for(int docCount=0;docCount(); int num = atLeast(200); for (int i = 0; i < num; i++) { String s = _TestUtil.randomUnicodeString(random()); field.setStringValue(s); + storedField.setStringValue(s); terms.add(new BytesRef(s)); writer.addDocument(doc); } Index: lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java (working copy) @@ -78,8 +78,9 @@ 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(newField("id", Integer.toString(nextID++), StringField.TYPE)); + d.add(newField("id", Integer.toString(nextID++), StoredField.TYPE)); + d.add(newField("contents", English.intToEnglish(n), TextField.TYPE)); writer.addDocument(d); } Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (working copy) @@ -15,22 +15,23 @@ * limitations under the License. */ -import org.apache.lucene.store.AlreadyClosedException; -import org.apache.lucene.store.Directory; +import java.io.IOException; +import java.util.ArrayList; +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.FieldType; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.store.AlreadyClosedException; +import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Random; - public class TestIndexWriterMerging extends LuceneTestCase { @@ -111,7 +112,8 @@ for (int i = start; i < (start + numDocs); i++) { Document temp = new Document(); - temp.add(newField("count", (""+i), StringField.TYPE_STORED)); + temp.add(newField("count", (""+i), StringField.TYPE)); + temp.add(newField("count", (""+i), StoredField.TYPE)); writer.addDocument(temp); } @@ -131,13 +133,13 @@ FieldType customType = new FieldType(); customType.setStored(true); - FieldType customType1 = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType1 = new FieldType(TextField.TYPE); customType1.setTokenized(false); customType1.setStoreTermVectors(true); customType1.setStoreTermVectorPositions(true); customType1.setStoreTermVectorOffsets(true); - Field idField = newField("id", "", StringField.TYPE_UNSTORED); + Field idField = newField("id", "", StringField.TYPE); document.add(idField); Field storedField = newField("stored", "stored", customType); document.add(storedField); @@ -194,7 +196,7 @@ FieldType customType = new FieldType(); customType.setStored(true); - FieldType customType1 = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType1 = new FieldType(TextField.TYPE); customType1.setTokenized(false); customType1.setStoreTermVectors(true); customType1.setStoreTermVectorPositions(true); @@ -204,7 +206,7 @@ document.add(storedField); Field termVectorField = newField("termVector", "termVector", customType1); document.add(termVectorField); - Field idField = newField("id", "", StringField.TYPE_UNSTORED); + Field idField = newField("id", "", StringField.TYPE); document.add(idField); for(int i=0;i<98;i++) { idField.setStringValue("" + i); @@ -259,7 +261,7 @@ FieldType customType = new FieldType(); customType.setStored(true); - FieldType customType1 = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType1 = new FieldType(TextField.TYPE); customType1.setTokenized(false); customType1.setStoreTermVectors(true); customType1.setStoreTermVectorPositions(true); @@ -270,7 +272,7 @@ document.add(storedField); Field termVectorField = newField("termVector", "termVector", customType1); document.add(termVectorField); - Field idField = newField("id", "", StringField.TYPE_UNSTORED); + Field idField = newField("id", "", StringField.TYPE); document.add(idField); for(int i=0;i<98;i++) { idField.setStringValue("" + i); @@ -343,7 +345,7 @@ IndexWriter iw = new IndexWriter(dir, conf); Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); document.add(newField("tvtest", "a b c", customType)); @@ -357,7 +359,8 @@ Directory directory = newDirectory(); final Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setTokenized(false); Field idField = newField("id", "", customType); Index: lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java (working copy) @@ -728,15 +728,15 @@ 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(newField("content", "aaa", TextField.TYPE)); + doc.add(newField("id", "" + id, StringField.TYPE)); writer.addDocument(doc); } private void addDoc(IndexWriter writer) throws IOException { Document doc = new Document(); - doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED)); + doc.add(newField("content", "aaa", TextField.TYPE)); writer.addDocument(doc); } } Index: lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (working copy) @@ -94,14 +94,14 @@ } IndexWriter iw = new IndexWriter(rd1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document doc = new Document(); - Field idField = newField("id", "", TextField.TYPE_UNSTORED); + Field idField = newField("id", "", TextField.TYPE); doc.add(idField); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); doc.add(newField("test", "", customType)); idField.setStringValue("1"); iw.addDocument(doc); - doc.add(newField("test", "", TextField.TYPE_UNSTORED)); + doc.add(newField("test", "", TextField.TYPE)); idField.setStringValue("2"); iw.addDocument(doc); iw.close(); Index: lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (working copy) @@ -110,7 +110,8 @@ @Override public void run() { Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -155,7 +156,8 @@ // final segment, so deletion policy has a chance to // delete again: Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (working copy) @@ -340,7 +340,7 @@ try { final Document doc = new Document(); DirectoryReader r = DirectoryReader.open(dir); - Field f = newField("f", "", StringField.TYPE_UNSTORED); + Field f = newField("f", "", StringField.TYPE); doc.add(f); int count = 0; do { Index: lucene/core/src/test/org/apache/lucene/index/TestFlex.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestFlex.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestFlex.java (working copy) @@ -40,10 +40,10 @@ 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(newField("field1", "this is field1", TextField.TYPE)); + doc.add(newField("field2", "this is field2", TextField.TYPE)); + doc.add(newField("field3", "aaa", TextField.TYPE)); + doc.add(newField("field4", "bbb", TextField.TYPE)); for(int i=0;i data = new HashMap(); data.put("index", i+""); Index: lucene/core/src/test/org/apache/lucene/index/TestRandomStoredFields.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestRandomStoredFields.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestRandomStoredFields.java (working copy) @@ -49,7 +49,8 @@ final List fieldIDs = new ArrayList(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setTokenized(false); Field idField = newField("id", "", customType); Index: lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.*; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.PhraseQuery; @@ -31,8 +32,8 @@ import org.apache.lucene.store.IndexInput; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.store.RAMDirectory; +import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.BytesRef; import org.apache.lucene.util._TestUtil; /** @@ -97,7 +98,8 @@ content = this.term3 + " " + this.term2; } - doc.add(newField(this.field, content, TextField.TYPE_STORED)); + doc.add(newField(this.field, content, TextField.TYPE)); + doc.add(newField(this.field, content, StoredField.TYPE)); writer.addDocument(doc); } @@ -146,7 +148,8 @@ IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); for (int i = 0; i < 10; i++) { Document doc = new Document(); - doc.add(newField(this.field, "a b", TextField.TYPE_STORED)); + doc.add(newField(this.field, "a b", TextField.TYPE)); + doc.add(newField(this.field, "a b", StoredField.TYPE)); writer.addDocument(doc); } Index: lucene/core/src/test/org/apache/lucene/index/TestNorms.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestNorms.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestNorms.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DocValues.Source; import org.apache.lucene.index.DocValues.Type; @@ -67,8 +68,8 @@ config.setSimilarity(new CustomNormEncodingSimilarity()); 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 = newField("foo", "", TextField.TYPE); + Field bar = newField("bar", "", TextField.TYPE); doc.add(foo); doc.add(bar); @@ -189,11 +190,13 @@ Document doc = docs.nextDoc(); int boost = writeNorms ? 1 + random().nextInt(255) : 0; Field f = new Field(byteTestField, "" + boost, - TextField.TYPE_STORED); + TextField.TYPE); f.setBoost(boost); doc.add(f); + doc.add(new Field(byteTestField, "" + boost, + StoredField.TYPE)); writer.addDocument(doc); - doc.removeField(byteTestField); + doc.removeFields(byteTestField); if (rarely()) { writer.commit(); } Index: lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java (working copy) @@ -21,6 +21,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; @@ -44,8 +45,10 @@ TEST_VERSION_CURRENT, new MockAnalyzer(random()))); doc = new Document(); - doc.add(newField("field1", "the quick brown fox jumps", TextField.TYPE_STORED)); - doc.add(newField("field2", "the quick brown fox jumps", TextField.TYPE_STORED)); + doc.add(newField("field1", "the quick brown fox jumps", TextField.TYPE)); + doc.add(newField("field1", "the quick brown fox jumps", StoredField.TYPE)); + doc.add(newField("field2", "the quick brown fox jumps", TextField.TYPE)); + doc.add(newField("field2", "the quick brown fox jumps", StoredField.TYPE)); iw1.addDocument(doc); iw1.close(); @@ -54,8 +57,10 @@ TEST_VERSION_CURRENT, new MockAnalyzer(random()))); doc = new Document(); - doc.add(newField("field1", "the fox jumps over the lazy dog", TextField.TYPE_STORED)); - doc.add(newField("field3", "the fox jumps over the lazy dog", TextField.TYPE_STORED)); + doc.add(newField("field1", "the fox jumps over the lazy dog", TextField.TYPE)); + doc.add(newField("field1", "the fox jumps over the lazy dog", StoredField.TYPE)); + doc.add(newField("field3", "the fox jumps over the lazy dog", TextField.TYPE)); + doc.add(newField("field3", "the fox jumps over the lazy dog", StoredField.TYPE)); iw2.addDocument(doc); iw2.close(); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (working copy) @@ -26,6 +26,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; @@ -237,10 +238,10 @@ Directory d = newDirectory(); IndexWriter w = new IndexWriter(d, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document doc = new Document(); - doc.add(newField("field", "a a\uffffb", TextField.TYPE_UNSTORED)); + doc.add(newField("field", "a a\uffffb", TextField.TYPE)); w.addDocument(doc); doc = new Document(); - doc.add(newField("field", "a", TextField.TYPE_UNSTORED)); + doc.add(newField("field", "a", TextField.TYPE)); w.addDocument(doc); IndexReader r = w.getReader(); assertEquals(1, r.docFreq(new Term("field", "a\uffffb"))); @@ -256,8 +257,10 @@ Document doc = new Document(); final int count = utf8Data.length/2; - for(int i=0;i allTerms = new HashSet(); Index: lucene/core/src/test/org/apache/lucene/index/TestDocCount.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDocCount.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestDocCount.java (working copy) @@ -53,7 +53,7 @@ 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(newField("" + _TestUtil.nextInt(random(), 'a', 'z'), "" + _TestUtil.nextInt(random(), 'a', 'z'), StringField.TYPE)); } return doc; } Index: lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (working copy) @@ -50,7 +50,7 @@ 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); 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 @@ 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); customType.setOmitNorms(true); for (int i = 0; i < numDocs; i++) { Document doc = new Document(); @@ -193,7 +193,7 @@ 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); customType.setOmitNorms(true); for (int i = 0; i < numDocs; i++) { Document doc = new Document(); @@ -270,7 +270,7 @@ 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); customType.setOmitNorms(true); for (int i = 0; i < 39; i++) { Document doc = new Document(); @@ -326,7 +326,7 @@ Directory dir = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), dir); Document doc = new Document(); - doc.add(newField("foo", "bar", StringField.TYPE_UNSTORED)); + doc.add(newField("foo", "bar", StringField.TYPE)); writer.addDocument(doc); DirectoryReader reader = writer.getReader(); AtomicReader r = getOnlySegmentReader(reader); @@ -351,7 +351,7 @@ Directory dir = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), dir); Document doc = new Document(); - doc.add(newField("foo", "bar", TextField.TYPE_UNSTORED)); + doc.add(newField("foo", "bar", TextField.TYPE)); writer.addDocument(doc); DirectoryReader reader = writer.getReader(); AtomicReader r = getOnlySegmentReader(reader); Index: lucene/core/src/test/org/apache/lucene/index/TestRollback.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestRollback.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestRollback.java (working copy) @@ -19,6 +19,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -31,7 +32,8 @@ 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(newField("pk", Integer.toString(i), StringField.TYPE)); + doc.add(newField("pk", Integer.toString(i), StoredField.TYPE)); rw.addDocument(doc); } rw.close(); @@ -42,8 +44,10 @@ 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(newField("pk", value, StringField.TYPE)); + doc.add(newField("pk", value, StoredField.TYPE)); + doc.add(newField("text", "foo", StringField.TYPE)); + doc.add(newField("text", "foo", StoredField.TYPE)); w.updateDocument(new Term("pk", value), doc); } w.rollback(); Index: lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (working copy) @@ -99,7 +99,7 @@ Document doc = new Document(); for(int i=0;i aDocs = new HashSet(); final Document doc = new Document(); - final Field f = newField("field", "", StringField.TYPE_UNSTORED); + final Field f = newField("field", "", StringField.TYPE); doc.add(f); - final Field idField = newField("id", "", StringField.TYPE_STORED); + final Field idField = newField("id", "", StringField.TYPE); + final Field storedIDField = newField("id", "", StoredField.TYPE); doc.add(idField); + doc.add(storedIDField); int num = atLeast(4097); if (VERBOSE) { System.out.println("\nTEST: numDocs=" + num); @@ -53,6 +55,7 @@ f.setStringValue("b"); } idField.setStringValue(""+id); + storedIDField.setStringValue(""+id); w.addDocument(doc); if (VERBOSE) { System.out.println("\nTEST: doc upto " + id); Index: lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java (working copy) @@ -36,7 +36,7 @@ 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 Field("id", "" + i, StringField.TYPE)); } writer.addDocument(doc); } Index: lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestParallelAtomicReader.java (working copy) @@ -22,9 +22,10 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; +import org.apache.lucene.search.*; import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -122,7 +123,8 @@ IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document d3 = new Document(); - d3.add(newField("f3", "v1", TextField.TYPE_STORED)); + d3.add(newField("f3", "v1", TextField.TYPE)); + d3.add(newField("f3", "v1", StoredField.TYPE)); w2.addDocument(d3); w2.close(); @@ -238,16 +240,24 @@ dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))); Document d1 = new Document(); - d1.add(newField("f1", "v1", TextField.TYPE_STORED)); - d1.add(newField("f2", "v1", TextField.TYPE_STORED)); - d1.add(newField("f3", "v1", TextField.TYPE_STORED)); - d1.add(newField("f4", "v1", TextField.TYPE_STORED)); + d1.add(newField("f1", "v1", TextField.TYPE)); + d1.add(newField("f1", "v1", StoredField.TYPE)); + d1.add(newField("f2", "v1", TextField.TYPE)); + d1.add(newField("f2", "v1", StoredField.TYPE)); + d1.add(newField("f3", "v1", TextField.TYPE)); + d1.add(newField("f3", "v1", StoredField.TYPE)); + d1.add(newField("f4", "v1", TextField.TYPE)); + d1.add(newField("f4", "v1", StoredField.TYPE)); w.addDocument(d1); Document d2 = new Document(); - d2.add(newField("f1", "v2", TextField.TYPE_STORED)); - d2.add(newField("f2", "v2", TextField.TYPE_STORED)); - d2.add(newField("f3", "v2", TextField.TYPE_STORED)); - d2.add(newField("f4", "v2", TextField.TYPE_STORED)); + d2.add(newField("f1", "v2", TextField.TYPE)); + d2.add(newField("f1", "v2", StoredField.TYPE)); + d2.add(newField("f2", "v2", TextField.TYPE)); + d2.add(newField("f2", "v2", StoredField.TYPE)); + d2.add(newField("f3", "v2", TextField.TYPE)); + d2.add(newField("f3", "v2", StoredField.TYPE)); + d2.add(newField("f4", "v2", TextField.TYPE)); + d2.add(newField("f4", "v2", StoredField.TYPE)); w.addDocument(d2); w.close(); @@ -269,12 +279,16 @@ Directory dir1 = newDirectory(); IndexWriter w1 = new IndexWriter(dir1, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))); Document d1 = new Document(); - d1.add(newField("f1", "v1", TextField.TYPE_STORED)); - d1.add(newField("f2", "v1", TextField.TYPE_STORED)); + d1.add(newField("f1", "v1", TextField.TYPE)); + d1.add(newField("f1", "v1", StoredField.TYPE)); + d1.add(newField("f2", "v1", TextField.TYPE)); + d1.add(newField("f2", "v1", StoredField.TYPE)); w1.addDocument(d1); Document d2 = new Document(); - d2.add(newField("f1", "v2", TextField.TYPE_STORED)); - d2.add(newField("f2", "v2", TextField.TYPE_STORED)); + d2.add(newField("f1", "v2", TextField.TYPE)); + d2.add(newField("f1", "v2", StoredField.TYPE)); + d2.add(newField("f2", "v2", TextField.TYPE)); + d2.add(newField("f2", "v2", StoredField.TYPE)); w1.addDocument(d2); w1.close(); return dir1; @@ -284,12 +298,16 @@ Directory dir2 = newDirectory(); IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))); Document d3 = new Document(); - d3.add(newField("f3", "v1", TextField.TYPE_STORED)); - d3.add(newField("f4", "v1", TextField.TYPE_STORED)); + d3.add(newField("f3", "v1", TextField.TYPE)); + d3.add(newField("f3", "v1", StoredField.TYPE)); + d3.add(newField("f4", "v1", TextField.TYPE)); + d3.add(newField("f4", "v1", StoredField.TYPE)); w2.addDocument(d3); Document d4 = new Document(); - d4.add(newField("f3", "v2", TextField.TYPE_STORED)); - d4.add(newField("f4", "v2", TextField.TYPE_STORED)); + d4.add(newField("f3", "v2", TextField.TYPE)); + d4.add(newField("f3", "v2", StoredField.TYPE)); + d4.add(newField("f4", "v2", TextField.TYPE)); + d4.add(newField("f4", "v2", StoredField.TYPE)); w2.addDocument(d4); w2.close(); return dir2; Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java (working copy) @@ -92,7 +92,7 @@ Random random = LuceneTestCase.random(); try { Document doc = new Document(); - doc.add(new Field("id", "1", TextField.TYPE_UNSTORED)); + doc.add(new Field("id", "1", TextField.TYPE)); writer.addDocument(doc); holder.reader = currentReader = writer.getReader(true); Term term = new Term("id"); Index: lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java (working copy) @@ -33,6 +33,7 @@ import org.apache.lucene.document.PackedLongDocValuesField; import org.apache.lucene.document.ShortDocValuesField; import org.apache.lucene.document.SortedBytesDocValuesField; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StraightBytesDocValuesField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DocValues.Source; @@ -40,8 +41,8 @@ import org.apache.lucene.store.ByteArrayDataOutput; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; @SuppressCodecs("Lucene3x") public class TestTypePromotion extends LuceneTestCase { @@ -228,7 +229,8 @@ for (int i = offset; i < offset + num; i++) { Document doc = new Document(); - doc.add(new Field("id", i + "", TextField.TYPE_STORED)); + doc.add(new Field("id", i + "", TextField.TYPE)); + doc.add(new Field("id", i + "", StoredField.TYPE)); switch (valueType) { case VAR_INTS: // TODO: can we do nextLong()? Index: lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (working copy) @@ -771,7 +771,8 @@ public void indexDoc() throws IOException { Document d = new Document(); - FieldType customType1 = new FieldType(TextField.TYPE_STORED); + FieldType customType1 = new FieldType(TextField.TYPE); + customType1.setStored(true); customType1.setTokenized(false); customType1.setOmitNorms(true); Index: lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java (working copy) @@ -22,9 +22,11 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; +import org.apache.lucene.search.*; import org.apache.lucene.search.BooleanClause.Occur; -import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; @@ -123,7 +125,8 @@ IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document d3 = new Document(); - d3.add(newField("f3", "v1", TextField.TYPE_STORED)); + d3.add(newField("f3", "v1", TextField.TYPE)); + d3.add(newField("f3", "v1", StoredField.TYPE)); w2.addDocument(d3); w2.close(); @@ -292,33 +295,40 @@ } } + private static final FieldType storedTextType = new FieldType(TextField.TYPE); + + static { + storedTextType.setStored(true); + storedTextType.freeze(); + } + // Fields 1-4 indexed together: private IndexSearcher single(Random random, boolean compositeComposite) throws IOException { dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random))); Document d1 = new Document(); - d1.add(newField("f1", "v1", TextField.TYPE_STORED)); - d1.add(newField("f2", "v1", TextField.TYPE_STORED)); - d1.add(newField("f3", "v1", TextField.TYPE_STORED)); - d1.add(newField("f4", "v1", TextField.TYPE_STORED)); + d1.add(newField("f1", "v1", storedTextType)); + d1.add(newField("f2", "v1", storedTextType)); + d1.add(newField("f3", "v1", storedTextType)); + d1.add(newField("f4", "v1", storedTextType)); w.addDocument(d1); Document d2 = new Document(); - d2.add(newField("f1", "v2", TextField.TYPE_STORED)); - d2.add(newField("f2", "v2", TextField.TYPE_STORED)); - d2.add(newField("f3", "v2", TextField.TYPE_STORED)); - d2.add(newField("f4", "v2", TextField.TYPE_STORED)); + d2.add(newField("f1", "v2", storedTextType)); + d2.add(newField("f2", "v2", storedTextType)); + d2.add(newField("f3", "v2", storedTextType)); + d2.add(newField("f4", "v2", storedTextType)); w.addDocument(d2); Document d3 = new Document(); - d3.add(newField("f1", "v3", TextField.TYPE_STORED)); - d3.add(newField("f2", "v3", TextField.TYPE_STORED)); - d3.add(newField("f3", "v3", TextField.TYPE_STORED)); - d3.add(newField("f4", "v3", TextField.TYPE_STORED)); + d3.add(newField("f1", "v3", storedTextType)); + d3.add(newField("f2", "v3", storedTextType)); + d3.add(newField("f3", "v3", storedTextType)); + d3.add(newField("f4", "v3", storedTextType)); w.addDocument(d3); Document d4 = new Document(); - d4.add(newField("f1", "v4", TextField.TYPE_STORED)); - d4.add(newField("f2", "v4", TextField.TYPE_STORED)); - d4.add(newField("f3", "v4", TextField.TYPE_STORED)); - d4.add(newField("f4", "v4", TextField.TYPE_STORED)); + d4.add(newField("f1", "v4", storedTextType)); + d4.add(newField("f2", "v4", storedTextType)); + d4.add(newField("f3", "v4", storedTextType)); + d4.add(newField("f4", "v4", storedTextType)); w.addDocument(d4); w.close(); @@ -357,22 +367,22 @@ IndexWriter w1 = new IndexWriter(dir1, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES)); Document d1 = new Document(); - d1.add(newField("f1", "v1", TextField.TYPE_STORED)); - d1.add(newField("f2", "v1", TextField.TYPE_STORED)); + d1.add(newField("f1", "v1", storedTextType)); + d1.add(newField("f2", "v1", storedTextType)); w1.addDocument(d1); w1.commit(); Document d2 = new Document(); - d2.add(newField("f1", "v2", TextField.TYPE_STORED)); - d2.add(newField("f2", "v2", TextField.TYPE_STORED)); + d2.add(newField("f1", "v2", storedTextType)); + d2.add(newField("f2", "v2", storedTextType)); w1.addDocument(d2); Document d3 = new Document(); - d3.add(newField("f1", "v3", TextField.TYPE_STORED)); - d3.add(newField("f2", "v3", TextField.TYPE_STORED)); + d3.add(newField("f1", "v3", storedTextType)); + d3.add(newField("f2", "v3", storedTextType)); w1.addDocument(d3); w1.commit(); Document d4 = new Document(); - d4.add(newField("f1", "v4", TextField.TYPE_STORED)); - d4.add(newField("f2", "v4", TextField.TYPE_STORED)); + d4.add(newField("f1", "v4", storedTextType)); + d4.add(newField("f2", "v4", storedTextType)); w1.addDocument(d4); w1.close(); return dir1; @@ -384,22 +394,22 @@ IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES)); Document d1 = new Document(); - d1.add(newField("f3", "v1", TextField.TYPE_STORED)); - d1.add(newField("f4", "v1", TextField.TYPE_STORED)); + d1.add(newField("f3", "v1", storedTextType)); + d1.add(newField("f4", "v1", storedTextType)); w2.addDocument(d1); w2.commit(); Document d2 = new Document(); - d2.add(newField("f3", "v2", TextField.TYPE_STORED)); - d2.add(newField("f4", "v2", TextField.TYPE_STORED)); + d2.add(newField("f3", "v2", storedTextType)); + d2.add(newField("f4", "v2", storedTextType)); w2.addDocument(d2); Document d3 = new Document(); - d3.add(newField("f3", "v3", TextField.TYPE_STORED)); - d3.add(newField("f4", "v3", TextField.TYPE_STORED)); + d3.add(newField("f3", "v3", storedTextType)); + d3.add(newField("f4", "v3", storedTextType)); w2.addDocument(d3); w2.commit(); Document d4 = new Document(); - d4.add(newField("f3", "v4", TextField.TYPE_STORED)); - d4.add(newField("f4", "v4", TextField.TYPE_STORED)); + d4.add(newField("f3", "v4", storedTextType)); + d4.add(newField("f4", "v4", storedTextType)); w2.addDocument(d4); w2.close(); return dir2; @@ -411,22 +421,22 @@ IndexWriter w2 = new IndexWriter(dir2, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(NoMergePolicy.NO_COMPOUND_FILES)); Document d1 = new Document(); - d1.add(newField("f3", "v1", TextField.TYPE_STORED)); - d1.add(newField("f4", "v1", TextField.TYPE_STORED)); + d1.add(newField("f3", "v1", storedTextType)); + d1.add(newField("f4", "v1", storedTextType)); w2.addDocument(d1); w2.commit(); Document d2 = new Document(); - d2.add(newField("f3", "v2", TextField.TYPE_STORED)); - d2.add(newField("f4", "v2", TextField.TYPE_STORED)); + d2.add(newField("f3", "v2", storedTextType)); + d2.add(newField("f4", "v2", storedTextType)); w2.addDocument(d2); w2.commit(); Document d3 = new Document(); - d3.add(newField("f3", "v3", TextField.TYPE_STORED)); - d3.add(newField("f4", "v3", TextField.TYPE_STORED)); + d3.add(newField("f3", "v3", storedTextType)); + d3.add(newField("f4", "v3", storedTextType)); w2.addDocument(d3); Document d4 = new Document(); - d4.add(newField("f3", "v4", TextField.TYPE_STORED)); - d4.add(newField("f4", "v4", TextField.TYPE_STORED)); + d4.add(newField("f3", "v4", storedTextType)); + d4.add(newField("f4", "v4", storedTextType)); w2.addDocument(d4); w2.close(); return dir2; Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (working copy) @@ -68,7 +68,7 @@ public class TestIndexWriter extends LuceneTestCase { - private static final FieldType storedTextType = new FieldType(TextField.TYPE_UNSTORED); + private static final FieldType storedTextType = new FieldType(TextField.TYPE); public void testDocCount() throws IOException { Directory dir = newDirectory(); @@ -129,7 +129,7 @@ static void addDoc(IndexWriter writer) throws IOException { Document doc = new Document(); - doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED)); + doc.add(newField("content", "aaa", TextField.TYPE)); writer.addDocument(doc); } @@ -463,7 +463,8 @@ MockDirectoryWrapper dir = newDirectory(); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(10)); // Enable norms for only 1 doc, pre flush - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setOmitNorms(true); for(int j=0;j<10;j++) { Document doc = new Document(); @@ -528,7 +529,8 @@ b.append(" a a a a a a a a"); } Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -602,7 +604,8 @@ setMergePolicy(newLogMergePolicy(10)) ); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -625,7 +628,8 @@ Directory dir = newDirectory(); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -658,7 +662,7 @@ TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); document.add(newField("tvtest", "", customType)); iw.addDocument(document); @@ -677,7 +681,7 @@ ((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); customType.setStoreTermVectors(true); document.add(newField("tvtest", "a b c", customType)); Thread.currentThread().setPriority(Thread.MAX_PRIORITY); @@ -703,18 +707,20 @@ Document doc = new Document(); String contents = "aa bb cc dd ee ff gg hh ii jj kk"; - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); FieldType type = null; if (i == 7) { // Add empty docs here - doc.add(newField("content3", "", TextField.TYPE_UNSTORED)); + doc.add(newField("content3", "", TextField.TYPE)); } 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)); + } else { + type = TextField.TYPE; + } + doc.add(newField("content1", contents, TextField.TYPE)); doc.add(newField("content3", "", customType)); doc.add(newField("content5", "", type)); } @@ -746,7 +752,7 @@ for(int i=0;i<10000;i++) b.append(" a"); b.append(" x"); - doc.add(newField("field", b.toString(), TextField.TYPE_UNSTORED)); + doc.add(newField("field", b.toString(), TextField.TYPE)); writer.addDocument(doc); writer.close(); @@ -764,7 +770,7 @@ 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(newField("", "a b c", TextField.TYPE)); writer.addDocument(doc); writer.close(); dir.close(); @@ -774,7 +780,7 @@ 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(newField("", "a b c", TextField.TYPE)); writer.addDocument(doc); writer.close(); DirectoryReader reader = DirectoryReader.open(dir); @@ -792,10 +798,10 @@ 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(newField("", "", StringField.TYPE)); + doc.add(newField("", "a", StringField.TYPE)); + doc.add(newField("", "b", StringField.TYPE)); + doc.add(newField("", "c", StringField.TYPE)); writer.addDocument(doc); writer.close(); DirectoryReader reader = DirectoryReader.open(dir); @@ -838,7 +844,8 @@ Directory dir = newDirectory(); MockIndexWriter w = new MockIndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); doc.add(newField("field", "a field", customType)); w.addDocument(doc); w.commit(); @@ -954,7 +961,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); Field f = newField("field", "", customType); @@ -991,7 +998,8 @@ IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -1168,7 +1176,8 @@ customType.setIndexed(true); f.setTokenStream(new MockTokenizer(new StringReader("doc1field1"), MockTokenizer.WHITESPACE, false)); - FieldType customType2 = new FieldType(TextField.TYPE_STORED); + FieldType customType2 = new FieldType(TextField.TYPE); + customType2.setStored(true); Field f2 = newField("string", "value", customType2); f2.setTokenStream(new MockTokenizer(new StringReader("doc1field2"), MockTokenizer.WHITESPACE, false)); @@ -1279,7 +1288,7 @@ s.append(' ').append(i); } Document d = new Document(); - Field f = newField("field", s.toString(), TextField.TYPE_UNSTORED); + Field f = newField("field", s.toString(), TextField.TYPE); d.add(f); w.addDocument(d); @@ -1311,7 +1320,7 @@ setMergePolicy(mergePolicy) ); Document doc = new Document(); - doc.add(newField("field", "go", TextField.TYPE_UNSTORED)); + doc.add(newField("field", "go", TextField.TYPE)); w.addDocument(doc); DirectoryReader r; if (iter == 0) { @@ -1381,7 +1390,8 @@ // First commit Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -1443,7 +1453,8 @@ } Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -1477,7 +1488,8 @@ TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMaxBufferedDocs(2)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -1503,11 +1515,14 @@ String BIG="alskjhlaksjghlaksjfhalksvjepgjioefgjnsdfjgefgjhelkgjhqewlrkhgwlekgrhwelkgjhwelkgrhwlkejg"; BIG=BIG+BIG+BIG+BIG; - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setOmitNorms(true); - FieldType customType2 = new FieldType(TextField.TYPE_STORED); + FieldType customType2 = new FieldType(TextField.TYPE); + customType2.setStored(true); customType2.setTokenized(false); - FieldType customType3 = new FieldType(TextField.TYPE_STORED); + FieldType customType3 = new FieldType(TextField.TYPE); + customType3.setStored(true); customType3.setTokenized(false); customType3.setOmitNorms(true); @@ -1632,7 +1647,7 @@ // 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); customType.setTokenized(false); Field contentField = new Field("content", "", customType); doc.add(contentField); @@ -1671,7 +1686,7 @@ iwc.setReaderTermsIndexDivisor(1); IndexWriter writer = new IndexWriter(dir, iwc); Document doc = new Document(); - doc.add(newField("", "a b c", TextField.TYPE_UNSTORED)); + doc.add(newField("", "a b c", TextField.TYPE)); writer.addDocument(doc); writer.close(); dir.close(); @@ -1705,7 +1720,8 @@ 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(newField("id", "0", StringField.TYPE)); + doc.add(newField("id", "0", StoredField.TYPE)); w.addDocument(doc); DirectoryReader r = w.getReader(); long version = r.getVersion(); @@ -1749,10 +1765,10 @@ 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); docsAndFreqs.setIndexOptions(IndexOptions.DOCS_AND_FREQS); - FieldType docsOnly = new FieldType(TextField.TYPE_UNSTORED); + FieldType docsOnly = new FieldType(TextField.TYPE); docsOnly.setIndexOptions(IndexOptions.DOCS_ONLY); Document doc = new Document(); Index: lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java (working copy) @@ -21,8 +21,10 @@ import java.io.IOException; 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.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; @@ -132,15 +134,18 @@ 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(newField("default","one two", TextField.TYPE)); + d1.add(newField("default","one two", StoredField.TYPE)); writer.addDocument(d1); Document d2 = new Document(); - d2.add(newField("default","one three", TextField.TYPE_STORED)); + d2.add(newField("default","one three", TextField.TYPE)); + d2.add(newField("default","one three", StoredField.TYPE)); writer.addDocument(d2); Document d3 = new Document(); - d3.add(newField("default","two four", TextField.TYPE_STORED)); + d3.add(newField("default","two four", TextField.TYPE)); + d3.add(newField("default","two four", StoredField.TYPE)); writer.addDocument(d3); writer.close(); Index: lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java (working copy) @@ -73,7 +73,7 @@ Term term = new Term("test", "a"); for (int i = 0; i < 5000; i++) { Document d1 = new Document(); - d1.add(newField(term.field(), term.text(), TextField.TYPE_UNSTORED)); + d1.add(newField(term.field(), term.text(), TextField.TYPE)); writer.addDocument(d1); } writer.commit(); Index: lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (working copy) @@ -46,7 +46,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -105,7 +105,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -140,7 +140,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -179,7 +179,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -215,7 +215,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -251,7 +251,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -296,7 +296,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -335,7 +335,7 @@ 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); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); @@ -396,7 +396,7 @@ document = new Document(); document.add(storedField); - FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED); + FieldType customType2 = new FieldType(StringField.TYPE); customType2.setStoreTermVectors(true); customType2.setStoreTermVectorPositions(true); customType2.setStoreTermVectorOffsets(true); @@ -451,7 +451,7 @@ document = new Document(); document.add(storedField); - FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED); + FieldType customType2 = new FieldType(StringField.TYPE); customType2.setStoreTermVectors(true); customType2.setStoreTermVectorPositions(true); customType2.setStoreTermVectorOffsets(true); @@ -485,7 +485,7 @@ Field storedField = newField("stored", "stored", customType); document.add(storedField); - FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED); + FieldType customType2 = new FieldType(StringField.TYPE); customType2.setStoreTermVectors(true); customType2.setStoreTermVectorPositions(true); customType2.setStoreTermVectorOffsets(true); @@ -521,19 +521,19 @@ 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); 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(newField("tvtest", "x y z", TextField.TYPE)); iw.addDocument(document); // Make first segment iw.commit(); - FieldType customType = new FieldType(StringField.TYPE_UNSTORED); + FieldType customType = new FieldType(StringField.TYPE); customType.setStoreTermVectors(true); document.add(newField("tvtest", "a b c", customType)); iw.addDocument(document); @@ -551,21 +551,21 @@ 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); 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(newField("tvtest", "x y z", TextField.TYPE)); iw.addDocument(document); // Make first segment iw.commit(); iw.forceMerge(1); - FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED); + FieldType customType2 = new FieldType(StringField.TYPE); customType2.setStoreTermVectors(true); document.add(newField("tvtest", "a b c", customType2)); iw.addDocument(document); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (working copy) @@ -196,8 +196,8 @@ 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(newField("content", "aaa", TextField.TYPE)); + doc.add(newField("id", Integer.toString(id), StringField.TYPE)); writer.addDocument(doc); } } Index: lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java (working copy) @@ -45,9 +45,9 @@ int numDocs = _TestUtil.nextInt(random(), 1, 100 * RANDOM_MULTIPLIER); Document doc = new Document(); - Field f = newField("field", "", StringField.TYPE_UNSTORED); + Field f = newField("field", "", StringField.TYPE); doc.add(f); - Field id = newField("id", "", StringField.TYPE_UNSTORED); + Field id = newField("id", "", StringField.TYPE); doc.add(id); boolean onlyUniqueTerms = random().nextBoolean(); @@ -156,7 +156,7 @@ Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random()))); Document d = new Document(); - d.add(newField("f", "j", StringField.TYPE_UNSTORED)); + d.add(newField("f", "j", StringField.TYPE)); w.addDocument(d); w.commit(); w.addDocument(d); Index: lucene/core/src/test/org/apache/lucene/index/TestCrash.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestCrash.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestCrash.java (working copy) @@ -44,8 +44,8 @@ } Document doc = new Document(); - doc.add(newField("content", "aaa", TextField.TYPE_UNSTORED)); - doc.add(newField("id", "0", TextField.TYPE_UNSTORED)); + doc.add(newField("content", "aaa", TextField.TYPE)); + doc.add(newField("id", "0", TextField.TYPE)); for(int i=0;i<157;i++) writer.addDocument(doc); Index: lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java =================================================================== --- lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java (working copy) @@ -34,7 +34,7 @@ MockDirectoryWrapper dir = newDirectory(); final Document doc = new Document(); - doc.add(newField("content", "aaa", StringField.TYPE_UNSTORED)); + doc.add(newField("content", "aaa", StringField.TYPE)); final int incrMin = TEST_NIGHTLY ? 15 : 40; for(int numDocs=10;numDocs<500;numDocs += _TestUtil.nextInt(random(), incrMin, 5*incrMin)) { LogDocMergePolicy ldmp = new LogDocMergePolicy(); @@ -75,7 +75,7 @@ MockDirectoryWrapper dir = newDirectory(); final Document doc = new Document(); - doc.add(newField("content", "aaa", StringField.TYPE_UNSTORED)); + doc.add(newField("content", "aaa", StringField.TYPE)); LogDocMergePolicy ldmp = new LogDocMergePolicy(); ldmp.setMinMergeDocs(1); @@ -179,7 +179,7 @@ setMergePolicy(newLogMergePolicy(51)) ); Document doc = new Document(); - doc.add(newField("field", "aaa", StringField.TYPE_UNSTORED)); + doc.add(newField("field", "aaa", StringField.TYPE)); for(int i=0;i<100;i++) writer.addDocument(doc); writer.forceMerge(1, false); Index: lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java =================================================================== --- lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (working copy) @@ -82,8 +82,10 @@ for (int j = 0; j < MAX_DOCS; j++) { Document d = new Document(); - d.add(newField(PRIORITY_FIELD, HIGH_PRIORITY, TextField.TYPE_STORED)); - d.add(newField(ID_FIELD, Integer.toString(j), TextField.TYPE_STORED)); + d.add(newField(PRIORITY_FIELD, HIGH_PRIORITY, TextField.TYPE)); + d.add(newField(PRIORITY_FIELD, HIGH_PRIORITY, StoredField.TYPE)); + d.add(newField(ID_FIELD, Integer.toString(j), TextField.TYPE)); + d.add(newField(ID_FIELD, Integer.toString(j), StoredField.TYPE)); writer.addDocument(d); } writer.close(); Index: lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java =================================================================== --- lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (working copy) @@ -1609,7 +1609,7 @@ RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(IndexWriterConfig.OpenMode.CREATE)); Document doc = new Document(); - Field idField = newField("id", "", StringField.TYPE_UNSTORED); + Field idField = newField("id", "", StringField.TYPE); doc.add(idField); final int NUM_IDS = atLeast(200); @@ -1744,7 +1744,7 @@ RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setOpenMode(IndexWriterConfig.OpenMode.CREATE)); Document doc = new Document(); - Field f = newField("field", "", StringField.TYPE_UNSTORED); + Field f = newField("field", "", StringField.TYPE); doc.add(f); final int NUM_TERMS = (int) (1000*RANDOM_MULTIPLIER * (1+random().nextDouble())); Index: lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java =================================================================== --- lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/util/TestFieldCacheSanityChecker.java (working copy) @@ -57,12 +57,12 @@ float theFloat = Float.MAX_VALUE; for (int i = 0; i < NUM_DOCS; i++){ Document doc = new Document(); - doc.add(newField("theLong", String.valueOf(theLong--), StringField.TYPE_UNSTORED)); - doc.add(newField("theDouble", String.valueOf(theDouble--), StringField.TYPE_UNSTORED)); - doc.add(newField("theByte", String.valueOf(theByte--), StringField.TYPE_UNSTORED)); - doc.add(newField("theShort", String.valueOf(theShort--), StringField.TYPE_UNSTORED)); - doc.add(newField("theInt", String.valueOf(theInt--), StringField.TYPE_UNSTORED)); - doc.add(newField("theFloat", String.valueOf(theFloat--), StringField.TYPE_UNSTORED)); + doc.add(newField("theLong", String.valueOf(theLong--), StringField.TYPE)); + doc.add(newField("theDouble", String.valueOf(theDouble--), StringField.TYPE)); + doc.add(newField("theByte", String.valueOf(theByte--), StringField.TYPE)); + doc.add(newField("theShort", String.valueOf(theShort--), StringField.TYPE)); + doc.add(newField("theInt", String.valueOf(theInt--), StringField.TYPE)); + doc.add(newField("theFloat", String.valueOf(theFloat--), StringField.TYPE)); if (0 == i % 3) { wA.addDocument(doc); } else { Index: lucene/core/src/test/org/apache/lucene/document/TestDocument.java =================================================================== --- lucene/core/src/test/org/apache/lucene/document/TestDocument.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/document/TestDocument.java (working copy) @@ -201,21 +201,26 @@ assertEquals(new String[0], doc.getValues("nope")); } - + + static FieldType storedStringType = new FieldType(StringField.TYPE); + static { + storedStringType.setStored(true); + storedStringType.freeze(); + } + private Document makeDocumentWithFields() { Document doc = new Document(); - FieldType stored = new FieldType(); - stored.setStored(true); - doc.add(new Field("keyword", "test1", StringField.TYPE_STORED)); - doc.add(new Field("keyword", "test2", StringField.TYPE_STORED)); - doc.add(new Field("text", "test1", TextField.TYPE_STORED)); - doc.add(new Field("text", "test2", TextField.TYPE_STORED)); - doc.add(new Field("unindexed", "test1", stored)); - doc.add(new Field("unindexed", "test2", stored)); - doc - .add(new TextField("unstored", "test1")); - doc - .add(new TextField("unstored", "test2")); + FieldType storedTextType = new FieldType(TextField.TYPE); + storedTextType.setStored(true); + storedTextType.freeze(); + doc.add(new Field("keyword", "test1", storedStringType)); + doc.add(new Field("keyword", "test2", storedStringType)); + doc.add(new Field("text", "test1", storedTextType)); + doc.add(new Field("text", "test2", storedTextType)); + doc.add(new Field("unindexed", "test1", storedStringType)); + doc.add(new Field("unindexed", "test2", storedStringType)); + doc.add(new StoredField("unstored", "test1")); + doc.add(new StoredField("unstored", "test2")); return doc; } @@ -250,10 +255,11 @@ public void testFieldSetValue() throws Exception { - Field field = new Field("id", "id1", StringField.TYPE_STORED); + Field field = new Field("id", "id1", storedStringType); Document doc = new Document(); doc.add(field); - doc.add(new Field("keyword", "test", StringField.TYPE_STORED)); + doc.add(new Field("keyword", "test", StringField.TYPE)); + doc.add(new Field("keyword", "test", StoredField.TYPE)); Directory dir = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), dir); @@ -289,7 +295,7 @@ // LUCENE-3616 public void testInvalidFields() { try { - new Field("foo", new EmptyTokenizer(new StringReader("")), StringField.TYPE_STORED); + new Field("foo", new EmptyTokenizer(new StringReader("")), StoredField.TYPE); fail("did not hit expected exc"); } catch (IllegalArgumentException iae) { // expected @@ -367,7 +373,8 @@ iwc.setMergePolicy(newLogMergePolicy()); IndexWriter iw = new IndexWriter(dir, iwc); Document doc = new Document(); - doc.add(new Field("field1", "sometext", StringField.TYPE_STORED)); + doc.add(new Field("field1", "sometext", StringField.TYPE)); + doc.add(new Field("field1", "sometext", StoredField.TYPE)); doc.add(new TextField("field2", "sometext")); doc.add(new StringField("foo", "bar")); iw.addDocument(doc); // add an 'ok' document Index: lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java =================================================================== --- lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (revision 1345508) +++ lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (working copy) @@ -91,7 +91,7 @@ dir.failOn(new FailOnlyOnMerge()); Document doc = new Document(); - Field idField = newField("id", "", StringField.TYPE_STORED); + Field idField = newField("id", "", StringField.TYPE); doc.add(idField); IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig( Index: lucene/core/src/java/org/apache/lucene/document/StringField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/StringField.java (revision 1345508) +++ lucene/core/src/java/org/apache/lucene/document/StringField.java (working copy) @@ -25,36 +25,25 @@ * field, or any field that you intend to use for sorting * or access through the field cache. * - *

This field's value is not stored by default; use the - * {@link StringField#TYPE_STORED} type (pass it to new - * Field) to store the value. */ + *

This field's value is not stored by default; use a + * separate {@link StoredField} instance store it. */ public final class StringField extends Field { /** Indexed, not tokenized, omits norms, indexes * DOCS_ONLY, not stored. */ - public static final FieldType TYPE_UNSTORED = new FieldType(); + public static final FieldType TYPE = new FieldType(); - /** Indexed, not tokenized, omits norms, indexes - * DOCS_ONLY, stored */ - public static final FieldType TYPE_STORED = new FieldType(); - static { - TYPE_UNSTORED.setIndexed(true); - TYPE_UNSTORED.setOmitNorms(true); - TYPE_UNSTORED.setIndexOptions(IndexOptions.DOCS_ONLY); - TYPE_UNSTORED.freeze(); - - TYPE_STORED.setIndexed(true); - TYPE_STORED.setStored(true); - TYPE_STORED.setOmitNorms(true); - TYPE_STORED.setIndexOptions(IndexOptions.DOCS_ONLY); - TYPE_STORED.freeze(); + TYPE.setIndexed(true); + TYPE.setOmitNorms(true); + TYPE.setIndexOptions(IndexOptions.DOCS_ONLY); + TYPE.freeze(); } /** Creates a new un-stored StringField */ public StringField(String name, String value) { - super(name, value, TYPE_UNSTORED); + super(name, value, TYPE); } @Override Index: lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java (revision 1345508) +++ lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java (working copy) @@ -62,11 +62,13 @@ @Override public void stringField(FieldInfo fieldInfo, String value) throws IOException { - final FieldType ft = new FieldType(TextField.TYPE_STORED); + final FieldType ft = new FieldType(TextField.TYPE); ft.setStoreTermVectors(fieldInfo.hasVectors()); ft.setIndexed(fieldInfo.isIndexed()); ft.setOmitNorms(fieldInfo.omitsNorms()); ft.setIndexOptions(fieldInfo.getIndexOptions()); + ft.setStored(true); + ft.freeze(); doc.add(new Field(fieldInfo.name, value, ft)); } Index: lucene/core/src/java/org/apache/lucene/document/TextField.java =================================================================== --- lucene/core/src/java/org/apache/lucene/document/TextField.java (revision 1345508) +++ lucene/core/src/java/org/apache/lucene/document/TextField.java (working copy) @@ -25,43 +25,34 @@ * vectors. For example this would be used on a 'body' * field, that contains the bulk of a document's text. * - * This field's value is not stored by default; use the - * {@link TextField#TYPE_STORED} type (pass it to new - * Field) to store the value. */ + *

This field's value is not stored by default; use a + * separate {@link StoredField} instance store it. */ public final class TextField extends Field { /* Indexed, tokenized, not stored. */ - public static final FieldType TYPE_UNSTORED = new FieldType(); + public static final FieldType TYPE = new FieldType(); - /* Indexed, tokenized, stored. */ - public static final FieldType TYPE_STORED = new FieldType(); - static { - TYPE_UNSTORED.setIndexed(true); - TYPE_UNSTORED.setTokenized(true); - TYPE_UNSTORED.freeze(); - - TYPE_STORED.setIndexed(true); - TYPE_STORED.setStored(true); - TYPE_STORED.setTokenized(true); - TYPE_STORED.freeze(); + TYPE.setIndexed(true); + TYPE.setTokenized(true); + TYPE.freeze(); } // TODO: add sugar for term vectors...? /** Creates a new un-stored TextField */ public TextField(String name, Reader reader) { - super(name, reader, TextField.TYPE_UNSTORED); + super(name, reader, TextField.TYPE); } /** Creates a new un-stored TextField */ public TextField(String name, String value) { - super(name, value, TextField.TYPE_UNSTORED); + super(name, value, TextField.TYPE); } /** Creates a new un-stored TextField */ public TextField(String name, TokenStream stream) { - super(name, stream, TextField.TYPE_UNSTORED); + super(name, stream, TextField.TYPE); } } Index: lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java =================================================================== --- lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (revision 1345508) +++ lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (working copy) @@ -33,13 +33,14 @@ import org.apache.lucene.benchmark.byTask.utils.Config; import org.apache.lucene.document.Document; +import org.apache.lucene.document.DoubleField; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType.NumericType; import org.apache.lucene.document.FieldType; +import org.apache.lucene.document.FloatField; import org.apache.lucene.document.IntField; import org.apache.lucene.document.LongField; -import org.apache.lucene.document.FloatField; -import org.apache.lucene.document.DoubleField; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; @@ -114,7 +115,8 @@ fields.put(BODY_FIELD, new Field(BODY_FIELD, "", bodyFt)); fields.put(TITLE_FIELD, new Field(TITLE_FIELD, "", ft)); fields.put(DATE_FIELD, new Field(DATE_FIELD, "", ft)); - fields.put(ID_FIELD, new Field(ID_FIELD, "", StringField.TYPE_STORED)); + fields.put(ID_FIELD, new Field(ID_FIELD, "", StringField.TYPE)); + fields.put(ID_FIELD, new Field(ID_FIELD, "", StoredField.TYPE)); fields.put(NAME_FIELD, new Field(NAME_FIELD, "", ft)); numericFields.put(DATE_MSEC_FIELD, new LongField(DATE_MSEC_FIELD, 0L)); @@ -315,9 +317,12 @@ doc.add(bodyField); if (storeBytes) { - Field bytesField = ds.getField(BYTES_FIELD, StringField.TYPE_STORED); + Field bytesField = ds.getField(BYTES_FIELD, StringField.TYPE); bytesField.setBytesValue(bdy.getBytes("UTF-8")); doc.add(bytesField); + Field bytesFieldStored = ds.getField(BYTES_FIELD, StoredField.TYPE); + bytesFieldStored.setBytesValue(bdy.getBytes("UTF-8")); + doc.add(bytesFieldStored); } } @@ -432,7 +437,7 @@ boolean termVecPositions = config.get("doc.term.vector.positions", false); boolean termVecOffsets = config.get("doc.term.vector.offsets", false); - valType = new FieldType(TextField.TYPE_UNSTORED); + valType = new FieldType(TextField.TYPE); valType.setStored(stored); valType.setTokenized(tokenized); valType.setOmitNorms(!norms); @@ -441,7 +446,7 @@ valType.setStoreTermVectorOffsets(termVecOffsets); valType.freeze(); - bodyValType = new FieldType(TextField.TYPE_UNSTORED); + bodyValType = new FieldType(TextField.TYPE); bodyValType.setStored(bodyStored); bodyValType.setTokenized(bodyTokenized); bodyValType.setOmitNorms(!bodyNorms); Index: lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java =================================================================== --- lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (revision 1345508) +++ lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (working copy) @@ -38,16 +38,18 @@ // One resume... private Document makeResume(String name, String country) { Document resume = new Document(); - resume.add(newField("docType", "resume", StringField.TYPE_UNSTORED)); - resume.add(newField("name", name, StringField.TYPE_STORED)); - resume.add(newField("country", country, StringField.TYPE_UNSTORED)); + resume.add(newField("docType", "resume", StringField.TYPE)); + resume.add(newField("name", name, StringField.TYPE)); + resume.add(newField("name", name, StoredField.TYPE)); + resume.add(newField("country", country, StringField.TYPE)); return resume; } // ... has multiple jobs private Document makeJob(String skill, int year) { Document job = new Document(); - job.add(newField("skill", skill, StringField.TYPE_STORED)); + job.add(newField("skill", skill, StringField.TYPE)); + job.add(newField("skill", skill, StoredField.TYPE)); job.add(new IntField("year", year)); job.add(new StoredField("year", year)); return job; @@ -56,7 +58,8 @@ // ... has multiple qualifications private Document makeQualification(String qualification, int year) { Document job = new Document(); - job.add(newField("qualification", qualification, StringField.TYPE_STORED)); + job.add(newField("qualification", qualification, StringField.TYPE)); + job.add(newField("qualification", qualification, StoredField.TYPE)); job.add(new IntField("year", year)); return job; } @@ -335,29 +338,33 @@ final boolean doDeletes = random().nextBoolean(); final List toDelete = new ArrayList(); + FieldType storedStringType = new FieldType(StringField.TYPE); + storedStringType.setStored(true); + storedStringType.freeze(); + // TODO: parallel star join, nested join cases too! final RandomIndexWriter w = new RandomIndexWriter(random(), dir); final RandomIndexWriter joinW = new RandomIndexWriter(random(), joinDir); for(int parentDocID=0;parentDocID joinDocs = new ArrayList(); @@ -381,7 +388,7 @@ Document joinChildDoc = new Document(); joinDocs.add(joinChildDoc); - Field childID = newField("childID", ""+childDocID, StringField.TYPE_STORED); + Field childID = newField("childID", ""+childDocID, storedStringType); childDoc.add(childID); joinChildDoc.add(childID); @@ -389,7 +396,7 @@ if (random().nextDouble() < 0.9) { Field f = newField("child" + childFieldID, childFields[childFieldID][random().nextInt(childFields[childFieldID].length)], - StringField.TYPE_UNSTORED); + StringField.TYPE); childDoc.add(f); joinChildDoc.add(f); } @@ -408,7 +415,7 @@ } if (doDeletes) { - joinChildDoc.add(newField("blockID", ""+parentDocID, StringField.TYPE_UNSTORED)); + joinChildDoc.add(newField("blockID", ""+parentDocID, StringField.TYPE)); } w.addDocument(childDoc); @@ -942,9 +949,9 @@ Directory dir = newDirectory(); RandomIndexWriter w = new RandomIndexWriter(random(), dir); Document childDoc = new Document(); - childDoc.add(newField("child", "1", StringField.TYPE_UNSTORED)); + childDoc.add(newField("child", "1", StringField.TYPE)); Document parentDoc = new Document(); - parentDoc.add(newField("parent", "1", StringField.TYPE_UNSTORED)); + parentDoc.add(newField("parent", "1", StringField.TYPE)); w.addDocuments(Arrays.asList(childDoc, parentDoc)); IndexReader r = w.getReader(); w.close(); @@ -966,16 +973,16 @@ Directory dir = newDirectory(); RandomIndexWriter w = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())).setMergePolicy(new LogDocMergePolicy())); Document parentDoc = new Document(); - parentDoc.add(newField("parent", "1", StringField.TYPE_UNSTORED)); - parentDoc.add(newField("isparent", "yes", StringField.TYPE_UNSTORED)); + parentDoc.add(newField("parent", "1", StringField.TYPE)); + parentDoc.add(newField("isparent", "yes", StringField.TYPE)); w.addDocuments(Arrays.asList(parentDoc)); // Add another doc so scorer is not null parentDoc = new Document(); - parentDoc.add(newField("parent", "2", StringField.TYPE_UNSTORED)); - parentDoc.add(newField("isparent", "yes", StringField.TYPE_UNSTORED)); + parentDoc.add(newField("parent", "2", StringField.TYPE)); + parentDoc.add(newField("isparent", "yes", StringField.TYPE)); Document childDoc = new Document(); - childDoc.add(newField("child", "2", StringField.TYPE_UNSTORED)); + childDoc.add(newField("child", "2", StringField.TYPE)); w.addDocuments(Arrays.asList(childDoc, parentDoc)); // Need single seg: Index: lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java =================================================================== --- lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (revision 1345508) +++ lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (working copy) @@ -67,45 +67,45 @@ // 0 Document doc = new Document(); - doc.add(new Field("description", "random text", TextField.TYPE_UNSTORED)); - doc.add(new Field("name", "name1", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "1", TextField.TYPE_UNSTORED)); + doc.add(new Field("description", "random text", TextField.TYPE)); + doc.add(new Field("name", "name1", TextField.TYPE)); + doc.add(new Field(idField, "1", TextField.TYPE)); w.addDocument(doc); // 1 doc = new Document(); - doc.add(new Field("price", "10.0", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "2", TextField.TYPE_UNSTORED)); - doc.add(new Field(toField, "1", TextField.TYPE_UNSTORED)); + doc.add(new Field("price", "10.0", TextField.TYPE)); + doc.add(new Field(idField, "2", TextField.TYPE)); + doc.add(new Field(toField, "1", TextField.TYPE)); w.addDocument(doc); // 2 doc = new Document(); - doc.add(new Field("price", "20.0", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "3", TextField.TYPE_UNSTORED)); - doc.add(new Field(toField, "1", TextField.TYPE_UNSTORED)); + doc.add(new Field("price", "20.0", TextField.TYPE)); + doc.add(new Field(idField, "3", TextField.TYPE)); + doc.add(new Field(toField, "1", TextField.TYPE)); w.addDocument(doc); // 3 doc = new Document(); - doc.add(new Field("description", "more random text", TextField.TYPE_UNSTORED)); - doc.add(new Field("name", "name2", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "4", TextField.TYPE_UNSTORED)); + doc.add(new Field("description", "more random text", TextField.TYPE)); + doc.add(new Field("name", "name2", TextField.TYPE)); + doc.add(new Field(idField, "4", TextField.TYPE)); w.addDocument(doc); w.commit(); // 4 doc = new Document(); - doc.add(new Field("price", "10.0", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "5", TextField.TYPE_UNSTORED)); - doc.add(new Field(toField, "4", TextField.TYPE_UNSTORED)); + doc.add(new Field("price", "10.0", TextField.TYPE)); + doc.add(new Field(idField, "5", TextField.TYPE)); + doc.add(new Field(toField, "4", TextField.TYPE)); w.addDocument(doc); // 5 doc = new Document(); - doc.add(new Field("price", "20.0", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "6", TextField.TYPE_UNSTORED)); - doc.add(new Field(toField, "4", TextField.TYPE_UNSTORED)); + doc.add(new Field("price", "20.0", TextField.TYPE)); + doc.add(new Field(idField, "6", TextField.TYPE)); + doc.add(new Field(toField, "4", TextField.TYPE)); w.addDocument(doc); IndexSearcher indexSearcher = new IndexSearcher(w.getReader()); @@ -149,45 +149,45 @@ // 0 Document doc = new Document(); - doc.add(new Field("description", "A random movie", TextField.TYPE_UNSTORED)); - doc.add(new Field("name", "Movie 1", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "1", TextField.TYPE_UNSTORED)); + doc.add(new Field("description", "A random movie", TextField.TYPE)); + doc.add(new Field("name", "Movie 1", TextField.TYPE)); + doc.add(new Field(idField, "1", TextField.TYPE)); w.addDocument(doc); // 1 doc = new Document(); - doc.add(new Field("subtitle", "The first subtitle of this movie", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "2", TextField.TYPE_UNSTORED)); - doc.add(new Field(toField, "1", TextField.TYPE_UNSTORED)); + doc.add(new Field("subtitle", "The first subtitle of this movie", TextField.TYPE)); + doc.add(new Field(idField, "2", TextField.TYPE)); + doc.add(new Field(toField, "1", TextField.TYPE)); w.addDocument(doc); // 2 doc = new Document(); - doc.add(new Field("subtitle", "random subtitle; random event movie", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "3", TextField.TYPE_UNSTORED)); - doc.add(new Field(toField, "1", TextField.TYPE_UNSTORED)); + doc.add(new Field("subtitle", "random subtitle; random event movie", TextField.TYPE)); + doc.add(new Field(idField, "3", TextField.TYPE)); + doc.add(new Field(toField, "1", TextField.TYPE)); w.addDocument(doc); // 3 doc = new Document(); - doc.add(new Field("description", "A second random movie", TextField.TYPE_UNSTORED)); - doc.add(new Field("name", "Movie 2", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "4", TextField.TYPE_UNSTORED)); + doc.add(new Field("description", "A second random movie", TextField.TYPE)); + doc.add(new Field("name", "Movie 2", TextField.TYPE)); + doc.add(new Field(idField, "4", TextField.TYPE)); w.addDocument(doc); w.commit(); // 4 doc = new Document(); - doc.add(new Field("subtitle", "a very random event happened during christmas night", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "5", TextField.TYPE_UNSTORED)); - doc.add(new Field(toField, "4", TextField.TYPE_UNSTORED)); + doc.add(new Field("subtitle", "a very random event happened during christmas night", TextField.TYPE)); + doc.add(new Field(idField, "5", TextField.TYPE)); + doc.add(new Field(toField, "4", TextField.TYPE)); w.addDocument(doc); // 5 doc = new Document(); - doc.add(new Field("subtitle", "movie end movie test 123 test 123 random", TextField.TYPE_UNSTORED)); - doc.add(new Field(idField, "6", TextField.TYPE_UNSTORED)); - doc.add(new Field(toField, "4", TextField.TYPE_UNSTORED)); + doc.add(new Field("subtitle", "movie end movie test 123 test 123 random", TextField.TYPE)); + doc.add(new Field(idField, "6", TextField.TYPE)); + doc.add(new Field(toField, "4", TextField.TYPE)); w.addDocument(doc); IndexSearcher indexSearcher = new IndexSearcher(w.getReader()); @@ -381,8 +381,8 @@ int randomI = random().nextInt(context.randomUniqueValues.length); String value = context.randomUniqueValues[randomI]; Document document = new Document(); - document.add(newField(random(), "id", id, TextField.TYPE_UNSTORED)); - document.add(newField(random(), "value", value, TextField.TYPE_UNSTORED)); + document.add(newField(random(), "id", id, TextField.TYPE)); + document.add(newField(random(), "value", value, TextField.TYPE)); boolean from = context.randomFrom[randomI]; int numberOfLinkValues = multipleValuesPerDocument ? 2 + random().nextInt(10) : 1; @@ -400,7 +400,7 @@ context.fromDocuments.get(linkValue).add(docs[i]); context.randomValueFromDocs.get(value).add(docs[i]); - document.add(newField(random(), "from", linkValue, TextField.TYPE_UNSTORED)); + document.add(newField(random(), "from", linkValue, TextField.TYPE)); } else { if (!context.toDocuments.containsKey(linkValue)) { context.toDocuments.put(linkValue, new ArrayList()); @@ -411,7 +411,7 @@ context.toDocuments.get(linkValue).add(docs[i]); context.randomValueToDocs.get(value).add(docs[i]); - document.add(newField(random(), "to", linkValue, TextField.TYPE_UNSTORED)); + document.add(newField(random(), "to", linkValue, TextField.TYPE)); } } Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java (revision 1345508) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java (working copy) @@ -67,55 +67,56 @@ Document doc = new Document(); addField(doc, groupField, "1", dvType); addField(doc, countField, "1", dvType); - doc.add(new Field("content", "random text", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "1", StringField.TYPE_UNSTORED)); + doc.add(new Field("content", "random text", TextField.TYPE)); + doc.add(new Field("id", "1", StringField.TYPE)); w.addDocument(doc); // 1 doc = new Document(); addField(doc, groupField, "1", dvType); addField(doc, countField, "1", dvType); - doc.add(new Field("content", "some more random text blob", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "2", StringField.TYPE_UNSTORED)); + doc.add(new Field("content", "some more random text blob", TextField.TYPE)); + doc.add(new Field("id", "2", StringField.TYPE)); w.addDocument(doc); // 2 doc = new Document(); addField(doc, groupField, "1", dvType); addField(doc, countField, "2", dvType); - doc.add(new Field("content", "some more random textual data", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "3", StringField.TYPE_UNSTORED)); + doc.add(new Field("content", "some more random textual data", TextField.TYPE)); + doc.add(new Field("id", "3", StringField.TYPE)); w.addDocument(doc); w.commit(); // To ensure a second segment // 3 doc = new Document(); addField(doc, groupField, "2", dvType); - doc.add(new Field("content", "some random text", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "4", StringField.TYPE_UNSTORED)); + doc.add(new Field("content", "some random text", TextField.TYPE)); + doc.add(new Field("id", "4", StringField.TYPE)); w.addDocument(doc); // 4 doc = new Document(); addField(doc, groupField, "3", dvType); addField(doc, countField, "1", dvType); - doc.add(new Field("content", "some more random text", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "5", StringField.TYPE_UNSTORED)); + doc.add(new Field("content", "some more random text", TextField.TYPE)); + doc.add(new Field("id", "5", StringField.TYPE)); w.addDocument(doc); // 5 doc = new Document(); addField(doc, groupField, "3", dvType); addField(doc, countField, "1", dvType); - doc.add(new Field("content", "random blob", TextField.TYPE_UNSTORED)); - doc.add(new Field("id", "6", StringField.TYPE_UNSTORED)); + doc.add(new Field("content", "random blob", TextField.TYPE)); + doc.add(new Field("id", "6", StringField.TYPE)); w.addDocument(doc); // 6 -- no author field doc = new Document(); - doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); + doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE)); + doc.add(new Field("content", "random word stuck in alot of other text", StoredField.TYPE)); addField(doc, countField, "1", dvType); - doc.add(new Field("id", "6", StringField.TYPE_UNSTORED)); + doc.add(new Field("id", "6", StringField.TYPE)); w.addDocument(doc); IndexSearcher indexSearcher = newSearcher(w.getReader()); @@ -316,7 +317,7 @@ } private void addField(Document doc, String field, String value, DocValues.Type type) { - doc.add(new Field(field, value, StringField.TYPE_UNSTORED)); + doc.add(new Field(field, value, StringField.TYPE)); if (type == null) { return; } @@ -450,14 +451,14 @@ countsVals.add(countValue); Document doc = new Document(); - doc.add(new Field("id", String.format("%09d", i), StringField.TYPE_UNSTORED)); + doc.add(new Field("id", String.format("%09d", i), StringField.TYPE)); if (groupValue != null) { addField(doc, groupField, groupValue, dvType); } if (countValue != null) { addField(doc, countField, countValue, dvType); } - doc.add(new Field("content", content, TextField.TYPE_UNSTORED)); + doc.add(new Field("content", content, TextField.TYPE)); w.addDocument(doc); } Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (revision 1345508) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (working copy) @@ -77,48 +77,55 @@ // 0 Document doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "random text", TextField.TYPE)); + doc.add(new Field("content", "random text", StoredField.TYPE)); doc.add(new Field("id", "1", customType)); w.addDocument(doc); // 1 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random text", TextField.TYPE)); + doc.add(new Field("content", "some more random text", StoredField.TYPE)); doc.add(new Field("id", "2", customType)); w.addDocument(doc); // 2 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random textual data", TextField.TYPE)); + doc.add(new Field("content", "some more random textual data", StoredField.TYPE)); doc.add(new Field("id", "3", customType)); w.addDocument(doc); // 3 doc = new Document(); addGroupField(doc, groupField, "author2", canUseIDV); - doc.add(new Field("content", "some random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "some random text", TextField.TYPE)); + doc.add(new Field("content", "some random text", StoredField.TYPE)); doc.add(new Field("id", "4", customType)); w.addDocument(doc); // 4 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random text", TextField.TYPE)); + doc.add(new Field("content", "some more random text", StoredField.TYPE)); doc.add(new Field("id", "5", customType)); w.addDocument(doc); // 5 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "random", TextField.TYPE_STORED)); + doc.add(new Field("content", "random", TextField.TYPE)); + doc.add(new Field("content", "random", StoredField.TYPE)); doc.add(new Field("id", "6", customType)); w.addDocument(doc); // 6 -- no author field doc = new Document(); - doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); + doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE)); + doc.add(new Field("content", "random word stuck in alot of other text", StoredField.TYPE)); doc.add(new Field("id", "6", customType)); w.addDocument(doc); @@ -174,7 +181,8 @@ } private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) { - doc.add(new Field(groupField, value, TextField.TYPE_STORED)); + doc.add(new Field(groupField, value, TextField.TYPE)); + doc.add(new Field(groupField, value, StoredField.TYPE)); if (canUseIDV) { doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value))); } @@ -582,7 +590,7 @@ final List> updateDocs = new ArrayList>(); - FieldType groupEndType = new FieldType(StringField.TYPE_UNSTORED); + FieldType groupEndType = new FieldType(StringField.TYPE); groupEndType.setIndexOptions(IndexOptions.DOCS_ONLY); groupEndType.setOmitNorms(true); @@ -594,12 +602,12 @@ Document doc = new Document(); docs.add(doc); if (groupValue.group != null) { - doc.add(newField("group", groupValue.group.utf8ToString(), StringField.TYPE_UNSTORED)); + doc.add(newField("group", groupValue.group.utf8ToString(), StringField.TYPE)); } - doc.add(newField("sort1", groupValue.sort1.utf8ToString(), StringField.TYPE_UNSTORED)); - doc.add(newField("sort2", groupValue.sort2.utf8ToString(), StringField.TYPE_UNSTORED)); + doc.add(newField("sort1", groupValue.sort1.utf8ToString(), StringField.TYPE)); + doc.add(newField("sort2", groupValue.sort2.utf8ToString(), StringField.TYPE)); doc.add(new IntField("id", groupValue.id)); - doc.add(newField("content", groupValue.content, TextField.TYPE_UNSTORED)); + doc.add(newField("content", groupValue.content, TextField.TYPE)); //System.out.println("TEST: doc content=" + groupValue.content + " group=" + (groupValue.group == null ? "null" : groupValue.group.utf8ToString()) + " sort1=" + groupValue.sort1.utf8ToString() + " id=" + groupValue.id); } // So we can pull filter marking last doc in block: @@ -713,15 +721,15 @@ doc.add(idvGroupField); } - Field group = newField("group", "", StringField.TYPE_UNSTORED); + Field group = newField("group", "", StringField.TYPE); doc.add(group); - Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED); + Field sort1 = newField("sort1", "", StringField.TYPE); doc.add(sort1); docNoGroup.add(sort1); - Field sort2 = newField("sort2", "", StringField.TYPE_UNSTORED); + Field sort2 = newField("sort2", "", StringField.TYPE); doc.add(sort2); docNoGroup.add(sort2); - Field content = newField("content", "", TextField.TYPE_UNSTORED); + Field content = newField("content", "", TextField.TYPE); doc.add(content); docNoGroup.add(content); IntField id = new IntField("id", 0); Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java (revision 1345508) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java (working copy) @@ -55,21 +55,24 @@ // 0 Document doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "random text", TextField.TYPE)); + doc.add(new Field("content", "random text", StoredField.TYPE)); doc.add(new Field("id", "1", customType)); w.addDocument(doc); // 1 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random text blob", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random text blob", TextField.TYPE)); + doc.add(new Field("content", "some more random text blob", StoredField.TYPE)); doc.add(new Field("id", "2", customType)); w.addDocument(doc); // 2 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random textual data", TextField.TYPE)); + doc.add(new Field("content", "some more random textual data", StoredField.TYPE)); doc.add(new Field("id", "3", customType)); w.addDocument(doc); w.commit(); // To ensure a second segment @@ -77,27 +80,31 @@ // 3 doc = new Document(); addGroupField(doc, groupField, "author2", canUseIDV); - doc.add(new Field("content", "some random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "some random text", TextField.TYPE)); + doc.add(new Field("content", "some random text", StoredField.TYPE)); doc.add(new Field("id", "4", customType)); w.addDocument(doc); // 4 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random text", TextField.TYPE)); + doc.add(new Field("content", "some more random text", StoredField.TYPE)); doc.add(new Field("id", "5", customType)); w.addDocument(doc); // 5 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "random blob", TextField.TYPE_STORED)); + doc.add(new Field("content", "random blob", TextField.TYPE)); + doc.add(new Field("content", "random blob", StoredField.TYPE)); doc.add(new Field("id", "6", customType)); w.addDocument(doc); // 6 -- no author field doc = new Document(); - doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); + doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE)); + doc.add(new Field("content", "random word stuck in alot of other text", StoredField.TYPE)); doc.add(new Field("id", "6", customType)); w.addDocument(doc); @@ -121,7 +128,8 @@ } private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) { - doc.add(new Field(groupField, value, TextField.TYPE_STORED)); + doc.add(new Field(groupField, value, TextField.TYPE)); + doc.add(new Field(groupField, value, StoredField.TYPE)); if (canUseIDV) { doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value))); } Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java (revision 1345508) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java (working copy) @@ -56,23 +56,26 @@ // 0 Document doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "random text", TextField.TYPE)); + doc.add(new Field("content", "random text", StoredField.TYPE)); doc.add(new Field("id", "1", customType)); documents.add(doc); // 1 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random text", TextField.TYPE)); + doc.add(new Field("content", "some more random text", StoredField.TYPE)); doc.add(new Field("id", "2", customType)); documents.add(doc); // 2 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV); - doc.add(new Field("content", "some more random textual data", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random textual data", TextField.TYPE)); + doc.add(new Field("content", "some more random textual data", StoredField.TYPE)); doc.add(new Field("id", "3", customType)); - doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED)); + doc.add(new Field("groupend", "x", StringField.TYPE)); documents.add(doc); w.addDocuments(documents); documents.clear(); @@ -80,33 +83,37 @@ // 3 doc = new Document(); addGroupField(doc, groupField, "author2", canUseIDV); - doc.add(new Field("content", "some random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "some random text", TextField.TYPE)); + doc.add(new Field("content", "some random text", StoredField.TYPE)); doc.add(new Field("id", "4", customType)); - doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED)); + doc.add(new Field("groupend", "x", StringField.TYPE)); w.addDocument(doc); // 4 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "some more random text", TextField.TYPE_STORED)); + doc.add(new Field("content", "some more random text", TextField.TYPE)); + doc.add(new Field("content", "some more random text", StoredField.TYPE)); doc.add(new Field("id", "5", customType)); documents.add(doc); // 5 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV); - doc.add(new Field("content", "random", TextField.TYPE_STORED)); + doc.add(new Field("content", "random", TextField.TYPE)); + doc.add(new Field("content", "random", StoredField.TYPE)); doc.add(new Field("id", "6", customType)); - doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED)); + doc.add(new Field("groupend", "x", StringField.TYPE)); documents.add(doc); w.addDocuments(documents); documents.clear(); // 6 -- no author field doc = new Document(); - doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); + doc.add(new Field("content", "random word stuck in alot of other text", TextField.TYPE)); + doc.add(new Field("content", "random word stuck in alot of other text", StoredField.TYPE)); doc.add(new Field("id", "6", customType)); - doc.add(new Field("groupend", "x", StringField.TYPE_UNSTORED)); + doc.add(new Field("groupend", "x", StringField.TYPE)); w.addDocument(doc); @@ -166,7 +173,8 @@ } private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) { - doc.add(new Field(groupField, value, TextField.TYPE_STORED)); + doc.add(new Field(groupField, value, TextField.TYPE)); + doc.add(new Field(groupField, value, StoredField.TYPE)); if (canUseIDV) { doc.add(new SortedBytesDocValuesField(groupField, new BytesRef(value))); } Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (revision 1345508) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (working copy) @@ -60,56 +60,72 @@ // 0 Document doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV, valueType); - doc.add(newField("content", "random text", TextField.TYPE_STORED)); - doc.add(newField("id", "1", StringField.TYPE_STORED)); + doc.add(newField("content", "random text", TextField.TYPE)); + doc.add(newField("content", "random text", StoredField.TYPE)); + doc.add(newField("id", "1", StringField.TYPE)); + doc.add(newField("id", "1", StoredField.TYPE)); w.addDocument(doc); // 1 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV, valueType); - doc.add(newField("content", "some more random text blob", TextField.TYPE_STORED)); - doc.add(newField("id", "2", StringField.TYPE_STORED)); + doc.add(newField("content", "some more random text blob", TextField.TYPE)); + doc.add(newField("content", "some more random text blob", StoredField.TYPE)); + doc.add(newField("id", "2", StringField.TYPE)); + doc.add(newField("id", "2", StoredField.TYPE)); w.addDocument(doc); // 2 doc = new Document(); addGroupField(doc, groupField, "author1", canUseIDV, valueType); - doc.add(newField("content", "some more random textual data", TextField.TYPE_STORED)); - doc.add(newField("id", "3", StringField.TYPE_STORED)); + doc.add(newField("content", "some more random textual data", TextField.TYPE)); + doc.add(newField("content", "some more random textual data", StoredField.TYPE)); + doc.add(newField("id", "3", StringField.TYPE)); + doc.add(newField("id", "3", StoredField.TYPE)); w.addDocument(doc); w.commit(); // To ensure a second segment // 3 doc = new Document(); addGroupField(doc, groupField, "author2", canUseIDV, valueType); - doc.add(newField("content", "some random text", TextField.TYPE_STORED)); - doc.add(newField("id", "4", StringField.TYPE_STORED)); + doc.add(newField("content", "some random text", TextField.TYPE)); + doc.add(newField("content", "some random text", StoredField.TYPE)); + doc.add(newField("id", "4", StringField.TYPE)); + doc.add(newField("id", "4", StoredField.TYPE)); w.addDocument(doc); // 4 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV, valueType); - doc.add(newField("content", "some more random text", TextField.TYPE_STORED)); - doc.add(newField("id", "5", StringField.TYPE_STORED)); + doc.add(newField("content", "some more random text", TextField.TYPE)); + doc.add(newField("content", "some more random text", StoredField.TYPE)); + doc.add(newField("id", "5", StringField.TYPE)); + doc.add(newField("id", "5", StoredField.TYPE)); w.addDocument(doc); // 5 doc = new Document(); addGroupField(doc, groupField, "author3", canUseIDV, valueType); - doc.add(newField("content", "random blob", TextField.TYPE_STORED)); - doc.add(newField("id", "6", StringField.TYPE_STORED)); + doc.add(newField("content", "random blob", TextField.TYPE)); + doc.add(newField("content", "random blob", StoredField.TYPE)); + doc.add(newField("id", "6", StringField.TYPE)); + doc.add(newField("id", "6", StoredField.TYPE)); w.addDocument(doc); // 6 -- no author field doc = new Document(); - doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); - doc.add(newField("id", "6", StringField.TYPE_STORED)); + doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE)); + doc.add(newField("content", "random word stuck in alot of other text", StoredField.TYPE)); + doc.add(newField("id", "6", StringField.TYPE)); + doc.add(newField("id", "6", StoredField.TYPE)); w.addDocument(doc); // 7 -- no author field doc = new Document(); - doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED)); - doc.add(newField("id", "7", StringField.TYPE_STORED)); + doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE)); + doc.add(newField("content", "random word stuck in alot of other text", StoredField.TYPE)); + doc.add(newField("id", "7", StringField.TYPE)); + doc.add(newField("id", "7", StoredField.TYPE)); w.addDocument(doc); IndexReader reader = w.getReader(); @@ -208,7 +224,7 @@ Document doc = new Document(); Document docNoGroup = new Document(); - Field group = newField("group", "", StringField.TYPE_UNSTORED); + Field group = newField("group", "", StringField.TYPE); doc.add(group); Field valuesField = null; if (canUseIDV) { @@ -227,16 +243,16 @@ } doc.add(valuesField); } - Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED); + Field sort1 = newField("sort1", "", StringField.TYPE); doc.add(sort1); docNoGroup.add(sort1); - Field sort2 = newField("sort2", "", StringField.TYPE_UNSTORED); + Field sort2 = newField("sort2", "", StringField.TYPE); doc.add(sort2); docNoGroup.add(sort2); - Field sort3 = newField("sort3", "", StringField.TYPE_UNSTORED); + Field sort3 = newField("sort3", "", StringField.TYPE); doc.add(sort3); docNoGroup.add(sort3); - Field content = newField("content", "", TextField.TYPE_UNSTORED); + Field content = newField("content", "", TextField.TYPE); doc.add(content); docNoGroup.add(content); IntField id = new IntField("id", 0); @@ -539,7 +555,8 @@ } private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV, Type valueType) { - doc.add(new Field(groupField, value, TextField.TYPE_STORED)); + doc.add(new Field(groupField, value, TextField.TYPE)); + doc.add(new Field(groupField, value, StoredField.TYPE)); if (canUseIDV) { Field valuesField = null; switch(valueType) { Index: lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java =================================================================== --- lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (revision 1345508) +++ lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (working copy) @@ -218,7 +218,7 @@ } private void addField(Document doc, String field, String value, boolean canUseIDV) { - doc.add(new Field(field, value, StringField.TYPE_UNSTORED)); + doc.add(new Field(field, value, StringField.TYPE)); if (canUseIDV) { doc.add(new SortedBytesDocValuesField(field, new BytesRef(value))); } @@ -367,7 +367,7 @@ Document docNoGroup = new Document(); Document docNoFacet = new Document(); Document docNoGroupNoFacet = new Document(); - Field group = newField("group", "", StringField.TYPE_UNSTORED); + Field group = newField("group", "", StringField.TYPE); Field groupDc = new SortedBytesDocValuesField("group", new BytesRef()); if (useDv) { doc.add(groupDc); @@ -378,7 +378,7 @@ Field[] facetFields; if (useDv) { facetFields = new Field[2]; - facetFields[0] = newField("facet", "", StringField.TYPE_UNSTORED); + facetFields[0] = newField("facet", "", StringField.TYPE); doc.add(facetFields[0]); docNoGroup.add(facetFields[0]); facetFields[1] = new SortedBytesDocValuesField("facet", new BytesRef()); @@ -387,12 +387,12 @@ } else { facetFields = multipleFacetValuesPerDocument ? new Field[2 + random.nextInt(6)] : new Field[1]; for (int i = 0; i < facetFields.length; i++) { - facetFields[i] = newField("facet", "", StringField.TYPE_UNSTORED); + facetFields[i] = newField("facet", "", StringField.TYPE); doc.add(facetFields[i]); docNoGroup.add(facetFields[i]); } } - Field content = newField("content", "", StringField.TYPE_UNSTORED); + Field content = newField("content", "", StringField.TYPE); doc.add(content); docNoGroup.add(content); docNoFacet.add(content); Index: lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (revision 1345508) +++ lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (working copy) @@ -1622,7 +1622,8 @@ private Document doc( String f, String v ){ Document doc = new Document(); - doc.add( new Field( f, v, TextField.TYPE_STORED)); + doc.add( new Field( f, v, TextField.TYPE)); + doc.add( new Field( f, v, StoredField.TYPE)); return doc; } @@ -1775,8 +1776,9 @@ private void addDoc(IndexWriter writer, String text) throws IOException { Document d = new Document(); - Field f = new Field(FIELD_NAME, text, TextField.TYPE_STORED); + Field f = new Field(FIELD_NAME, text, TextField.TYPE); d.add(f); + d.add(new Field(FIELD_NAME, text, StoredField.TYPE)); writer.addDocument(d); } Index: lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (revision 1345508) +++ lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java (working copy) @@ -60,7 +60,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -103,7 +103,7 @@ try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -174,7 +174,7 @@ try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); @@ -217,7 +217,8 @@ try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectors(true); document.add(new Field(FIELD, TEXT, customType)); @@ -256,7 +257,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectors(true); Index: lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (revision 1345508) +++ lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java (working copy) @@ -93,7 +93,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, null)); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, new OverlappingTokenStream(), customType)); @@ -137,7 +137,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, null)); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); @@ -182,7 +182,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, null)); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, new OverlappingTokenStream(), customType)); @@ -227,7 +227,7 @@ newIndexWriterConfig(TEST_VERSION_CURRENT, null)); try { final Document document = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); document.add(new Field(FIELD, new OverlappingTokenStream(), customType)); Index: lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (revision 1345508) +++ lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (working copy) @@ -355,7 +355,8 @@ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzer).setOpenMode(OpenMode.CREATE)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); @@ -373,7 +374,8 @@ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzerK).setOpenMode(OpenMode.CREATE)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); Index: lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java =================================================================== --- lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (revision 1345508) +++ lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java (working copy) @@ -139,7 +139,7 @@ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzerW).setOpenMode(OpenMode.CREATE)); Document doc = new Document(); - FieldType customType = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType = new FieldType(TextField.TYPE); customType.setStoreTermVectors(true); customType.setStoreTermVectorOffsets(true); customType.setStoreTermVectorPositions(true); Index: lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java =================================================================== --- lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java (revision 1345508) +++ lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java (working copy) @@ -126,7 +126,8 @@ @Override public void stringField(FieldInfo fieldInfo, String value) throws IOException { - FieldType ft = new FieldType(TextField.TYPE_STORED); + FieldType ft = new FieldType(TextField.TYPE); + ft.setStored(true); ft.setStoreTermVectors(fieldInfo.hasVectors()); fields.add(new Field(fieldInfo.name, value, ft)); } Index: lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (revision 1345508) +++ lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (working copy) @@ -26,6 +26,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; @@ -65,7 +66,8 @@ private void addDoc(RandomIndexWriter writer, String text) throws IOException { Document doc = new Document(); - doc.add(newField("text", text, TextField.TYPE_STORED)); + doc.add(newField("text", text, TextField.TYPE)); + doc.add(newField("text", text, StoredField.TYPE)); writer.addDocument(doc); } Index: lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (revision 1345508) +++ lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (working copy) @@ -20,6 +20,7 @@ import java.util.HashSet; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.IndexReader; @@ -58,7 +59,8 @@ 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(newField(fieldName, "" + term, StringField.TYPE)); + doc.add(newField(fieldName, "" + term, StoredField.TYPE)); w.addDocument(doc); } IndexReader reader = new SlowCompositeReaderWrapper(w.getReader()); @@ -92,7 +94,8 @@ Directory rd1 = newDirectory(); RandomIndexWriter w1 = new RandomIndexWriter(random(), rd1); Document doc = new Document(); - doc.add(newField(fieldName, "content1", StringField.TYPE_STORED)); + doc.add(newField(fieldName, "content1", StringField.TYPE)); + doc.add(newField(fieldName, "content1", StoredField.TYPE)); w1.addDocument(doc); IndexReader reader1 = w1.getReader(); w1.close(); @@ -101,7 +104,8 @@ Directory rd2 = newDirectory(); RandomIndexWriter w2 = new RandomIndexWriter(random(), rd2); doc = new Document(); - doc.add(newField(fieldName, "content2", StringField.TYPE_STORED)); + doc.add(newField(fieldName, "content2", StringField.TYPE)); + doc.add(newField(fieldName, "content2", StoredField.TYPE)); w2.addDocument(doc); IndexReader reader2 = w2.getReader(); w2.close(); Index: lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java (revision 1345508) +++ lucene/queries/src/test/org/apache/lucene/queries/ChainedFilterTest.java (working copy) @@ -21,6 +21,7 @@ import java.util.GregorianCalendar; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; @@ -62,9 +63,12 @@ for (int i = 0; i < MAX; i++) { Document doc = new Document(); - doc.add(newField("key", "" + (i + 1), StringField.TYPE_STORED)); - doc.add(newField("owner", (i < MAX / 2) ? "bob" : "sue", StringField.TYPE_STORED)); - doc.add(newField("date", cal.getTime().toString(), StringField.TYPE_STORED)); + doc.add(newField("key", "" + (i + 1), StringField.TYPE)); + doc.add(newField("key", "" + (i + 1), StoredField.TYPE)); + doc.add(newField("owner", (i < MAX / 2) ? "bob" : "sue", StringField.TYPE)); + doc.add(newField("owner", (i < MAX / 2) ? "bob" : "sue", StoredField.TYPE)); + doc.add(newField("date", cal.getTime().toString(), StringField.TYPE)); + doc.add(newField("date", cal.getTime().toString(), StoredField.TYPE)); writer.addDocument(doc); cal.add(Calendar.DATE, 1); Index: lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (revision 1345508) +++ lucene/queries/src/test/org/apache/lucene/queries/BooleanFilterTest.java (working copy) @@ -17,9 +17,12 @@ * limitations under the License. */ +import java.io.IOException; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.AtomicReaderContext; @@ -27,19 +30,17 @@ import org.apache.lucene.index.SlowCompositeReaderWrapper; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; +import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.Filter; +import org.apache.lucene.search.QueryWrapperFilter; +import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TermRangeFilter; -import org.apache.lucene.search.DocIdSet; -import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.QueryWrapperFilter; import org.apache.lucene.store.Directory; import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.LuceneTestCase; -import java.io.IOException; - public class BooleanFilterTest extends LuceneTestCase { private Directory directory; private AtomicReader reader; @@ -69,10 +70,14 @@ private void addDoc(RandomIndexWriter writer, String accessRights, String price, String date, String inStock) throws IOException { Document doc = new Document(); - doc.add(newField("accessRights", accessRights, TextField.TYPE_STORED)); - doc.add(newField("price", price, TextField.TYPE_STORED)); - doc.add(newField("date", date, TextField.TYPE_STORED)); - doc.add(newField("inStock", inStock, TextField.TYPE_STORED)); + doc.add(newField("accessRights", accessRights, TextField.TYPE)); + doc.add(newField("accessRights", accessRights, StoredField.TYPE)); + doc.add(newField("price", price, TextField.TYPE)); + doc.add(newField("price", price, StoredField.TYPE)); + doc.add(newField("date", date, TextField.TYPE)); + doc.add(newField("date", date, StoredField.TYPE)); + doc.add(newField("inStock", inStock, TextField.TYPE)); + doc.add(newField("inStock", inStock, StoredField.TYPE)); writer.addDocument(doc); } Index: lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java =================================================================== --- lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java (revision 1345508) +++ lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java (working copy) @@ -128,14 +128,15 @@ Field f; int scoreAndID = i + 1; - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setTokenized(false); customType.setOmitNorms(true); f = newField(ID_FIELD, id2String(scoreAndID), customType); // for debug purposes d.add(f); - FieldType customType2 = new FieldType(TextField.TYPE_UNSTORED); + FieldType customType2 = new FieldType(TextField.TYPE); customType2.setOmitNorms(true); f = newField(TEXT_FIELD, "text of doc" + scoreAndID + textLine(i), customType2); // for regular search d.add(f); Index: lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java =================================================================== --- lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (revision 1345508) +++ lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java (working copy) @@ -17,11 +17,20 @@ * limitations under the License. */ +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.Date; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.LongField; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; @@ -32,14 +41,6 @@ import org.apache.lucene.store.FSDirectory; import org.apache.lucene.util.Version; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; -import java.util.Date; - /** Index all text files under a directory. *

* This is a command-line application demonstrating simple Lucene indexing. @@ -174,9 +175,15 @@ // field that is indexed (i.e. searchable), but don't tokenize // the field into separate words and don't index term frequency // or positional information: - Field pathField = new Field("path", file.getPath(), StringField.TYPE_STORED); + Field pathField = new Field("path", file.getPath(), StringField.TYPE); doc.add(pathField); + // Also store the field so when we retrieve the + // Document after searching the path field is + // available: + Field storedPathField = new Field("path", file.getPath(), StoredField.TYPE); + doc.add(storedPathField); + // Add the last modified date of the file a field named "modified". // Use a LongField that is indexed (i.e. efficiently filterable with // NumericRangeFilter). This indexes to milli-second resolution, which Index: lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java =================================================================== --- lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (revision 1345508) +++ lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (working copy) @@ -134,7 +134,8 @@ InputStream dataIn = getServletContext().getResourceAsStream("/WEB-INF/data.tsv"); BufferedReader br = new BufferedReader(new InputStreamReader(dataIn)); String line = br.readLine(); - final FieldType textNoNorms = new FieldType(TextField.TYPE_STORED); + final FieldType textNoNorms = new FieldType(TextField.TYPE); + textNoNorms.setStored(true); textNoNorms.setOmitNorms(true); while (line != null) { line = line.trim(); Index: lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java =================================================================== --- lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java (revision 1345508) +++ lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java (working copy) @@ -17,23 +17,24 @@ package org.apache.lucene.spatial.prefix; -import com.spatial4j.core.context.SpatialContext; -import com.spatial4j.core.context.simple.SimpleSpatialContext; -import com.spatial4j.core.query.SpatialArgsParser; -import com.spatial4j.core.shape.Shape; -import com.spatial4j.core.shape.simple.PointImpl; +import java.io.IOException; +import java.util.Arrays; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.spatial.SimpleSpatialFieldInfo; import org.apache.lucene.spatial.SpatialTestCase; import org.apache.lucene.spatial.prefix.tree.QuadPrefixTree; import org.junit.Test; +import com.spatial4j.core.context.SpatialContext; +import com.spatial4j.core.context.simple.SimpleSpatialContext; +import com.spatial4j.core.query.SpatialArgsParser; +import com.spatial4j.core.shape.Shape; +import com.spatial4j.core.shape.simple.PointImpl; -import java.io.IOException; -import java.util.Arrays; - public class TestTermQueryPrefixGridStrategy extends SpatialTestCase { @Test @@ -45,7 +46,8 @@ Shape point = new PointImpl(-118.243680, 34.052230); Document losAngeles = new Document(); - losAngeles.add(new Field("name", "Los Angeles", StringField.TYPE_STORED)); + losAngeles.add(new Field("name", "Los Angeles", StringField.TYPE)); + losAngeles.add(new Field("name", "Los Angeles", StoredField.TYPE)); losAngeles.add(prefixGridStrategy.createField(fieldInfo, point, true, true)); addDocumentsAndCommit(Arrays.asList(losAngeles)); Index: lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java =================================================================== --- lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (revision 1345508) +++ lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java (working copy) @@ -18,22 +18,23 @@ package org.apache.lucene.spatial; +import java.io.IOException; +import java.io.InputStream; +import java.util.*; +import java.util.logging.Logger; + +import org.apache.lucene.document.Document; +import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; +import org.apache.lucene.document.StringField; +import org.apache.lucene.index.IndexableField; +import org.junit.Assert; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.io.sample.SampleData; import com.spatial4j.core.io.sample.SampleDataReader; import com.spatial4j.core.query.SpatialArgsParser; import com.spatial4j.core.shape.Shape; -import org.junit.Assert; -import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; -import org.apache.lucene.document.StringField; -import org.apache.lucene.index.IndexableField; -import java.io.IOException; -import java.io.InputStream; -import java.util.*; -import java.util.logging.Logger; - public abstract class StrategyTestCase extends SpatialTestCase { public static final String DATA_STATES_POLY = "states-poly.txt"; @@ -76,8 +77,10 @@ while (sampleData.hasNext()) { SampleData data = sampleData.next(); Document document = new Document(); - document.add(new Field("id", data.id, StringField.TYPE_STORED)); - document.add(new Field("name", data.name, StringField.TYPE_STORED)); + document.add(new Field("id", data.id, StringField.TYPE)); + document.add(new Field("id", data.id, StoredField.TYPE)); + document.add(new Field("name", data.name, StringField.TYPE)); + document.add(new Field("name", data.name, StoredField.TYPE)); Shape shape = ctx.readShape(data.shape); for (IndexableField f : strategy.createFields(fieldInfo, shape, true, storeShape)) { if( f != null ) { // null if incompatibleGeometry && ignore Index: lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java =================================================================== --- lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (revision 1345508) +++ lucene/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (working copy) @@ -126,8 +126,8 @@ IndexWriter writer = new IndexWriter(ramdir, new IndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setCodec(_TestUtil.alwaysPostingsFormat(new Lucene40PostingsFormat()))); Document doc = new Document(); - Field field1 = newField("foo", fooField.toString(), TextField.TYPE_UNSTORED); - Field field2 = newField("term", termField.toString(), TextField.TYPE_UNSTORED); + Field field1 = newField("foo", fooField.toString(), TextField.TYPE); + Field field2 = newField("term", termField.toString(), TextField.TYPE); doc.add(field1); doc.add(field2); writer.addDocument(doc); Index: lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java =================================================================== --- lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (revision 1345508) +++ lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -54,23 +55,28 @@ Document doc; doc = new Document(); - doc.add(newField("aaa", "foo", TextField.TYPE_STORED)); + doc.add(newField("aaa", "foo", TextField.TYPE)); + doc.add(newField("aaa", "foo", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("aaa", "foo", TextField.TYPE_STORED)); + doc.add(newField("aaa", "foo", TextField.TYPE)); + doc.add(newField("aaa", "foo", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("contents", "Tom", TextField.TYPE_STORED)); + doc.add(newField("contents", "Tom", TextField.TYPE)); + doc.add(newField("contents", "Tom", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("contents", "Jerry", TextField.TYPE_STORED)); + doc.add(newField("contents", "Jerry", TextField.TYPE)); + doc.add(newField("contents", "Jerry", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("zzz", "bar", TextField.TYPE_STORED)); + doc.add(newField("zzz", "bar", TextField.TYPE)); + doc.add(newField("zzz", "bar", StoredField.TYPE)); writer.addDocument(doc); writer.forceMerge(1); Index: lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java =================================================================== --- lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (revision 1345508) +++ lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java (working copy) @@ -28,6 +28,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; @@ -59,31 +60,39 @@ for (int i = 0; i < 1000; i++) { Document doc = new Document(); - doc.add(newField("field1", English.intToEnglish(i), TextField.TYPE_STORED)); - doc.add(newField("field2", English.intToEnglish(i + 1), TextField.TYPE_STORED)); // + word thousand - doc.add(newField("field3", "fvei" + (i % 2 == 0 ? " five" : ""), TextField.TYPE_STORED)); // + word thousand + doc.add(newField("field1", English.intToEnglish(i), TextField.TYPE)); + doc.add(newField("field1", English.intToEnglish(i), StoredField.TYPE)); + doc.add(newField("field2", English.intToEnglish(i + 1), TextField.TYPE)); // + word thousand + doc.add(newField("field2", English.intToEnglish(i + 1), StoredField.TYPE)); // + word thousand + doc.add(newField("field3", "fvei" + (i % 2 == 0 ? " five" : ""), TextField.TYPE)); // + word thousand + doc.add(newField("field3", "fvei" + (i % 2 == 0 ? " five" : ""), StoredField.TYPE)); // + word thousand writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("field1", "eight", TextField.TYPE_STORED)); // "eight" in + doc.add(newField("field1", "eight", TextField.TYPE)); // "eight" in // the index // twice + doc.add(newField("field1", "eight", StoredField.TYPE)); // "eight" in + // the index + // twice writer.addDocument(doc); } { Document doc = new Document(); - doc - .add(newField("field1", "twenty-one twenty-one", - TextField.TYPE_STORED)); // "twenty-one" in the index thrice + doc.add(newField("field1", "twenty-one twenty-one", + TextField.TYPE)); // "twenty-one" in the index thrice + doc.add(newField("field1", "twenty-one twenty-one", + StoredField.TYPE)); // "twenty-one" in the index thrice writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("field1", "twenty", TextField.TYPE_STORED)); // "twenty" + doc.add(newField("field1", "twenty", TextField.TYPE)); // "twenty" // in the // index // twice + doc.add(newField("field1", "twenty", StoredField.TYPE)); writer.addDocument(doc); } Index: lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java =================================================================== --- lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java (revision 1345508) +++ lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java (working copy) @@ -44,23 +44,23 @@ for (int i = 900; i < 1112; i++) { Document doc = new Document(); String num = English.intToEnglish(i).replaceAll("[-]", " ").replaceAll("[,]", ""); - doc.add(newField("numbers", num, TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", num, TextField.TYPE)); writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("numbers", "thou hast sand betwixt thy toes", TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", "thou hast sand betwixt thy toes", TextField.TYPE)); writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("numbers", "hundredeight eightyeight yeight", TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", "hundredeight eightyeight yeight", TextField.TYPE)); writer.addDocument(doc); } { Document doc = new Document(); - doc.add(newField("numbers", "tres y cinco", TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", "tres y cinco", TextField.TYPE)); writer.addDocument(doc); } Index: lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java =================================================================== --- lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java (revision 1345508) +++ lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java (working copy) @@ -39,7 +39,7 @@ String[] termsToAdd = { "metanoia", "metanoian", "metanoiai", "metanoias", "metanoi𐑍" }; for (int i = 0; i < termsToAdd.length; i++) { Document doc = new Document(); - doc.add(newField("repentance", termsToAdd[i], TextField.TYPE_UNSTORED)); + doc.add(newField("repentance", termsToAdd[i], TextField.TYPE)); writer.addDocument(doc); } @@ -68,7 +68,7 @@ for (int i = 0; i < 20; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE)); writer.addDocument(doc); } @@ -108,7 +108,7 @@ // add some more documents for (int i = 1000; i < 1100; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE)); writer.addDocument(doc); } @@ -132,13 +132,13 @@ new MockAnalyzer(random(), MockTokenizer.SIMPLE, true)); Document doc = new Document(); - doc.add(newField("text", "foobar", TextField.TYPE_UNSTORED)); + doc.add(newField("text", "foobar", TextField.TYPE)); writer.addDocument(doc); - doc.add(newField("text", "foobar", TextField.TYPE_UNSTORED)); + doc.add(newField("text", "foobar", TextField.TYPE)); writer.addDocument(doc); - doc.add(newField("text", "foobaz", TextField.TYPE_UNSTORED)); + doc.add(newField("text", "foobaz", TextField.TYPE)); writer.addDocument(doc); - doc.add(newField("text", "fobar", TextField.TYPE_UNSTORED)); + doc.add(newField("text", "fobar", TextField.TYPE)); writer.addDocument(doc); IndexReader ir = writer.getReader(); @@ -200,7 +200,7 @@ for (int i = 0; i < 20; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE)); writer.addDocument(doc); } @@ -224,7 +224,7 @@ for (int i = 0; i < 20; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE)); writer.addDocument(doc); } @@ -249,7 +249,7 @@ for (int i = 0; i < 20; i++) { Document doc = new Document(); - doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE_UNSTORED)); + doc.add(newField("numbers", English.intToEnglish(i), TextField.TYPE)); writer.addDocument(doc); } Index: lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java =================================================================== --- lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (revision 1345508) +++ lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java (working copy) @@ -26,15 +26,16 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; -import org.apache.lucene.index.FieldInfo.IndexOptions; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.AtomicReader; import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.FieldInfo.IndexOptions; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.Term; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.Terms; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.BooleanClause; @@ -575,8 +576,9 @@ Document doc = new Document(); // the word field is never queried on... its indexed so it can be quickly // checked for rebuild (and stored for retrieval). Doesn't need norms or TF/pos - Field f = new Field(F_WORD, text, StringField.TYPE_STORED); + Field f = new Field(F_WORD, text, StringField.TYPE); doc.add(f); // orig term + doc.add(new StoredField(F_WORD, text)); addGram(text, doc, ng1, ng2); return doc; } @@ -588,7 +590,7 @@ String end = null; for (int i = 0; i < len - ng + 1; i++) { String gram = text.substring(i, i + ng); - FieldType ft = new FieldType(StringField.TYPE_UNSTORED); + FieldType ft = new FieldType(StringField.TYPE); ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS); Field ngramField = new Field(key, gram, ft); // spellchecker does not use positional queries, but we want freqs Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (revision 1345508) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (working copy) @@ -28,6 +28,7 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -62,15 +63,18 @@ Document doc; doc = new Document(); - doc.add(new Field("content", "please divide this sentence into shingles", TextField.TYPE_STORED)); + doc.add(new Field("content", "please divide this sentence into shingles", TextField.TYPE)); + doc.add(new Field("content", "please divide this sentence into shingles", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("content", "just another test sentence", TextField.TYPE_STORED)); + doc.add(new Field("content", "just another test sentence", TextField.TYPE)); + doc.add(new Field("content", "just another test sentence", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("content", "a sentence which contains no test", TextField.TYPE_STORED)); + doc.add(new Field("content", "a sentence which contains no test", TextField.TYPE)); + doc.add(new Field("content", "a sentence which contains no test", StoredField.TYPE)); writer.addDocument(doc); writer.close(); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (revision 1345508) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (working copy) @@ -24,6 +24,7 @@ import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; @@ -53,8 +54,10 @@ TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))); Document doc = new Document(); - doc.add(new Field("partnum", "Q36", StringField.TYPE_STORED)); - doc.add(new Field("description", "Illidium Space Modulator", TextField.TYPE_STORED)); + doc.add(new Field("partnum", "Q36", StringField.TYPE)); + doc.add(new Field("partnum", "Q36", StoredField.TYPE)); + doc.add(new Field("description", "Illidium Space Modulator", TextField.TYPE)); + doc.add(new Field("description", "Illidium Space Modulator", StoredField.TYPE)); writer.addDocument(doc); writer.close(); @@ -89,10 +92,12 @@ RAMDirectory dir = new RAMDirectory(); IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new KeywordAnalyzer())); Document doc = new Document(); - doc.add(new Field("partnum", "Q36", TextField.TYPE_STORED)); + doc.add(new Field("partnum", "Q36", TextField.TYPE)); + doc.add(new Field("partnum", "Q36", StoredField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(new Field("partnum", "Q37", TextField.TYPE_STORED)); + doc.add(new Field("partnum", "Q37", TextField.TYPE)); + doc.add(new Field("partnum", "Q37", StoredField.TYPE)); writer.addDocument(doc); writer.close(); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (revision 1345508) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (working copy) @@ -58,7 +58,7 @@ for(int i=0;i<10000;i++) b.append(" a"); b.append(" x"); - doc.add(newField("field", b.toString(), TextField.TYPE_UNSTORED)); + doc.add(newField("field", b.toString(), TextField.TYPE)); writer.addDocument(doc); writer.close(); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (revision 1345508) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (working copy) @@ -93,7 +93,7 @@ TokenStream tokenStream = analyzer.tokenStream("field", new StringReader("abcd ")); TeeSinkTokenFilter tee = new TeeSinkTokenFilter(tokenStream); TokenStream sink = tee.newSinkTokenStream(); - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setStoreTermVectors(true); ft.setStoreTermVectorOffsets(true); ft.setStoreTermVectorPositions(true); Index: lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java =================================================================== --- lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (revision 1345508) +++ lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (working copy) @@ -16,9 +16,14 @@ * limitations under the License. */ +import java.io.StringReader; +import java.util.Arrays; +import java.util.Collections; + import org.apache.lucene.analysis.*; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -26,10 +31,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.store.RAMDirectory; -import java.io.StringReader; -import java.util.Arrays; -import java.util.Collections; - public class QueryAutoStopWordAnalyzerTest extends BaseTokenStreamTestCase { String variedFieldValues[] = {"the", "quick", "brown", "fox", "jumped", "over", "the", "lazy", "boring", "dog"}; String repetitiveFieldValues[] = {"boring", "boring", "vaguelyboring"}; @@ -49,8 +50,10 @@ Document doc = new Document(); String variedFieldValue = variedFieldValues[i % variedFieldValues.length]; String repetitiveFieldValue = repetitiveFieldValues[i % repetitiveFieldValues.length]; - doc.add(new Field("variedField", variedFieldValue, TextField.TYPE_STORED)); - doc.add(new Field("repetitiveField", repetitiveFieldValue, TextField.TYPE_STORED)); + doc.add(new Field("variedField", variedFieldValue, TextField.TYPE)); + doc.add(new Field("variedField", variedFieldValue, StoredField.TYPE)); + doc.add(new Field("repetitiveField", repetitiveFieldValue, TextField.TYPE)); + doc.add(new Field("repetitiveField", repetitiveFieldValue, StoredField.TYPE)); writer.addDocument(doc); } writer.close(); Index: lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java =================================================================== --- lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (revision 1345508) +++ lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java (working copy) @@ -17,10 +17,13 @@ * limitations under the License. */ +import java.io.StringReader; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriter; @@ -35,8 +38,6 @@ import org.junit.Before; import org.junit.Test; -import java.io.StringReader; - /** * Testcase for {@link UIMABaseAnalyzer} */ @@ -69,9 +70,11 @@ // add the first doc Document doc = new Document(); String dummyTitle = "this is a dummy title "; - doc.add(new Field("title", dummyTitle, TextField.TYPE_STORED)); + doc.add(new Field("title", dummyTitle, TextField.TYPE)); + doc.add(new Field("title", dummyTitle, StoredField.TYPE)); String dummyContent = "there is some content written here"; - doc.add(new Field("contents", dummyContent, TextField.TYPE_STORED)); + doc.add(new Field("contents", dummyContent, TextField.TYPE)); + doc.add(new Field("contents", dummyContent, StoredField.TYPE)); writer.addDocument(doc, analyzer); writer.commit(); @@ -90,9 +93,11 @@ // add a second doc doc = new Document(); String dogmasTitle = "dogmas"; - doc.add(new Field("title", dogmasTitle, TextField.TYPE_STORED)); + doc.add(new Field("title", dogmasTitle, TextField.TYPE)); + doc.add(new Field("title", dogmasTitle, StoredField.TYPE)); String dogmasContents = "white men can't jump"; - doc.add(new Field("contents", dogmasContents, TextField.TYPE_STORED)); + doc.add(new Field("contents", dogmasContents, TextField.TYPE)); + doc.add(new Field("contents", dogmasContents, StoredField.TYPE)); writer.addDocument(doc, analyzer); writer.commit(); Index: lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java =================================================================== --- lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (revision 1345508) +++ lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java (working copy) @@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriterConfig.OpenMode; @@ -104,15 +105,19 @@ StringBuilder sb = new StringBuilder(); Document doc = new Document(); String id = format.format(n); - doc.add(newField("id", id, StringField.TYPE_STORED)); - doc.add(newField("indexname", indexName, StringField.TYPE_STORED)); + doc.add(newField("id", id, StringField.TYPE)); + doc.add(newField("id", id, StoredField.TYPE)); + doc.add(newField("indexname", indexName, StringField.TYPE)); + doc.add(newField("indexname", indexName, StoredField.TYPE)); sb.append("a"); sb.append(n); - doc.add(newField("field1", sb.toString(), TextField.TYPE_STORED)); + doc.add(newField("field1", sb.toString(), TextField.TYPE)); + doc.add(newField("field1", sb.toString(), StoredField.TYPE)); sb.append(" b"); sb.append(n); for (int i = 1; i < numFields; i++) { - doc.add(newField("field" + (i + 1), sb.toString(), TextField.TYPE_STORED)); + doc.add(newField("field" + (i + 1), sb.toString(), TextField.TYPE)); + doc.add(newField("field" + (i + 1), sb.toString(), StoredField.TYPE)); } return doc; } Index: lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java =================================================================== --- lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (revision 1345508) +++ lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java (working copy) @@ -18,6 +18,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.store.Directory; @@ -37,8 +38,10 @@ Document doc; for (int i = 0; i < NUM_DOCS; i++) { doc = new Document(); - doc.add(newField("id", i + "", StringField.TYPE_STORED)); - doc.add(newField("f", i + " " + i, TextField.TYPE_STORED)); + doc.add(newField("id", i + "", StringField.TYPE)); + doc.add(newField("id", i + "", StoredField.TYPE)); + doc.add(newField("f", i + " " + i, TextField.TYPE)); + doc.add(newField("f", i + " " + i, StoredField.TYPE)); w.addDocument(doc); if (i%3==0) w.commit(); } Index: lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java =================================================================== --- lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (revision 1345508) +++ lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -206,9 +207,11 @@ Document doc = new Document(); String content = getContent(i); - doc.add(newField(rnd, "FIELD_1", content, TextField.TYPE_STORED)); + doc.add(newField(rnd, "FIELD_1", content, TextField.TYPE)); + doc.add(newField(rnd, "FIELD_1", content, StoredField.TYPE)); //add a different field - doc.add(newField(rnd, "different_field", "diff", TextField.TYPE_STORED)); + doc.add(newField(rnd, "different_field", "diff", TextField.TYPE)); + doc.add(newField(rnd, "different_field", "diff", StoredField.TYPE)); writer.addDocument(doc); } @@ -216,7 +219,8 @@ //highest freq terms for a specific field. for (int i = 1; i <= 10; i++) { Document doc = new Document(); - doc.add(newField(rnd, "different_field", "diff", TextField.TYPE_STORED)); + doc.add(newField(rnd, "different_field", "diff", TextField.TYPE)); + doc.add(newField(rnd, "different_field", "diff", StoredField.TYPE)); writer.addDocument(doc); } // add some docs where tf < df so we can see if sorting works @@ -227,7 +231,8 @@ for (int i = 0; i < highTF; i++) { content += "highTF "; } - doc.add(newField(rnd, "FIELD_1", content, TextField.TYPE_STORED)); + doc.add(newField(rnd, "FIELD_1", content, TextField.TYPE)); + doc.add(newField(rnd, "FIELD_1", content, StoredField.TYPE)); writer.addDocument(doc); // highTF medium df =5 int medium_df = 5; @@ -238,7 +243,8 @@ for (int j = 0; j < tf; j++) { newcontent += "highTFmedDF "; } - newdoc.add(newField(rnd, "FIELD_1", newcontent, TextField.TYPE_STORED)); + newdoc.add(newField(rnd, "FIELD_1", newcontent, TextField.TYPE)); + newdoc.add(newField(rnd, "FIELD_1", newcontent, StoredField.TYPE)); writer.addDocument(newdoc); } // add a doc with high tf in field different_field @@ -248,7 +254,8 @@ for (int i = 0; i < targetTF; i++) { content += "TF150 "; } - doc.add(newField(rnd, "different_field", content, TextField.TYPE_STORED)); + doc.add(newField(rnd, "different_field", content, TextField.TYPE)); + doc.add(newField(rnd, "different_field", content, StoredField.TYPE)); writer.addDocument(doc); writer.close(); Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java (revision 1345508) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java (working copy) @@ -93,7 +93,7 @@ RandomIndexWriter writer = new RandomIndexWriter(random(), dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.KEYWORD, false)).setMergePolicy(newLogMergePolicy())); Document doc = new Document(); - Field field = newField("field", "", TextField.TYPE_UNSTORED); + Field field = newField("field", "", TextField.TYPE); doc.add(field); for (int i = 0; i < terms; i++) { Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (revision 1345508) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (working copy) @@ -17,9 +17,13 @@ * limitations under the License. */ +import java.io.IOException; +import java.util.HashSet; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; @@ -31,9 +35,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; -import java.io.IOException; -import java.util.HashSet; - public class FuzzyLikeThisQueryTest extends LuceneTestCase { private Directory directory; private IndexSearcher searcher; @@ -69,8 +70,10 @@ private void addDoc(RandomIndexWriter writer, String name, String id) throws IOException { Document doc = new Document(); - doc.add(newField("name", name, TextField.TYPE_STORED)); - doc.add(newField("id", id, TextField.TYPE_STORED)); + doc.add(newField("name", name, TextField.TYPE)); + doc.add(newField("name", name, StoredField.TYPE)); + doc.add(newField("id", id, TextField.TYPE)); + doc.add(newField("id", id, StoredField.TYPE)); writer.addDocument(doc); } Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (revision 1345508) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (working copy) @@ -6,6 +6,7 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.RandomIndexWriter; @@ -58,8 +59,9 @@ for (int i = 0; i < numDocs; i++) { Document doc = new Document(); String value = _TestUtil.randomUnicodeString(random()); - Field field = newField("field", value, StringField.TYPE_STORED); + Field field = newField("field", value, StringField.TYPE); doc.add(field); + doc.add(newField("field", value, StoredField.TYPE)); iw.addDocument(doc); } splitDoc = _TestUtil.randomUnicodeString(random()); Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (revision 1345508) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.*; @@ -76,9 +77,12 @@ private void addDoc(RandomIndexWriter writer, String url, String text, String date) throws IOException { Document doc = new Document(); - doc.add(newField(KEY_FIELD, url, StringField.TYPE_STORED)); - doc.add(newField("text", text, TextField.TYPE_STORED)); - doc.add(newField("date", date, TextField.TYPE_STORED)); + doc.add(newField(KEY_FIELD, url, StringField.TYPE)); + doc.add(newField(KEY_FIELD, url, StoredField.TYPE)); + doc.add(newField("text", text, TextField.TYPE)); + doc.add(newField("text", text, StoredField.TYPE)); + doc.add(newField("date", date, TextField.TYPE)); + doc.add(newField("date", date, StoredField.TYPE)); writer.addDocument(doc); } Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java (revision 1345508) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java (working copy) @@ -17,12 +17,13 @@ * limitations under the License. */ +import java.io.IOException; +import java.util.Arrays; import java.util.List; -import java.util.Arrays; -import java.io.IOException; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiReader; @@ -462,7 +463,8 @@ private void addDoc(String text, RandomIndexWriter writer) throws IOException { Document doc = new Document(); - doc.add(newField("field", text, TextField.TYPE_STORED)); + doc.add(newField("field", text, TextField.TYPE)); + doc.add(newField("field", text, StoredField.TYPE)); writer.addDocument(doc); } } Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (revision 1345508) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (working copy) @@ -47,7 +47,7 @@ directory = newDirectory(); RandomIndexWriter writer = new RandomIndexWriter(random(), directory); Document doc = new Document(); - doc.add(newField(FN, "the quick brown fox jumps over the lazy dog", TextField.TYPE_UNSTORED)); + doc.add(newField(FN, "the quick brown fox jumps over the lazy dog", TextField.TYPE)); writer.addDocument(doc); reader = writer.getReader(); writer.close(); Index: lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java =================================================================== --- lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (revision 1345508) +++ lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (working copy) @@ -65,10 +65,10 @@ // Field.Store.NO, Field.Index.ANALYZED)); // writer.addDocument(doc); // doc = new Document(); - doc.add(newField("field", "auto update", TextField.TYPE_UNSTORED)); + doc.add(newField("field", "auto update", TextField.TYPE)); writer.addDocument(doc); doc = new Document(); - doc.add(newField("field", "first auto update", TextField.TYPE_UNSTORED)); + doc.add(newField("field", "first auto update", TextField.TYPE)); writer.addDocument(doc); writer.forceMerge(1); writer.close(); Index: lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java (revision 1345508) +++ lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java (working copy) @@ -165,7 +165,8 @@ title = new StringField("title", ""); doc.add(title); - FieldType ft = new FieldType(TextField.TYPE_STORED); + FieldType ft = new FieldType(TextField.TYPE); + ft.setStored(true); ft.setStoreTermVectors(true); ft.setStoreTermVectorOffsets(true); ft.setStoreTermVectorPositions(true); @@ -176,10 +177,12 @@ body = new Field("body", "", ft); doc.add(body); - id = new Field("docid", "", StringField.TYPE_STORED); + FieldType storedStringType = new FieldType(StringField.TYPE); + storedStringType.setStored(true); + id = new Field("docid", "", storedStringType); doc.add(id); - date = new Field("date", "", StringField.TYPE_STORED); + date = new Field("date", "", storedStringType); doc.add(date); if (useDocValues) { Index: lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java (revision 1345508) +++ lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java (working copy) @@ -27,6 +27,7 @@ import org.apache.lucene.document.Document; 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.DirectoryReader; @@ -85,8 +86,10 @@ IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE_STORED)); - doc.add(new Field("body", "body", StringField.TYPE_STORED)); + doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE)); + doc.add(new StoredField("content", "\u0633\u0627\u0628")); + doc.add(new Field("body", "body", StringField.TYPE)); + doc.add(new StoredField("body", "body")); writer.addDocument(doc); writer.close(); IndexReader reader = DirectoryReader.open(dir); @@ -122,7 +125,8 @@ // orders the U+0698 character before the U+0633 character, so the single // index Term below should NOT be returned by a TermRangeQuery with a Farsi // Collator (or an Arabic one for the case when Farsi is not supported). - doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE_STORED)); + doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE)); + doc.add(new StoredField("content", "\u0633\u0627\u0628")); writer.addDocument(doc); writer.close(); IndexReader reader = DirectoryReader.open(dir); @@ -146,8 +150,10 @@ IndexWriter writer = new IndexWriter(farsiIndex, new IndexWriterConfig( TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE_STORED)); - doc.add(new Field("body", "body", StringField.TYPE_STORED)); + doc.add(new Field("content", "\u0633\u0627\u0628", TextField.TYPE)); + doc.add(new StoredField("content", "\u0633\u0627\u0628")); + doc.add(new Field("body", "body", StringField.TYPE)); + doc.add(new StoredField("body", "body")); writer.addDocument(doc); writer.close(); Index: lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (revision 1345508) +++ lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java (working copy) @@ -45,7 +45,8 @@ public static final String TEXT_FIELD_1_KEY = "textField1"; public static Field textField1; static { - customType = new FieldType(TextField.TYPE_STORED); + customType = new FieldType(TextField.TYPE); + customType.setStored(true); textField1 = new Field(TEXT_FIELD_1_KEY, FIELD_1_TEXT, customType); } @@ -56,7 +57,8 @@ public static final String TEXT_FIELD_2_KEY = "textField2"; public static Field textField2; static { - customType2 = new FieldType(TextField.TYPE_STORED); + customType2 = new FieldType(TextField.TYPE); + customType2.setStored(true); customType2.setStoreTermVectors(true); customType2.setStoreTermVectorPositions(true); customType2.setStoreTermVectorOffsets(true); @@ -69,7 +71,8 @@ public static Field textField3; static { - customType3 = new FieldType(TextField.TYPE_STORED); + customType3 = new FieldType(TextField.TYPE); + customType3.setStored(true); customType3.setOmitNorms(true); textField3 = new Field(TEXT_FIELD_3_KEY, FIELD_3_TEXT, customType3); } @@ -77,8 +80,11 @@ public static final String KEYWORD_TEXT = "Keyword"; public static final String KEYWORD_FIELD_KEY = "keyField"; public static Field keyField; + public static final FieldType customTypeKey; static { - keyField = new Field(KEYWORD_FIELD_KEY, KEYWORD_TEXT, StringField.TYPE_STORED); + customTypeKey = new FieldType(StringField.TYPE); + customTypeKey.setStored(true); + keyField = new Field(KEYWORD_FIELD_KEY, KEYWORD_TEXT, customTypeKey); } public static final FieldType customType5; @@ -86,9 +92,10 @@ public static final String NO_NORMS_KEY = "omitNorms"; public static Field noNormsField; static { - customType5 = new FieldType(TextField.TYPE_STORED); + customType5 = new FieldType(TextField.TYPE); customType5.setOmitNorms(true); customType5.setTokenized(false); + customType5.setStored(true); noNormsField = new Field(NO_NORMS_KEY, NO_NORMS_TEXT, customType5); } @@ -97,7 +104,8 @@ public static final String NO_TF_KEY = "omitTermFreqAndPositions"; public static Field noTFField; static { - customType6 = new FieldType(TextField.TYPE_STORED); + customType6 = new FieldType(TextField.TYPE); + customType6.setStored(true); customType6.setIndexOptions(IndexOptions.DOCS_ONLY); noTFField = new Field(NO_TF_KEY, NO_TF_TEXT, customType6); } @@ -115,14 +123,14 @@ public static final String UNSTORED_1_FIELD_TEXT = "unstored field text"; public static final String UNSTORED_FIELD_1_KEY = "unStoredField1"; - public static Field unStoredField1 = new Field(UNSTORED_FIELD_1_KEY, UNSTORED_1_FIELD_TEXT, TextField.TYPE_UNSTORED); + public static Field unStoredField1 = new Field(UNSTORED_FIELD_1_KEY, UNSTORED_1_FIELD_TEXT, TextField.TYPE); public static final FieldType customType8; public static final String UNSTORED_2_FIELD_TEXT = "unstored field text"; public static final String UNSTORED_FIELD_2_KEY = "unStoredField2"; public static Field unStoredField2; static { - customType8 = new FieldType(TextField.TYPE_UNSTORED); + customType8 = new FieldType(TextField.TYPE); customType8.setStoreTermVectors(true); unStoredField2 = new Field(UNSTORED_FIELD_2_KEY, UNSTORED_2_FIELD_TEXT, customType8); } @@ -293,12 +301,14 @@ public static Document createDocument(int n, String indexName, int numFields) { StringBuilder sb = new StringBuilder(); - FieldType customType = new FieldType(TextField.TYPE_STORED); + FieldType customType = new FieldType(TextField.TYPE); + customType.setStored(true); customType.setStoreTermVectors(true); customType.setStoreTermVectorPositions(true); customType.setStoreTermVectorOffsets(true); - FieldType customType1 = new FieldType(StringField.TYPE_STORED); + FieldType customType1 = new FieldType(StringField.TYPE); + customType1.setStored(true); customType1.setStoreTermVectors(true); customType1.setStoreTermVectorPositions(true); customType1.setStoreTermVectorOffsets(true); Index: lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java =================================================================== --- lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (revision 1345508) +++ lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (working copy) @@ -29,6 +29,8 @@ 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.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; import org.apache.lucene.search.IndexSearcher; @@ -158,7 +160,8 @@ final String addedField; if (random().nextBoolean()) { addedField = "extra" + random().nextInt(40); - doc.add(newField(addedField, "a random field", TextField.TYPE_STORED)); + doc.add(newField(addedField, "a random field", TextField.TYPE)); + doc.add(newField(addedField, "a random field", StoredField.TYPE)); } else { addedField = null; } @@ -181,13 +184,14 @@ packID = packCount.getAndIncrement() + ""; } - final Field packIDField = newField("packID", packID, StringField.TYPE_STORED); + final Field packIDField = new Field("packID", packID, StringField.TYPE); final List docIDs = new ArrayList(); final SubDocs subDocs = new SubDocs(packID, docIDs); final List docsList = new ArrayList(); allSubDocs.add(subDocs); doc.add(packIDField); + doc.add(new StoredField("packID", packID)); docsList.add(_TestUtil.cloneDocument(doc)); docIDs.add(doc.get("docid")); @@ -218,7 +222,7 @@ } addDocuments(packIDTerm, docsList); } - doc.removeField("packID"); + doc.removeFields("packID"); if (random().nextInt(5) == 2) { if (VERBOSE) { Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java (revision 1345508) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java (working copy) @@ -283,7 +283,7 @@ Directory ramDir = newDirectory(); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(newField("body", "blah the footest blah", TextField.TYPE_UNSTORED)); + doc.add(newField("body", "blah the footest blah", TextField.TYPE)); iw.addDocument(doc); iw.close(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (revision 1345508) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java (working copy) @@ -322,7 +322,7 @@ Directory ramDir = newDirectory(); IndexWriter iw = new IndexWriter(ramDir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer)); Document doc = new Document(); - doc.add(newField("body", "blah the footest blah", TextField.TYPE_UNSTORED)); + doc.add(newField("body", "blah the footest blah", TextField.TYPE)); iw.addDocument(doc); iw.close(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (revision 1345508) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java (working copy) @@ -1289,7 +1289,7 @@ Directory dir = newDirectory(); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(TEST_VERSION_CURRENT, new CannedAnalyzer())); Document doc = new Document(); - doc.add(newField("field", "", TextField.TYPE_UNSTORED)); + doc.add(newField("field", "", TextField.TYPE)); w.addDocument(doc); IndexReader r = DirectoryReader.open(w, true); IndexSearcher s = newSearcher(r); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (revision 1345508) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (working copy) @@ -17,12 +17,18 @@ * limitations under the License. */ +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenFilter; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.IntField; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.AtomicReaderContext; import org.apache.lucene.index.DirectoryReader; @@ -40,12 +46,7 @@ import org.junit.Assume; import org.junit.BeforeClass; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - public class TestParser extends LuceneTestCase { private static CoreParser builder; @@ -69,8 +70,10 @@ String date = line.substring(0, endOfDate).trim(); String content = line.substring(endOfDate).trim(); Document doc = new Document(); - doc.add(newField("date", date, TextField.TYPE_STORED)); - doc.add(newField("contents", content, TextField.TYPE_STORED)); + doc.add(newField("date", date, TextField.TYPE)); + doc.add(newField("date", date, StoredField.TYPE)); + doc.add(newField("contents", content, TextField.TYPE)); + doc.add(newField("contents", content, StoredField.TYPE)); doc.add(new IntField("date2", Integer.valueOf(date))); writer.addDocument(doc); line = d.readLine(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (revision 1345508) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java (working copy) @@ -17,8 +17,16 @@ * limitations under the License. */ +import java.io.IOException; +import java.util.Locale; +import java.util.Properties; +import java.util.StringTokenizer; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.TransformerException; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -31,14 +39,7 @@ import org.w3c.dom.Document; import org.xml.sax.SAXException; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.TransformerException; -import java.io.IOException; -import java.util.Locale; -import java.util.Properties; -import java.util.StringTokenizer; - /** * This class illustrates how form input (such as from a web page or Swing gui) can be * turned into Lucene queries using a choice of XSL templates for different styles of queries. @@ -129,7 +130,8 @@ String name = st.nextToken().trim(); if (st.hasMoreTokens()) { String value = st.nextToken().trim(); - result.add(newField(name, value, TextField.TYPE_STORED)); + result.add(newField(name, value, TextField.TYPE)); + result.add(newField(name, value, StoredField.TYPE)); } } return result; Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (revision 1345508) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java (working copy) @@ -22,6 +22,7 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -120,8 +121,10 @@ IndexWriter w = new IndexWriter(rd, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer)); for (int i = 0; i < docsContent.length; i++) { Document doc = new Document(); - doc.add(newField("name", docsContent[i].name, TextField.TYPE_STORED)); - doc.add(newField("id", docsContent[i].id, TextField.TYPE_STORED)); + doc.add(newField("name", docsContent[i].name, TextField.TYPE)); + doc.add(newField("name", docsContent[i].name, StoredField.TYPE)); + doc.add(newField("id", docsContent[i].id, TextField.TYPE)); + doc.add(newField("id", docsContent[i].id, StoredField.TYPE)); w.addDocument(doc); } w.close(); Index: lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java =================================================================== --- lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (revision 1345508) +++ lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java (working copy) @@ -1111,7 +1111,7 @@ Analyzer a = new MockAnalyzer(random(), MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true); IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, a)); Document doc = new Document(); - doc.add(newField("f", "the wizard of ozzy", TextField.TYPE_UNSTORED)); + doc.add(newField("f", "the wizard of ozzy", TextField.TYPE)); w.addDocument(doc); IndexReader r = DirectoryReader.open(w, true); w.close(); Index: lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java =================================================================== --- lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java (revision 1345508) +++ lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java (working copy) @@ -5,17 +5,17 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.store.Directory; - import org.apache.lucene.facet.example.ExampleUtils; import org.apache.lucene.facet.index.CategoryDocumentBuilder; import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.facet.taxonomy.TaxonomyWriter; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.store.Directory; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -69,7 +69,8 @@ // create a plain Lucene document and add some regular Lucene fields to it Document doc = new Document(); - doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], TextField.TYPE_STORED)); + doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], TextField.TYPE)); + doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], StoredField.TYPE)); doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum])); // invoke the category document builder for adding categories to the document and, Index: lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java =================================================================== --- lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java (revision 1345508) +++ lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java (working copy) @@ -6,14 +6,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.Term; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.RAMDirectory; - import org.apache.lucene.facet.example.ExampleUtils; import org.apache.lucene.facet.example.simple.SimpleUtils; import org.apache.lucene.facet.index.CategoryDocumentBuilder; @@ -22,6 +16,12 @@ import org.apache.lucene.facet.index.params.PerDimensionIndexingParams; import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.Term; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.RAMDirectory; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -172,7 +172,8 @@ // create a plain Lucene document and add some regular Lucene fields // to it Document doc = new Document(); - doc.add(new Field(SimpleUtils.TITLE, docTitles[docNum], TextField.TYPE_STORED)); + doc.add(new Field(SimpleUtils.TITLE, docTitles[docNum], TextField.TYPE)); + doc.add(new Field(SimpleUtils.TITLE, docTitles[docNum], StoredField.TYPE)); doc.add(new TextField(SimpleUtils.TEXT, docTexts[docNum])); // finally add the document to the index Index: lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java =================================================================== --- lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java (revision 1345508) +++ lucene/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java (working copy) @@ -2,12 +2,8 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.store.Directory; - import org.apache.lucene.facet.enhancements.EnhancementsDocumentBuilder; import org.apache.lucene.facet.enhancements.association.AssociationProperty; import org.apache.lucene.facet.example.ExampleUtils; @@ -17,6 +13,10 @@ import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.facet.taxonomy.TaxonomyWriter; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.store.Directory; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -93,7 +93,8 @@ // create a plain Lucene document and add some regular Lucene fields // to it Document doc = new Document(); - doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], TextField.TYPE_STORED)); + doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], TextField.TYPE)); + doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], StoredField.TYPE)); doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum])); // invoke the category document builder for adding categories to the Index: lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java =================================================================== --- lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (revision 1345508) +++ lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (working copy) @@ -14,13 +14,27 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; +import org.apache.lucene.facet.index.CategoryDocumentBuilder; +import org.apache.lucene.facet.index.params.CategoryListParams; +import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams; +import org.apache.lucene.facet.index.params.FacetIndexingParams; +import org.apache.lucene.facet.search.params.FacetRequest; +import org.apache.lucene.facet.search.params.FacetSearchParams; +import org.apache.lucene.facet.search.results.FacetResult; +import org.apache.lucene.facet.search.results.FacetResultNode; +import org.apache.lucene.facet.taxonomy.CategoryPath; +import org.apache.lucene.facet.taxonomy.TaxonomyReader; +import org.apache.lucene.facet.taxonomy.TaxonomyWriter; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.DocsEnum; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.MultiFields; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; @@ -29,24 +43,10 @@ import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; - import org.apache.lucene.util.Bits; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util._TestUtil; -import org.apache.lucene.facet.index.CategoryDocumentBuilder; -import org.apache.lucene.facet.index.params.CategoryListParams; -import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams; -import org.apache.lucene.facet.index.params.FacetIndexingParams; -import org.apache.lucene.facet.search.params.FacetRequest; -import org.apache.lucene.facet.search.params.FacetSearchParams; -import org.apache.lucene.facet.search.results.FacetResult; -import org.apache.lucene.facet.search.results.FacetResultNode; -import org.apache.lucene.facet.taxonomy.CategoryPath; -import org.apache.lucene.facet.taxonomy.TaxonomyReader; -import org.apache.lucene.facet.taxonomy.TaxonomyWriter; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -263,7 +263,8 @@ CategoryDocumentBuilder builder = new CategoryDocumentBuilder(tw, iParams); builder.setCategoryPaths(categories); builder.build(d); - d.add(new Field("content", content, TextField.TYPE_STORED)); + d.add(new Field("content", content, TextField.TYPE)); + d.add(new Field("content", content, StoredField.TYPE)); iw.addDocument(d); } Index: lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java =================================================================== --- lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java (revision 1345508) +++ lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java (working copy) @@ -7,24 +7,13 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.index.RandomIndexWriter; -import org.apache.lucene.index.Term; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; -import org.apache.lucene.store.Directory; -import org.junit.Test; - -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.facet.index.CategoryDocumentBuilder; import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams; import org.apache.lucene.facet.search.params.CountFacetRequest; +import org.apache.lucene.facet.search.params.FacetRequest.ResultMode; import org.apache.lucene.facet.search.params.FacetSearchParams; -import org.apache.lucene.facet.search.params.FacetRequest.ResultMode; import org.apache.lucene.facet.search.results.FacetResult; import org.apache.lucene.facet.search.results.FacetResultNode; import org.apache.lucene.facet.taxonomy.CategoryPath; @@ -32,6 +21,17 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; import org.apache.lucene.facet.util.PartitionsUtils; +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriterConfig.OpenMode; +import org.apache.lucene.index.RandomIndexWriter; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.TermQuery; +import org.apache.lucene.store.Directory; +import org.apache.lucene.util.LuceneTestCase; +import org.junit.Test; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -328,7 +328,8 @@ cps.add(cp); Document d = new Document(); new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d); - d.add(new Field("content", "alpha", TextField.TYPE_STORED)); + d.add(new Field("content", "alpha", TextField.TYPE)); + d.add(new Field("content", "alpha", StoredField.TYPE)); iw.addDocument(d); } Index: lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java =================================================================== --- lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (revision 1345508) +++ lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (working copy) @@ -7,7 +7,20 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; +import org.apache.lucene.facet.index.CategoryDocumentBuilder; +import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams; +import org.apache.lucene.facet.index.params.FacetIndexingParams; +import org.apache.lucene.facet.search.FacetsCollector; +import org.apache.lucene.facet.search.params.CountFacetRequest; +import org.apache.lucene.facet.search.params.FacetRequest; +import org.apache.lucene.facet.search.params.FacetSearchParams; +import org.apache.lucene.facet.taxonomy.CategoryPath; +import org.apache.lucene.facet.taxonomy.TaxonomyReader; +import org.apache.lucene.facet.taxonomy.TaxonomyWriter; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; @@ -17,23 +30,10 @@ import org.apache.lucene.search.Collector; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.MatchAllDocsQuery; +import org.apache.lucene.search.MultiCollector; import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; - -import org.apache.lucene.search.MultiCollector; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.facet.index.CategoryDocumentBuilder; -import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams; -import org.apache.lucene.facet.index.params.FacetIndexingParams; -import org.apache.lucene.facet.search.FacetsCollector; -import org.apache.lucene.facet.search.params.CountFacetRequest; -import org.apache.lucene.facet.search.params.FacetRequest; -import org.apache.lucene.facet.search.params.FacetSearchParams; -import org.apache.lucene.facet.taxonomy.CategoryPath; -import org.apache.lucene.facet.taxonomy.TaxonomyReader; -import org.apache.lucene.facet.taxonomy.TaxonomyWriter; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; /** * Licensed to the Apache Software Foundation (ASF) under one or more @@ -129,7 +129,8 @@ cps.add(cp); Document d = new Document(); new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d); - d.add(new Field("content", "alpha", TextField.TYPE_STORED)); + d.add(new Field("content", "alpha", TextField.TYPE)); + d.add(new Field("content", "alpha", StoredField.TYPE)); iw.addDocument(d); } Index: lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (revision 1345508) +++ lucene/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (working copy) @@ -184,7 +184,7 @@ // Finally creating a suitable field with stream and adding it to a // master field-list, used during the build process (see // super.build()) - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setOmitNorms(true); fieldList.add(new Field(e.getKey(), stream, ft)); } Index: lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java =================================================================== --- lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (revision 1345508) +++ lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (working copy) @@ -213,11 +213,14 @@ reader = null; - FieldType ft = new FieldType(TextField.TYPE_UNSTORED); + FieldType ft = new FieldType(TextField.TYPE); ft.setOmitNorms(true); parentStreamField = new Field(Consts.FIELD_PAYLOADS, parentStream, ft); - fullPathField = new Field(Consts.FULL, "", StringField.TYPE_STORED); + final FieldType storedStringType = new FieldType(StringField.TYPE); + storedStringType.setStored(true); + fullPathField = new Field(Consts.FULL, "", storedStringType); + this.nextID = indexWriter.maxDoc(); if (cache == null) { Index: solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java =================================================================== --- solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (revision 1345508) +++ solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (working copy) @@ -20,12 +20,12 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.Properties; - import javax.xml.parsers.ParserConfigurationException; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; +import org.apache.lucene.document.StoredField; import org.apache.lucene.document.TextField; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; @@ -124,8 +124,10 @@ new IndexWriterConfig(Version.LUCENE_40, new StandardAnalyzer(Version.LUCENE_40)) ); Document doc = new Document(); - doc.add(new Field("id", "2", TextField.TYPE_STORED)); - doc.add(new Field("name", "name2", TextField.TYPE_STORED)); + doc.add(new Field("id", "2", TextField.TYPE)); + doc.add(new Field("id", "2", StoredField.TYPE)); + doc.add(new Field("name", "name2", TextField.TYPE)); + doc.add(new Field("name", "name2", StoredField.TYPE)); iw.addDocument(doc); iw.commit(); iw.close(); Index: solr/core/src/test/org/apache/solr/search/TestSort.java =================================================================== --- solr/core/src/test/org/apache/solr/search/TestSort.java (revision 1345508) +++ solr/core/src/test/org/apache/solr/search/TestSort.java (working copy) @@ -158,8 +158,8 @@ public void testSort() throws Exception { Directory dir = new RAMDirectory(); - Field f = new Field("f", "0", StringField.TYPE_UNSTORED); - Field f2 = new Field("f2", "0", StringField.TYPE_UNSTORED); + Field f = new Field("f", "0", StringField.TYPE); + Field f2 = new Field("f2", "0", StringField.TYPE); for (int iterCnt = 0; iterCnt