You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/06/30 17:06:25 UTC
svn commit: r1606767 - in /lucene/dev/trunk: ./ lucene/ lucene/core/
lucene/core/src/test/org/apache/lucene/index/
Author: rmuir
Date: Mon Jun 30 15:06:25 2014
New Revision: 1606767
URL: http://svn.apache.org/r1606767
Log:
add backwards compatibility indexes for 4.9
Added:
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.49.cfs.zip
- copied unchanged from r1606766, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.49.cfs.zip
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/index.49.nocfs.zip
- copied unchanged from r1606766, lucene/dev/branches/branch_4x/lucene/core/src/test/org/apache/lucene/index/index.49.nocfs.zip
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/core/ (props changed)
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
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=1606767&r1=1606766&r2=1606767&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 Mon Jun 30 15:06:25 2014
@@ -40,6 +40,7 @@ import org.apache.lucene.document.IntFie
import org.apache.lucene.document.LongField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
+import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
@@ -231,6 +232,8 @@ public class TestBackwardsCompatibility
"45.nocfs",
"461.cfs",
"461.nocfs",
+ "49.cfs",
+ "49.nocfs"
};
final String[] unsupportedNames = {"19.cfs",
@@ -457,6 +460,8 @@ public class TestBackwardsCompatibility
final boolean is40Index = MultiFields.getMergedFieldInfos(reader).fieldInfo("content5") != null;
// true if this is a 4.2+ index
final boolean is42Index = MultiFields.getMergedFieldInfos(reader).fieldInfo("dvSortedSet") != null;
+ // true if this is a 4.9+ index
+ final boolean is49Index = MultiFields.getMergedFieldInfos(reader).fieldInfo("dvSortedNumeric") != null;
assert is40Index; // NOTE: currently we can only do this on trunk!
@@ -515,6 +520,10 @@ public class TestBackwardsCompatibility
if (is42Index) {
dvSortedSet = MultiDocValues.getSortedSetValues(reader, "dvSortedSet");
}
+ SortedNumericDocValues dvSortedNumeric = null;
+ if (is49Index) {
+ dvSortedNumeric = MultiDocValues.getSortedNumericValues(reader, "dvSortedNumeric");
+ }
for (int i=0;i<35;i++) {
int id = Integer.parseInt(reader.document(i).get("id"));
@@ -551,6 +560,11 @@ public class TestBackwardsCompatibility
term = dvSortedSet.lookupOrd(ord);
assertEquals(expectedRef, term);
}
+ if (is49Index) {
+ dvSortedNumeric.setDocument(i);
+ assertEquals(1, dvSortedNumeric.count());
+ assertEquals(id, dvSortedNumeric.valueAt(0));
+ }
}
}
@@ -732,6 +746,7 @@ public class TestBackwardsCompatibility
doc.add(new NumericDocValuesField("dvPacked", id));
doc.add(new NumericDocValuesField("dvShort", (short)id));
doc.add(new SortedSetDocValuesField("dvSortedSet", ref));
+ doc.add(new SortedNumericDocValuesField("dvSortedNumeric", id));
// a field with both offsets and term vectors for a cross-check
FieldType customType3 = new FieldType(TextField.TYPE_STORED);
customType3.setStoreTermVectors(true);
@@ -858,22 +873,22 @@ public class TestBackwardsCompatibility
IndexSearcher searcher = newSearcher(reader);
for (int id=10; id<15; id++) {
- ScoreDoc[] hits = searcher.search(NumericRangeQuery.newIntRange("trieInt", 4, Integer.valueOf(id), Integer.valueOf(id), true, true), 100).scoreDocs;
+ ScoreDoc[] hits = searcher.search(NumericRangeQuery.newIntRange("trieInt", NumericUtils.PRECISION_STEP_DEFAULT_32, Integer.valueOf(id), Integer.valueOf(id), true, true), 100).scoreDocs;
assertEquals("wrong number of hits", 1, hits.length);
StoredDocument d = searcher.doc(hits[0].doc);
assertEquals(String.valueOf(id), d.get("id"));
- hits = searcher.search(NumericRangeQuery.newLongRange("trieLong", 4, Long.valueOf(id), Long.valueOf(id), true, true), 100).scoreDocs;
+ hits = searcher.search(NumericRangeQuery.newLongRange("trieLong", NumericUtils.PRECISION_STEP_DEFAULT, Long.valueOf(id), Long.valueOf(id), true, true), 100).scoreDocs;
assertEquals("wrong number of hits", 1, hits.length);
d = searcher.doc(hits[0].doc);
assertEquals(String.valueOf(id), d.get("id"));
}
// check that also lower-precision fields are ok
- ScoreDoc[] hits = searcher.search(NumericRangeQuery.newIntRange("trieInt", 4, Integer.MIN_VALUE, Integer.MAX_VALUE, false, false), 100).scoreDocs;
+ ScoreDoc[] hits = searcher.search(NumericRangeQuery.newIntRange("trieInt", NumericUtils.PRECISION_STEP_DEFAULT_32, Integer.MIN_VALUE, Integer.MAX_VALUE, false, false), 100).scoreDocs;
assertEquals("wrong number of hits", 34, hits.length);
- hits = searcher.search(NumericRangeQuery.newLongRange("trieLong", 4, Long.MIN_VALUE, Long.MAX_VALUE, false, false), 100).scoreDocs;
+ hits = searcher.search(NumericRangeQuery.newLongRange("trieLong", NumericUtils.PRECISION_STEP_DEFAULT, Long.MIN_VALUE, Long.MAX_VALUE, false, false), 100).scoreDocs;
assertEquals("wrong number of hits", 34, hits.length);
// check decoding of terms