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/01/12 16:39:10 UTC
svn commit: r1230595 [2/2] - in /lucene/dev/branches/lucene3453:
lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/
lucene/contrib/spatial/src/test/org/apache/lucene/spatial/tier/
lucene/src/java/org/apache/lucene/codecs/ lucene/sr...
Modified: lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java Thu Jan 12 15:39:08 2012
@@ -55,18 +55,18 @@ public class TestDocValuesScoring extend
Document doc = new Document();
Field field = newField("foo", "", TextField.TYPE_UNSTORED);
doc.add(field);
- DocValuesField dvField = new DocValuesField("foo_boost", DocValues.Type.FLOAT_32);
+ DocValuesField dvField = new DocValuesField("foo_boost", 0.0f, DocValues.Type.FLOAT_32);
doc.add(dvField);
Field field2 = newField("bar", "", TextField.TYPE_UNSTORED);
doc.add(field2);
field.setValue("quick brown fox");
field2.setValue("quick brown fox");
- dvField.setFloat(2f); // boost x2
+ dvField.setValue(2f); // boost x2
iw.addDocument(doc);
field.setValue("jumps over lazy brown dog");
field2.setValue("jumps over lazy brown dog");
- dvField.setFloat(4f); // boost x4
+ dvField.setValue(4f); // boost x4
iw.addDocument(doc);
IndexReader ir = iw.getReader();
iw.close();
Modified: lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (original)
+++ lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java Thu Jan 12 15:39:08 2012
@@ -19,9 +19,10 @@ 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.index.IndexReader;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowMultiReaderWrapper;
@@ -58,16 +59,40 @@ public class TestNumericRangeQuery32 ext
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
.setMaxBufferedDocs(_TestUtil.nextInt(random, 100, 1000))
.setMergePolicy(newLogMergePolicy()));
-
+
+ final FieldType storedInt = NumericField.getFieldType(NumericField.DataType.INT, true);
+
+ final FieldType storedInt8 = new FieldType(storedInt);
+ storedInt8.setNumericPrecisionStep(8);
+
+ final FieldType storedInt4 = new FieldType(storedInt);
+ storedInt4.setNumericPrecisionStep(4);
+
+ final FieldType storedInt2 = new FieldType(storedInt);
+ storedInt2.setNumericPrecisionStep(2);
+
+ final FieldType storedIntNone = new FieldType(storedInt);
+ storedIntNone.setNumericPrecisionStep(Integer.MAX_VALUE);
+
+ final FieldType unstoredInt = NumericField.getFieldType(NumericField.DataType.INT, false);
+
+ final FieldType unstoredInt8 = new FieldType(unstoredInt);
+ unstoredInt8.setNumericPrecisionStep(8);
+
+ final FieldType unstoredInt4 = new FieldType(unstoredInt);
+ unstoredInt4.setNumericPrecisionStep(4);
+
+ final FieldType unstoredInt2 = new FieldType(unstoredInt);
+ unstoredInt2.setNumericPrecisionStep(2);
+
NumericField
- field8 = new NumericField("field8", 8, NumericField.getFieldType(NumericField.DataType.INT, true)),
- field4 = new NumericField("field4", 4, NumericField.getFieldType(NumericField.DataType.INT, true)),
- field2 = new NumericField("field2", 2, NumericField.getFieldType(NumericField.DataType.INT, true)),
- fieldNoTrie = new NumericField("field"+Integer.MAX_VALUE, Integer.MAX_VALUE,
- NumericField.getFieldType(NumericField.DataType.INT, rarely())),
- ascfield8 = new NumericField("ascfield8", 8, NumericField.DataType.INT),
- ascfield4 = new NumericField("ascfield4", 4, NumericField.DataType.INT),
- ascfield2 = new NumericField("ascfield2", 2, NumericField.DataType.INT);
+ 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);
Document doc = new Document();
// add fields, that have a distance to test general functionality
@@ -78,15 +103,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.setIntValue(val);
- field4.setIntValue(val);
- field2.setIntValue(val);
- fieldNoTrie.setIntValue(val);
+ field8.setValue(val);
+ field4.setValue(val);
+ field2.setValue(val);
+ fieldNoTrie.setValue(val);
val=l-(noDocs/2);
- ascfield8.setIntValue(val);
- ascfield4.setIntValue(val);
- ascfield2.setIntValue(val);
+ ascfield8.setValue(val);
+ ascfield4.setValue(val);
+ ascfield2.setValue(val);
writer.addDocument(doc);
}
@@ -144,9 +169,9 @@ public class TestNumericRangeQuery32 ext
assertNotNull(sd);
assertEquals("Score doc count"+type, count, sd.length );
Document doc=searcher.doc(sd[0].doc);
- assertEquals("First doc"+type, 2*distance+startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("First doc"+type, 2*distance+startOffset, doc.getField(field).numericValue().intValue());
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc"+type, (1+count)*distance+startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("Last doc"+type, (1+count)*distance+startOffset, doc.getField(field).numericValue().intValue());
}
}
@@ -198,9 +223,9 @@ public class TestNumericRangeQuery32 ext
assertNotNull(sd);
assertEquals("Score doc count", count, sd.length );
Document doc=searcher.doc(sd[0].doc);
- assertEquals("First doc", startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("First doc", startOffset, doc.getField(field).numericValue().intValue());
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc", (count-1)*distance+startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("Last doc", (count-1)*distance+startOffset, doc.getField(field).numericValue().intValue());
q=NumericRangeQuery.newIntRange(field, precisionStep, null, upper, false, true);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER);
@@ -208,9 +233,9 @@ public class TestNumericRangeQuery32 ext
assertNotNull(sd);
assertEquals("Score doc count", count, sd.length );
doc=searcher.doc(sd[0].doc);
- assertEquals("First doc", startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("First doc", startOffset, doc.getField(field).numericValue().intValue());
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc", (count-1)*distance+startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("Last doc", (count-1)*distance+startOffset, doc.getField(field).numericValue().intValue());
}
@Test
@@ -238,9 +263,9 @@ public class TestNumericRangeQuery32 ext
assertNotNull(sd);
assertEquals("Score doc count", noDocs-count, sd.length );
Document doc=searcher.doc(sd[0].doc);
- assertEquals("First doc", count*distance+startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("First doc", count*distance+startOffset, doc.getField(field).numericValue().intValue());
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc", (noDocs-1)*distance+startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("Last doc", (noDocs-1)*distance+startOffset, doc.getField(field).numericValue().intValue());
q=NumericRangeQuery.newIntRange(field, precisionStep, lower, null, true, false);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER);
@@ -248,9 +273,9 @@ public class TestNumericRangeQuery32 ext
assertNotNull(sd);
assertEquals("Score doc count", noDocs-count, sd.length );
doc=searcher.doc(sd[0].doc);
- assertEquals("First doc", count*distance+startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("First doc", count*distance+startOffset, doc.getField(field).numericValue().intValue() );
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc", (noDocs-1)*distance+startOffset, Integer.parseInt(doc.get(field)) );
+ assertEquals("Last doc", (noDocs-1)*distance+startOffset, doc.getField(field).numericValue().intValue() );
}
@Test
@@ -553,9 +578,9 @@ public class TestNumericRangeQuery32 ext
if (topDocs.totalHits==0) continue;
ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd);
- int last=Integer.parseInt(searcher.doc(sd[0].doc).get(field));
+ int last = searcher.doc(sd[0].doc).getField(field).numericValue().intValue();
for (int j=1; j<sd.length; j++) {
- int act=Integer.parseInt(searcher.doc(sd[j].doc).get(field));
+ int act = searcher.doc(sd[j].doc).getField(field).numericValue().intValue();
assertTrue("Docs should be sorted backwards", last>act );
last=act;
}
Modified: lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (original)
+++ lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java Thu Jan 12 15:39:08 2012
@@ -19,14 +19,15 @@ 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.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowMultiReaderWrapper;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.index.IndexReader.AtomicReaderContext;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -58,20 +59,49 @@ public class TestNumericRangeQuery64 ext
newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
.setMaxBufferedDocs(_TestUtil.nextInt(random, 100, 1000))
.setMergePolicy(newLogMergePolicy()));
-
+
+ final FieldType storedLong = NumericField.getFieldType(NumericField.DataType.LONG, true);
+
+ final FieldType storedLong8 = new FieldType(storedLong);
+ storedLong8.setNumericPrecisionStep(8);
+
+ final FieldType storedLong4 = new FieldType(storedLong);
+ storedLong4.setNumericPrecisionStep(4);
+
+ final FieldType storedLong6 = new FieldType(storedLong);
+ storedLong6.setNumericPrecisionStep(6);
+
+ final FieldType storedLong2 = new FieldType(storedLong);
+ storedLong2.setNumericPrecisionStep(2);
+
+ final FieldType storedLongNone = new FieldType(storedLong);
+ storedLongNone.setNumericPrecisionStep(Integer.MAX_VALUE);
+
+ final FieldType unstoredLong = NumericField.getFieldType(NumericField.DataType.LONG, false);
+
+ final FieldType unstoredLong8 = new FieldType(unstoredLong);
+ unstoredLong8.setNumericPrecisionStep(8);
+
+ final FieldType unstoredLong6 = new FieldType(unstoredLong);
+ unstoredLong6.setNumericPrecisionStep(6);
+
+ final FieldType unstoredLong4 = new FieldType(unstoredLong);
+ unstoredLong4.setNumericPrecisionStep(4);
+
+ final FieldType unstoredLong2 = new FieldType(unstoredLong);
+ unstoredLong2.setNumericPrecisionStep(2);
+
NumericField
- field8 = new NumericField("field8", 8, NumericField.getFieldType(NumericField.DataType.LONG, true)),
- field6 = new NumericField("field6", 6, NumericField.getFieldType(NumericField.DataType.LONG, true)),
- field4 = new NumericField("field4", 4, NumericField.getFieldType(NumericField.DataType.LONG, true)),
- field2 = new NumericField("field2", 2, NumericField.getFieldType(NumericField.DataType.LONG, true)),
- fieldNoTrie = new NumericField("field"+Integer.MAX_VALUE, Integer.MAX_VALUE,
- NumericField.getFieldType(NumericField.DataType.LONG, rarely())),
-
- ascfield8 = new NumericField("ascfield8", 8, NumericField.DataType.LONG),
- ascfield6 = new NumericField("ascfield6", 6, NumericField.DataType.LONG),
- ascfield4 = new NumericField("ascfield4", 4, NumericField.DataType.LONG),
- ascfield2 = new NumericField("ascfield2", 2, NumericField.DataType.LONG);
-
+ 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);
+
Document doc = new Document();
// add fields, that have a distance to test general functionality
doc.add(field8); doc.add(field6); doc.add(field4); doc.add(field2); doc.add(fieldNoTrie);
@@ -81,17 +111,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.setLongValue(val);
- field6.setLongValue(val);
- field4.setLongValue(val);
- field2.setLongValue(val);
- fieldNoTrie.setLongValue(val);
+ field8.setValue(val);
+ field6.setValue(val);
+ field4.setValue(val);
+ field2.setValue(val);
+ fieldNoTrie.setValue(val);
val=l-(noDocs/2);
- ascfield8.setLongValue(val);
- ascfield6.setLongValue(val);
- ascfield4.setLongValue(val);
- ascfield2.setLongValue(val);
+ ascfield8.setValue(val);
+ ascfield6.setValue(val);
+ ascfield4.setValue(val);
+ ascfield2.setValue(val);
writer.addDocument(doc);
}
reader = writer.getReader();
@@ -148,9 +178,9 @@ public class TestNumericRangeQuery64 ext
assertNotNull(sd);
assertEquals("Score doc count"+type, count, sd.length );
Document doc=searcher.doc(sd[0].doc);
- assertEquals("First doc"+type, 2*distance+startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("First doc"+type, 2*distance+startOffset, doc.getField(field).numericValue().longValue() );
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc"+type, (1+count)*distance+startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("Last doc"+type, (1+count)*distance+startOffset, doc.getField(field).numericValue().longValue() );
}
}
@@ -208,9 +238,9 @@ public class TestNumericRangeQuery64 ext
assertNotNull(sd);
assertEquals("Score doc count", count, sd.length );
Document doc=searcher.doc(sd[0].doc);
- assertEquals("First doc", startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("First doc", startOffset, doc.getField(field).numericValue().longValue() );
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc", (count-1)*distance+startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("Last doc", (count-1)*distance+startOffset, doc.getField(field).numericValue().longValue() );
q=NumericRangeQuery.newLongRange(field, precisionStep, null, upper, false, true);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER);
@@ -218,9 +248,9 @@ public class TestNumericRangeQuery64 ext
assertNotNull(sd);
assertEquals("Score doc count", count, sd.length );
doc=searcher.doc(sd[0].doc);
- assertEquals("First doc", startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("First doc", startOffset, doc.getField(field).numericValue().longValue() );
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc", (count-1)*distance+startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("Last doc", (count-1)*distance+startOffset, doc.getField(field).numericValue().longValue() );
}
@Test
@@ -253,9 +283,9 @@ public class TestNumericRangeQuery64 ext
assertNotNull(sd);
assertEquals("Score doc count", noDocs-count, sd.length );
Document doc=searcher.doc(sd[0].doc);
- assertEquals("First doc", count*distance+startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("First doc", count*distance+startOffset, doc.getField(field).numericValue().longValue() );
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc", (noDocs-1)*distance+startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("Last doc", (noDocs-1)*distance+startOffset, doc.getField(field).numericValue().longValue() );
q=NumericRangeQuery.newLongRange(field, precisionStep, lower, null, true, false);
topDocs = searcher.search(q, null, noDocs, Sort.INDEXORDER);
@@ -263,9 +293,9 @@ public class TestNumericRangeQuery64 ext
assertNotNull(sd);
assertEquals("Score doc count", noDocs-count, sd.length );
doc=searcher.doc(sd[0].doc);
- assertEquals("First doc", count*distance+startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("First doc", count*distance+startOffset, doc.getField(field).numericValue().longValue() );
doc=searcher.doc(sd[sd.length-1].doc);
- assertEquals("Last doc", (noDocs-1)*distance+startOffset, Long.parseLong(doc.get(field)) );
+ assertEquals("Last doc", (noDocs-1)*distance+startOffset, doc.getField(field).numericValue().longValue() );
}
@Test
@@ -588,9 +618,9 @@ public class TestNumericRangeQuery64 ext
if (topDocs.totalHits==0) continue;
ScoreDoc[] sd = topDocs.scoreDocs;
assertNotNull(sd);
- long last=Long.parseLong(searcher.doc(sd[0].doc).get(field));
+ long last=searcher.doc(sd[0].doc).getField(field).numericValue().longValue();
for (int j=1; j<sd.length; j++) {
- long act=Long.parseLong(searcher.doc(sd[j].doc).get(field));
+ long act=searcher.doc(sd[j].doc).getField(field).numericValue().longValue();
assertTrue("Docs should be sorted backwards", last>act );
last=act;
}
Modified: lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestSort.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/branches/lucene3453/lucene/src/test/org/apache/lucene/search/TestSort.java Thu Jan 12 15:39:08 2012
@@ -146,25 +146,19 @@ public class TestSort extends LuceneTest
if (data[i][2] != null) {
doc.add(new StringField ("int", data[i][2]));
if (supportsDocValues) {
- DocValuesField dvf = new DocValuesField("int", DocValues.Type.VAR_INTS);
- dvf.setInt(Integer.parseInt(data[i][2]));
- doc.add(dvf);
+ doc.add(new DocValuesField("int", Integer.parseInt(data[i][2]), DocValues.Type.VAR_INTS));
}
}
if (data[i][3] != null) {
doc.add(new StringField ("float", data[i][3]));
if (supportsDocValues) {
- DocValuesField dvf = new DocValuesField("float", DocValues.Type.FLOAT_32);
- dvf.setFloat(Float.parseFloat(data[i][3]));
- doc.add(dvf);
+ doc.add(new DocValuesField("float", Float.parseFloat(data[i][3]), DocValues.Type.FLOAT_32));
}
}
if (data[i][4] != null) {
doc.add(new StringField ("string", data[i][4]));
if (supportsDocValues) {
- DocValuesField dvf = new DocValuesField("string", stringDVType);
- dvf.setBytes(new BytesRef(data[i][4]));
- doc.add(dvf);
+ doc.add(new DocValuesField("string", new BytesRef(data[i][4]), stringDVType));
}
}
if (data[i][5] != null) doc.add (new StringField ("custom", data[i][5]));
@@ -173,9 +167,7 @@ public class TestSort extends LuceneTest
if (data[i][8] != null) {
doc.add(new StringField ("double", data[i][8]));
if (supportsDocValues) {
- DocValuesField dvf = new DocValuesField("double", DocValues.Type.FLOAT_64);
- dvf.setFloat(Double.parseDouble(data[i][8]));
- doc.add(dvf);
+ doc.add(new DocValuesField("double", Double.parseDouble(data[i][8]), DocValues.Type.FLOAT_64));
}
}
if (data[i][9] != null) doc.add (new StringField ("short", data[i][9]));
@@ -220,16 +212,12 @@ public class TestSort extends LuceneTest
//doc.add (new Field ("contents", Integer.toString(i), Field.Store.NO, Field.Index.ANALYZED));
doc.add(new StringField("string", num));
if (supportsDocValues) {
- DocValuesField dvf = new DocValuesField("string", DocValues.Type.BYTES_VAR_SORTED);
- dvf.setBytes(new BytesRef(num));
- doc.add(dvf);
+ doc.add(new DocValuesField("string", new BytesRef(num), DocValues.Type.BYTES_VAR_SORTED));
}
String num2 = getRandomCharString(getRandomNumber(1, 4), 48, 50);
doc.add(new StringField ("string2", num2));
if (supportsDocValues) {
- DocValuesField dvf = new DocValuesField("string2", DocValues.Type.BYTES_VAR_SORTED);
- dvf.setBytes(new BytesRef(num2));
- doc.add(dvf);
+ doc.add(new DocValuesField("string2", new BytesRef(num2), DocValues.Type.BYTES_VAR_SORTED));
}
doc.add (new Field ("tracer2", num2, onlyStored));
for(IndexableField f2 : doc.getFields()) {
@@ -241,16 +229,12 @@ public class TestSort extends LuceneTest
//doc.add (new Field ("contents", Integer.toString(i), Field.Store.NO, Field.Index.ANALYZED));
doc.add(new StringField("string_fixed", numFixed));
if (supportsDocValues) {
- DocValuesField dvf = new DocValuesField("string_fixed", DocValues.Type.BYTES_FIXED_SORTED);
- dvf.setBytes(new BytesRef(numFixed));
- doc.add(dvf);
+ doc.add(new DocValuesField("string_fixed", new BytesRef(numFixed), DocValues.Type.BYTES_FIXED_SORTED));
}
String num2Fixed = getRandomCharString(fixedLen2, 48, 52);
doc.add(new StringField ("string2_fixed", num2Fixed));
if (supportsDocValues) {
- DocValuesField dvf = new DocValuesField("string2_fixed", DocValues.Type.BYTES_FIXED_SORTED);
- dvf.setBytes(new BytesRef(num2Fixed));
- doc.add(dvf);
+ doc.add(new DocValuesField("string2_fixed", new BytesRef(num2Fixed), DocValues.Type.BYTES_FIXED_SORTED));
}
doc.add (new Field ("tracer2_fixed", num2Fixed, onlyStored));
Modified: lucene/dev/branches/lucene3453/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/lucene3453/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Thu Jan 12 15:39:08 2012
@@ -109,8 +109,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, NumericField.DataType.LONG));
- numericFields.put(TIME_SEC_FIELD, new NumericField(TIME_SEC_FIELD, NumericField.DataType.INT));
+ numericFields.put(DATE_MSEC_FIELD, new NumericField(DATE_MSEC_FIELD, 0L));
+ numericFields.put(TIME_SEC_FIELD, new NumericField(TIME_SEC_FIELD, 0));
doc = new Document();
} else {
@@ -139,14 +139,33 @@ public class DocMaker implements Closeab
}
NumericField getNumericField(String name, NumericField.DataType type) {
- if (!reuseFields) {
- return new NumericField(name, type);
+ NumericField f;
+ if (reuseFields) {
+ f = numericFields.get(name);
+ } else {
+ f = null;
}
-
- NumericField f = numericFields.get(name);
+
if (f == null) {
- f = new NumericField(name, type);
- numericFields.put(name, f);
+ switch(type) {
+ case INT:
+ f = new NumericField(name, 0);
+ break;
+ case LONG:
+ f = new NumericField(name, 0L);
+ break;
+ case FLOAT:
+ f = new NumericField(name, 0.0f);
+ break;
+ case DOUBLE:
+ f = new NumericField(name, 0.0);
+ break;
+ default:
+ assert false;
+ }
+ if (reuseFields) {
+ numericFields.put(name, f);
+ }
}
return f;
}
@@ -250,14 +269,14 @@ public class DocMaker implements Closeab
}
NumericField dateField = ds.getNumericField(DATE_MSEC_FIELD, NumericField.DataType.LONG);
- dateField.setLongValue(date.getTime());
+ dateField.setValue(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.setIntValue(sec);
+ timeSecField.setValue(sec);
doc.add(timeSecField);
// Set TITLE_FIELD
Modified: lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java (original)
+++ lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java Thu Jan 12 15:39:08 2012
@@ -211,7 +211,7 @@ public class AllGroupHeadsCollectorTest
doc.add(group);
DocValuesField valuesField = null;
if (canUseIDV) {
- valuesField = new DocValuesField("group", valueType);
+ valuesField = new DocValuesField("group", new BytesRef(), valueType);
doc.add(valuesField);
}
Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED);
@@ -226,7 +226,7 @@ public class AllGroupHeadsCollectorTest
Field content = newField("content", "", TextField.TYPE_UNSTORED);
doc.add(content);
docNoGroup.add(content);
- NumericField id = new NumericField("id", NumericField.DataType.INT);
+ NumericField id = new NumericField("id", 0);
doc.add(id);
docNoGroup.add(id);
final GroupDoc[] groupDocs = new GroupDoc[numDocs];
@@ -257,14 +257,14 @@ public class AllGroupHeadsCollectorTest
if (groupDoc.group != null) {
group.setValue(groupDoc.group.utf8ToString());
if (canUseIDV) {
- valuesField.setBytes(new BytesRef(groupDoc.group.utf8ToString()));
+ valuesField.setValue(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.setIntValue(groupDoc.id);
+ id.setValue(groupDoc.id);
if (groupDoc.group == null) {
w.addDocument(docNoGroup);
} else {
@@ -527,9 +527,7 @@ public class AllGroupHeadsCollectorTest
private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV, Type valueType) {
doc.add(new Field(groupField, value, TextField.TYPE_STORED));
if (canUseIDV) {
- DocValuesField valuesField = new DocValuesField(groupField, valueType);
- valuesField.setBytes(new BytesRef(value));
- doc.add(valuesField);
+ doc.add(new DocValuesField(groupField, new BytesRef(value), valueType));
}
}
Modified: lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java (original)
+++ lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java Thu Jan 12 15:39:08 2012
@@ -123,9 +123,7 @@ public class AllGroupsCollectorTest exte
private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) {
doc.add(new Field(groupField, value, TextField.TYPE_STORED));
if (canUseIDV) {
- DocValuesField valuesField = new DocValuesField(groupField, Type.BYTES_VAR_SORTED);
- valuesField.setBytes(new BytesRef(value));
- doc.add(valuesField);
+ doc.add(new DocValuesField(groupField, new BytesRef(value), Type.BYTES_VAR_SORTED));
}
}
Modified: lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/lucene3453/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Thu Jan 12 15:39:08 2012
@@ -171,9 +171,7 @@ public class TestGrouping extends Lucene
private void addGroupField(Document doc, String groupField, String value, boolean canUseIDV) {
doc.add(new Field(groupField, value, TextField.TYPE_STORED));
if (canUseIDV) {
- DocValuesField valuesField = new DocValuesField(groupField, Type.BYTES_VAR_SORTED);
- valuesField.setBytes(new BytesRef(value));
- doc.add(valuesField);
+ doc.add(new DocValuesField(groupField, new BytesRef(value), Type.BYTES_VAR_SORTED));
}
}
@@ -705,7 +703,7 @@ public class TestGrouping extends Lucene
Document doc = new Document();
Document docNoGroup = new Document();
- DocValuesField idvGroupField = new DocValuesField("group", Type.BYTES_VAR_SORTED);
+ DocValuesField idvGroupField = new DocValuesField("group", new BytesRef(), Type.BYTES_VAR_SORTED);
if (canUseIDV) {
doc.add(idvGroupField);
}
@@ -721,7 +719,7 @@ public class TestGrouping extends Lucene
Field content = newField("content", "", TextField.TYPE_UNSTORED);
doc.add(content);
docNoGroup.add(content);
- NumericField id = new NumericField("id", NumericField.DataType.INT);
+ NumericField id = new NumericField("id", 0);
doc.add(id);
docNoGroup.add(id);
final GroupDoc[] groupDocs = new GroupDoc[numDocs];
@@ -747,13 +745,13 @@ public class TestGrouping extends Lucene
if (groupDoc.group != null) {
group.setValue(groupDoc.group.utf8ToString());
if (canUseIDV) {
- idvGroupField.setBytes(BytesRef.deepCopyOf(groupDoc.group));
+ idvGroupField.setValue(BytesRef.deepCopyOf(groupDoc.group));
}
}
sort1.setValue(groupDoc.sort1.utf8ToString());
sort2.setValue(groupDoc.sort2.utf8ToString());
content.setValue(groupDoc.content);
- id.setIntValue(groupDoc.id);
+ id.setValue(groupDoc.id);
if (groupDoc.group == null) {
w.addDocument(docNoGroup);
} else {
Modified: lucene/dev/branches/lucene3453/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (original)
+++ lucene/dev/branches/lucene3453/modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java Thu Jan 12 15:39:08 2012
@@ -33,6 +33,7 @@ import java.util.TimeZone;
import org.apache.lucene.analysis.Analyzer;
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.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -192,17 +193,37 @@ public class TestNumericQueryParser exte
for (NumericField.DataType type : NumericField.DataType.values()) {
numericConfigMap.put(type.name(), new NumericConfig(PRECISION_STEP,
NUMBER_FORMAT, type));
-
- NumericField field = new NumericField(type.name(), PRECISION_STEP, NumericField.getFieldType(type, true));
-
+
+ FieldType ft = new FieldType(NumericField.getFieldType(type, true));
+ ft.setNumericPrecisionStep(PRECISION_STEP);
+ final NumericField field;
+
+ switch(type) {
+ case INT:
+ field = new NumericField(type.name(), 0, ft);
+ break;
+ case FLOAT:
+ field = new NumericField(type.name(), 0.0f, ft);
+ break;
+ case LONG:
+ field = new NumericField(type.name(), 0l, ft);
+ break;
+ case DOUBLE:
+ field = new NumericField(type.name(), 0.0, ft);
+ break;
+ default:
+ assert false;
+ field = null;
+ }
numericFieldMap.put(type.name(), field);
doc.add(field);
-
}
numericConfigMap.put(DATE_FIELD_NAME, new NumericConfig(PRECISION_STEP,
DATE_FORMAT, NumericField.DataType.LONG));
- NumericField dateField = new NumericField(DATE_FIELD_NAME, PRECISION_STEP, NumericField.getFieldType(NumericField.DataType.LONG, true));
+ FieldType ft = new FieldType(NumericField.getFieldType(NumericField.DataType.LONG, true));
+ ft.setNumericPrecisionStep(PRECISION_STEP);
+ NumericField dateField = new NumericField(DATE_FIELD_NAME, 0l, ft);
numericFieldMap.put(DATE_FIELD_NAME, dateField);
doc.add(dateField);
@@ -264,24 +285,23 @@ public class TestNumericQueryParser exte
Number number = getNumberType(numberType, NumericField.DataType.DOUBLE
.name());
- numericFieldMap.get(NumericField.DataType.DOUBLE.name()).setDoubleValue(
+ numericFieldMap.get(NumericField.DataType.DOUBLE.name()).setValue(
number.doubleValue());
number = getNumberType(numberType, NumericField.DataType.INT.name());
- numericFieldMap.get(NumericField.DataType.INT.name()).setIntValue(
+ numericFieldMap.get(NumericField.DataType.INT.name()).setValue(
number.intValue());
number = getNumberType(numberType, NumericField.DataType.LONG.name());
- numericFieldMap.get(NumericField.DataType.LONG.name()).setLongValue(
+ numericFieldMap.get(NumericField.DataType.LONG.name()).setValue(
number.longValue());
number = getNumberType(numberType, NumericField.DataType.FLOAT.name());
- numericFieldMap.get(NumericField.DataType.FLOAT.name()).setFloatValue(
+ numericFieldMap.get(NumericField.DataType.FLOAT.name()).setValue(
number.floatValue());
number = getNumberType(numberType, DATE_FIELD_NAME);
- numericFieldMap.get(DATE_FIELD_NAME).setLongValue(number.longValue());
-
+ numericFieldMap.get(DATE_FIELD_NAME).setValue(number.longValue());
}
private static int randomDateStyle(Random random) {
Modified: lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java (original)
+++ lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java Thu Jan 12 15:39:08 2012
@@ -21,7 +21,6 @@ package org.apache.solr.response.transfo
import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
import org.apache.solr.common.SolrDocument;
-import org.apache.solr.handler.component.QueryElevationComponent;
import org.apache.solr.schema.FieldType;
import java.util.Set;
@@ -67,7 +66,7 @@ public abstract class BaseEditorialTrans
String key;
Object field = doc.get(idFieldName);
if (field instanceof NumericField){
- key = ((Field)field).stringValue();
+ key = ((Field)field).numericValue().toString();
key = ft.readableToIndexed(key);
} else if (field instanceof Field){
key = ((Field)field).stringValue();
Modified: lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/schema/TrieField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/schema/TrieField.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/schema/TrieField.java (original)
+++ lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/schema/TrieField.java Thu Jan 12 15:39:08 2012
@@ -501,39 +501,40 @@ public class TrieField extends org.apach
default:
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for trie field: " + type);
}
+ ft.setNumericPrecisionStep(precisionStep);
- final org.apache.lucene.document.NumericField f = new org.apache.lucene.document.NumericField(field.getName(), precisionStep, ft);
+ final org.apache.lucene.document.NumericField f;
switch (type) {
case INTEGER:
int i = (value instanceof Number)
? ((Number)value).intValue()
: Integer.parseInt(value.toString());
- f.setIntValue(i);
+ f = new org.apache.lucene.document.NumericField(field.getName(), i, ft);
break;
case FLOAT:
float fl = (value instanceof Number)
? ((Number)value).floatValue()
: Float.parseFloat(value.toString());
- f.setFloatValue(fl);
+ f = new org.apache.lucene.document.NumericField(field.getName(), fl, ft);
break;
case LONG:
long l = (value instanceof Number)
? ((Number)value).longValue()
: Long.parseLong(value.toString());
- f.setLongValue(l);
+ f = new org.apache.lucene.document.NumericField(field.getName(), l, ft);
break;
case DOUBLE:
double d = (value instanceof Number)
? ((Number)value).doubleValue()
: Double.parseDouble(value.toString());
- f.setDoubleValue(d);
+ f = new org.apache.lucene.document.NumericField(field.getName(), d, ft);
break;
case DATE:
Date date = (value instanceof Date)
? ((Date)value)
: dateField.parseMath(null, value.toString());
- f.setLongValue(date.getTime());
+ f = new org.apache.lucene.document.NumericField(field.getName(), date.getTime(), ft);
break;
default:
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown type for trie field: " + type);
Modified: lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/lucene3453/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Thu Jan 12 15:39:08 2012
@@ -436,28 +436,28 @@ public class SolrIndexSearcher extends I
public void intField(FieldInfo fieldInfo, int value) {
FieldType ft = new FieldType(NumericField.getFieldType(NumericField.DataType.INT, true));
ft.setIndexed(fieldInfo.isIndexed);
- doc.add(new NumericField(fieldInfo.name, ft).setIntValue(value));
+ doc.add(new NumericField(fieldInfo.name, value, ft));
}
@Override
public void longField(FieldInfo fieldInfo, long value) {
FieldType ft = new FieldType(NumericField.getFieldType(NumericField.DataType.LONG, true));
ft.setIndexed(fieldInfo.isIndexed);
- doc.add(new NumericField(fieldInfo.name, ft).setLongValue(value));
+ doc.add(new NumericField(fieldInfo.name, value, ft));
}
@Override
public void floatField(FieldInfo fieldInfo, float value) {
FieldType ft = new FieldType(NumericField.getFieldType(NumericField.DataType.FLOAT, true));
ft.setIndexed(fieldInfo.isIndexed);
- doc.add(new NumericField(fieldInfo.name, ft).setFloatValue(value));
+ doc.add(new NumericField(fieldInfo.name, value, ft));
}
@Override
public void doubleField(FieldInfo fieldInfo, double value) {
FieldType ft = new FieldType(NumericField.getFieldType(NumericField.DataType.DOUBLE, true));
ft.setIndexed(fieldInfo.isIndexed);
- doc.add(new NumericField(fieldInfo.name, ft).setDoubleValue(value));
+ doc.add(new NumericField(fieldInfo.name, value, ft));
}
}
Modified: lucene/dev/branches/lucene3453/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3453/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java?rev=1230595&r1=1230594&r2=1230595&view=diff
==============================================================================
--- lucene/dev/branches/lucene3453/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java (original)
+++ lucene/dev/branches/lucene3453/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java Thu Jan 12 15:39:08 2012
@@ -88,7 +88,8 @@ public class PolyFieldTest extends SolrT
//first two fields contain the values, third is just stored and contains the original
for (int i = 0; i < 3; i++) {
boolean hasValue = fields[i].binaryValue() != null
- || fields[i].stringValue() != null;
+ || fields[i].stringValue() != null
+ || fields[i].numericValue() != null;
assertTrue("Doesn't have a value: " + fields[i], hasValue);
}
/*assertTrue("first field " + fields[0].tokenStreamValue() + " is not 35.0", pt.getSubType().toExternal(fields[0]).equals(String.valueOf(xy[0])));