You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2011/08/27 15:27:12 UTC
svn commit: r1162347 [10/15] - in /lucene/dev/trunk: lucene/ lucene/contrib/
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/
lucene/contrib/highlighter/src/java/org/apache/lucene/searc...
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressIndexing2.java Sat Aug 27 13:27:01 2011
@@ -31,7 +31,8 @@ import junit.framework.Assert;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
@@ -130,10 +131,10 @@ public class TestStressIndexing2 extends
static Term idTerm = new Term("id","");
IndexingThread[] threads;
- static Comparator<Fieldable> fieldNameComparator = new Comparator<Fieldable>() {
- public int compare(Fieldable o1, Fieldable o2) {
- return o1.name().compareTo(o2.name());
- }
+ static Comparator<IndexableField> fieldNameComparator = new Comparator<IndexableField>() {
+ public int compare(IndexableField o1, IndexableField o2) {
+ return o1.name().compareTo(o2.name());
+ }
};
// This test avoids using any extra synchronization in the multiple
@@ -249,13 +250,12 @@ public class TestStressIndexing2 extends
Iterator<Document> iter = docs.values().iterator();
while (iter.hasNext()) {
Document d = iter.next();
- ArrayList<Fieldable> fields = new ArrayList<Fieldable>();
+ ArrayList<IndexableField> fields = new ArrayList<IndexableField>();
fields.addAll(d.getFields());
// put fields in same order each time
Collections.sort(fields, fieldNameComparator);
Document d1 = new Document();
- d1.setBoost(d.getBoost());
for (int i=0; i<fields.size(); i++) {
d1.add(fields.get(i));
}
@@ -508,8 +508,8 @@ public class TestStressIndexing2 extends
}
public static void verifyEquals(Document d1, Document d2) {
- List<Fieldable> ff1 = d1.getFields();
- List<Fieldable> ff2 = d2.getFields();
+ List<IndexableField> ff1 = d1.getFields();
+ List<IndexableField> ff2 = d2.getFields();
Collections.sort(ff1, fieldNameComparator);
Collections.sort(ff2, fieldNameComparator);
@@ -517,10 +517,10 @@ public class TestStressIndexing2 extends
assertEquals(ff1 + " : " + ff2, ff1.size(), ff2.size());
for (int i=0; i<ff1.size(); i++) {
- Fieldable f1 = ff1.get(i);
- Fieldable f2 = ff2.get(i);
- if (f1.isBinary()) {
- assert(f2.isBinary());
+ IndexableField f1 = ff1.get(i);
+ IndexableField f2 = ff2.get(i);
+ if (f1.binaryValue() != null) {
+ assert(f2.binaryValue() != null);
} else {
String s1 = f1.stringValue();
String s2 = f2.stringValue();
@@ -666,42 +666,59 @@ public class TestStressIndexing2 extends
public void indexDoc() throws IOException {
Document d = new Document();
+ FieldType customType1 = new FieldType(TextField.TYPE_STORED);
+ customType1.setTokenized(false);
+ customType1.setOmitNorms(true);
+
ArrayList<Field> fields = new ArrayList<Field>();
String idString = getIdString();
- Field idField = newField("id", idString, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
+ Field idField = newField("id", idString, customType1);
fields.add(idField);
int nFields = nextInt(maxFields);
for (int i=0; i<nFields; i++) {
- Field.TermVector tvVal = Field.TermVector.NO;
+ FieldType customType = new FieldType();
switch (nextInt(4)) {
case 0:
- tvVal = Field.TermVector.NO;
break;
case 1:
- tvVal = Field.TermVector.YES;
+ customType.setStoreTermVectors(true);
break;
case 2:
- tvVal = Field.TermVector.WITH_POSITIONS;
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
break;
case 3:
- tvVal = Field.TermVector.WITH_POSITIONS_OFFSETS;
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorOffsets(true);
break;
}
switch (nextInt(4)) {
case 0:
- fields.add(newField("f" + nextInt(100), getString(1), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS, tvVal));
+ customType.setStored(true);
+ customType.setOmitNorms(true);
+ customType.setIndexed(true);
+ fields.add(newField("f" + nextInt(100), getString(1), customType));
break;
case 1:
- fields.add(newField("f" + nextInt(100), getString(0), Field.Store.NO, Field.Index.ANALYZED, tvVal));
+ customType.setIndexed(true);
+ customType.setTokenized(true);
+ fields.add(newField("f" + nextInt(100), getString(0), customType));
break;
case 2:
- fields.add(newField("f" + nextInt(100), getString(0), Field.Store.YES, Field.Index.NO, Field.TermVector.NO));
+ customType.setStored(true);
+ customType.setStoreTermVectors(false);
+ customType.setStoreTermVectorOffsets(false);
+ customType.setStoreTermVectorPositions(false);
+ fields.add(newField("f" + nextInt(100), getString(0), customType));
break;
case 3:
- fields.add(newField("f" + nextInt(100), getString(bigFieldSize), Field.Store.YES, Field.Index.ANALYZED, tvVal));
+ customType.setStored(true);
+ customType.setIndexed(true);
+ customType.setTokenized(true);
+ fields.add(newField("f" + nextInt(100), getString(bigFieldSize), customType));
break;
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestStressNRT.java Sat Aug 27 13:27:01 2011
@@ -28,7 +28,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
@@ -81,6 +82,9 @@ public class TestStressNRT extends Lucen
final int nReadThreads = _TestUtil.nextInt(random, 1, TEST_NIGHTLY ? 10 : 5);
initModel(ndocs);
+ final FieldType storedOnlyType = new FieldType();
+ storedOnlyType.setStored(true);
+
if (VERBOSE) {
System.out.println("\n");
System.out.println("TEST: commitPercent=" + commitPercent);
@@ -228,8 +232,8 @@ public class TestStressNRT extends Lucen
// add tombstone first
if (tombstones) {
Document d = new Document();
- d.add(new Field("id","-"+Integer.toString(id), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
- d.add(new Field(field, Long.toString(nextVal), Field.Store.YES, Field.Index.NO));
+ d.add(newField("id", "-"+Integer.toString(id), StringField.TYPE_STORED));
+ d.add(newField(field, Long.toString(nextVal), storedOnlyType));
writer.updateDocument(new Term("id", "-"+Integer.toString(id)), d);
}
@@ -244,8 +248,8 @@ public class TestStressNRT extends Lucen
// add tombstone first
if (tombstones) {
Document d = new Document();
- d.add(new Field("id","-"+Integer.toString(id), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
- d.add(new Field(field, Long.toString(nextVal), Field.Store.YES, Field.Index.NO));
+ d.add(newField("id", "-"+Integer.toString(id), StringField.TYPE_STORED));
+ d.add(newField(field, Long.toString(nextVal), storedOnlyType));
writer.updateDocument(new Term("id", "-"+Integer.toString(id)), d);
}
@@ -257,8 +261,8 @@ public class TestStressNRT extends Lucen
} else {
// assertU(adoc("id",Integer.toString(id), field, Long.toString(nextVal)));
Document d = new Document();
- d.add(newField("id",Integer.toString(id), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
- d.add(newField(field, Long.toString(nextVal), Field.Store.YES, Field.Index.NO));
+ d.add(newField("id", Integer.toString(id), StringField.TYPE_STORED));
+ d.add(newField(field, Long.toString(nextVal), storedOnlyType));
if (VERBOSE) {
System.out.println("TEST: " + Thread.currentThread().getName() + ": u id:" + id + " val=" + nextVal);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestSumDocFreq.java Sat Aug 27 13:27:01 2011
@@ -20,6 +20,7 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -37,8 +38,8 @@ public class TestSumDocFreq extends Luce
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
- Field field1 = newField("foo", "", Field.Index.ANALYZED);
- Field field2 = newField("bar", "", Field.Index.ANALYZED);
+ Field field1 = newField("foo", "", TextField.TYPE_UNSTORED);
+ Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
doc.add(field1);
doc.add(field2);
for (int i = 0; i < numDocs; i++) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsReader.java Sat Aug 27 13:27:01 2011
@@ -30,9 +30,9 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IOContext;
-import org.apache.lucene.store.IOContext.Context;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -100,16 +100,24 @@ public class TestTermVectorsReader exten
Document doc = new Document();
for(int i=0;i<testFields.length;i++) {
- final Field.TermVector tv;
- if (testFieldsStorePos[i] && testFieldsStoreOff[i])
- tv = Field.TermVector.WITH_POSITIONS_OFFSETS;
- else if (testFieldsStorePos[i] && !testFieldsStoreOff[i])
- tv = Field.TermVector.WITH_POSITIONS;
- else if (!testFieldsStorePos[i] && testFieldsStoreOff[i])
- tv = Field.TermVector.WITH_OFFSETS;
- else
- tv = Field.TermVector.YES;
- doc.add(new Field(testFields[i], "", Field.Store.NO, Field.Index.ANALYZED, tv));
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ if (testFieldsStorePos[i] && testFieldsStoreOff[i]) {
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
+ }
+ else if (testFieldsStorePos[i] && !testFieldsStoreOff[i]) {
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ }
+ else if (!testFieldsStorePos[i] && testFieldsStoreOff[i]) {
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorOffsets(true);
+ }
+ else {
+ customType.setStoreTermVectors(true);
+ }
+ doc.add(new Field(testFields[i], customType, ""));
}
//Create 5 documents for testing, they all have the same
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermVectorsWriter.java Sat Aug 27 13:27:01 2011
@@ -28,6 +28,9 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
@@ -41,10 +44,14 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
- Field f = newField("field", "abcd", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
+ Field f = newField("field", "abcd", customType);
doc.add(f);
doc.add(f);
- Field f2 = newField("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ Field f2 = newField("field", "", customType);
doc.add(f2);
doc.add(f);
w.addDocument(doc);
@@ -76,7 +83,11 @@ public class TestTermVectorsWriter exten
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
- Field f = newField("field", "abcd", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
+ Field f = newField("field", "abcd", customType);
doc.add(f);
doc.add(f);
w.addDocument(doc);
@@ -98,7 +109,11 @@ public class TestTermVectorsWriter exten
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
- Field f = newField("field", "abcd ", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
+ Field f = newField("field", "abcd ", customType);
doc.add(f);
doc.add(f);
w.addDocument(doc);
@@ -124,7 +139,11 @@ public class TestTermVectorsWriter exten
TokenStream stream = analyzer.tokenStream("field", new StringReader("abcd "));
stream.reset(); // TODO: wierd to reset before wrapping with CachingTokenFilter... correct?
stream = new CachingTokenFilter(stream);
- Field f = new Field("field", stream, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
+ Field f = new Field("field", customType, stream);
doc.add(f);
doc.add(f);
w.addDocument(doc);
@@ -147,7 +166,11 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.SIMPLE, true, MockTokenFilter.ENGLISH_STOPSET, true)));
Document doc = new Document();
- Field f = newField("field", "abcd the", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
+ Field f = newField("field", "abcd the", customType);
doc.add(f);
doc.add(f);
w.addDocument(doc);
@@ -170,10 +193,12 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
- Field f = newField("field", "abcd the ", Field.Store.NO,
- Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
- Field f2 = newField("field", "crunch man", Field.Store.NO,
- Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
+ Field f = newField("field", "abcd the ", customType);
+ Field f2 = newField("field", "crunch man", customType);
doc.add(f);
doc.add(f2);
w.addDocument(doc);
@@ -201,10 +226,12 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
- Field f = newField("field", "", Field.Store.NO,
- Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
- Field f2 = newField("field", "crunch man", Field.Store.NO,
- Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
+ Field f = newField("field", "", customType);
+ Field f2 = newField("field", "crunch man", customType);
doc.add(f);
doc.add(f2);
w.addDocument(doc);
@@ -229,14 +256,16 @@ public class TestTermVectorsWriter exten
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ customType.setStoreTermVectorPositions(true);
+ customType.setStoreTermVectorOffsets(true);
- Field f = newField("field", "abcd", Field.Store.NO,
- Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ Field f = newField("field", "abcd", customType);
doc.add(f);
- doc.add(newField("field", "", Field.Store.NO, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", "", customType));
- Field f2 = newField("field", "crunch", Field.Store.NO,
- Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ Field f2 = newField("field", "crunch", customType);
doc.add(f2);
w.addDocument(doc);
@@ -268,18 +297,21 @@ public class TestTermVectorsWriter exten
new LogDocMergePolicy()));
Document document = new Document();
+ FieldType customType = new FieldType();
+ customType.setStored(true);
- Field storedField = newField("stored", "stored", Field.Store.YES,
- Field.Index.NO);
+ Field storedField = newField("stored", "stored", customType);
document.add(storedField);
writer.addDocument(document);
writer.addDocument(document);
document = new Document();
document.add(storedField);
- Field termVectorField = newField("termVector", "termVector",
- Field.Store.NO, Field.Index.NOT_ANALYZED,
- Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ customType2.setStoreTermVectors(true);
+ customType2.setStoreTermVectorPositions(true);
+ customType2.setStoreTermVectorOffsets(true);
+ Field termVectorField = newField("termVector", "termVector", customType2);
document.add(termVectorField);
writer.addDocument(document);
@@ -320,17 +352,21 @@ public class TestTermVectorsWriter exten
Document document = new Document();
- Field storedField = newField("stored", "stored", Field.Store.YES,
- Field.Index.NO);
+ FieldType customType = new FieldType();
+ customType.setStored(true);
+
+ Field storedField = newField("stored", "stored", customType);
document.add(storedField);
writer.addDocument(document);
writer.addDocument(document);
document = new Document();
document.add(storedField);
- Field termVectorField = newField("termVector", "termVector",
- Field.Store.NO, Field.Index.NOT_ANALYZED,
- Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ customType2.setStoreTermVectors(true);
+ customType2.setStoreTermVectorPositions(true);
+ customType2.setStoreTermVectorOffsets(true);
+ Field termVectorField = newField("termVector", "termVector", customType2);
document.add(termVectorField);
writer.addDocument(document);
writer.optimize();
@@ -357,12 +393,16 @@ public class TestTermVectorsWriter exten
Document document = new Document();
document = new Document();
- Field storedField = newField("stored", "stored", Field.Store.YES,
- Field.Index.NO);
+ FieldType customType = new FieldType();
+ customType.setStored(true);
+
+ Field storedField = newField("stored", "stored", customType);
document.add(storedField);
- Field termVectorField = newField("termVector", "termVector",
- Field.Store.NO, Field.Index.NOT_ANALYZED,
- Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ customType2.setStoreTermVectors(true);
+ customType2.setStoreTermVectorPositions(true);
+ customType2.setStoreTermVectorOffsets(true);
+ Field termVectorField = newField("termVector", "termVector", customType2);
document.add(termVectorField);
for(int i=0;i<10;i++)
writer.addDocument(document);
@@ -394,18 +434,22 @@ public class TestTermVectorsWriter exten
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document document = new Document();
- document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
- Field.TermVector.YES));
+ FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ 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", Field.Store.NO, Field.Index.ANALYZED,
- Field.TermVector.NO));
+ document.add(newField("tvtest", "x y z", TextField.TYPE_UNSTORED));
iw.addDocument(document);
// Make first segment
iw.commit();
- document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
- Field.TermVector.YES));
+ FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ Field termVectorField = newField("termVector", "termVector", customType2);
+ document.add(newField("tvtest", "a b c", customType));
iw.addDocument(document);
// Make 2nd segment
iw.commit();
@@ -421,22 +465,24 @@ public class TestTermVectorsWriter exten
IndexWriter iw = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document document = new Document();
- document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
- Field.TermVector.YES));
+ FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
+ Field termVectorField = newField("termVector", "termVector", customType);
+ document.add(newField("tvtest", "a b c", customType));
iw.addDocument(document);
iw.commit();
document = new Document();
- document.add(newField("tvtest", "x y z", Field.Store.NO, Field.Index.ANALYZED,
- Field.TermVector.NO));
+ document.add(newField("tvtest", "x y z", TextField.TYPE_UNSTORED));
iw.addDocument(document);
// Make first segment
iw.commit();
iw.optimize();
- document.add(newField("tvtest", "a b c", Field.Store.NO, Field.Index.ANALYZED,
- Field.TermVector.YES));
+ FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ customType2.setStoreTermVectors(true);
+ document.add(newField("tvtest", "a b c", customType2));
iw.addDocument(document);
// Make 2nd segment
iw.commit();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermdocPerf.java Sat Aug 27 13:27:01 2011
@@ -22,12 +22,11 @@ import java.io.Reader;
import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.ReusableAnalyzerBase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -86,7 +85,8 @@ public class TestTermdocPerf extends Luc
};
Document doc = new Document();
- doc.add(newField(field,val, Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS));
+
+ doc.add(newField(field,val, StringField.TYPE_UNSTORED));
IndexWriter writer = new IndexWriter(
dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java Sat Aug 27 13:27:01 2011
@@ -33,6 +33,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -165,7 +167,7 @@ public class TestTermsEnum extends Lucen
System.out.println("TEST: addDoc id:" + id + " terms=" + terms);
}
for (String s2 : terms) {
- doc.add(newField("f", s2, Field.Index.NOT_ANALYZED));
+ doc.add(newField("f", s2, StringField.TYPE_UNSTORED));
termToID.put(new BytesRef(s2), id);
}
w.addDocument(doc);
@@ -365,7 +367,7 @@ public class TestTermsEnum extends Lucen
w.w.setInfoStream(VERBOSE ? System.out : null);
for(String term : terms) {
Document doc = new Document();
- Field f = newField(FIELD, term, Field.Index.NOT_ANALYZED_NO_NORMS);
+ Field f = newField(FIELD, term, StringField.TYPE_UNSTORED);
doc.add(f);
w.addDocument(doc);
}
@@ -506,9 +508,9 @@ public class TestTermsEnum extends Lucen
final RandomIndexWriter w = new RandomIndexWriter(random, d);
w.w.setInfoStream(VERBOSE ? System.out : null);
Document doc = new Document();
- doc.add(newField("field", "one two three", Field.Index.ANALYZED));
+ doc.add(newField("field", "one two three", TextField.TYPE_UNSTORED));
doc = new Document();
- doc.add(newField("field2", "one two three", Field.Index.ANALYZED));
+ doc.add(newField("field2", "one two three", TextField.TYPE_UNSTORED));
w.addDocument(doc);
w.commit();
w.deleteDocuments(new Term("field", "one"));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java Sat Aug 27 13:27:01 2011
@@ -27,6 +27,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.TermsEnum.SeekStatus;
import org.apache.lucene.index.codecs.CodecProvider;
import org.apache.lucene.search.AutomatonQuery;
@@ -63,7 +64,7 @@ public class TestTermsEnum2 extends Luce
new MockAnalyzer(random, MockTokenizer.KEYWORD, false))
.setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
Document doc = new Document();
- Field field = newField("field", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
+ Field field = newField("field", "", StringField.TYPE_STORED);
doc.add(field);
terms = new TreeSet<BytesRef>();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java Sat Aug 27 13:27:01 2011
@@ -22,7 +22,8 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.store.Directory;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.util.English;
@@ -62,10 +63,13 @@ public class TestThreadedOptimize extend
((LogMergePolicy) writer.getConfig().getMergePolicy()).setMergeFactor(1000);
+ final FieldType customType = new FieldType(StringField.TYPE_STORED);
+ customType.setOmitNorms(true);
+
for(int i=0;i<200;i++) {
Document d = new Document();
- d.add(newField("id", Integer.toString(i), Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
- d.add(newField("contents", English.intToEnglish(i), Field.Store.NO, Field.Index.ANALYZED_NO_NORMS));
+ d.add(newField("id", Integer.toString(i), customType));
+ d.add(newField("contents", English.intToEnglish(i), customType));
writer.addDocument(d);
}
@@ -85,8 +89,8 @@ public class TestThreadedOptimize extend
writerFinal.optimize(false);
for(int k=0;k<17*(1+iFinal);k++) {
Document d = new Document();
- d.add(newField("id", iterFinal + "_" + iFinal + "_" + j + "_" + k, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
- d.add(newField("contents", English.intToEnglish(iFinal+k), Field.Store.NO, Field.Index.ANALYZED_NO_NORMS));
+ d.add(newField("id", iterFinal + "_" + iFinal + "_" + j + "_" + k, customType));
+ d.add(newField("contents", English.intToEnglish(iFinal+k), customType));
writerFinal.addDocument(d);
}
for(int k=0;k<9*(1+iFinal);k++)
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTieredMergePolicy.java Sat Aug 27 13:27:01 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util._TestUtil;
@@ -39,7 +39,7 @@ public class TestTieredMergePolicy exten
w.setInfoStream(VERBOSE ? System.out : null);
for(int i=0;i<80;i++) {
Document doc = new Document();
- doc.add(newField("content", "aaa " + (i%4), Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("content", "aaa " + (i%4), TextField.TYPE_UNSTORED));
w.addDocument(doc);
}
assertEquals(80, w.maxDoc());
@@ -86,7 +86,7 @@ public class TestTieredMergePolicy exten
final int numDocs = _TestUtil.nextInt(random, 20, 100);
for(int i=0;i<numDocs;i++) {
Document doc = new Document();
- doc.add(newField("content", "aaa " + (i%4), Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("content", "aaa " + (i%4), TextField.TYPE_UNSTORED));
w.addDocument(doc);
int count = w.getSegmentCount();
maxCount = Math.max(count, maxCount);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactionRollback.java Sat Aug 27 13:27:01 2011
@@ -29,7 +29,7 @@ import java.util.HashMap;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
@@ -128,9 +128,10 @@ public class TestTransactionRollback ext
//Build index, of records 1 to 100, committing after each batch of 10
IndexDeletionPolicy sdp=new KeepAllDeletionPolicy();
IndexWriter w=new IndexWriter(dir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)).setIndexDeletionPolicy(sdp));
+
for(int currentRecordId=1;currentRecordId<=100;currentRecordId++) {
Document doc=new Document();
- doc.add(newField(FIELD_RECORD_ID,""+currentRecordId,Field.Store.YES,Field.Index.ANALYZED));
+ doc.add(newField(FIELD_RECORD_ID,""+currentRecordId,TextField.TYPE_STORED));
w.addDocument(doc);
if (currentRecordId%10 == 0) {
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestTransactions.java Sat Aug 27 13:27:01 2011
@@ -21,7 +21,9 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
@@ -145,11 +147,13 @@ public class TestTransactions extends Lu
public void update(IndexWriter writer) throws IOException {
// Add 10 docs:
+ FieldType customType = new FieldType(StringField.TYPE_UNSTORED);
+ customType.setStoreTermVectors(true);
for(int j=0; j<10; j++) {
Document d = new Document();
int n = random.nextInt();
- d.add(newField("id", Integer.toString(nextID++), Field.Store.YES, Field.Index.NOT_ANALYZED));
- d.add(newField("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED));
+ d.add(newField("id", Integer.toString(nextID++), customType));
+ d.add(newField("contents", English.intToEnglish(n), TextField.TYPE_UNSTORED));
writer.addDocument(d);
}
@@ -193,7 +197,7 @@ public class TestTransactions extends Lu
for(int j=0; j<7; j++) {
Document d = new Document();
int n = random.nextInt();
- d.add(newField("contents", English.intToEnglish(n), Field.Store.NO, Field.Index.ANALYZED));
+ d.add(newField("contents", English.intToEnglish(n), TextField.TYPE_UNSTORED));
writer.addDocument(d);
}
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestUniqueTermCount.java Sat Aug 27 13:27:01 2011
@@ -24,6 +24,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.search.DefaultSimilarity;
import org.apache.lucene.search.DefaultSimilarityProvider;
import org.apache.lucene.search.Similarity;
@@ -54,7 +55,7 @@ public class TestUniqueTermCount extends
});
RandomIndexWriter writer = new RandomIndexWriter(random, dir, config);
Document doc = new Document();
- Field foo = newField("foo", "", Field.Store.NO, Field.Index.ANALYZED);
+ Field foo = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(foo);
for (int i = 0; i < 100; i++) {
foo.setValue(addValue());
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java Sat Aug 27 13:27:01 2011
@@ -303,7 +303,7 @@ public class TestSurrogates extends Luce
uniqueTerms.add(term);
fieldTerms.add(new Term(field, term));
Document doc = new Document();
- doc.add(newField(field, term, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField(field, term, StringField.TYPE_UNSTORED));
w.addDocument(doc);
}
uniqueTermCount += uniqueTerms.size();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java Sat Aug 27 13:27:01 2011
@@ -26,6 +26,8 @@ import java.util.Locale;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.IndexReader;
@@ -60,14 +62,15 @@ public class Test10KPulsings extends Luc
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(cp));
Document document = new Document();
- Field field = newField("field", "", Field.Store.YES, Field.Index.ANALYZED);
+ FieldType ft = new FieldType(TextField.TYPE_STORED);
switch(_TestUtil.nextInt(random, 0, 2)) {
- case 0: field.setIndexOptions(IndexOptions.DOCS_ONLY); break;
- case 1: field.setIndexOptions(IndexOptions.DOCS_AND_FREQS); break;
- default: field.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS); break;
+ case 0: ft.setIndexOptions(IndexOptions.DOCS_ONLY); break;
+ case 1: ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS); break;
+ default: ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS); break;
}
+ Field field = newField("field", "", ft);
document.add(field);
NumberFormat df = new DecimalFormat("00000", new DecimalFormatSymbols(Locale.ENGLISH));
@@ -111,14 +114,15 @@ public class Test10KPulsings extends Luc
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setCodecProvider(cp));
Document document = new Document();
- Field field = newField("field", "", Field.Store.YES, Field.Index.ANALYZED);
+ FieldType ft = new FieldType(TextField.TYPE_STORED);
switch(_TestUtil.nextInt(random, 0, 2)) {
- case 0: field.setIndexOptions(IndexOptions.DOCS_ONLY); break;
- case 1: field.setIndexOptions(IndexOptions.DOCS_AND_FREQS); break;
- default: field.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS); break;
+ case 0: ft.setIndexOptions(IndexOptions.DOCS_ONLY); break;
+ case 1: ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS); break;
+ default: ft.setIndexOptions(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS); break;
}
+ Field field = newField("field", "", ft);
document.add(field);
NumberFormat df = new DecimalFormat("00000", new DecimalFormatSymbols(Locale.ENGLISH));
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java Sat Aug 27 13:27:01 2011
@@ -25,12 +25,11 @@ import java.util.EnumSet;
import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.AbstractField;
import org.apache.lucene.document.IndexDocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -81,7 +80,7 @@ public class TestDocValuesIndexing exten
IndexDocValuesField valuesField = new IndexDocValuesField("docId");
valuesField.setInt(i);
doc.add(valuesField);
- doc.add(new Field("docId", "" + i, Store.NO, Index.ANALYZED));
+ doc.add(new TextField("docId", "" + i));
writer.addDocument(doc);
}
writer.commit();
@@ -481,22 +480,14 @@ public class TestDocValuesIndexing exten
ValueType.FLOAT_32,
ValueType.FLOAT_64);
- private static Index[] IDX_VALUES = new Index[] { Index.ANALYZED,
- Index.ANALYZED_NO_NORMS, Index.NOT_ANALYZED, Index.NOT_ANALYZED_NO_NORMS,
- Index.NO };
-
private FixedBitSet indexValues(IndexWriter w, int numValues, ValueType value,
List<ValueType> valueVarList, boolean withDeletions, int bytesSize)
throws CorruptIndexException, IOException {
final boolean isNumeric = NUMERICS.contains(value);
FixedBitSet deleted = new FixedBitSet(numValues);
Document doc = new Document();
- Index idx = IDX_VALUES[random.nextInt(IDX_VALUES.length)];
- AbstractField field = random.nextBoolean() ? new IndexDocValuesField(value.name())
- : newField(value.name(), _TestUtil.randomRealisticUnicodeString(random,
- 10), idx == Index.NO ? Store.YES : Store.NO, idx);
- doc.add(field);
- IndexDocValuesField valField = new IndexDocValuesField("prototype");
+ IndexDocValuesField valField = new IndexDocValuesField(value.name());
+ doc.add(valField);
final BytesRef bytesRef = new BytesRef();
final String idBase = value.name() + "_";
@@ -544,9 +535,7 @@ public class TestDocValuesIndexing exten
}
}
doc.removeFields("id");
- doc.add(new Field("id", idBase + i, Store.YES,
- Index.NOT_ANALYZED_NO_NORMS));
- valField.set(field);
+ doc.add(new Field("id", StringField.TYPE_STORED, idBase + i));
w.addDocument(doc);
if (i % 7 == 0) {
@@ -568,8 +557,9 @@ public class TestDocValuesIndexing exten
w.commit();
// TODO test unoptimized with deletions
- if (withDeletions || random.nextBoolean())
+ if (withDeletions || random.nextBoolean()) {
w.optimize(true);
+ }
return deleted;
}
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Sat Aug 27 13:27:01 2011
@@ -23,6 +23,7 @@ import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.RandomIndexWriter;
@@ -116,9 +117,9 @@ public class BaseTestRangeFilter extends
/* build an index */
Document doc = new Document();
- Field idField = newField(random, "id", "", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
- Field randField = newField(random, "rand", "", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
- Field bodyField = newField(random, "body", "", Field.Store.NO, Field.Index.NOT_ANALYZED_NO_NORMS);
+ Field idField = newField(random, "id", "", StringField.TYPE_STORED);
+ Field randField = newField(random, "rand", "", StringField.TYPE_STORED);
+ Field bodyField = newField(random, "body", "", StringField.TYPE_UNSTORED);
doc.add(idField);
doc.add(randField);
doc.add(bodyField);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQuery.java Sat Aug 27 13:27:01 2011
@@ -21,6 +21,7 @@ import java.io.IOException;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
@@ -46,12 +47,9 @@ public class TestAutomatonQuery extends
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
- Field titleField = newField("title", "some title", Field.Store.NO,
- Field.Index.ANALYZED);
- Field field = newField(FN, "this is document one 2345", Field.Store.NO,
- Field.Index.ANALYZED);
- Field footerField = newField("footer", "a footer", Field.Store.NO,
- Field.Index.ANALYZED);
+ Field titleField = newField("title", "some title", TextField.TYPE_UNSTORED);
+ Field field = newField(FN, "this is document one 2345", TextField.TYPE_UNSTORED);
+ Field footerField = newField("footer", "a footer", TextField.TYPE_UNSTORED);
doc.add(titleField);
doc.add(field);
doc.add(footerField);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java Sat Aug 27 13:27:01 2011
@@ -21,6 +21,7 @@ import java.io.IOException;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -47,12 +48,9 @@ public class TestAutomatonQueryUnicode e
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
- Field titleField = newField("title", "some title", Field.Store.NO,
- Field.Index.ANALYZED);
- Field field = newField(FN, "", Field.Store.NO,
- Field.Index.ANALYZED);
- Field footerField = newField("footer", "a footer", Field.Store.NO,
- Field.Index.ANALYZED);
+ Field titleField = newField("title", "some title", TextField.TYPE_UNSTORED);
+ Field field = newField(FN, "", TextField.TYPE_UNSTORED);
+ Field footerField = newField("footer", "a footer", TextField.TYPE_UNSTORED);
doc.add(titleField);
doc.add(field);
doc.add(footerField);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBoolean2.java Sat Aug 27 13:27:01 2011
@@ -22,7 +22,7 @@ import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
@@ -56,7 +56,7 @@ public class TestBoolean2 extends Lucene
RandomIndexWriter writer= new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
- doc.add(newField(field, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField(field, docFields[i], TextField.TYPE_UNSTORED));
writer.addDocument(doc);
}
writer.close();
@@ -81,12 +81,12 @@ public class TestBoolean2 extends Lucene
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
.setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
Document doc = new Document();
- doc.add(newField("field2", "xxx", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field2", "xxx", TextField.TYPE_UNSTORED));
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
w.addDocument(doc);
}
doc = new Document();
- doc.add(newField("field2", "big bad bug", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field2", "big bad bug", TextField.TYPE_UNSTORED));
for(int i=0;i<NUM_EXTRA_DOCS/2;i++) {
w.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java Sat Aug 27 13:27:01 2011
@@ -19,7 +19,8 @@ package org.apache.lucene.search;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -56,10 +57,10 @@ public class TestBooleanMinShouldMatch e
for (int i = 0; i < data.length; i++) {
Document doc = new Document();
- doc.add(newField("id", String.valueOf(i), Field.Store.YES, Field.Index.NOT_ANALYZED));//Field.Keyword("id",String.valueOf(i)));
- doc.add(newField("all", "all", Field.Store.YES, Field.Index.NOT_ANALYZED));//Field.Keyword("all","all"));
+ doc.add(newField("id", String.valueOf(i), StringField.TYPE_STORED));//Field.Keyword("id",String.valueOf(i)));
+ doc.add(newField("all", "all", StringField.TYPE_STORED));//Field.Keyword("all","all"));
if (null != data[i]) {
- doc.add(newField("data", data[i], Field.Store.YES, Field.Index.ANALYZED));//Field.Text("data",data[i]));
+ doc.add(newField("data", data[i], TextField.TYPE_STORED));//Field.Text("data",data[i]));
}
w.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanOr.java Sat Aug 27 13:27:01 2011
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -141,13 +141,11 @@ public class TestBooleanOr extends Lucen
d.add(newField(
FIELD_T,
"Optimize not deleting all files",
- Field.Store.YES,
- Field.Index.ANALYZED));
+ TextField.TYPE_STORED));
d.add(newField(
FIELD_C,
"Deleted When I run an optimize in our production environment.",
- Field.Store.YES,
- Field.Index.ANALYZED));
+ TextField.TYPE_STORED));
//
writer.addDocument(d);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanQuery.java Sat Aug 27 13:27:01 2011
@@ -21,9 +21,8 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -68,7 +67,7 @@ public class TestBooleanQuery extends Lu
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random, dir);
Document doc = new Document();
- doc.add(newField("field", "a b c d", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", "a b c d", TextField.TYPE_UNSTORED));
w.addDocument(doc);
IndexReader r = w.getReader();
@@ -129,7 +128,7 @@ public class TestBooleanQuery extends Lu
Directory dir1 = newDirectory();
RandomIndexWriter iw1 = new RandomIndexWriter(random, dir1);
Document doc1 = new Document();
- doc1.add(newField("field", "foo bar", Field.Index.ANALYZED));
+ doc1.add(newField("field", "foo bar", TextField.TYPE_UNSTORED));
iw1.addDocument(doc1);
IndexReader reader1 = iw1.getReader();
iw1.close();
@@ -137,7 +136,7 @@ public class TestBooleanQuery extends Lu
Directory dir2 = newDirectory();
RandomIndexWriter iw2 = new RandomIndexWriter(random, dir2);
Document doc2 = new Document();
- doc2.add(newField("field", "foo baz", Field.Index.ANALYZED));
+ doc2.add(newField("field", "foo baz", TextField.TYPE_UNSTORED));
iw2.addDocument(doc2);
IndexReader reader2 = iw2.getReader();
iw2.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestBooleanScorer.java Sat Aug 27 13:27:01 2011
@@ -21,7 +21,7 @@ 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.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -42,7 +42,7 @@ public class TestBooleanScorer extends L
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
for (int i = 0; i < values.length; i++) {
Document doc = new Document();
- doc.add(newField(FIELD, values[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField(FIELD, values[i], StringField.TYPE_STORED));
writer.addDocument(doc);
}
IndexReader ir = writer.getReader();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java Sat Aug 27 13:27:01 2011
@@ -21,7 +21,8 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SerialMergeScheduler;
@@ -54,7 +55,9 @@ public class TestCachingSpanFilter exten
// add a doc, refresh the reader, and check that its there
Document doc = new Document();
- doc.add(newField("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ FieldType customType = new FieldType(TextField.TYPE_STORED);
+ customType.setTokenized(false);
+ doc.add(newField("id", "1", customType));
writer.addDocument(doc);
reader = refreshReader(reader);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java Sat Aug 27 13:27:01 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -175,7 +175,7 @@ public class TestCachingWrapperFilter ex
// add a doc, refresh the reader, and check that its there
Document doc = new Document();
- doc.add(newField("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("id", "1", StringField.TYPE_STORED));
writer.addDocument(doc);
reader = refreshReader(reader);
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestConstantScoreQuery.java Sat Aug 27 13:27:01 2011
@@ -18,7 +18,7 @@ package org.apache.lucene.search;
*/
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -89,7 +89,7 @@ public class TestConstantScoreQuery exte
RandomIndexWriter writer = new RandomIndexWriter (random, directory);
Document doc = new Document();
- doc.add(newField("field", "term", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("field", "term", StringField.TYPE_UNSTORED));
writer.addDocument(doc);
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestCustomSearcherSort.java Sat Aug 27 13:27:01 2011
@@ -25,7 +25,8 @@ import java.util.TreeMap;
import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -56,16 +57,13 @@ public class TestCustomSearcherSort exte
Document doc = new Document();
if ((i % 5) != 0) { // some documents must not have an entry in the first
// sort field
- doc.add(newField("publicationDate_", random.getLuceneDate(),
- Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("publicationDate_", random.getLuceneDate(), StringField.TYPE_STORED));
}
if ((i % 7) == 0) { // some documents to match the query (see below)
- doc.add(newField("content", "test", Field.Store.YES,
- Field.Index.ANALYZED));
+ doc.add(newField("content", "test", TextField.TYPE_STORED));
}
// every document has a defined 'mandant' field
- doc.add(newField("mandant", Integer.toString(i % 3), Field.Store.YES,
- Field.Index.NOT_ANALYZED));
+ doc.add(newField("mandant", Integer.toString(i % 3), StringField.TYPE_STORED));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateFilter.java Sat Aug 27 13:27:01 2011
@@ -21,7 +21,8 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -48,10 +49,9 @@ public class TestDateFilter extends Luce
Document doc = new Document();
// add time that is in the past
doc.add(newField("datefield", DateTools.timeToString(now - 1000,
- DateTools.Resolution.MILLISECOND), Field.Store.YES,
- Field.Index.NOT_ANALYZED));
+ DateTools.Resolution.MILLISECOND), StringField.TYPE_STORED));
doc.add(newField("body", "Today is a very sunny day in New York City",
- Field.Store.YES, Field.Index.ANALYZED));
+ TextField.TYPE_STORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -115,10 +115,9 @@ public class TestDateFilter extends Luce
Document doc = new Document();
// add time that is in the future
doc.add(newField("datefield", DateTools.timeToString(now + 888888,
- DateTools.Resolution.MILLISECOND), Field.Store.YES,
- Field.Index.NOT_ANALYZED));
+ DateTools.Resolution.MILLISECOND), StringField.TYPE_STORED));
doc.add(newField("body", "Today is a very sunny day in New York City",
- Field.Store.YES, Field.Index.ANALYZED));
+ TextField.TYPE_STORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDateSort.java Sat Aug 27 13:27:01 2011
@@ -22,15 +22,13 @@ import java.util.Arrays;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.Sort;
-import org.apache.lucene.search.SortField;
import org.apache.lucene.store.Directory;
/**
@@ -107,13 +105,12 @@ public class TestDateSort extends Lucene
Document document = new Document();
// Add the text field.
- Field textField = newField(TEXT_FIELD, text, Field.Store.YES, Field.Index.ANALYZED);
+ Field textField = newField(TEXT_FIELD, text, TextField.TYPE_STORED);
document.add(textField);
// Add the date/time field.
String dateTimeString = DateTools.timeToString(time, DateTools.Resolution.SECOND);
- Field dateTimeField = newField(DATE_TIME_FIELD, dateTimeString, Field.Store.YES,
- Field.Index.NOT_ANALYZED);
+ Field dateTimeField = newField(DATE_TIME_FIELD, dateTimeString, StringField.TYPE_STORED);
document.add(dateTimeField);
return document;
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java Sat Aug 27 13:27:01 2011
@@ -20,7 +20,8 @@ package org.apache.lucene.search;
import org.apache.lucene.util.LuceneTestCase;
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.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.SlowMultiReaderWrapper;
@@ -83,6 +84,11 @@ public class TestDisjunctionMaxQuery ext
public IndexReader r;
public IndexSearcher s;
+ private static final FieldType nonAnalyzedType = new FieldType(TextField.TYPE_STORED);
+ static {
+ nonAnalyzedType.setTokenized(false);
+ }
+
@Override
public void setUp() throws Exception {
super.setUp();
@@ -97,57 +103,51 @@ public class TestDisjunctionMaxQuery ext
// d1 is an "ok" match for: albino elephant
{
Document d1 = new Document();
- d1.add(newField("id", "d1", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
+ d1.add(newField("id", "d1", nonAnalyzedType));// Field.Keyword("id",
// "d1"));
d1
- .add(newField("hed", "elephant", Field.Store.YES,
- Field.Index.ANALYZED));// Field.Text("hed", "elephant"));
+ .add(newField("hed", "elephant", TextField.TYPE_STORED));// Field.Text("hed", "elephant"));
d1
- .add(newField("dek", "elephant", Field.Store.YES,
- Field.Index.ANALYZED));// Field.Text("dek", "elephant"));
+ .add(newField("dek", "elephant", TextField.TYPE_STORED));// Field.Text("dek", "elephant"));
writer.addDocument(d1);
}
// d2 is a "good" match for: albino elephant
{
Document d2 = new Document();
- d2.add(newField("id", "d2", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
+ d2.add(newField("id", "d2", nonAnalyzedType));// Field.Keyword("id",
// "d2"));
d2
- .add(newField("hed", "elephant", Field.Store.YES,
- Field.Index.ANALYZED));// Field.Text("hed", "elephant"));
- d2.add(newField("dek", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("dek",
+ .add(newField("hed", "elephant", TextField.TYPE_STORED));// Field.Text("hed", "elephant"));
+ d2.add(newField("dek", "albino", TextField.TYPE_STORED));// Field.Text("dek",
// "albino"));
d2
- .add(newField("dek", "elephant", Field.Store.YES,
- Field.Index.ANALYZED));// Field.Text("dek", "elephant"));
+ .add(newField("dek", "elephant", TextField.TYPE_STORED));// Field.Text("dek", "elephant"));
writer.addDocument(d2);
}
// d3 is a "better" match for: albino elephant
{
Document d3 = new Document();
- d3.add(newField("id", "d3", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
+ d3.add(newField("id", "d3", nonAnalyzedType));// Field.Keyword("id",
// "d3"));
- d3.add(newField("hed", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("hed",
+ d3.add(newField("hed", "albino", TextField.TYPE_STORED));// Field.Text("hed",
// "albino"));
d3
- .add(newField("hed", "elephant", Field.Store.YES,
- Field.Index.ANALYZED));// Field.Text("hed", "elephant"));
+ .add(newField("hed", "elephant", TextField.TYPE_STORED));// Field.Text("hed", "elephant"));
writer.addDocument(d3);
}
// d4 is the "best" match for: albino elephant
{
Document d4 = new Document();
- d4.add(newField("id", "d4", Field.Store.YES, Field.Index.NOT_ANALYZED));// Field.Keyword("id",
+ d4.add(newField("id", "d4", nonAnalyzedType));// Field.Keyword("id",
// "d4"));
- d4.add(newField("hed", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("hed",
+ d4.add(newField("hed", "albino", TextField.TYPE_STORED));// Field.Text("hed",
// "albino"));
d4
- .add(newField("hed", "elephant", Field.Store.YES,
- Field.Index.ANALYZED));// Field.Text("hed", "elephant"));
- d4.add(newField("dek", "albino", Field.Store.YES, Field.Index.ANALYZED));// Field.Text("dek",
+ .add(newField("hed", "elephant", nonAnalyzedType));// Field.Text("hed", "elephant"));
+ d4.add(newField("dek", "albino", TextField.TYPE_STORED));// Field.Text("dek",
// "albino"));
writer.addDocument(d4);
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocBoost.java Sat Aug 27 13:27:01 2011
@@ -38,26 +38,18 @@ public class TestDocBoost extends Lucene
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, store, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
- Fieldable f1 = newField("field", "word", Field.Store.YES, Field.Index.ANALYZED);
- Fieldable f2 = newField("field", "word", Field.Store.YES, Field.Index.ANALYZED);
+ Field f1 = newField("field", "word", TextField.TYPE_STORED);
+ Field f2 = newField("field", "word", TextField.TYPE_STORED);
f2.setBoost(2.0f);
Document d1 = new Document();
Document d2 = new Document();
- Document d3 = new Document();
- Document d4 = new Document();
- d3.setBoost(3.0f);
- d4.setBoost(2.0f);
d1.add(f1); // boost = 1
d2.add(f2); // boost = 2
- d3.add(f1); // boost = 3
- d4.add(f2); // boost = 4
writer.addDocument(d1);
writer.addDocument(d2);
- writer.addDocument(d3);
- writer.addDocument(d4);
IndexReader reader = writer.getReader();
writer.close();
@@ -89,7 +81,7 @@ public class TestDocBoost extends Lucene
float lastScore = 0.0f;
- for (int i = 0; i < 4; i++) {
+ for (int i = 0; i < 2; i++) {
assertTrue(scores[i] > lastScore);
lastScore = scores[i];
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocIdSet.java Sat Aug 27 13:27:01 2011
@@ -25,8 +25,7 @@ import java.util.Iterator;
import junit.framework.Assert;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -103,7 +102,7 @@ public class TestDocIdSet extends Lucene
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
- doc.add(newField("c", "val", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField("c", "val", StringField.TYPE_UNSTORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java Sat Aug 27 13:27:01 2011
@@ -22,6 +22,7 @@ import java.io.IOException;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IndexDocValuesField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -50,11 +51,11 @@ public class TestDocValuesScoring extend
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random, dir);
Document doc = new Document();
- Field field = newField("foo", "", Field.Store.NO, Field.Index.ANALYZED);
+ Field field = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(field);
IndexDocValuesField dvField = new IndexDocValuesField("foo_boost");
doc.add(dvField);
- Field field2 = newField("bar", "", Field.Store.NO, Field.Index.ANALYZED);
+ Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
doc.add(field2);
field.setValue("quick brown fox");
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestElevationComparator.java Sat Aug 27 13:27:01 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.search;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.search.FieldValueHitQueue.Entry;
@@ -124,7 +124,7 @@ public class TestElevationComparator ext
private Document adoc(String[] vals) {
Document doc = new Document();
for (int i = 0; i < vals.length - 2; i += 2) {
- doc.add(newField(vals[i], vals[i + 1], Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField(vals[i], vals[i + 1], TextField.TYPE_STORED));
}
return doc;
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java?rev=1162347&r1=1162346&r2=1162347&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestExplanations.java Sat Aug 27 13:27:01 2011
@@ -20,6 +20,8 @@ package org.apache.lucene.search;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -73,11 +75,11 @@ public class TestExplanations extends Lu
RandomIndexWriter writer= new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
- doc.add(newField(KEY, ""+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
- Field f = newField(FIELD, docFields[i], Field.Store.NO, Field.Index.ANALYZED);
+ doc.add(newField(KEY, ""+i, StringField.TYPE_UNSTORED));
+ Field f = newField(FIELD, docFields[i], TextField.TYPE_UNSTORED);
f.setBoost(i);
doc.add(f);
- doc.add(newField(ALTFIELD, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField(ALTFIELD, docFields[i], TextField.TYPE_UNSTORED));
writer.addDocument(doc);
}
reader = writer.getReader();