You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/02/17 15:46:38 UTC
svn commit: r1245583 [2/3] - in /lucene/dev/trunk:
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/
lucene/core/...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Fri Feb 17 14:46:35 2012
@@ -32,7 +32,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.LongField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
@@ -548,8 +549,8 @@ public class TestBackwardsCompatibility
doc.add(new Field("content2", "here is more content with aaa aaa aaa", customType2));
doc.add(new Field("fie\u2C77ld", "field with non-ascii name", customType2));
// add numeric fields, to test if flex preserves encoding
- doc.add(new NumericField("trieInt", id));
- doc.add(new NumericField("trieLong", (long) id));
+ doc.add(new IntField("trieInt", id));
+ doc.add(new LongField("trieLong", (long) id));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java Fri Feb 17 14:46:35 2012
@@ -85,7 +85,7 @@ public class TestConcurrentMergeSchedule
}
for(int j=0;j<20;j++) {
- idField.setValue(Integer.toString(i*20+j));
+ idField.setStringValue(Integer.toString(i*20+j));
writer.addDocument(doc);
}
@@ -141,7 +141,7 @@ public class TestConcurrentMergeSchedule
System.out.println("\nTEST: cycle");
}
for(int j=0;j<100;j++) {
- idField.setValue(Integer.toString(i*100+j));
+ idField.setStringValue(Integer.toString(i*100+j));
writer.addDocument(doc);
}
@@ -212,7 +212,7 @@ public class TestConcurrentMergeSchedule
for(int iter=0;iter<10;iter++) {
for(int j=0;j<201;j++) {
- idField.setValue(Integer.toString(iter*201+j));
+ idField.setStringValue(Integer.toString(iter*201+j));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocTermOrds.java Fri Feb 17 14:46:35 2012
@@ -28,7 +28,7 @@ import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.IntField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocTermOrds.TermOrdsIterator;
@@ -54,13 +54,13 @@ public class TestDocTermOrds extends Luc
Document doc = new Document();
Field field = newField("field", "", TextField.TYPE_UNSTORED);
doc.add(field);
- field.setValue("a b c");
+ field.setStringValue("a b c");
w.addDocument(doc);
- field.setValue("d e f");
+ field.setStringValue("d e f");
w.addDocument(doc);
- field.setValue("a f");
+ field.setStringValue("a f");
w.addDocument(doc);
final IndexReader r = w.getReader();
@@ -124,7 +124,7 @@ public class TestDocTermOrds extends Luc
for(int id=0;id<NUM_DOCS;id++) {
Document doc = new Document();
- doc.add(new NumericField("id", id));
+ doc.add(new IntField("id", id));
final int termCount = _TestUtil.nextInt(random, 0, 20*RANDOM_MULTIPLIER);
while(ordsForDocSet.size() < termCount) {
@@ -221,7 +221,7 @@ public class TestDocTermOrds extends Luc
for(int id=0;id<NUM_DOCS;id++) {
Document doc = new Document();
- doc.add(new NumericField("id", id));
+ doc.add(new IntField("id", id));
final int termCount = _TestUtil.nextInt(random, 0, 20*RANDOM_MULTIPLIER);
while(ordsForDocSet.size() < termCount) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Fri Feb 17 14:46:35 2012
@@ -614,25 +614,25 @@ public class TestDocValuesIndexing exten
if (isNumeric) {
switch (valueType) {
case VAR_INTS:
- valField.setValue((long)i);
+ valField.setLongValue((long)i);
break;
case FIXED_INTS_16:
- valField.setValue((short)i);
+ valField.setIntValue((short)i);
break;
case FIXED_INTS_32:
- valField.setValue(i);
+ valField.setIntValue(i);
break;
case FIXED_INTS_64:
- valField.setValue((long)i);
+ valField.setLongValue((long)i);
break;
case FIXED_INTS_8:
- valField.setValue((byte)(0xFF & (i % 128)));
+ valField.setIntValue((byte)(0xFF & (i % 128)));
break;
case FLOAT_32:
- valField.setValue(2.0f * i);
+ valField.setFloatValue(2.0f * i);
break;
case FLOAT_64:
- valField.setValue(2.0d * i);
+ valField.setDoubleValue(2.0d * i);
break;
default:
fail("unexpected value " + valueType);
@@ -642,7 +642,7 @@ public class TestDocValuesIndexing exten
b[j] = upto++;
}
if (bytesRef != null) {
- valField.setValue(bytesRef);
+ valField.setBytesValue(bytesRef);
}
}
doc.removeFields("id");
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java Fri Feb 17 14:46:35 2012
@@ -24,9 +24,13 @@ import java.util.*;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.DocumentStoredFieldVisitor;
+import org.apache.lucene.document.DoubleField;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType.NumericType;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.FloatField;
+import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.LongField;
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
@@ -231,45 +235,51 @@ public class TestFieldsReader extends Lu
RandomIndexWriter w = new RandomIndexWriter(random, dir);
final int numDocs = atLeast(500);
final Number[] answers = new Number[numDocs];
- final NumericField.DataType[] typeAnswers = new NumericField.DataType[numDocs];
+ final NumericType[] typeAnswers = new NumericType[numDocs];
for(int id=0;id<numDocs;id++) {
Document doc = new Document();
- final NumericField nf;
+ final Field nf;
+ final Field sf;
final Number answer;
- final NumericField.DataType typeAnswer;
+ final NumericType typeAnswer;
if (random.nextBoolean()) {
// float/double
if (random.nextBoolean()) {
final float f = random.nextFloat();
answer = Float.valueOf(f);
- nf = new NumericField("nf", answer, NumericField.getFieldType(NumericField.DataType.FLOAT, true));
- typeAnswer = NumericField.DataType.FLOAT;
+ nf = new FloatField("nf", f);
+ sf = new StoredField("nf", f);
+ typeAnswer = NumericType.FLOAT;
} else {
final double d = random.nextDouble();
answer = Double.valueOf(d);
- nf = new NumericField("nf", answer, NumericField.getFieldType(NumericField.DataType.DOUBLE, true));
- typeAnswer = NumericField.DataType.DOUBLE;
+ nf = new DoubleField("nf", d);
+ sf = new StoredField("nf", d);
+ typeAnswer = NumericType.DOUBLE;
}
} else {
// int/long
if (random.nextBoolean()) {
final int i = random.nextInt();
answer = Integer.valueOf(i);
- nf = new NumericField("nf", answer, NumericField.getFieldType(NumericField.DataType.INT, true));
- typeAnswer = NumericField.DataType.INT;
+ nf = new IntField("nf", i);
+ sf = new StoredField("nf", i);
+ typeAnswer = NumericType.INT;
} else {
final long l = random.nextLong();
answer = Long.valueOf(l);
- nf = new NumericField("nf", answer, NumericField.getFieldType(NumericField.DataType.LONG, true));
- typeAnswer = NumericField.DataType.LONG;
+ nf = new LongField("nf", l);
+ sf = new StoredField("nf", l);
+ typeAnswer = NumericType.LONG;
}
}
doc.add(nf);
+ doc.add(sf);
answers[id] = answer;
typeAnswers[id] = typeAnswer;
- FieldType ft = new FieldType(NumericField.getFieldType(NumericField.DataType.INT, false));
+ FieldType ft = new FieldType(IntField.TYPE);
ft.setNumericPrecisionStep(Integer.MAX_VALUE);
- doc.add(new NumericField("id", id, ft));
+ doc.add(new IntField("id", id, ft));
w.addDocument(doc);
}
final DirectoryReader r = w.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Fri Feb 17 14:46:35 2012
@@ -1660,16 +1660,16 @@ public class TestIndexWriter extends Luc
w = new RandomIndexWriter(random, dir);
- contentField.setValue("other");
+ contentField.setStringValue("other");
w.addDocument(doc);
- contentField.setValue("term");
+ contentField.setStringValue("term");
w.addDocument(doc);
- contentField.setValue(bigTerm);
+ contentField.setStringValue(bigTerm);
w.addDocument(doc);
- contentField.setValue("zzz");
+ contentField.setStringValue("zzz");
w.addDocument(doc);
reader = w.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java Fri Feb 17 14:46:35 2012
@@ -347,7 +347,7 @@ public class TestIndexWriterCommit exten
if (failed.get()) break;
for(int j=0;j<10;j++) {
final String s = finalI + "_" + String.valueOf(count++);
- f.setValue(s);
+ f.setStringValue(s);
w.addDocument(doc);
w.commit();
DirectoryReader r2 = DirectoryReader.openIfChanged(r);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Fri Feb 17 14:46:35 2012
@@ -150,7 +150,7 @@ public class TestIndexWriterExceptions e
}
doFail.set(this);
final String id = ""+r.nextInt(50);
- idField.setValue(id);
+ idField.setStringValue(id);
Term idTerm = new Term("id", id);
try {
if (r.nextBoolean()) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java Fri Feb 17 14:46:35 2012
@@ -144,7 +144,7 @@ public class TestIndexWriterMerging exte
Field termVectorField = newField("termVector", "termVector", customType1);
document.add(termVectorField);
for(int i=0;i<10;i++) {
- idField.setValue("" + i);
+ idField.setStringValue("" + i);
writer.addDocument(document);
}
writer.close();
@@ -207,7 +207,7 @@ public class TestIndexWriterMerging exte
Field idField = newField("id", "", StringField.TYPE_UNSTORED);
document.add(idField);
for(int i=0;i<98;i++) {
- idField.setValue("" + i);
+ idField.setStringValue("" + i);
writer.addDocument(document);
}
writer.close();
@@ -273,7 +273,7 @@ public class TestIndexWriterMerging exte
Field idField = newField("id", "", StringField.TYPE_UNSTORED);
document.add(idField);
for(int i=0;i<98;i++) {
- idField.setValue("" + i);
+ idField.setStringValue("" + i);
writer.addDocument(document);
}
writer.close();
@@ -385,7 +385,7 @@ public class TestIndexWriterMerging exte
System.out.println("TEST: iter=" + iter);
}
for(int j=0;j<199;j++) {
- idField.setValue(Integer.toString(iter*201+j));
+ idField.setStringValue(Integer.toString(iter*201+j));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java Fri Feb 17 14:46:35 2012
@@ -879,9 +879,9 @@ public class TestIndexWriterReader exten
doc.add(newField("field", "a b c", TextField.TYPE_UNSTORED));
Field id = newField("id", "", StringField.TYPE_UNSTORED);
doc.add(id);
- id.setValue("0");
+ id.setStringValue("0");
w.addDocument(doc);
- id.setValue("1");
+ id.setStringValue("1");
w.addDocument(doc);
w.deleteDocuments(new Term("id", "0"));
@@ -903,9 +903,9 @@ public class TestIndexWriterReader exten
doc.add(newField("field", "a b c", TextField.TYPE_UNSTORED));
Field id = newField("id", "", StringField.TYPE_UNSTORED);
doc.add(id);
- id.setValue("0");
+ id.setStringValue("0");
w.addDocument(doc);
- id.setValue("1");
+ id.setStringValue("1");
w.addDocument(doc);
IndexReader r = w.getReader();
assertEquals(2, r.numDocs());
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java Fri Feb 17 14:46:35 2012
@@ -306,7 +306,7 @@ public class TestIndexWriterUnicode exte
s = new String(chars, 0, 2);
}
allTerms.add(s);
- f.setValue(s);
+ f.setStringValue(s);
writer.addDocument(d);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java Fri Feb 17 14:46:35 2012
@@ -53,7 +53,7 @@ public class TestMaxTermFrequency extend
Field foo = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(foo);
for (int i = 0; i < 100; i++) {
- foo.setValue(addValue());
+ foo.setStringValue(addValue());
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java Fri Feb 17 14:46:35 2012
@@ -60,7 +60,7 @@ public class TestMultiFields extends Luc
// re-use existing term
BytesRef term = terms.get(random.nextInt(terms.size()));
docs.get(term).add(i);
- f.setValue(term.utf8ToString());
+ f.setStringValue(term.utf8ToString());
} else {
String s = _TestUtil.randomUnicodeString(random, 10);
BytesRef term = new BytesRef(s);
@@ -70,9 +70,9 @@ public class TestMultiFields extends Luc
docs.get(term).add(i);
terms.add(term);
uniqueTerms.add(term);
- f.setValue(s);
+ f.setStringValue(s);
}
- id.setValue(""+i);
+ id.setStringValue(""+i);
w.addDocument(doc);
if (random.nextInt(4) == 1) {
w.commit();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNorms.java Fri Feb 17 14:46:35 2012
@@ -70,7 +70,7 @@ public class TestNorms extends LuceneTes
doc.add(bar);
for (int i = 0; i < 100; i++) {
- bar.setValue("singleton");
+ bar.setStringValue("singleton");
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java Fri Feb 17 14:46:35 2012
@@ -98,10 +98,10 @@ public class TestParallelReaderEmptyInde
FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
customType.setStoreTermVectors(true);
doc.add(newField("test", "", customType));
- idField.setValue("1");
+ idField.setStringValue("1");
iw.addDocument(doc);
doc.add(newField("test", "", TextField.TYPE_UNSTORED));
- idField.setValue("2");
+ idField.setStringValue("2");
iw.addDocument(doc);
iw.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Fri Feb 17 14:46:35 2012
@@ -32,7 +32,7 @@ import org.apache.lucene.codecs.lucene40
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.IntField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.DocIdSetIterator;
@@ -239,7 +239,7 @@ public class TestPostingsOffsets extends
for(int docCount=0;docCount<numDocs;docCount++) {
Document doc = new Document();
- doc.add(new NumericField("id", docCount));
+ doc.add(new IntField("id", docCount));
List<Token> tokens = new ArrayList<Token>();
final int numTokens = atLeast(100);
//final int numTokens = atLeast(20);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRandomStoredFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRandomStoredFields.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRandomStoredFields.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRandomStoredFields.java Fri Feb 17 14:46:35 2012
@@ -69,7 +69,7 @@ public class TestRandomStoredFields exte
Document doc = new Document();
doc.add(idField);
final String id = ""+i;
- idField.setValue(id);
+ idField.setStringValue(id);
docs.put(id, doc);
if (VERBOSE) {
System.out.println("TEST: add doc id=" + id);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java Fri Feb 17 14:46:35 2012
@@ -50,7 +50,7 @@ public class TestReaderClosed extends Lu
// but for preflex codec, the test can be very slow, so use less iterations.
int num = atLeast(10);
for (int i = 0; i < num; i++) {
- field.setValue(_TestUtil.randomUnicodeString(random, 10));
+ field.setStringValue(_TestUtil.randomUnicodeString(random, 10));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java Fri Feb 17 14:46:35 2012
@@ -57,7 +57,7 @@ public class TestRollingUpdates extends
} else {
id++;
}
- ((Field) doc.getField("docid")).setValue(myID);
+ ((Field) doc.getField("docid")).setStringValue(myID);
w.updateDocument(new Term("docid", myID), doc);
if (docIter >= SIZE && random.nextInt(50) == 17) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java Fri Feb 17 14:46:35 2012
@@ -43,12 +43,12 @@ public class TestStressAdvance extends L
int num = atLeast(4097);
for(int id=0;id<num;id++) {
if (random.nextInt(4) == 3) {
- f.setValue("a");
+ f.setStringValue("a");
aDocs.add(id);
} else {
- f.setValue("b");
+ f.setStringValue("b");
}
- idField.setValue(""+id);
+ idField.setStringValue(""+id);
w.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java Fri Feb 17 14:46:35 2012
@@ -45,13 +45,13 @@ public class TestSumDocFreq extends Luce
doc.add(field1);
doc.add(field2);
for (int i = 0; i < numDocs; i++) {
- id.setValue("" + i);
+ id.setStringValue("" + i);
char ch1 = (char) _TestUtil.nextInt(random, 'a', 'z');
char ch2 = (char) _TestUtil.nextInt(random, 'a', 'z');
- field1.setValue("" + ch1 + " " + ch2);
+ field1.setStringValue("" + ch1 + " " + ch2);
ch1 = (char) _TestUtil.nextInt(random, 'a', 'z');
ch2 = (char) _TestUtil.nextInt(random, 'a', 'z');
- field2.setValue("" + ch1 + " " + ch2);
+ field2.setStringValue("" + ch1 + " " + ch2);
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java Fri Feb 17 14:46:35 2012
@@ -32,7 +32,7 @@ import java.util.TreeSet;
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.IntField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.search.FieldCache;
@@ -164,7 +164,7 @@ public class TestTermsEnum extends Lucen
private void addDoc(RandomIndexWriter w, Collection<String> terms, Map<BytesRef,Integer> termToID, int id) throws IOException {
Document doc = new Document();
- doc.add(new NumericField("id", id));
+ doc.add(new IntField("id", id));
if (VERBOSE) {
System.out.println("TEST: addDoc id:" + id + " terms=" + terms);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java Fri Feb 17 14:46:35 2012
@@ -71,7 +71,7 @@ public class TestTermsEnum2 extends Luce
int num = atLeast(200);
for (int i = 0; i < num; i++) {
String s = _TestUtil.randomUnicodeString(random);
- field.setValue(s);
+ field.setStringValue(s);
terms.add(new BytesRef(s));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTypePromotion.java Fri Feb 17 14:46:35 2012
@@ -215,33 +215,33 @@ public class TestTypePromotion extends L
switch (valueType) {
case VAR_INTS:
values[i] = random.nextInt();
- valField.setValue(values[i]);
+ valField.setLongValue(values[i]);
break;
case FIXED_INTS_16:
values[i] = random.nextInt(Short.MAX_VALUE);
- valField.setValue((short) values[i]);
+ valField.setIntValue((short) values[i]);
break;
case FIXED_INTS_32:
values[i] = random.nextInt();
- valField.setValue((int) values[i]);
+ valField.setIntValue((int) values[i]);
break;
case FIXED_INTS_64:
values[i] = random.nextLong();
- valField.setValue(values[i]);
+ valField.setLongValue(values[i]);
break;
case FLOAT_64:
double nextDouble = random.nextDouble();
values[i] = Double.doubleToRawLongBits(nextDouble);
- valField.setValue(nextDouble);
+ valField.setDoubleValue(nextDouble);
break;
case FLOAT_32:
final float nextFloat = random.nextFloat();
values[i] = Double.doubleToRawLongBits(nextFloat);
- valField.setValue(nextFloat);
+ valField.setFloatValue(nextFloat);
break;
case FIXED_INTS_8:
values[i] = (byte) i;
- valField.setValue((byte)values[i]);
+ valField.setIntValue((byte)values[i]);
break;
case BYTES_FIXED_DEREF:
case BYTES_FIXED_SORTED:
@@ -250,7 +250,7 @@ public class TestTypePromotion extends L
byte bytes[] = new byte[8];
ByteArrayDataOutput out = new ByteArrayDataOutput(bytes, 0, 8);
out.writeLong(values[i]);
- valField.setValue(new BytesRef(bytes));
+ valField.setBytesValue(new BytesRef(bytes));
break;
case BYTES_VAR_DEREF:
case BYTES_VAR_SORTED:
@@ -267,7 +267,7 @@ public class TestTypePromotion extends L
lout.writeLong(values[i]);
len = 8;
}
- valField.setValue(new BytesRef(lbytes, 0, len));
+ valField.setBytesValue(new BytesRef(lbytes, 0, len));
break;
default:
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Fri Feb 17 14:46:35 2012
@@ -52,7 +52,7 @@ public class TestUniqueTermCount extends
Field foo = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(foo);
for (int i = 0; i < 100; i++) {
- foo.setValue(addValue());
+ foo.setStringValue(addValue());
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Fri Feb 17 14:46:35 2012
@@ -135,7 +135,7 @@ public class BaseTestRangeFilter extends
int maxCount = 0;
for (int d = minId; d <= maxId; d++) {
- idField.setValue(pad(d));
+ idField.setStringValue(pad(d));
int r = index.allowNegativeRandomInts ? random.nextInt() : random
.nextInt(Integer.MAX_VALUE);
if (index.maxR < r) {
@@ -151,8 +151,8 @@ public class BaseTestRangeFilter extends
} else if (r == index.minR) {
minCount++;
}
- randField.setValue(pad(r));
- bodyField.setValue("body");
+ randField.setStringValue(pad(r));
+ bodyField.setStringValue("body");
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java Fri Feb 17 14:46:35 2012
@@ -55,9 +55,9 @@ public class TestAutomatonQuery extends
doc.add(field);
doc.add(footerField);
writer.addDocument(doc);
- field.setValue("some text from doc two a short piece 5678.91");
+ field.setStringValue("some text from doc two a short piece 5678.91");
writer.addDocument(doc);
- field.setValue("doc three has some different stuff"
+ field.setStringValue("doc three has some different stuff"
+ " with numbers 1234 5678.9 and letter b");
writer.addDocument(doc);
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java Fri Feb 17 14:46:35 2012
@@ -54,30 +54,30 @@ public class TestAutomatonQueryUnicode e
doc.add(titleField);
doc.add(field);
doc.add(footerField);
- field.setValue("\uD866\uDF05abcdef");
+ field.setStringValue("\uD866\uDF05abcdef");
writer.addDocument(doc);
- field.setValue("\uD866\uDF06ghijkl");
+ field.setStringValue("\uD866\uDF06ghijkl");
writer.addDocument(doc);
// this sorts before the previous two in UTF-8/UTF-32, but after in UTF-16!!!
- field.setValue("\uFB94mnopqr");
+ field.setStringValue("\uFB94mnopqr");
writer.addDocument(doc);
- field.setValue("\uFB95stuvwx"); // this one too.
+ field.setStringValue("\uFB95stuvwx"); // this one too.
writer.addDocument(doc);
- field.setValue("a\uFFFCbc");
+ field.setStringValue("a\uFFFCbc");
writer.addDocument(doc);
- field.setValue("a\uFFFDbc");
+ field.setStringValue("a\uFFFDbc");
writer.addDocument(doc);
- field.setValue("a\uFFFEbc");
+ field.setStringValue("a\uFFFEbc");
writer.addDocument(doc);
- field.setValue("a\uFB94bc");
+ field.setStringValue("a\uFB94bc");
writer.addDocument(doc);
- field.setValue("bacadaba");
+ field.setStringValue("bacadaba");
writer.addDocument(doc);
- field.setValue("\uFFFD");
+ field.setStringValue("\uFFFD");
writer.addDocument(doc);
- field.setValue("\uFFFD\uD866\uDF05");
+ field.setStringValue("\uFFFD\uD866\uDF05");
writer.addDocument(doc);
- field.setValue("\uFFFD\uFFFD");
+ field.setStringValue("\uFFFD\uFFFD");
writer.addDocument(doc);
reader = writer.getReader();
searcher = newSearcher(reader);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java Fri Feb 17 14:46:35 2012
@@ -61,13 +61,13 @@ public class TestDocValuesScoring extend
Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
doc.add(field2);
- field.setValue("quick brown fox");
- field2.setValue("quick brown fox");
- dvField.setValue(2f); // boost x2
+ field.setStringValue("quick brown fox");
+ field2.setStringValue("quick brown fox");
+ dvField.setFloatValue(2f); // boost x2
iw.addDocument(doc);
- field.setValue("jumps over lazy brown dog");
- field2.setValue("jumps over lazy brown dog");
- dvField.setValue(4f); // boost x4
+ field.setStringValue("jumps over lazy brown dog");
+ field2.setStringValue("jumps over lazy brown dog");
+ dvField.setFloatValue(4f); // boost x4
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCache.java Fri Feb 17 14:46:35 2012
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.IntField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.*;
import org.apache.lucene.store.Directory;
@@ -78,7 +78,7 @@ public class TestFieldCache extends Luce
}
if (i%2 == 0) {
- doc.add(new NumericField("numInt", i));
+ doc.add(new IntField("numInt", i));
}
// sometimes skip the field:
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery2.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery2.java Fri Feb 17 14:46:35 2012
@@ -94,7 +94,7 @@ public class TestFuzzyQuery2 extends Luc
doc.add(field);
for (int i = 0; i < terms; i++) {
- field.setValue(mapInt(codePointTable, i));
+ field.setStringValue(mapInt(codePointTable, i));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java Fri Feb 17 14:46:35 2012
@@ -23,7 +23,7 @@ import java.text.DecimalFormatSymbols;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.IntField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -52,7 +52,7 @@ public class TestMultiValuedNumericRange
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), StringField.TYPE_UNSTORED));
- doc.add(new NumericField("trie", value));
+ doc.add(new IntField("trie", value));
}
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Fri Feb 17 14:46:35 2012
@@ -20,7 +20,8 @@ package org.apache.lucene.search;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.FloatField;
+import org.apache.lucene.document.IntField;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
@@ -60,7 +61,9 @@ public class TestNumericRangeQuery32 ext
.setMaxBufferedDocs(_TestUtil.nextInt(random, 100, 1000))
.setMergePolicy(newLogMergePolicy()));
- final FieldType storedInt = NumericField.getFieldType(NumericField.DataType.INT, true);
+ final FieldType storedInt = new FieldType(IntField.TYPE);
+ storedInt.setStored(true);
+ storedInt.freeze();
final FieldType storedInt8 = new FieldType(storedInt);
storedInt8.setNumericPrecisionStep(8);
@@ -74,7 +77,7 @@ public class TestNumericRangeQuery32 ext
final FieldType storedIntNone = new FieldType(storedInt);
storedIntNone.setNumericPrecisionStep(Integer.MAX_VALUE);
- final FieldType unstoredInt = NumericField.getFieldType(NumericField.DataType.INT, false);
+ final FieldType unstoredInt = IntField.TYPE;
final FieldType unstoredInt8 = new FieldType(unstoredInt);
unstoredInt8.setNumericPrecisionStep(8);
@@ -85,14 +88,14 @@ public class TestNumericRangeQuery32 ext
final FieldType unstoredInt2 = new FieldType(unstoredInt);
unstoredInt2.setNumericPrecisionStep(2);
- NumericField
- field8 = new NumericField("field8", 0, storedInt8),
- field4 = new NumericField("field4", 0, storedInt4),
- field2 = new NumericField("field2", 0, storedInt2),
- fieldNoTrie = new NumericField("field"+Integer.MAX_VALUE, 0, storedIntNone),
- ascfield8 = new NumericField("ascfield8", 0, unstoredInt8),
- ascfield4 = new NumericField("ascfield4", 0, unstoredInt4),
- ascfield2 = new NumericField("ascfield2", 0, unstoredInt2);
+ IntField
+ field8 = new IntField("field8", 0, storedInt8),
+ field4 = new IntField("field4", 0, storedInt4),
+ field2 = new IntField("field2", 0, storedInt2),
+ fieldNoTrie = new IntField("field"+Integer.MAX_VALUE, 0, storedIntNone),
+ ascfield8 = new IntField("ascfield8", 0, unstoredInt8),
+ ascfield4 = new IntField("ascfield4", 0, unstoredInt4),
+ ascfield2 = new IntField("ascfield2", 0, unstoredInt2);
Document doc = new Document();
// add fields, that have a distance to test general functionality
@@ -103,15 +106,15 @@ public class TestNumericRangeQuery32 ext
// Add a series of noDocs docs with increasing int values
for (int l=0; l<noDocs; l++) {
int val=distance*l+startOffset;
- field8.setValue(val);
- field4.setValue(val);
- field2.setValue(val);
- fieldNoTrie.setValue(val);
+ field8.setIntValue(val);
+ field4.setIntValue(val);
+ field2.setIntValue(val);
+ fieldNoTrie.setIntValue(val);
val=l-(noDocs/2);
- ascfield8.setValue(val);
- ascfield4.setValue(val);
- ascfield2.setValue(val);
+ ascfield8.setIntValue(val);
+ ascfield4.setIntValue(val);
+ ascfield2.setIntValue(val);
writer.addDocument(doc);
}
@@ -299,23 +302,23 @@ public class TestNumericRangeQuery32 ext
RandomIndexWriter writer = new RandomIndexWriter(random, dir,
newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
- doc.add(new NumericField("float", Float.NEGATIVE_INFINITY));
- doc.add(new NumericField("int", Integer.MIN_VALUE));
+ doc.add(new FloatField("float", Float.NEGATIVE_INFINITY));
+ doc.add(new IntField("int", Integer.MIN_VALUE));
writer.addDocument(doc);
doc = new Document();
- doc.add(new NumericField("float", Float.POSITIVE_INFINITY));
- doc.add(new NumericField("int", Integer.MAX_VALUE));
+ doc.add(new FloatField("float", Float.POSITIVE_INFINITY));
+ doc.add(new IntField("int", Integer.MAX_VALUE));
writer.addDocument(doc);
doc = new Document();
- doc.add(new NumericField("float", 0.0f));
- doc.add(new NumericField("int", 0));
+ doc.add(new FloatField("float", 0.0f));
+ doc.add(new IntField("int", 0));
writer.addDocument(doc);
for (float f : TestNumericUtils.FLOAT_NANs) {
doc = new Document();
- doc.add(new NumericField("float", f));
+ doc.add(new FloatField("float", f));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Fri Feb 17 14:46:35 2012
@@ -19,8 +19,9 @@ package org.apache.lucene.search;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.DoubleField;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.LongField;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
@@ -60,7 +61,9 @@ public class TestNumericRangeQuery64 ext
.setMaxBufferedDocs(_TestUtil.nextInt(random, 100, 1000))
.setMergePolicy(newLogMergePolicy()));
- final FieldType storedLong = NumericField.getFieldType(NumericField.DataType.LONG, true);
+ final FieldType storedLong = new FieldType(LongField.TYPE);
+ storedLong.setStored(true);
+ storedLong.freeze();
final FieldType storedLong8 = new FieldType(storedLong);
storedLong8.setNumericPrecisionStep(8);
@@ -77,7 +80,7 @@ public class TestNumericRangeQuery64 ext
final FieldType storedLongNone = new FieldType(storedLong);
storedLongNone.setNumericPrecisionStep(Integer.MAX_VALUE);
- final FieldType unstoredLong = NumericField.getFieldType(NumericField.DataType.LONG, false);
+ final FieldType unstoredLong = LongField.TYPE;
final FieldType unstoredLong8 = new FieldType(unstoredLong);
unstoredLong8.setNumericPrecisionStep(8);
@@ -91,16 +94,16 @@ public class TestNumericRangeQuery64 ext
final FieldType unstoredLong2 = new FieldType(unstoredLong);
unstoredLong2.setNumericPrecisionStep(2);
- NumericField
- field8 = new NumericField("field8", 0L, storedLong8),
- field6 = new NumericField("field6", 0L, storedLong6),
- field4 = new NumericField("field4", 0L, storedLong4),
- field2 = new NumericField("field2", 0L, storedLong2),
- fieldNoTrie = new NumericField("field"+Integer.MAX_VALUE, 0L, storedLongNone),
- ascfield8 = new NumericField("ascfield8", 0L, unstoredLong8),
- ascfield6 = new NumericField("ascfield6", 0L, unstoredLong6),
- ascfield4 = new NumericField("ascfield4", 0L, unstoredLong4),
- ascfield2 = new NumericField("ascfield2", 0L, unstoredLong2);
+ LongField
+ field8 = new LongField("field8", 0L, storedLong8),
+ field6 = new LongField("field6", 0L, storedLong6),
+ field4 = new LongField("field4", 0L, storedLong4),
+ field2 = new LongField("field2", 0L, storedLong2),
+ fieldNoTrie = new LongField("field"+Integer.MAX_VALUE, 0L, storedLongNone),
+ ascfield8 = new LongField("ascfield8", 0L, unstoredLong8),
+ ascfield6 = new LongField("ascfield6", 0L, unstoredLong6),
+ ascfield4 = new LongField("ascfield4", 0L, unstoredLong4),
+ ascfield2 = new LongField("ascfield2", 0L, unstoredLong2);
Document doc = new Document();
// add fields, that have a distance to test general functionality
@@ -111,17 +114,17 @@ public class TestNumericRangeQuery64 ext
// Add a series of noDocs docs with increasing long values, by updating the fields
for (int l=0; l<noDocs; l++) {
long val=distance*l+startOffset;
- field8.setValue(val);
- field6.setValue(val);
- field4.setValue(val);
- field2.setValue(val);
- fieldNoTrie.setValue(val);
+ field8.setLongValue(val);
+ field6.setLongValue(val);
+ field4.setLongValue(val);
+ field2.setLongValue(val);
+ fieldNoTrie.setLongValue(val);
val=l-(noDocs/2);
- ascfield8.setValue(val);
- ascfield6.setValue(val);
- ascfield4.setValue(val);
- ascfield2.setValue(val);
+ ascfield8.setLongValue(val);
+ ascfield6.setLongValue(val);
+ ascfield4.setLongValue(val);
+ ascfield2.setLongValue(val);
writer.addDocument(doc);
}
reader = writer.getReader();
@@ -324,23 +327,23 @@ public class TestNumericRangeQuery64 ext
RandomIndexWriter writer = new RandomIndexWriter(random, dir,
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
Document doc = new Document();
- doc.add(new NumericField("double", Double.NEGATIVE_INFINITY));
- doc.add(new NumericField("long", Long.MIN_VALUE));
+ doc.add(new DoubleField("double", Double.NEGATIVE_INFINITY));
+ doc.add(new LongField("long", Long.MIN_VALUE));
writer.addDocument(doc);
doc = new Document();
- doc.add(new NumericField("double", Double.POSITIVE_INFINITY));
- doc.add(new NumericField("long", Long.MAX_VALUE));
+ doc.add(new DoubleField("double", Double.POSITIVE_INFINITY));
+ doc.add(new LongField("long", Long.MAX_VALUE));
writer.addDocument(doc);
doc = new Document();
- doc.add(new NumericField("double", 0.0));
- doc.add(new NumericField("long", 0L));
+ doc.add(new DoubleField("double", 0.0));
+ doc.add(new LongField("long", 0L));
writer.addDocument(doc);
for (double d : TestNumericUtils.DOUBLE_NANs) {
doc = new Document();
- doc.add(new NumericField("double", d));
+ doc.add(new DoubleField("double", d));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java Fri Feb 17 14:46:35 2012
@@ -654,7 +654,7 @@ public class TestPhraseQuery extends Luc
}
}
docs.add(doc);
- f.setValue(sb.toString());
+ f.setStringValue(sb.toString());
w.addDocument(d);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java Fri Feb 17 14:46:35 2012
@@ -58,15 +58,15 @@ public class TestPrefixInBooleanQuery ex
writer.addDocument(doc);
}
- field.setValue("tangfulin");
+ field.setStringValue("tangfulin");
writer.addDocument(doc);
- field.setValue("meaninglessnames");
+ field.setStringValue("meaninglessnames");
for (int i = 5138; i < 11377; ++i) {
writer.addDocument(doc);
}
- field.setValue("tangfulin");
+ field.setStringValue("tangfulin");
writer.addDocument(doc);
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java Fri Feb 17 14:46:35 2012
@@ -64,7 +64,7 @@ public class TestPrefixRandom extends Lu
final String codec = Codec.getDefault().getName();
int num = codec.equals("Lucene3x") ? 200 * RANDOM_MULTIPLIER : atLeast(1000);
for (int i = 0; i < num; i++) {
- field.setValue(_TestUtil.randomUnicodeString(random, 10));
+ field.setStringValue(_TestUtil.randomUnicodeString(random, 10));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java Fri Feb 17 14:46:35 2012
@@ -60,7 +60,7 @@ public class TestRegexpRandom extends Lu
NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ENGLISH));
for (int i = 0; i < 1000; i++) {
- field.setValue(df.format(i));
+ field.setStringValue(df.format(i));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java Fri Feb 17 14:46:35 2012
@@ -72,7 +72,7 @@ public class TestRegexpRandom2 extends L
int num = atLeast(200);
for (int i = 0; i < num; i++) {
String s = _TestUtil.randomUnicodeString(random);
- field.setValue(s);
+ field.setStringValue(s);
terms.add(s);
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java Fri Feb 17 14:46:35 2012
@@ -55,7 +55,7 @@ public class TestSearchWithThreads exten
sb.append(random.nextBoolean() ? "aaa" : "bbb");
sb.append(' ');
}
- body.setValue(sb.toString());
+ body.setStringValue(sb.toString());
w.addDocument(doc);
sb.delete(0, sb.length());
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java Fri Feb 17 14:46:35 2012
@@ -54,11 +54,11 @@ public class TestSimilarityProvider exte
Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
doc.add(field2);
- field.setValue("quick brown fox");
- field2.setValue("quick brown fox");
+ field.setStringValue("quick brown fox");
+ field2.setStringValue("quick brown fox");
iw.addDocument(doc);
- field.setValue("jumps over lazy brown dog");
- field2.setValue("jumps over lazy brown dog");
+ field.setStringValue("jumps over lazy brown dog");
+ field2.setStringValue("jumps over lazy brown dog");
iw.addDocument(doc);
reader = iw.getReader();
iw.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Fri Feb 17 14:46:35 2012
@@ -239,13 +239,13 @@ public class TestSloppyPhraseQuery exten
Field f = new Field("lyrics", "", customType);
Document doc = new Document();
doc.add(f);
- f.setValue("drug drug");
+ f.setStringValue("drug drug");
iw.addDocument(doc);
- f.setValue("drug druggy drug");
+ f.setStringValue("drug druggy drug");
iw.addDocument(doc);
- f.setValue("drug druggy druggy drug");
+ f.setStringValue("drug druggy druggy drug");
iw.addDocument(doc);
- f.setValue("drug druggy drug druggy drug");
+ f.setStringValue("drug druggy drug druggy drug");
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java Fri Feb 17 14:46:35 2012
@@ -22,7 +22,8 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.FloatField;
+import org.apache.lucene.document.IntField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReaderContext;
@@ -30,7 +31,6 @@ import org.apache.lucene.index.Composite
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
-import org.apache.lucene.index.IndexReaderContext;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
@@ -97,7 +97,7 @@ public class TestTopDocsMerge extends Lu
final Document doc = new Document();
doc.add(newField("string", _TestUtil.randomRealisticUnicodeString(random), StringField.TYPE_UNSTORED));
doc.add(newField("text", content[random.nextInt(content.length)], TextField.TYPE_UNSTORED));
- doc.add(new NumericField("float", random.nextFloat()));
+ doc.add(new FloatField("float", random.nextFloat()));
final int intValue;
if (random.nextInt(100) == 17) {
intValue = Integer.MIN_VALUE;
@@ -106,7 +106,7 @@ public class TestTopDocsMerge extends Lu
} else {
intValue = random.nextInt();
}
- doc.add(new NumericField("int", intValue));
+ doc.add(new IntField("int", intValue));
if (VERBOSE) {
System.out.println(" doc=" + doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java Fri Feb 17 14:46:35 2012
@@ -57,7 +57,7 @@ public class TestWildcardRandom extends
NumberFormat df = new DecimalFormat("000", new DecimalFormatSymbols(Locale.ENGLISH));
for (int i = 0; i < 1000; i++) {
- field.setValue(df.format(i));
+ field.setStringValue(df.format(i));
writer.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java Fri Feb 17 14:46:35 2012
@@ -46,11 +46,11 @@ public class TestSpanMultiTermQueryWrapp
Field field = newField("field", "", TextField.TYPE_UNSTORED);
doc.add(field);
- field.setValue("quick brown fox");
+ field.setStringValue("quick brown fox");
iw.addDocument(doc);
- field.setValue("jumps over lazy broun dog");
+ field.setStringValue("jumps over lazy broun dog");
iw.addDocument(doc);
- field.setValue("jumps over extremely very lazy broxn dog");
+ field.setStringValue("jumps over extremely very lazy broxn dog");
iw.addDocument(doc);
reader = iw.getReader();
iw.close();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java Fri Feb 17 14:46:35 2012
@@ -161,8 +161,8 @@ public class TestMultiMMap extends Lucen
int numDocs = 100;
for (int i = 0; i < numDocs; i++) {
- docid.setValue("" + i);
- junk.setValue(_TestUtil.randomUnicodeString(random));
+ docid.setStringValue("" + i);
+ junk.setStringValue(_TestUtil.randomUnicodeString(random));
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Fri Feb 17 14:46:35 2012
@@ -1627,7 +1627,7 @@ public class TestFSTs extends LuceneTest
}
}
allIDs.add(idString);
- idField.setValue(idString);
+ idField.setStringValue(idString);
w.addDocument(doc);
}
@@ -1752,7 +1752,7 @@ public class TestFSTs extends LuceneTest
}
for(String term : allTerms) {
- f.setValue(term);
+ f.setStringValue(term);
w.addDocument(doc);
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Fri Feb 17 14:46:35 2012
@@ -25,6 +25,7 @@ import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
+import org.apache.lucene.document.DocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
@@ -176,9 +177,6 @@ public class RandomIndexWriter implement
String name = "random_" + type.name() + "" + docValuesFieldPrefix;
if ("Lucene3x".equals(codec.getName()) || doc.getField(name) != null)
return;
- FieldType ft = new FieldType();
- ft.setDocValueType(type);
- ft.freeze();
final Field f;
switch (type) {
case BYTES_FIXED_DEREF:
@@ -193,33 +191,33 @@ public class RandomIndexWriter implement
fixedRef.grow(fixedBytesLength);
fixedRef.length = fixedBytesLength;
}
- f = new Field(name, fixedRef, ft);
+ f = new DocValuesField(name, fixedRef, type);
break;
case BYTES_VAR_DEREF:
case BYTES_VAR_STRAIGHT:
case BYTES_VAR_SORTED:
- f = new Field(name, new BytesRef(_TestUtil.randomUnicodeString(random, 200)), ft);
+ f = new DocValuesField(name, new BytesRef(_TestUtil.randomUnicodeString(random, 200)), type);
break;
case FLOAT_32:
- f = new Field(name, random.nextFloat(), ft);
+ f = new DocValuesField(name, random.nextFloat(), type);
break;
case FLOAT_64:
- f = new Field(name, random.nextDouble(), ft);
+ f = new DocValuesField(name, random.nextDouble(), type);
break;
case VAR_INTS:
- f = new Field(name, random.nextLong(), ft);
+ f = new DocValuesField(name, random.nextLong(), type);
break;
case FIXED_INTS_16:
- f = new Field(name, random.nextInt(Short.MAX_VALUE), ft);
+ f = new DocValuesField(name, random.nextInt(Short.MAX_VALUE), type);
break;
case FIXED_INTS_32:
- f = new Field(name, random.nextInt(), ft);
+ f = new DocValuesField(name, random.nextInt(), type);
break;
case FIXED_INTS_64:
- f = new Field(name, random.nextLong(), ft);
+ f = new DocValuesField(name, random.nextLong(), type);
break;
case FIXED_INTS_8:
- f = new Field(name, random.nextInt(128), ft);
+ f = new DocValuesField(name, random.nextInt(128), type);
break;
default:
throw new IllegalArgumentException("no such type: " + type);
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java Fri Feb 17 14:46:35 2012
@@ -175,12 +175,12 @@ public class LineFileDocs implements Clo
throw new RuntimeException("line: [" + line + "] is in an invalid format !");
}
- docState.body.setValue(line.substring(1+spot2, line.length()));
+ docState.body.setStringValue(line.substring(1+spot2, line.length()));
final String title = line.substring(0, spot);
- docState.title.setValue(title);
- docState.titleTokenized.setValue(title);
- docState.date.setValue(line.substring(1+spot, spot2));
- docState.id.setValue(Integer.toString(id.getAndIncrement()));
+ docState.title.setStringValue(title);
+ docState.titleTokenized.setStringValue(title);
+ docState.date.setStringValue(line.substring(1+spot, spot2));
+ docState.id.setStringValue(Integer.toString(id.getAndIncrement()));
return docState.doc;
}
}
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Fri Feb 17 14:46:35 2012
@@ -20,22 +20,26 @@ package org.apache.lucene.benchmark.byTa
import java.io.Closeable;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import java.util.Properties;
-import java.util.Locale;
import java.util.Random;
-import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
-import java.text.SimpleDateFormat;
-import java.text.ParsePosition;
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType.NumericType;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.LongField;
+import org.apache.lucene.document.FloatField;
+import org.apache.lucene.document.DoubleField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
@@ -89,7 +93,7 @@ public class DocMaker implements Closeab
static class DocState {
private final Map<String,Field> fields;
- private final Map<String,NumericField> numericFields;
+ private final Map<String,Field> numericFields;
private final boolean reuseFields;
final Document doc;
DocData docData = new DocData();
@@ -100,7 +104,7 @@ public class DocMaker implements Closeab
if (reuseFields) {
fields = new HashMap<String,Field>();
- numericFields = new HashMap<String,NumericField>();
+ numericFields = new HashMap<String,Field>();
// Initialize the map with the default fields.
fields.put(BODY_FIELD, new Field(BODY_FIELD, "", bodyFt));
@@ -109,8 +113,8 @@ public class DocMaker implements Closeab
fields.put(ID_FIELD, new Field(ID_FIELD, "", StringField.TYPE_STORED));
fields.put(NAME_FIELD, new Field(NAME_FIELD, "", ft));
- numericFields.put(DATE_MSEC_FIELD, new NumericField(DATE_MSEC_FIELD, 0L));
- numericFields.put(TIME_SEC_FIELD, new NumericField(TIME_SEC_FIELD, 0));
+ numericFields.put(DATE_MSEC_FIELD, new LongField(DATE_MSEC_FIELD, 0L));
+ numericFields.put(TIME_SEC_FIELD, new IntField(TIME_SEC_FIELD, 0));
doc = new Document();
} else {
@@ -138,8 +142,8 @@ public class DocMaker implements Closeab
return f;
}
- NumericField getNumericField(String name, NumericField.DataType type) {
- NumericField f;
+ Field getNumericField(String name, NumericType type) {
+ Field f;
if (reuseFields) {
f = numericFields.get(name);
} else {
@@ -149,16 +153,16 @@ public class DocMaker implements Closeab
if (f == null) {
switch(type) {
case INT:
- f = new NumericField(name, 0);
+ f = new IntField(name, 0);
break;
case LONG:
- f = new NumericField(name, 0L);
+ f = new LongField(name, 0L);
break;
case FLOAT:
- f = new NumericField(name, 0.0f);
+ f = new FloatField(name, 0.0F);
break;
case DOUBLE:
- f = new NumericField(name, 0.0);
+ f = new DoubleField(name, 0.0);
break;
default:
assert false;
@@ -233,7 +237,7 @@ public class DocMaker implements Closeab
id = numDocsCreated.getAndIncrement();
}
}
- idField.setValue(Integer.toString(id));
+ idField.setStringValue(Integer.toString(id));
doc.add(idField);
// Set NAME_FIELD
@@ -241,7 +245,7 @@ public class DocMaker implements Closeab
if (name == null) name = "";
name = cnt < 0 ? name : name + "_" + cnt;
Field nameField = ds.getField(NAME_FIELD, valType);
- nameField.setValue(name);
+ nameField.setStringValue(name);
doc.add(nameField);
// Set DATE_FIELD
@@ -260,7 +264,7 @@ public class DocMaker implements Closeab
dateString = "";
}
Field dateStringField = ds.getField(DATE_FIELD, valType);
- dateStringField.setValue(dateString);
+ dateStringField.setStringValue(dateString);
doc.add(dateStringField);
if (date == null) {
@@ -268,21 +272,21 @@ public class DocMaker implements Closeab
date = new Date();
}
- NumericField dateField = ds.getNumericField(DATE_MSEC_FIELD, NumericField.DataType.LONG);
- dateField.setValue(date.getTime());
+ Field dateField = ds.getNumericField(DATE_MSEC_FIELD, NumericType.LONG);
+ dateField.setLongValue(date.getTime());
doc.add(dateField);
util.cal.setTime(date);
final int sec = util.cal.get(Calendar.HOUR_OF_DAY)*3600 + util.cal.get(Calendar.MINUTE)*60 + util.cal.get(Calendar.SECOND);
- NumericField timeSecField = ds.getNumericField(TIME_SEC_FIELD, NumericField.DataType.INT);
- timeSecField.setValue(sec);
+ Field timeSecField = ds.getNumericField(TIME_SEC_FIELD, NumericType.INT);
+ timeSecField.setIntValue(sec);
doc.add(timeSecField);
// Set TITLE_FIELD
String title = docData.getTitle();
Field titleField = ds.getField(TITLE_FIELD, valType);
- titleField.setValue(title == null ? "" : title);
+ titleField.setStringValue(title == null ? "" : title);
doc.add(titleField);
String body = docData.getBody();
@@ -303,12 +307,12 @@ public class DocMaker implements Closeab
docData.setBody(body.substring(size)); // some left
}
Field bodyField = ds.getField(BODY_FIELD, bodyValType);
- bodyField.setValue(bdy);
+ bodyField.setStringValue(bdy);
doc.add(bodyField);
if (storeBytes) {
Field bytesField = ds.getField(BYTES_FIELD, StringField.TYPE_STORED);
- bytesField.setValue(bdy.getBytes("UTF-8"));
+ bytesField.setBytesValue(bdy.getBytes("UTF-8"));
doc.add(bytesField);
}
}
@@ -318,7 +322,7 @@ public class DocMaker implements Closeab
if (props != null) {
for (final Map.Entry<Object,Object> entry : props.entrySet()) {
Field f = ds.getField((String) entry.getKey(), valType);
- f.setValue((String) entry.getValue());
+ f.setStringValue((String) entry.getValue());
doc.add(f);
}
docData.setProps(null);
Modified: lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java (original)
+++ lucene/dev/trunk/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java Fri Feb 17 14:46:35 2012
@@ -26,7 +26,10 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.IntField;
+import org.apache.lucene.document.LongField;
+import org.apache.lucene.document.FloatField;
+import org.apache.lucene.document.DoubleField;
import org.apache.lucene.index.IndexableField;
/**
@@ -69,7 +72,13 @@ public class ReadTokensTask extends Perf
Analyzer analyzer = getRunData().getAnalyzer();
int tokenCount = 0;
for(final IndexableField field : fields) {
- if (!field.fieldType().tokenized() || field instanceof NumericField) continue;
+ if (!field.fieldType().tokenized() ||
+ field instanceof IntField ||
+ field instanceof LongField ||
+ field instanceof FloatField ||
+ field instanceof DoubleField) {
+ continue;
+ }
final TokenStream stream = field.tokenStream(analyzer);
// reset the TokenStream to the first token
Modified: lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java (original)
+++ lucene/dev/trunk/modules/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java Fri Feb 17 14:46:35 2012
@@ -549,7 +549,7 @@ public class DirectoryTaxonomyWriter imp
Document d = new Document();
d.add(parentStreamField);
- fullPathField.setValue(categoryPath.toString(delimiter, length));
+ fullPathField.setStringValue(categoryPath.toString(delimiter, length));
d.add(fullPathField);
// Note that we do no pass an Analyzer here because the fields that are
Modified: lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (original)
+++ lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java Fri Feb 17 14:46:35 2012
@@ -227,7 +227,7 @@ public class AllGroupHeadsCollectorTest
Field content = newField("content", "", TextField.TYPE_UNSTORED);
doc.add(content);
docNoGroup.add(content);
- NumericField id = new NumericField("id", 0);
+ IntField id = new IntField("id", 0);
doc.add(id);
docNoGroup.add(id);
final GroupDoc[] groupDocs = new GroupDoc[numDocs];
@@ -256,16 +256,16 @@ public class AllGroupHeadsCollectorTest
groupDocs[i] = groupDoc;
if (groupDoc.group != null) {
- group.setValue(groupDoc.group.utf8ToString());
+ group.setStringValue(groupDoc.group.utf8ToString());
if (canUseIDV) {
- valuesField.setValue(new BytesRef(groupDoc.group.utf8ToString()));
+ valuesField.setBytesValue(new BytesRef(groupDoc.group.utf8ToString()));
}
}
- sort1.setValue(groupDoc.sort1.utf8ToString());
- sort2.setValue(groupDoc.sort2.utf8ToString());
- sort3.setValue(groupDoc.sort3.utf8ToString());
- content.setValue(groupDoc.content);
- id.setValue(groupDoc.id);
+ sort1.setStringValue(groupDoc.sort1.utf8ToString());
+ sort2.setStringValue(groupDoc.sort2.utf8ToString());
+ sort3.setStringValue(groupDoc.sort3.utf8ToString());
+ content.setStringValue(groupDoc.content);
+ id.setIntValue(groupDoc.id);
if (groupDoc.group == null) {
w.addDocument(docNoGroup);
} else {
Modified: lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1245583&r1=1245582&r2=1245583&view=diff
==============================================================================
--- lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/trunk/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Fri Feb 17 14:46:35 2012
@@ -595,7 +595,7 @@ public class TestGrouping extends Lucene
}
doc.add(newField("sort1", groupValue.sort1.utf8ToString(), StringField.TYPE_UNSTORED));
doc.add(newField("sort2", groupValue.sort2.utf8ToString(), StringField.TYPE_UNSTORED));
- doc.add(new NumericField("id", groupValue.id));
+ doc.add(new IntField("id", groupValue.id));
doc.add(newField("content", groupValue.content, TextField.TYPE_UNSTORED));
//System.out.println("TEST: doc content=" + groupValue.content + " group=" + (groupValue.group == null ? "null" : groupValue.group.utf8ToString()) + " sort1=" + groupValue.sort1.utf8ToString() + " id=" + groupValue.id);
}
@@ -721,7 +721,7 @@ public class TestGrouping extends Lucene
Field content = newField("content", "", TextField.TYPE_UNSTORED);
doc.add(content);
docNoGroup.add(content);
- NumericField id = new NumericField("id", 0);
+ IntField id = new IntField("id", 0);
doc.add(id);
docNoGroup.add(id);
final GroupDoc[] groupDocs = new GroupDoc[numDocs];
@@ -745,15 +745,15 @@ public class TestGrouping extends Lucene
groupDocs[i] = groupDoc;
if (groupDoc.group != null) {
- group.setValue(groupDoc.group.utf8ToString());
+ group.setStringValue(groupDoc.group.utf8ToString());
if (canUseIDV) {
- idvGroupField.setValue(BytesRef.deepCopyOf(groupDoc.group));
+ idvGroupField.setBytesValue(BytesRef.deepCopyOf(groupDoc.group));
}
}
- sort1.setValue(groupDoc.sort1.utf8ToString());
- sort2.setValue(groupDoc.sort2.utf8ToString());
- content.setValue(groupDoc.content);
- id.setValue(groupDoc.id);
+ sort1.setStringValue(groupDoc.sort1.utf8ToString());
+ sort2.setStringValue(groupDoc.sort2.utf8ToString());
+ content.setStringValue(groupDoc.content);
+ id.setIntValue(groupDoc.id);
if (groupDoc.group == null) {
w.addDocument(docNoGroup);
} else {