Apache/lucene
1
0
Fork 0
mirror of https://github.com/apache/lucene.git synced 2025-03-09 01:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

LUCENE-6092: NumberRangePrefixTree toRangeShape normalization bug

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1643327 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
David Wayne Smiley 2014-12-05 15:24:12 +00:00
parent af748a9254
commit 29c90c668c
3 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java
View File

@ -232,20 +232,34 @@ public abstract class NumberRangePrefixTree extends SpatialPrefixTree {
public Shape toRangeShape(Shape start, Shape end) {
if (!(start instanceof LevelledValue && end instanceof LevelledValue))
throw new IllegalArgumentException("Must pass "+LevelledValue.class+" but got "+start.getClass());
LevelledValue minLV = (LevelledValue) start;
LevelledValue maxLV = (LevelledValue) end;
if (minLV.equals(maxLV))
return minLV;
//Optimize precision of the range, e.g. April 1st to April 30th is April.
minLV = minLV.getLVAtLevel(truncateStartVals(minLV, 0));
maxLV = maxLV.getLVAtLevel(truncateEndVals(maxLV, 0));
int cmp = comparePrefixLV(minLV, maxLV);
LevelledValue startLV = (LevelledValue) start;
LevelledValue endLV = (LevelledValue) end;
//note: this normalization/optimization process is actually REQUIRED based on assumptions elsewhere.
//Normalize start & end
startLV = startLV.getLVAtLevel(truncateStartVals(startLV, 0)); // chops off trailing min-vals (zeroes)
endLV = endLV.getLVAtLevel(truncateEndVals(endLV, 0)); // chops off trailing max-vals
//Optimize to just start or end if it's equivalent, e.g. April to April 1st is April 1st.
int cmp = comparePrefixLV(startLV, endLV);
if (cmp > 0) {
throw new IllegalArgumentException("Wrong order: "+start+" TO "+end);
}
if (cmp == 0 && minLV.getLevel() == maxLV.getLevel())
return minLV;
return new NRShape(minLV, maxLV);
if (cmp == 0) {//one is a prefix of the other
if (startLV.getLevel() == endLV.getLevel()) {
//same
return startLV;
} else if (endLV.getLevel() > startLV.getLevel()) {
// e.g. April to April 1st
if (truncateStartVals(endLV, startLV.getLevel()) == startLV.getLevel()) {
return endLV;
}
} else {//minLV level > maxLV level
// e.g. April 30 to April
if (truncateEndVals(startLV, endLV.getLevel()) == endLV.getLevel()) {
return startLV;
}
}
}
return new NRShape(startLV, endLV);
}
/** From lv.getLevel on up, it returns the first Level seen with val != 0. It doesn't check past endLevel. */

7
lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java
View File

@ -27,6 +27,7 @@ import org.junit.Ignore;
import org.junit.Test;
import java.io.IOException;
import java.text.ParseException;
import java.util.Calendar;
public class DateNRStrategyTest extends RandomSpatialOpStrategyTestCase {
@ -65,12 +66,6 @@ public class DateNRStrategyTest extends RandomSpatialOpStrategyTestCase {
testOperationRandomShapes(SpatialOperation.Contains);
}
@Test @Ignore("see LUCENE-5692")
@Repeat(iterations = ITERATIONS)
public void testDisjoint() throws IOException {
testOperationRandomShapes(SpatialOperation.IsDisjointTo);
}
@Test
public void testWithinSame() throws IOException {
final Calendar cal = tree.newCal();

4
lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java
View File

@ -157,7 +157,9 @@ public class DateRangePrefixTreeTest extends LuceneTestCase {
assertEquals("2014", tree.parseShape("[2014-01-01 TO 2014-12-31]").toString());
assertEquals("2014", tree.parseShape("[2014-01 TO 2014]").toString());
assertEquals("2014", tree.parseShape("[2014-01 TO 2014]").toString());
assertEquals("2014-01", tree.parseShape("[2014 TO 2014-01]").toString());
assertEquals("2014-12", tree.parseShape("[2014-12 TO 2014]").toString());
assertEquals("[2014 TO 2014-04-06]", tree.parseShape("[2014-01 TO 2014-04-06]").toString());