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 2018/04/11 06:54:28 UTC
[1/2] lucene-solr:master: LUCENE-8245: Handle parallel planes case
properly.
Repository: lucene-solr
Updated Branches:
refs/heads/master 0292d0f6e -> 5b250b4a4
LUCENE-8245: Handle parallel planes case properly.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8e778924
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8e778924
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8e778924
Branch: refs/heads/master
Commit: 8e77892443601d702071dae4336d4976d9a7564f
Parents: e8f862e
Author: Karl Wright <Da...@gmail.com>
Authored: Wed Apr 11 02:53:51 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Wed Apr 11 02:53:51 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8e778924/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
----------------------------------------------------------------------
diff --git a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
index 3c63559..5e362f2 100644
--- a/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
+++ b/lucene/spatial3d/src/java/org/apache/lucene/spatial3d/geom/GeoComplexPolygon.java
@@ -603,6 +603,9 @@ class GeoComplexPolygon extends GeoBasePolygon {
//System.out.println(" Computing crossings between "+envelopePlane+" and ["+edge.startPoint+"->"+edge.endPoint+"]");
final GeoPoint[] unboundedIntersectionPoints = envelopePlane.findIntersections(planetModel, edge.plane);
+ if (unboundedIntersectionPoints == null) {
+ return null;
+ }
// Go through the intersection points one at a time. Notes:
// (1) So that we don't double-count, we can only include at most one point in the result per intersection.
// (2) Single-solution results imply that the plane was not crossed. The only time we consider them is if the edge ends on the plane, in which case we count it as a crossing.
[2/2] lucene-solr:master: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/lucene-solr
Posted by kw...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5b250b4a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5b250b4a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5b250b4a
Branch: refs/heads/master
Commit: 5b250b4a403f5b572f667d89acab6d07553b2e65
Parents: 8e77892 0292d0f
Author: Karl Wright <Da...@gmail.com>
Authored: Wed Apr 11 02:54:03 2018 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Wed Apr 11 02:54:03 2018 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 5 +
.../solr/cloud/MultiSolrCloudTestCaseTest.java | 80 ++++++++++++++
.../solr/core/HdfsDirectoryFactoryTest.java | 2 +
.../solr/handler/TestReplicationHandler.java | 14 +--
solr/solr-ref-guide/src/collections-api.adoc | 41 +++----
.../solr-ref-guide/src/how-solrcloud-works.adoc | 3 +-
.../solr-ref-guide/src/time-routed-aliases.adoc | 95 ++++++++++++++++
.../solr/cloud/MultiSolrCloudTestCase.java | 107 +++++++++++++++++++
.../apache/solr/cloud/SolrCloudTestCase.java | 13 ++-
9 files changed, 332 insertions(+), 28 deletions(-)
----------------------------------------------------------------------