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/19 18:06:44 UTC
[1/2] lucene-solr:master: Fix test to recognize null polygon response.
Repository: lucene-solr
Updated Branches:
refs/heads/master af7dad682 -> 8ba1a3880
Fix test to recognize null polygon response.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5bb9084b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5bb9084b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5bb9084b
Branch: refs/heads/master
Commit: 5bb9084bd5892d7906455c96319027ad6daae85b
Parents: 2342290
Author: Karl Wright <Da...@gmail.com>
Authored: Tue Apr 19 12:06:15 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Tue Apr 19 12:06:15 2016 -0400
----------------------------------------------------------------------
.../test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java | 3 +++
.../lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5bb9084b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
----------------------------------------------------------------------
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
index 5f42e4f..fa5900f 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java
@@ -145,6 +145,9 @@ public class Geo3dRptTest extends RandomSpatialOpStrategyTestCase {
final int convexPointIndex = random().nextInt(vertexCount); //If we get this wrong, hopefully we get IllegalArgumentException
try {
final GeoShape shape = GeoPolygonFactory.makeGeoPolygon(PlanetModel.SPHERE, geoPoints);
+ if (shape == null) {
+ continue;
+ }
return new Geo3dShape(shape, ctx);
} catch (IllegalArgumentException e) {
// This is what happens when we create a shape that is invalid. Although it is conceivable that there are cases where
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5bb9084b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java
----------------------------------------------------------------------
diff --git a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java
index f6f08dd..362809f 100644
--- a/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java
+++ b/lucene/spatial-extras/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java
@@ -186,6 +186,9 @@ public abstract class Geo3dShapeRectRelationTestCase extends RandomizedShapeTest
}
try {
final GeoShape shape = GeoPolygonFactory.makeGeoPolygon(planetModel, geoPoints);
+ if (shape == null) {
+ continue;
+ }
return new Geo3dShape(planetModel, shape, ctx);
} catch (IllegalArgumentException e) {
// This is what happens when we create a shape that is invalid. Although it is conceivable that there are cases where
[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/8ba1a388
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8ba1a388
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8ba1a388
Branch: refs/heads/master
Commit: 8ba1a3880bdcfb0a8764e997fae7a79cc29142a4
Parents: 5bb9084 af7dad6
Author: Karl Wright <Da...@gmail.com>
Authored: Tue Apr 19 12:06:32 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Tue Apr 19 12:06:32 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 4 +
.../org/apache/solr/handler/SQLHandler.java | 72 +++++
.../org/apache/solr/handler/StreamHandler.java | 49 ++++
.../solr/response/TextResponseWriter.java | 7 +
.../client/solrj/io/comp/FieldComparator.java | 13 +
.../solrj/io/comp/MultipleFieldComparator.java | 12 +
.../solr/client/solrj/io/eq/FieldEqualitor.java | 17 +-
.../solrj/io/eq/MultipleFieldEqualitor.java | 12 +
.../solrj/io/graph/GatherNodesStream.java | 66 ++++-
.../solrj/io/graph/ShortestPathStream.java | 29 +-
.../client/solrj/io/ops/ConcatOperation.java | 15 +-
.../client/solrj/io/ops/DistinctOperation.java | 33 +--
.../client/solrj/io/ops/GroupOperation.java | 42 ++-
.../client/solrj/io/ops/ReplaceOperation.java | 6 +
.../solrj/io/ops/ReplaceWithFieldOperation.java | 12 +
.../solrj/io/ops/ReplaceWithValueOperation.java | 12 +
.../client/solrj/io/ops/StreamOperation.java | 3 -
.../client/solrj/io/stream/CloudSolrStream.java | 32 +-
.../solrj/io/stream/ComplementStream.java | 57 +++-
.../client/solrj/io/stream/DaemonStream.java | 57 +++-
.../client/solrj/io/stream/ExceptionStream.java | 14 +
.../client/solrj/io/stream/FacetStream.java | 34 ++-
.../client/solrj/io/stream/HashJoinStream.java | 41 ++-
.../client/solrj/io/stream/IntersectStream.java | 56 +++-
.../solr/client/solrj/io/stream/JDBCStream.java | 37 +++
.../solr/client/solrj/io/stream/JoinStream.java | 33 ++-
.../client/solrj/io/stream/MergeStream.java | 35 ++-
.../client/solrj/io/stream/ParallelStream.java | 41 ++-
.../client/solrj/io/stream/PushBackStream.java | 7 +-
.../client/solrj/io/stream/RandomStream.java | 26 ++
.../solr/client/solrj/io/stream/RankStream.java | 43 ++-
.../client/solrj/io/stream/ReducerStream.java | 37 ++-
.../client/solrj/io/stream/RollupStream.java | 43 ++-
.../client/solrj/io/stream/SelectStream.java | 41 ++-
.../solr/client/solrj/io/stream/SolrStream.java | 18 +-
.../solr/client/solrj/io/stream/SortStream.java | 36 ++-
.../client/solrj/io/stream/StatsStream.java | 27 ++
.../client/solrj/io/stream/TopicStream.java | 52 +++-
.../client/solrj/io/stream/TupleStream.java | 10 +
.../client/solrj/io/stream/UniqueStream.java | 37 ++-
.../client/solrj/io/stream/UpdateStream.java | 48 ++-
.../solrj/io/stream/expr/Explanation.java | 158 ++++++++++
.../solrj/io/stream/expr/Expressible.java | 9 +
.../solrj/io/stream/expr/StreamExplanation.java | 72 +++++
.../client/solrj/io/stream/metrics/Metric.java | 19 ++
.../solrj/io/stream/RecordCountStream.java | 36 ++-
.../StreamExpressionToExplanationTest.java | 290 +++++++++++++++++++
solr/webapp/web/css/angular/menu.css | 1 +
solr/webapp/web/css/angular/stream.css | 233 +++++++++++++++
solr/webapp/web/index.html | 3 +
solr/webapp/web/js/angular/app.js | 4 +
.../webapp/web/js/angular/controllers/stream.js | 251 ++++++++++++++++
solr/webapp/web/partials/stream.html | 64 ++++
53 files changed, 2234 insertions(+), 172 deletions(-)
----------------------------------------------------------------------