You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/08/16 00:03:52 UTC
svn commit: r1158029 [11/15] - in /lucene/dev/branches/fieldtype_conflicted:
lucene/ lucene/contrib/ lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/highlight/
lucene/contrib/highlighter...
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Mon Aug 15 22:03:41 2011
@@ -23,8 +23,8 @@ import java.text.DecimalFormatSymbols;
import org.apache.lucene.analysis.MockAnalyzer;
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.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.store.Directory;
@@ -51,8 +51,8 @@ public class TestMultiValuedNumericRange
Document doc = new Document();
for (int m=0, c=random.nextInt(10); m<=c; m++) {
int value = random.nextInt(Integer.MAX_VALUE);
- doc.add(newField("asc", format.format(value), Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(new NumericField("trie", Field.Store.NO, true).setIntValue(value));
+ doc.add(newField("asc", format.format(value), StringField.TYPE_UNSTORED));
+ doc.add(new NumericField("trie").setIntValue(value));
}
writer.addDocument(doc);
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNot.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNot.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNot.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNot.java Mon Aug 15 22:03:41 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
/** Similarity unit test.
*
@@ -38,7 +38,7 @@ public class TestNot extends LuceneTestC
RandomIndexWriter writer = new RandomIndexWriter(random, store);
Document d1 = new Document();
- d1.add(newField("field", "a b", Field.Store.YES, Field.Index.ANALYZED));
+ d1.add(newField("field", "a b", TextField.TYPE_STORED));
writer.addDocument(d1);
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Mon Aug 15 22:03:41 2011
@@ -60,6 +60,7 @@ public class TestNumericRangeQuery32 ext
.setMergePolicy(newLogMergePolicy()));
NumericField
+<<<<<<<
field8 = new NumericField("field8", 8, Field.Store.YES, true),
field4 = new NumericField("field4", 4, Field.Store.YES, true),
field2 = new NumericField("field2", 2, Field.Store.YES, true),
@@ -67,6 +68,15 @@ public class TestNumericRangeQuery32 ext
ascfield8 = new NumericField("ascfield8", 8, Field.Store.NO, true),
ascfield4 = new NumericField("ascfield4", 4, Field.Store.NO, true),
ascfield2 = new NumericField("ascfield2", 2, Field.Store.NO, true);
+=======
+ field8 = new NumericField("field8", 8, NumericField.TYPE_STORED),
+ field4 = new NumericField("field4", 4, NumericField.TYPE_STORED),
+ field2 = new NumericField("field2", 2, NumericField.TYPE_STORED),
+ fieldNoTrie = new NumericField("field"+Integer.MAX_VALUE, Integer.MAX_VALUE, NumericField.TYPE_STORED),
+ ascfield8 = new NumericField("ascfield8", 8, NumericField.TYPE_UNSTORED),
+ ascfield4 = new NumericField("ascfield4", 4, NumericField.TYPE_UNSTORED),
+ ascfield2 = new NumericField("ascfield2", 2, NumericField.TYPE_UNSTORED);
+>>>>>>>
Document doc = new Document();
// add fields, that have a distance to test general functionality
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Mon Aug 15 22:03:41 2011
@@ -57,6 +57,7 @@ public class TestNumericRangeQuery64 ext
.setMergePolicy(newLogMergePolicy()));
NumericField
+<<<<<<<
field8 = new NumericField("field8", 8, Field.Store.YES, true),
field6 = new NumericField("field6", 6, Field.Store.YES, true),
field4 = new NumericField("field4", 4, Field.Store.YES, true),
@@ -66,6 +67,17 @@ public class TestNumericRangeQuery64 ext
ascfield6 = new NumericField("ascfield6", 6, Field.Store.NO, true),
ascfield4 = new NumericField("ascfield4", 4, Field.Store.NO, true),
ascfield2 = new NumericField("ascfield2", 2, Field.Store.NO, true);
+=======
+ field8 = new NumericField("field8", 8, NumericField.TYPE_STORED),
+ field6 = new NumericField("field6", 6, NumericField.TYPE_STORED),
+ field4 = new NumericField("field4", 4, NumericField.TYPE_STORED),
+ field2 = new NumericField("field2", 2, NumericField.TYPE_STORED),
+ fieldNoTrie = new NumericField("field"+Integer.MAX_VALUE, Integer.MAX_VALUE, NumericField.TYPE_STORED),
+ ascfield8 = new NumericField("ascfield8", 8, NumericField.TYPE_UNSTORED),
+ ascfield6 = new NumericField("ascfield6", 6, NumericField.TYPE_UNSTORED),
+ ascfield4 = new NumericField("ascfield4", 4, NumericField.TYPE_UNSTORED),
+ ascfield2 = new NumericField("ascfield2", 2, NumericField.TYPE_UNSTORED);
+>>>>>>>
Document doc = new Document();
// add fields, that have a distance to test general functionality
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java Mon Aug 15 22:03:41 2011
@@ -19,7 +19,7 @@ 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.TextField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.IndexReader;
@@ -47,16 +47,11 @@ public class TestPhrasePrefixQuery exten
Document doc3 = new Document();
Document doc4 = new Document();
Document doc5 = new Document();
- doc1.add(newField("body", "blueberry pie", Field.Store.YES,
- Field.Index.ANALYZED));
- doc2.add(newField("body", "blueberry strudel", Field.Store.YES,
- Field.Index.ANALYZED));
- doc3.add(newField("body", "blueberry pizza", Field.Store.YES,
- Field.Index.ANALYZED));
- doc4.add(newField("body", "blueberry chewing gum", Field.Store.YES,
- Field.Index.ANALYZED));
- doc5.add(newField("body", "piccadilly circus", Field.Store.YES,
- Field.Index.ANALYZED));
+ doc1.add(newField("body", "blueberry pie", TextField.TYPE_STORED));
+ doc2.add(newField("body", "blueberry strudel", TextField.TYPE_STORED));
+ doc3.add(newField("body", "blueberry pizza", TextField.TYPE_STORED));
+ doc4.add(newField("body", "blueberry chewing gum", TextField.TYPE_STORED));
+ doc5.add(newField("body", "piccadilly circus", TextField.TYPE_STORED));
writer.addDocument(doc1);
writer.addDocument(doc2);
writer.addDocument(doc3);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPhraseQuery.java Mon Aug 15 22:03:41 2011
@@ -68,19 +68,19 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory, analyzer);
Document doc = new Document();
- doc.add(newField("field", "one two three four five", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(newField("repeated", "this is a repeated field - first part", Field.Store.YES, Field.Index.ANALYZED));
- Fieldable repeatedField = newField("repeated", "second part of a repeated field", Field.Store.YES, Field.Index.ANALYZED);
+ 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(repeatedField);
- doc.add(newField("palindrome", "one two three two one", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("palindrome", "one two three two one", TextField.TYPE_STORED));
writer.addDocument(doc);
doc = new Document();
- doc.add(newField("nonexist", "phrase exist notexist exist found", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("nonexist", "phrase exist notexist exist found", TextField.TYPE_STORED));
writer.addDocument(doc);
doc = new Document();
- doc.add(newField("nonexist", "phrase exist notexist exist found", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("nonexist", "phrase exist notexist exist found", TextField.TYPE_STORED));
writer.addDocument(doc);
reader = writer.getReader();
@@ -223,7 +223,7 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory,
newIndexWriterConfig( Version.LUCENE_40, stopAnalyzer));
Document doc = new Document();
- doc.add(newField("field", "the stop words are here", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "the stop words are here", TextField.TYPE_STORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
@@ -258,12 +258,12 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
- doc.add(newField("source", "marketing info", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("source", "marketing info", TextField.TYPE_STORED));
writer.addDocument(doc);
doc = new Document();
- doc.add(newField("contents", "foobar", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(newField("source", "marketing info", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("contents", "foobar", TextField.TYPE_STORED));
+ doc.add(newField("source", "marketing info", TextField.TYPE_STORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -294,15 +294,15 @@ public class TestPhraseQuery extends Luc
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", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("contents", "map entry woo", TextField.TYPE_STORED));
writer.addDocument(doc);
doc = new Document();
- doc.add(newField("contents", "woo map entry", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("contents", "woo map entry", TextField.TYPE_STORED));
writer.addDocument(doc);
doc = new Document();
- doc.add(newField("contents", "map foobarword entry woo", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("contents", "map foobarword entry woo", TextField.TYPE_STORED));
writer.addDocument(doc);
reader = writer.getReader();
@@ -345,15 +345,15 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
Document doc = new Document();
- doc.add(newField("field", "foo firstname lastname foo", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", "foo firstname lastname foo", TextField.TYPE_STORED));
writer.addDocument(doc);
Document doc2 = new Document();
- doc2.add(newField("field", "foo firstname zzz lastname foo", Field.Store.YES, Field.Index.ANALYZED));
+ doc2.add(newField("field", "foo firstname zzz lastname foo", TextField.TYPE_STORED));
writer.addDocument(doc2);
Document doc3 = new Document();
- doc3.add(newField("field", "foo firstname zzz yyy lastname foo", Field.Store.YES, Field.Index.ANALYZED));
+ doc3.add(newField("field", "foo firstname zzz yyy lastname foo", TextField.TYPE_STORED));
writer.addDocument(doc3);
IndexReader reader = writer.getReader();
@@ -608,7 +608,7 @@ public class TestPhraseQuery extends Luc
RandomIndexWriter w = new RandomIndexWriter(random, dir, newIndexWriterConfig(TEST_VERSION_CURRENT, analyzer).setMergePolicy(newLogMergePolicy()));
List<List<String>> docs = new ArrayList<List<String>>();
Document d = new Document();
- Field f = newField("f", "", Field.Store.NO, Field.Index.ANALYZED);
+ Field f = newField("f", "", TextField.TYPE_UNSTORED);
d.add(f);
Random r = random;
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPositionIncrement.java Mon Aug 15 22:03:41 2011
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.tokena
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.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.IndexReader;
@@ -88,7 +88,7 @@ public class TestPositionIncrement exten
Directory store = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, store, analyzer);
Document d = new Document();
- d.add(newField("field", "bogus", Field.Store.YES, Field.Index.ANALYZED));
+ d.add(newField("field", "bogus", TextField.TYPE_STORED));
writer.addDocument(d);
IndexReader reader = writer.getReader();
writer.close();
@@ -206,7 +206,7 @@ public class TestPositionIncrement exten
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockPayloadAnalyzer());
Document doc = new Document();
- doc.add(new Field("content", new StringReader(
+ doc.add(new TextField("content", new StringReader(
"a a b c d e a f g h i j a b k k")));
writer.addDocument(doc);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixFilter.java Mon Aug 15 22:03:41 2011
@@ -23,7 +23,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
/**
* Tests {@link PrefixFilter} class.
@@ -40,7 +40,7 @@ public class TestPrefixFilter extends Lu
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
for (int i = 0; i < categories.length; i++) {
Document doc = new Document();
- doc.add(newField("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("category", categories[i], StringField.TYPE_STORED));
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Mon Aug 15 22:03:41 2011
@@ -20,6 +20,7 @@ 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.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -50,8 +51,7 @@ public class TestPrefixInBooleanQuery ex
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
Document doc = new Document();
- Field field = newField(FIELD, "meaninglessnames", Field.Store.NO,
- Field.Index.NOT_ANALYZED_NO_NORMS);
+ Field field = newField(FIELD, "meaninglessnames", StringField.TYPE_UNSTORED);
doc.add(field);
for (int i = 0; i < 5137; ++i) {
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixQuery.java Mon Aug 15 22:03:41 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
/**
* Tests {@link PrefixQuery} class.
@@ -41,7 +41,7 @@ public class TestPrefixQuery extends Luc
RandomIndexWriter writer = new RandomIndexWriter(random, directory);
for (int i = 0; i < categories.length; i++) {
Document doc = new Document();
- doc.add(newField("category", categories[i], Field.Store.YES, Field.Index.NOT_ANALYZED));
+ doc.add(newField("category", categories[i], StringField.TYPE_STORED));
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestPrefixRandom.java Mon Aug 15 22:03:41 2011
@@ -23,6 +23,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.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
@@ -53,7 +54,7 @@ public class TestPrefixRandom extends Lu
.setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
Document doc = new Document();
- Field field = newField("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
+ Field field = newField("field", "", StringField.TYPE_UNSTORED);
doc.add(field);
// we generate aweful prefixes: good for testing.
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java Mon Aug 15 22:03:41 2011
@@ -18,8 +18,7 @@ package org.apache.lucene.search;
*/
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.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -33,7 +32,7 @@ public class TestQueryWrapperFilter exte
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir);
Document doc = new Document();
- doc.add(newField("field", "value", Store.NO, Index.ANALYZED));
+ doc.add(newField("field", "value", TextField.TYPE_UNSTORED));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpQuery.java Mon Aug 15 22:03:41 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.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -50,7 +50,7 @@ public class TestRegexpQuery extends Luc
Document doc = new Document();
doc.add(newField(FN,
"the quick brown fox jumps over the lazy ??? dog 493432 49344",
- Field.Store.NO, Field.Index.ANALYZED));
+ TextField.TYPE_UNSTORED));
writer.addDocument(doc);
reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom.java Mon Aug 15 22:03:41 2011
@@ -25,6 +25,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.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -51,7 +53,10 @@ public class TestRegexpRandom extends Lu
.setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
Document doc = new Document();
- Field field = newField("field", "", Field.Store.NO, Field.Index.ANALYZED_NO_NORMS);
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
+ customType.setOmitNorms(true);
+ Field field = newField("field", "", customType);
doc.add(field);
NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ENGLISH));
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestRegexpRandom2.java Mon Aug 15 22:03:41 2011
@@ -26,6 +26,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.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Term;
@@ -63,7 +64,7 @@ public class TestRegexpRandom2 extends L
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random, MockTokenizer.KEYWORD, false))
.setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
Document doc = new Document();
- Field field = newField("field", "", Field.Store.NO, Field.Index.NOT_ANALYZED);
+ Field field = newField("field", "", StringField.TYPE_UNSTORED);
doc.add(field);
List<String> terms = new ArrayList<String>();
int num = atLeast(200);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestScorerPerf.java Mon Aug 15 22:03:41 2011
@@ -13,7 +13,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -64,7 +64,7 @@ public class TestScorerPerf extends Luce
Document d = new Document();
for (int j=0; j<nTerms; j++) {
if (random.nextInt(freq[j]) == 0) {
- d.add(newField("f", terms[j].text(), Field.Store.NO, Field.Index.NOT_ANALYZED));
+ d.add(newField("f", terms[j].text(), StringField.TYPE_UNSTORED));
//System.out.println(d);
}
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSearchWithThreads.java Mon Aug 15 22:03:41 2011
@@ -22,6 +22,7 @@ import java.util.concurrent.atomic.Atomi
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;
@@ -44,7 +45,7 @@ public class TestSearchWithThreads exten
// 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", "", Field.Index.ANALYZED);
+ final Field body = newField("body", "", TextField.TYPE_UNSTORED);
doc.add(body);
final StringBuilder sb = new StringBuilder();
for(int docCount=0;docCount<NUM_DOCS;docCount++) {
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSetNorm.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSetNorm.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSetNorm.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSetNorm.java Mon Aug 15 22:03:41 2011
@@ -39,7 +39,7 @@ public class TestSetNorm extends LuceneT
IndexWriter writer = new IndexWriter(store, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
// add the same document four times
- Fieldable f1 = newField("field", "word", Field.Store.YES, Field.Index.ANALYZED);
+ Field f1 = newField("field", "word", TextField.TYPE_STORED);
Document d1 = new Document();
d1.add(f1);
writer.addDocument(d1);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSimilarity.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSimilarity.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSimilarity.java Mon Aug 15 22:03:41 2011
@@ -30,7 +30,12 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+<<<<<<<
import org.apache.lucene.document.Field;
+=======
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.Explanation.IDFExplanation;
+>>>>>>>
/** Similarity unit test.
*
@@ -61,10 +66,10 @@ public class TestSimilarity extends Luce
.setSimilarityProvider(new SimpleSimilarityProvider()));
Document d1 = new Document();
- d1.add(newField("field", "a c", Field.Store.YES, Field.Index.ANALYZED));
+ d1.add(newField("field", "a c", TextField.TYPE_STORED));
Document d2 = new Document();
- d2.add(newField("field", "a b c", Field.Store.YES, Field.Index.ANALYZED));
+ d2.add(newField("field", "a b c", TextField.TYPE_STORED));
writer.addDocument(d1);
writer.addDocument(d2);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSimilarityProvider.java Mon Aug 15 22:03:41 2011
@@ -20,6 +20,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.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
@@ -44,9 +45,9 @@ public class TestSimilarityProvider exte
new MockAnalyzer(random)).setSimilarityProvider(sim);
RandomIndexWriter iw = new RandomIndexWriter(random, directory, iwc);
Document doc = new Document();
- Field field = newField("foo", "", Field.Store.NO, Field.Index.ANALYZED);
+ Field field = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(field);
- 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/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Mon Aug 15 22:03:41 2011
@@ -22,6 +22,8 @@ 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.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -137,8 +139,9 @@ public class TestSloppyPhraseQuery exten
private static Document makeDocument(String docText) {
Document doc = new Document();
- Field f = new Field("f", docText, Field.Store.NO, Field.Index.ANALYZED);
- f.setOmitNorms(true);
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setOmitNorms(true);
+ Field f = new Field("f", customType, docText);
doc.add(f);
return doc;
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSort.java Mon Aug 15 22:03:41 2011
@@ -28,11 +28,15 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.IndexDocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -137,6 +141,7 @@ public class TestSort extends LuceneTest
IndexDocValuesField.set(new Field ("float", data[i][3], Field.Store.NO, Field.Index.NOT_ANALYZED), ValueType.FLOAT_32)
: new Field ("float", data[i][3], Field.Store.NO, Field.Index.NOT_ANALYZED);
doc.add(f);
+<<<<<<<
}
if (data[i][4] != null) doc.add (new Field ("string", data[i][4], Field.Store.NO, Field.Index.NOT_ANALYZED));
if (data[i][5] != null) doc.add (new Field ("custom", data[i][5], Field.Store.NO, Field.Index.NOT_ANALYZED));
@@ -152,6 +157,30 @@ public class TestSort extends LuceneTest
if (data[i][10] != null) doc.add (new Field ("byte", data[i][10], Field.Store.NO, Field.Index.NOT_ANALYZED));
if (data[i][11] != null) doc.add (new Field ("parser", data[i][11], Field.Store.NO, Field.Index.NOT_ANALYZED));
doc.setBoost(2); // produce some scores above 1.0
+=======
+ dirs.add(indexStore);
+ RandomIndexWriter writer = new RandomIndexWriter(random, indexStore, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+
+ FieldType customType = new FieldType();
+ customType.setStored(true);
+
+ for (int i=0; i<data.length; ++i) {
+ if (((i%2)==0 && even) || ((i%2)==1 && odd)) {
+ Document doc = new Document();
+ doc.add (new Field ("tracer", customType, data[i][0]));
+ doc.add (new TextField ("contents", data[i][1]));
+ if (data[i][2] != null) doc.add (new StringField ("int", data[i][2]));
+ if (data[i][3] != null) doc.add (new StringField ("float", data[i][3]));
+ if (data[i][4] != null) doc.add (new StringField ("string", data[i][4]));
+ if (data[i][5] != null) doc.add (new StringField ("custom", data[i][5]));
+ if (data[i][6] != null) doc.add (new StringField ("i18n", data[i][6]));
+ if (data[i][7] != null) doc.add (new StringField ("long", data[i][7]));
+ if (data[i][8] != null) doc.add (new StringField ("double", data[i][8]));
+ if (data[i][9] != null) doc.add (new StringField ("short", data[i][9]));
+ if (data[i][10] != null) doc.add (new StringField ("byte", data[i][10]));
+ if (data[i][11] != null) doc.add (new StringField ("parser", data[i][11]));
+ //doc.setBoost(2); // produce some scores above 1.0
+>>>>>>>
writer.addDocument (doc);
}
}
@@ -176,16 +205,18 @@ public class TestSort extends LuceneTest
setMaxBufferedDocs(4).
setMergePolicy(newLogMergePolicy(97))
);
+ FieldType customType = new FieldType();
+ customType.setStored(true);
for (int i=0; i<NUM_STRINGS; i++) {
Document doc = new Document();
String num = getRandomCharString(getRandomNumber(2, 8), 48, 52);
- doc.add (new Field ("tracer", num, Field.Store.YES, Field.Index.NO));
+ doc.add (new Field ("tracer", customType, num));
//doc.add (new Field ("contents", Integer.toString(i), Field.Store.NO, Field.Index.ANALYZED));
- doc.add (new Field ("string", num, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add (new StringField ("string", num));
String num2 = getRandomCharString(getRandomNumber(1, 4), 48, 50);
- doc.add (new Field ("string2", num2, Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add (new Field ("tracer2", num2, Field.Store.YES, Field.Index.NO));
- doc.setBoost(2); // produce some scores above 1.0
+ doc.add (new StringField ("string2", num2));
+ doc.add (new Field ("tracer2", customType, num2));
+ // doc.setBoost(2); // produce some scores above 1.0
writer.addDocument (doc);
}
@@ -387,17 +418,17 @@ public class TestSort extends LuceneTest
boolean fail = false;
for (int x = 0; x < n; ++x) {
Document doc2 = searcher.doc(result[x].doc);
- String[] v = doc2.getValues("tracer");
- String[] v2 = doc2.getValues("tracer2");
+ IndexableField[] v = doc2.getFields("tracer");
+ IndexableField[] v2 = doc2.getFields("tracer2");
for (int j = 0; j < v.length; ++j) {
if (last != null) {
- int cmp = v[j].compareTo(last);
+ int cmp = v[j].stringValue().compareTo(last);
if (!(cmp >= 0)) { // ensure first field is in order
fail = true;
System.out.println("fail:" + v[j] + " < " + last);
}
if (cmp == 0) { // ensure second field is in reverse order
- cmp = v2[j].compareTo(lastSub);
+ cmp = v2[j].stringValue().compareTo(lastSub);
if (cmp > 0) {
fail = true;
System.out.println("rev field fail:" + v2[j] + " > " + lastSub);
@@ -409,8 +440,8 @@ public class TestSort extends LuceneTest
}
}
}
- last = v[j];
- lastSub = v2[j];
+ last = v[j].stringValue();
+ lastSub = v2[j].stringValue();
lastDocId = result[x].doc;
buff.append(v[j] + "(" + v2[j] + ")(" + result[x].doc+") ");
}
@@ -1051,9 +1082,9 @@ public class TestSort extends LuceneTest
int n = result.length;
for (int i=0; i<n; ++i) {
Document doc = searcher.doc(result[i].doc);
- String[] v = doc.getValues("tracer");
+ IndexableField[] v = doc.getFields("tracer");
for (int j=0; j<v.length; ++j) {
- buff.append (v[j]);
+ buff.append (v[j].stringValue());
}
}
assertEquals (msg, expectedResult, buff.toString());
@@ -1064,12 +1095,12 @@ public class TestSort extends LuceneTest
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
- doc.add(newField("f", "", Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(newField("t", "1", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("f", "", StringField.TYPE_UNSTORED));
+ doc.add(newField("t", "1", StringField.TYPE_UNSTORED));
w.addDocument(doc);
w.commit();
doc = new Document();
- doc.add(newField("t", "1", Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add(newField("t", "1", StringField.TYPE_UNSTORED));
w.addDocument(doc);
IndexReader r = IndexReader.open(w, true);
@@ -1091,8 +1122,8 @@ public class TestSort extends LuceneTest
TEST_VERSION_CURRENT, new MockAnalyzer(random)));
for (int i=0; i<5; i++) {
Document doc = new Document();
- doc.add (new Field ("string", "a"+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add (new Field ("string", "b"+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add (new StringField ("string", "a"+i));
+ doc.add (new StringField ("string", "b"+i));
writer.addDocument (doc);
}
writer.optimize(); // enforce one segment to have a higher unique term count in all cases
@@ -1112,8 +1143,8 @@ public class TestSort extends LuceneTest
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
for (int i=0; i<5; i++) {
Document doc = new Document();
- doc.add (new Field ("string", "a"+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add (new Field ("string", "b"+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
+ doc.add (new StringField ("string", "a"+i));
+ doc.add (new StringField ("string", "b"+i));
writer.addDocument (doc);
}
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSpanQueryFilter.java Mon Aug 15 22:03:41 2011
@@ -20,7 +20,7 @@ import java.util.List;
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.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -39,7 +39,7 @@ public class TestSpanQueryFilter extends
for (int i = 0; i < 500; i++) {
Document document = new Document();
document.add(newField("field", English.intToEnglish(i) + " equals " + English.intToEnglish(i),
- Field.Store.NO, Field.Index.ANALYZED));
+ TextField.TYPE_UNSTORED));
writer.addDocument(document);
}
final int number = 10;
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java Mon Aug 15 22:03:41 2011
@@ -46,12 +46,11 @@ public class TestSubScorerFreqs extends
int num = atLeast(31);
for (int i = 0; i < num; i++) {
Document doc = new Document();
- doc.add(newField("f", "a b c d b c d c d d", Field.Store.NO,
- Field.Index.ANALYZED));
+ doc.add(newField("f", "a b c d b c d c d d", TextField.TYPE_UNSTORED));
w.addDocument(doc);
doc = new Document();
- doc.add(newField("f", "a b c d", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("f", "a b c d", TextField.TYPE_UNSTORED));
w.addDocument(doc);
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermRangeQuery.java Mon Aug 15 22:03:41 2011
@@ -27,6 +27,8 @@ import org.apache.lucene.analysis.*;
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.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.Terms;
@@ -265,8 +267,8 @@ public class TestTermRangeQuery extends
private void insertDoc(IndexWriter writer, String content) throws IOException {
Document doc = new Document();
- doc.add(newField("id", "id" + docCount, Field.Store.YES, Field.Index.NOT_ANALYZED));
- doc.add(newField("content", content, Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("id", "id" + docCount, StringField.TYPE_STORED));
+ doc.add(newField("content", content, TextField.TYPE_UNSTORED));
writer.addDocument(doc);
docCount++;
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermScorer.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermScorer.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermScorer.java Mon Aug 15 22:03:41 2011
@@ -24,6 +24,7 @@ import java.util.List;
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.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -51,8 +52,7 @@ public class TestTermScorer extends Luce
for (int i = 0; i < values.length; i++) {
Document doc = new Document();
doc
- .add(newField(FIELD, values[i], Field.Store.YES,
- Field.Index.ANALYZED));
+ .add(newField(FIELD, values[i], TextField.TYPE_STORED));
writer.addDocument(doc);
}
indexReader = new SlowMultiReaderWrapper(writer.getReader());
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTermVectors.java Mon Aug 15 22:03:41 2011
@@ -23,6 +23,8 @@ 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.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
@@ -47,26 +49,25 @@ public class TestTermVectors extends Luc
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
Document doc = new Document();
- Field.TermVector termVector;
+ FieldType ft = new FieldType(TextField.TYPE_STORED);
int mod3 = i % 3;
int mod2 = i % 2;
- if (mod2 == 0 && mod3 == 0){
- termVector = Field.TermVector.WITH_POSITIONS_OFFSETS;
- }
- else if (mod2 == 0){
- termVector = Field.TermVector.WITH_POSITIONS;
- }
- else if (mod3 == 0){
- termVector = Field.TermVector.WITH_OFFSETS;
- }
- else {
- termVector = Field.TermVector.YES;
+ if (mod2 == 0 && mod3 == 0) {
+ ft.setStoreTermVectors(true);
+ ft.setStoreTermVectorOffsets(true);
+ ft.setStoreTermVectorPositions(true);
+ } else if (mod2 == 0) {
+ ft.setStoreTermVectors(true);
+ ft.setStoreTermVectorPositions(true);
+ } else if (mod3 == 0) {
+ ft.setStoreTermVectors(true);
+ ft.setStoreTermVectorOffsets(true);
+ } else {
+ ft.setStoreTermVectors(true);
}
- doc.add(new Field("field", English.intToEnglish(i),
- Field.Store.YES, Field.Index.ANALYZED, termVector));
+ doc.add(new Field("field", ft, English.intToEnglish(i)));
//test no term vectors too
- doc.add(new Field("noTV", English.intToEnglish(i),
- Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("noTV", TextField.TYPE_STORED, English.intToEnglish(i)));
writer.addDocument(doc);
}
reader = writer.getReader();
@@ -91,11 +92,10 @@ public class TestTermVectors extends Luc
ScoreDoc[] hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals(100, hits.length);
- for (int i = 0; i < hits.length; i++)
- {
+ for (int i = 0; i < hits.length; i++) {
TermFreqVector [] vector = searcher.reader.getTermFreqVectors(hits[i].doc);
assertTrue(vector != null);
- assertTrue(vector.length == 1);
+ assertEquals("doc=" + hits[i].doc + " tv=" + vector, 1, vector.length);
}
TermFreqVector vector;
vector = searcher.reader.getTermFreqVector(hits[0].doc, "noTV");
@@ -109,11 +109,15 @@ public class TestTermVectors extends Luc
public void testTermVectorsFieldOrder() throws IOException {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random, dir, new MockAnalyzer(random, MockTokenizer.SIMPLE, true));
- Document doc = new Document();
- doc.add(new Field("c", "some content here", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- doc.add(new Field("a", "some content here", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- doc.add(new Field("b", "some content here", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- doc.add(new Field("x", "some content here", Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ Document doc = new Document();;
+ FieldType ft = new FieldType(TextField.TYPE_STORED);
+ ft.setStoreTermVectors(true);
+ ft.setStoreTermVectorOffsets(true);
+ ft.setStoreTermVectorPositions(true);
+ doc.add(newField("c", "some content here", ft));
+ doc.add(newField("a", "some content here", ft));
+ doc.add(newField("b", "some content here", ft));
+ doc.add(newField("x", "some content here", ft));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
@@ -341,10 +345,14 @@ public class TestTermVectors extends Luc
private void setupDoc(Document doc, String text)
{
- doc.add(new Field("field2", text, Field.Store.YES,
- Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
- doc.add(new Field("field", text, Field.Store.YES,
- Field.Index.ANALYZED, Field.TermVector.YES));
+ FieldType ft = new FieldType(TextField.TYPE_STORED);
+ ft.setStoreTermVectors(true);
+ ft.setStoreTermVectorOffsets(true);
+ ft.setStoreTermVectorPositions(true);
+ FieldType ft2 = new FieldType(TextField.TYPE_STORED);
+ ft2.setStoreTermVectors(true);
+ doc.add(newField("field2", text, ft));
+ doc.add(newField("field", text, ft2));
//System.out.println("Document: " + doc);
}
@@ -359,17 +367,19 @@ public class TestTermVectors extends Luc
}
for (int i = 0; i < 100; i++) {
Document doc = new Document();
- doc.add(new Field("field", English.intToEnglish(i),
- Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO));
+ doc.add(newField("field", English.intToEnglish(i), TextField.TYPE_STORED));
writer.addDocument(doc);
}
if (VERBOSE) {
System.out.println("TEST: now add vectors");
}
+ FieldType ft = new FieldType(TextField.TYPE_STORED);
+ ft.setStoreTermVectors(true);
+ ft.setStoreTermVectorOffsets(true);
+ ft.setStoreTermVectorPositions(true);
for(int i=0;i<10;i++) {
Document doc = new Document();
- doc.add(new Field("field", English.intToEnglish(100+i),
- Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+ doc.add(newField("field", English.intToEnglish(100+i), ft));
writer.addDocument(doc);
}
@@ -400,16 +410,28 @@ public class TestTermVectors extends Luc
newIndexWriterConfig(TEST_VERSION_CURRENT,
new MockAnalyzer(random, MockTokenizer.SIMPLE, true)).setOpenMode(OpenMode.CREATE));
Document doc = new Document();
- doc.add(new Field("field", "one",
- Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.NO));
- doc.add(new Field("field", "one",
- Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.YES));
- doc.add(new Field("field", "one",
- Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS));
- doc.add(new Field("field", "one",
- Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_OFFSETS));
- doc.add(new Field("field", "one",
- Field.Store.YES, Field.Index.ANALYZED, Field.TermVector.WITH_POSITIONS_OFFSETS));
+
+ FieldType ft2 = new FieldType(TextField.TYPE_STORED);
+ ft2.setStoreTermVectors(true);
+
+ FieldType ft3 = new FieldType(TextField.TYPE_STORED);
+ ft3.setStoreTermVectors(true);
+ ft3.setStoreTermVectorPositions(true);
+
+ FieldType ft4 = new FieldType(TextField.TYPE_STORED);
+ ft4.setStoreTermVectors(true);
+ ft4.setStoreTermVectorOffsets(true);
+
+ FieldType ft5 = new FieldType(TextField.TYPE_STORED);
+ ft5.setStoreTermVectors(true);
+ ft5.setStoreTermVectorOffsets(true);
+ ft5.setStoreTermVectorPositions(true);
+
+ doc.add(newField("field", "one", TextField.TYPE_STORED));
+ doc.add(newField("field", "one", ft2));
+ doc.add(newField("field", "one", ft3));
+ doc.add(newField("field", "one", ft4));
+ doc.add(newField("field", "one", ft5));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java Mon Aug 15 22:03:41 2011
@@ -22,7 +22,7 @@ import java.util.BitSet;
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.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
@@ -111,7 +111,7 @@ public class TestTimeLimitingCollector e
private void add(String value, RandomIndexWriter iw) throws IOException {
Document d = new Document();
- d.add(newField(FIELD_NAME, value, Field.Store.NO, Field.Index.ANALYZED));
+ d.add(newField(FIELD_NAME, value, TextField.TYPE_UNSTORED));
iw.addDocument(d);
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestWildcard.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestWildcard.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestWildcard.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestWildcard.java Mon Aug 15 22:03:41 2011
@@ -21,9 +21,7 @@ import org.apache.lucene.store.Directory
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.Field.Store;
-import org.apache.lucene.document.Field.Index;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -244,7 +242,7 @@ public class TestWildcard
RandomIndexWriter writer = new RandomIndexWriter(random, indexStore);
for (int i = 0; i < contents.length; ++i) {
Document doc = new Document();
- doc.add(newField(field, contents[i], Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField(field, contents[i], TextField.TYPE_STORED));
writer.addDocument(doc);
}
writer.close();
@@ -344,7 +342,7 @@ public class TestWildcard
.setMergePolicy(newLogMergePolicy()));
for (int i = 0; i < docs.length; i++) {
Document doc = new Document();
- doc.add(newField(field,docs[i],Store.NO,Index.ANALYZED));
+ doc.add(newField(field,docs[i],TextField.TYPE_UNSTORED));
iw.addDocument(doc);
}
iw.close();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/TestWildcardRandom.java Mon Aug 15 22:03:41 2011
@@ -25,6 +25,7 @@ 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.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -51,7 +52,7 @@ public class TestWildcardRandom extends
.setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
Document doc = new Document();
- Field field = newField("field", "", Field.Store.NO, Field.Index.ANALYZED_NO_NORMS);
+ Field field = newField("field", "", StringField.TYPE_UNSTORED);
doc.add(field);
NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ENGLISH));
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/cache/TestEntryCreators.java Mon Aug 15 22:03:41 2011
@@ -24,7 +24,8 @@ import java.util.Set;
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.search.FieldCache.*;
@@ -91,8 +92,9 @@ public class TestEntryCreators extends L
for( NumberTypeTester tester : typeTests ) {
if (random.nextInt(20) != 17 && i > 1) {
tester.values[i] = 10 + random.nextInt( 20 ); // get some field overlap
- doc.add(newField(tester.field, String.valueOf(tester.values[i]),
- Field.Store.NO, Field.Index.NOT_ANALYZED ));
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setTokenized(false);
+ doc.add(newField(tester.field, String.valueOf(tester.values[i]), customType));
}
}
writer.addDocument(doc);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/PayloadHelper.java Mon Aug 15 22:03:41 2011
@@ -24,6 +24,7 @@ import org.apache.lucene.index.Payload;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.util.English;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.index.IndexReader;
@@ -122,9 +123,9 @@ public class PayloadHelper {
// writer.infoStream = System.out;
for (int i = 0; i < numDocs; i++) {
Document doc = new Document();
- doc.add(new Field(FIELD, English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field(MULTI_FIELD, English.intToEnglish(i) + " " + English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field(NO_PAYLOAD_FIELD, English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field(FIELD, TextField.TYPE_STORED, English.intToEnglish(i)));
+ doc.add(new Field(MULTI_FIELD, TextField.TYPE_STORED, English.intToEnglish(i) + " " + English.intToEnglish(i)));
+ doc.add(new Field(NO_PAYLOAD_FIELD, TextField.TYPE_STORED, English.intToEnglish(i)));
writer.addDocument(doc);
}
reader = IndexReader.open(writer, true);
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadNearQuery.java Mon Aug 15 22:03:41 2011
@@ -24,7 +24,8 @@ import org.apache.lucene.analysis.TokenF
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
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.FieldInvertState;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Payload;
@@ -112,9 +113,11 @@ public class TestPayloadNearQuery extend
//writer.infoStream = System.out;
for (int i = 0; i < 1000; i++) {
Document doc = new Document();
- doc.add(newField("field", English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
+ doc.add(newField("field", English.intToEnglish(i), customType));
String txt = English.intToEnglish(i) +' '+English.intToEnglish(i+1);
- doc.add(newField("field2", txt, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field2", txt, customType));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java Mon Aug 15 22:03:41 2011
@@ -46,8 +46,13 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+<<<<<<<
import org.junit.AfterClass;
import org.junit.BeforeClass;
+=======
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
+>>>>>>>
import java.io.Reader;
import java.io.IOException;
@@ -117,13 +122,15 @@ public class TestPayloadTermQuery extend
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer())
.setSimilarityProvider(similarityProvider).setMergePolicy(newLogMergePolicy()));
//writer.infoStream = System.out;
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
for (int i = 0; i < 1000; i++) {
Document doc = new Document();
- Field noPayloadField = newField(PayloadHelper.NO_PAYLOAD_FIELD, English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED);
+ Field noPayloadField = newField(PayloadHelper.NO_PAYLOAD_FIELD, English.intToEnglish(i), customType);
//noPayloadField.setBoost(0);
doc.add(noPayloadField);
- doc.add(newField("field", English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
- doc.add(newField("multiField", English.intToEnglish(i) + " " + English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField("field", English.intToEnglish(i), customType));
+ doc.add(newField("multiField", English.intToEnglish(i) + " " + English.intToEnglish(i), customType));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestBasics.java Mon Aug 15 22:03:41 2011
@@ -32,7 +32,8 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.RandomIndexWriter;
@@ -120,7 +121,9 @@ public class TestBasics extends LuceneTe
//writer.infoStream = System.out;
for (int i = 0; i < 2000; i++) {
Document doc = new Document();
- doc.add(newField("field", English.intToEnglish(i), Field.Store.YES, Field.Index.ANALYZED));
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
+ doc.add(newField("field", English.intToEnglish(i), customType));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java Mon Aug 15 22:03:41 2011
@@ -23,6 +23,7 @@ import java.util.Set;
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.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -46,7 +47,7 @@ public class TestFieldMaskingSpanQuery e
}
protected static Field field(String name, String value) {
- return newField(name, value, Field.Store.NO, Field.Index.ANALYZED);
+ return newField(name, value, TextField.TYPE_UNSTORED);
}
protected static IndexSearcher searcher;
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java Mon Aug 15 22:03:41 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.search.spans;
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.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader.ReaderContext;
@@ -57,7 +57,7 @@ public class TestNearSpansOrdered extend
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);
}
reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Mon Aug 15 22:03:41 2011
@@ -31,7 +31,8 @@ import org.apache.lucene.analysis.tokena
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.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.IndexReader;
@@ -113,8 +114,9 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarityProvider(similarity));
Document doc = new Document();
- doc.add(newField(PayloadHelper.FIELD, "one two three one four three",
- Field.Store.YES, Field.Index.ANALYZED));
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
+ doc.add(newField(PayloadHelper.FIELD, "one two three one four three", customType));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
writer.close();
@@ -261,7 +263,7 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
- doc.add(new Field("content", new StringReader("a b c d e f g h i j a k")));
+ doc.add(new TextField("content", new StringReader("a b c d e f g h i j a k")));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -300,7 +302,7 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
- doc.add(new Field("content", new StringReader("a b a d k f a h i k a k")));
+ doc.add(new TextField("content", new StringReader("a b a d k f a h i k a k")));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
IndexSearcher is = newSearcher(reader);
@@ -337,7 +339,7 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new TestPayloadAnalyzer()));
Document doc = new Document();
- doc.add(new Field("content", new StringReader("j k a l f k k p a t a k l k t a")));
+ doc.add(new TextField("content", new StringReader("j k a l f k k p a t a k l k t a")));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
IndexSearcher is = newSearcher(reader);
@@ -379,7 +381,9 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarityProvider(similarity));
Document doc = new Document();
- doc.add(newField(PayloadHelper.FIELD,"xx rr yy mm pp", Field.Store.YES, Field.Index.ANALYZED));
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
+ doc.add(newField(PayloadHelper.FIELD,"xx rr yy mm pp", customType));
writer.addDocument(doc);
IndexReader reader = writer.getReader();
@@ -440,10 +444,12 @@ public class TestPayloadSpans extends Lu
newIndexWriterConfig(TEST_VERSION_CURRENT, new PayloadAnalyzer()).setSimilarityProvider(similarity));
Document doc = null;
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
for(int i = 0; i < docs.length; i++) {
doc = new Document();
String docText = docs[i];
- doc.add(newField(PayloadHelper.FIELD,docText, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField(PayloadHelper.FIELD,docText, customType));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java Mon Aug 15 22:03:41 2011
@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -41,10 +41,10 @@ public class TestSpanFirstQuery extends
RandomIndexWriter writer = new RandomIndexWriter(random, dir, analyzer);
Document doc = new Document();
- doc.add(newField("field", "the quick brown fox", Field.Index.ANALYZED));
+ doc.add(newField("field", "the quick brown fox", TextField.TYPE_UNSTORED));
writer.addDocument(doc);
Document doc2 = new Document();
- doc2.add(newField("field", "quick brown fox", Field.Index.ANALYZED));
+ doc2.add(newField("field", "quick brown fox", TextField.TYPE_UNSTORED));
writer.addDocument(doc2);
IndexReader reader = writer.getReader();
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java Mon Aug 15 22:03:41 2011
@@ -19,6 +19,7 @@ package org.apache.lucene.search.spans;
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;
@@ -42,7 +43,7 @@ public class TestSpanMultiTermQueryWrapp
directory = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random, directory);
Document doc = new Document();
- Field field = newField("field", "", Field.Store.NO, Field.Index.ANALYZED);
+ Field field = newField("field", "", TextField.TYPE_UNSTORED);
doc.add(field);
field.setValue("quick brown fox");
Modified: lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java?rev=1158029&r1=1158028&r2=1158029&view=diff
==============================================================================
--- lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java (original)
+++ lucene/dev/branches/fieldtype_conflicted/lucene/src/test/org/apache/lucene/search/spans/TestSpans.java Mon Aug 15 22:03:41 2011
@@ -38,7 +38,9 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
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.util.LuceneTestCase;
import org.apache.lucene.util.ReaderUtil;
@@ -56,9 +58,11 @@ public class TestSpans extends LuceneTes
super.setUp();
directory = newDirectory();
RandomIndexWriter writer= new RandomIndexWriter(random, directory, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
- doc.add(newField(field, docFields[i], Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(newField(field, docFields[i], customType));
writer.addDocument(doc);
}
reader = writer.getReader();
@@ -452,8 +456,12 @@ public class TestSpans extends LuceneTes
// LUCENE-1404
private void addDoc(IndexWriter writer, String id, String text) throws IOException {
final Document doc = new Document();
- doc.add( newField("id", id, Field.Store.YES, Field.Index.NOT_ANALYZED) );
- doc.add( newField("text", text, Field.Store.YES, Field.Index.ANALYZED) );
+ FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
+ customType.setStored(true);
+ FieldType customType2 = new FieldType(StringField.TYPE_UNSTORED);
+ customType2.setStored(true);
+ doc.add( newField("id", id, customType2) );
+ doc.add( newField("text", text, customType) );
writer.addDocument(doc);
}