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 2016/04/07 15:25:59 UTC
lucene-solr:master: LUCENE-7168: fix ceil/floor decode to match encode
Repository: lucene-solr
Updated Branches:
refs/heads/master 93511352a -> df07e0c30
LUCENE-7168: fix ceil/floor decode to match encode
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/df07e0c3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/df07e0c3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/df07e0c3
Branch: refs/heads/master
Commit: df07e0c30ff0d90f9052dd411f027c0dfcc3fb88
Parents: 9351135
Author: Mike McCandless <mi...@apache.org>
Authored: Thu Apr 7 09:27:48 2016 -0400
Committer: Mike McCandless <mi...@apache.org>
Committed: Thu Apr 7 09:27:48 2016 -0400
----------------------------------------------------------------------
.../org/apache/lucene/spatial3d/Geo3DUtil.java | 13 ++++
.../spatial3d/PointInShapeIntersectVisitor.java | 22 ++-----
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 63 ++++++--------------
3 files changed, 38 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/df07e0c3/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/Geo3DUtil.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/Geo3DUtil.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/Geo3DUtil.java
index cc11294..1ff56a7 100644
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/Geo3DUtil.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/Geo3DUtil.java
@@ -71,4 +71,17 @@ class Geo3DUtil {
assert result > x;
return result;
}
+
+ /** Returns smallest double that would encode to int x. */
+ // NOTE: keep this package private!!
+ static double decodeValueFloor(int x) {
+ return x * DECODE;
+ }
+
+ /** Returns largest double that would encode to int x. */
+ // NOTE: keep this package private!!
+ static double decodeValueCeil(int x) {
+ assert x < Integer.MAX_VALUE;
+ return Math.nextDown((x+1) * DECODE);
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/df07e0c3/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/PointInShapeIntersectVisitor.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/PointInShapeIntersectVisitor.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/PointInShapeIntersectVisitor.java
index 25dea72..b9d4e70 100644
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/PointInShapeIntersectVisitor.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/PointInShapeIntersectVisitor.java
@@ -57,12 +57,12 @@ class PointInShapeIntersectVisitor implements IntersectVisitor {
// here are inclusive, we need to extend the bounds to the largest un-quantized values that
// could quantize into these bounds. The encoding (Geo3DUtil.encodeValue) does
// a Math.round from double to long, so e.g. 1.4 -> 1, and -1.4 -> -1:
- double xMin = decodeValueMin(NumericUtils.sortableBytesToInt(minPackedValue, 0));
- double xMax = decodeValueMax(NumericUtils.sortableBytesToInt(maxPackedValue, 0));
- double yMin = decodeValueMin(NumericUtils.sortableBytesToInt(minPackedValue, 1 * Integer.BYTES));
- double yMax = decodeValueMax(NumericUtils.sortableBytesToInt(maxPackedValue, 1 * Integer.BYTES));
- double zMin = decodeValueMin(NumericUtils.sortableBytesToInt(minPackedValue, 2 * Integer.BYTES));
- double zMax = decodeValueMax(NumericUtils.sortableBytesToInt(maxPackedValue, 2 * Integer.BYTES));
+ double xMin = Geo3DUtil.decodeValueFloor(NumericUtils.sortableBytesToInt(minPackedValue, 0));
+ double xMax = Geo3DUtil.decodeValueCeil(NumericUtils.sortableBytesToInt(maxPackedValue, 0));
+ double yMin = Geo3DUtil.decodeValueFloor(NumericUtils.sortableBytesToInt(minPackedValue, 1 * Integer.BYTES));
+ double yMax = Geo3DUtil.decodeValueCeil(NumericUtils.sortableBytesToInt(maxPackedValue, 1 * Integer.BYTES));
+ double zMin = Geo3DUtil.decodeValueFloor(NumericUtils.sortableBytesToInt(minPackedValue, 2 * Integer.BYTES));
+ double zMax = Geo3DUtil.decodeValueCeil(NumericUtils.sortableBytesToInt(maxPackedValue, 2 * Integer.BYTES));
//System.out.println(" compare: x=" + cellXMin + "-" + cellXMax + " y=" + cellYMin + "-" + cellYMax + " z=" + cellZMin + "-" + cellZMax);
assert xMin <= xMax;
@@ -94,14 +94,4 @@ class PointInShapeIntersectVisitor implements IntersectVisitor {
return Relation.CELL_CROSSES_QUERY;
}
}
-
- /** More negative decode, at bottom of cell */
- static double decodeValueMin(int x) {
- return (((double)x) - 0.5) * Geo3DUtil.DECODE;
- }
-
- /** More positive decode, at top of cell */
- static double decodeValueMax(int x) {
- return (((double)x) + 0.5) * Geo3DUtil.DECODE;
- }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/df07e0c3/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
index b751125..410618c 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
@@ -75,7 +75,6 @@ import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.NumericUtils;
import org.apache.lucene.util.StringHelper;
import org.apache.lucene.util.TestUtil;
-import org.junit.Ignore;
import com.carrotsearch.randomizedtesting.generators.RandomInts;
@@ -266,14 +265,14 @@ public class TestGeo3DPoint extends LuceneTestCase {
} else {
GeoArea xyzSolid = GeoAreaFactory.makeGeoArea(PlanetModel.WGS84,
- PointInShapeIntersectVisitor.decodeValueMin(cell.xMinEnc), PointInShapeIntersectVisitor.decodeValueMax(cell.xMaxEnc),
- PointInShapeIntersectVisitor.decodeValueMin(cell.yMinEnc), PointInShapeIntersectVisitor.decodeValueMax(cell.yMaxEnc),
- PointInShapeIntersectVisitor.decodeValueMin(cell.zMinEnc), PointInShapeIntersectVisitor.decodeValueMax(cell.zMaxEnc));
+ Geo3DUtil.decodeValueFloor(cell.xMinEnc), Geo3DUtil.decodeValueCeil(cell.xMaxEnc),
+ Geo3DUtil.decodeValueFloor(cell.yMinEnc), Geo3DUtil.decodeValueCeil(cell.yMaxEnc),
+ Geo3DUtil.decodeValueFloor(cell.zMinEnc), Geo3DUtil.decodeValueCeil(cell.zMaxEnc));
if (VERBOSE) {
- log.println(" minx="+PointInShapeIntersectVisitor.decodeValueMin(cell.xMinEnc)+" maxx="+PointInShapeIntersectVisitor.decodeValueMax(cell.xMaxEnc)+
- " miny="+PointInShapeIntersectVisitor.decodeValueMin(cell.yMinEnc)+" maxy="+PointInShapeIntersectVisitor.decodeValueMax(cell.yMaxEnc)+
- " minz="+PointInShapeIntersectVisitor.decodeValueMin(cell.zMinEnc)+" maxz="+PointInShapeIntersectVisitor.decodeValueMax(cell.zMaxEnc));
+ log.println(" minx="+Geo3DUtil.decodeValueFloor(cell.xMinEnc)+" maxx="+Geo3DUtil.decodeValueCeil(cell.xMaxEnc)+
+ " miny="+Geo3DUtil.decodeValueFloor(cell.yMinEnc)+" maxy="+Geo3DUtil.decodeValueCeil(cell.yMaxEnc)+
+ " minz="+Geo3DUtil.decodeValueFloor(cell.zMinEnc)+" maxz="+Geo3DUtil.decodeValueCeil(cell.zMaxEnc));
}
switch (xyzSolid.getRelationship(shape)) {
@@ -312,9 +311,7 @@ public class TestGeo3DPoint extends LuceneTestCase {
log.println(" GeoArea.DISJOINT: drop this cell");
for(int docID=0;docID<numDocs;docID++) {
if (cell.contains(docs[docID])) {
- if (VERBOSE) {
- log.println(" skip doc=" + docID);
- }
+ log.println(" skip doc=" + docID);
}
}
}
@@ -1024,9 +1021,9 @@ public class TestGeo3DPoint extends LuceneTestCase {
lat = Math.min(90, Math.nextUp(lat));
lon = Math.min(180, Math.nextUp(lon));
GeoPoint point = new GeoPoint(PlanetModel.WGS84, toRadians(lat), toRadians(lon));
- GeoPoint pointEnc = new GeoPoint(PointInShapeIntersectVisitor.decodeValueMin(Geo3DUtil.encodeValue(point.x)),
- PointInShapeIntersectVisitor.decodeValueMin(Geo3DUtil.encodeValue(point.y)),
- PointInShapeIntersectVisitor.decodeValueMin(Geo3DUtil.encodeValue(point.z)));
+ GeoPoint pointEnc = new GeoPoint(Geo3DUtil.decodeValueFloor(Geo3DUtil.encodeValue(point.x)),
+ Geo3DUtil.decodeValueFloor(Geo3DUtil.encodeValue(point.y)),
+ Geo3DUtil.decodeValueFloor(Geo3DUtil.encodeValue(point.z)));
assertTrue(pointEnc.x <= point.x);
assertTrue(pointEnc.y <= point.y);
assertTrue(pointEnc.z <= point.z);
@@ -1039,9 +1036,9 @@ public class TestGeo3DPoint extends LuceneTestCase {
lat = Math.max(-90, Math.nextDown(lat));
lon = Math.max(-180, Math.nextDown(lon));
GeoPoint point = new GeoPoint(PlanetModel.WGS84, toRadians(lat), toRadians(lon));
- GeoPoint pointEnc = new GeoPoint(PointInShapeIntersectVisitor.decodeValueMin(Geo3DUtil.encodeValue(point.x)),
- PointInShapeIntersectVisitor.decodeValueMin(Geo3DUtil.encodeValue(point.y)),
- PointInShapeIntersectVisitor.decodeValueMin(Geo3DUtil.encodeValue(point.z)));
+ GeoPoint pointEnc = new GeoPoint(Geo3DUtil.decodeValueFloor(Geo3DUtil.encodeValue(point.x)),
+ Geo3DUtil.decodeValueFloor(Geo3DUtil.encodeValue(point.y)),
+ Geo3DUtil.decodeValueFloor(Geo3DUtil.encodeValue(point.z)));
assertTrue(pointEnc.x <= point.x);
assertTrue(pointEnc.y <= point.y);
assertTrue(pointEnc.z <= point.z);
@@ -1226,12 +1223,12 @@ public class TestGeo3DPoint extends LuceneTestCase {
@Override
public String toString() {
- double xMin = PointInShapeIntersectVisitor.decodeValueMin(NumericUtils.sortableBytesToInt(minPackedValue, 0));
- double xMax = PointInShapeIntersectVisitor.decodeValueMax(NumericUtils.sortableBytesToInt(maxPackedValue, 0));
- double yMin = PointInShapeIntersectVisitor.decodeValueMin(NumericUtils.sortableBytesToInt(minPackedValue, 1 * Integer.BYTES));
- double yMax = PointInShapeIntersectVisitor.decodeValueMax(NumericUtils.sortableBytesToInt(maxPackedValue, 1 * Integer.BYTES));
- double zMin = PointInShapeIntersectVisitor.decodeValueMin(NumericUtils.sortableBytesToInt(minPackedValue, 2 * Integer.BYTES));
- double zMax = PointInShapeIntersectVisitor.decodeValueMax(NumericUtils.sortableBytesToInt(maxPackedValue, 2 * Integer.BYTES));
+ double xMin = Geo3DUtil.decodeValueFloor(NumericUtils.sortableBytesToInt(minPackedValue, 0));
+ double xMax = Geo3DUtil.decodeValueCeil(NumericUtils.sortableBytesToInt(maxPackedValue, 0));
+ double yMin = Geo3DUtil.decodeValueFloor(NumericUtils.sortableBytesToInt(minPackedValue, 1 * Integer.BYTES));
+ double yMax = Geo3DUtil.decodeValueCeil(NumericUtils.sortableBytesToInt(maxPackedValue, 1 * Integer.BYTES));
+ double zMin = Geo3DUtil.decodeValueFloor(NumericUtils.sortableBytesToInt(minPackedValue, 2 * Integer.BYTES));
+ double zMax = Geo3DUtil.decodeValueCeil(NumericUtils.sortableBytesToInt(maxPackedValue, 2 * Integer.BYTES));
return "Cell(x=" + xMin + " TO " + xMax + " y=" + yMin + " TO " + yMax + " z=" + zMin + " TO " + zMax + ")";
}
@@ -1273,26 +1270,4 @@ public class TestGeo3DPoint extends LuceneTestCase {
return b.toString();
}
-
- @Ignore("https://issues.apache.org/jira/browse/LUCENE-7168")
- public void testCuriousFailure() throws Exception {
- GeoShape shape = GeoCircleFactory.makeGeoCircle(PlanetModel.WGS84, -0.8971654677124566, -0.3398482030102755, 1.4775317506492547);
- GeoPoint point = new GeoPoint(0.8653002868649471, 0.50134342478497, 0.046203414829601996);
-
- // point is inside our circle shape:
- assertTrue(shape.isWithin(point));
-
- double xMin = 0.8653002866318559;
- double xMax = 0.8653002870980383;
- double yMin = 0.5013434245518787;
- double yMax = 0.5013434250180612;
- double zMin = 0.04620341459651078;
- double zMax = 0.04620341506269321;
- GeoArea xyzSolid = GeoAreaFactory.makeGeoArea(PlanetModel.WGS84, xMin, xMax, yMin, yMax, zMin, zMax);
-
- // point is also inside our wee tiny box:
- assertTrue(xyzSolid.isWithin(point));
-
- assertTrue(xyzSolid.getRelationship(shape) != GeoArea.DISJOINT);
- }
}