You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2016/04/15 02:57:54 UTC
[2/2] lucene-solr:branch_6x: LUCENE-7221: Merge issue
LUCENE-7221: Merge issue
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d5b12607
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d5b12607
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d5b12607
Branch: refs/heads/branch_6x
Commit: d5b1260740732162165b3646da9ad544e9bd106e
Parents: 0b0e442
Author: Karl Wright <Da...@gmail.com>
Authored: Thu Apr 14 20:55:54 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Thu Apr 14 20:56:47 2016 -0400
----------------------------------------------------------------------
.../src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d5b12607/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 deb3587..330a15e 100644
--- a/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
+++ b/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
@@ -1356,6 +1356,9 @@ public class TestGeo3DPoint extends LuceneTestCase {
public static String explain(String fieldName, GeoShape shape, GeoPoint targetDocPoint, GeoPoint scaledDocPoint, IndexReader reader, int docID) throws Exception {
+ final XYZBounds bounds = new XYZBounds();
+ shape.getBounds(bounds);
+
// First find the leaf reader that owns this doc:
int subIndex = ReaderUtil.subIndex(docID, reader.leaves());
LeafReader leafReader = reader.leaves().get(subIndex).reader();
@@ -1364,7 +1367,7 @@ public class TestGeo3DPoint extends LuceneTestCase {
b.append("target is in leaf " + leafReader + " of full reader " + reader + "\n");
DocIdSetBuilder hits = new DocIdSetBuilder(leafReader.maxDoc());
- ExplainingVisitor visitor = new ExplainingVisitor(shape, targetDocPoint, scaledDocPoint, new PointInShapeIntersectVisitor(hits, shape), docID - reader.leaves().get(subIndex).docBase, 3, Integer.BYTES, b);
+ ExplainingVisitor visitor = new ExplainingVisitor(shape, targetDocPoint, scaledDocPoint, new PointInShapeIntersectVisitor(hits, shape, bounds), docID - reader.leaves().get(subIndex).docBase, 3, Integer.BYTES, b);
// Do first phase, where we just figure out the "path" that leads to the target docID:
leafReader.getPointValues().intersect(fieldName, visitor);