You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2016/04/27 20:22:18 UTC

[34/50] [abbrv] lucene-solr:solr-5750: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

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/506d61ab
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/506d61ab
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/506d61ab

Branch: refs/heads/solr-5750
Commit: 506d61abe773ccf0b9aabf6eb88c83380c1eda95
Parents: 0233765 6fa5166
Author: Noble Paul <no...@apache.org>
Authored: Tue Apr 26 19:24:52 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Apr 26 19:24:52 2016 +0530

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  13 +-
 .../org/apache/lucene/document/StringField.java |   4 +-
 .../src/java/org/apache/lucene/geo/Polygon.java | 221 ---------
 .../java/org/apache/lucene/geo/Polygon2D.java   | 473 +++++++++++++++++++
 .../org/apache/lucene/search/LRUQueryCache.java | 238 ++++++----
 .../lucene/search/QueryCachingPolicy.java       |  18 +-
 .../search/UsageTrackingQueryCachingPolicy.java |   7 +-
 .../test/org/apache/lucene/geo/TestPolygon.java | 330 -------------
 .../org/apache/lucene/geo/TestPolygon2D.java    | 289 +++++++++++
 .../apache/lucene/search/TestIndexSearcher.java |   2 +-
 .../apache/lucene/search/TestLRUQueryCache.java |   8 +-
 .../apache/lucene/search/TestPointQueries.java  |   2 +-
 .../TestUsageTrackingFilterCachingPolicy.java   |  17 +-
 .../apache/lucene/queries/TermsQueryTest.java   |  16 +-
 .../lucene/queryparser/xml/TestCoreParser.java  |   9 +-
 .../lucene/document/LatLonDocValuesField.java   | 135 ++++++
 .../org/apache/lucene/document/LatLonGrid.java  | 168 -------
 .../org/apache/lucene/document/LatLonPoint.java |  68 +--
 .../lucene/document/LatLonPointBoxQuery.java    | 287 +++++++++++
 .../document/LatLonPointDistanceComparator.java |   2 +-
 .../document/LatLonPointDistanceQuery.java      |  17 +-
 .../document/LatLonPointInPolygonQuery.java     |  34 +-
 .../org/apache/lucene/document/LatLonTree.java  | 401 ----------------
 .../apache/lucene/document/MatchingPoints.java  |  90 ++++
 .../document/TestLatLonDocValuesField.java      |  30 ++
 .../apache/lucene/document/TestLatLonGrid.java  | 106 -----
 .../apache/lucene/document/TestLatLonPoint.java |   3 -
 .../document/TestLatLonPointDistanceSort.java   |  20 +-
 .../apache/lucene/document/TestLatLonTree.java  |  53 ---
 .../org/apache/lucene/document/TestNearest.java |   3 +-
 .../search/GeoPointInPolygonQueryImpl.java      |  16 +-
 .../org/apache/lucene/spatial3d/Geo3DPoint.java |  17 +-
 .../spatial3d/PointInShapeIntersectVisitor.java |   5 +
 .../spatial3d/geom/GeoConcavePolygon.java       |  66 ++-
 .../lucene/spatial3d/geom/GeoConvexPolygon.java |  66 ++-
 .../spatial3d/geom/GeoPolygonFactory.java       |   6 +-
 .../lucene/spatial3d/geom/GeoStandardPath.java  |   4 +-
 .../apache/lucene/geo/BaseGeoPointTestCase.java |   2 +-
 .../java/org/apache/lucene/geo/GeoTestUtil.java |  54 +++
 .../org/apache/lucene/index/RandomCodec.java    |   2 +-
 .../org/apache/lucene/util/LuceneTestCase.java  |   2 +-
 solr/CHANGES.txt                                |   5 +
 .../src/java/org/apache/solr/cloud/Assign.java  |   8 +-
 .../OverseerAutoReplicaFailoverThread.java      |   1 +
 .../cloud/OverseerCollectionMessageHandler.java |  40 +-
 .../cloud/OverseerConfigSetMessageHandler.java  |   1 +
 .../cloud/overseer/ClusterStateMutator.java     |  16 +-
 .../solr/cloud/overseer/CollectionMutator.java  |   6 +-
 .../apache/solr/cloud/overseer/NodeMutator.java |   9 +-
 .../solr/cloud/overseer/ReplicaMutator.java     |  36 +-
 .../solr/cloud/overseer/SliceMutator.java       |  39 +-
 .../solr/cloud/overseer/ZkStateWriter.java      |   3 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   5 +-
 .../solr/handler/CdcrUpdateLogSynchronizer.java |   4 +-
 .../org/apache/solr/handler/SQLHandler.java     |   1 +
 .../solr/handler/admin/CollectionsHandler.java  |  27 +-
 .../solr/handler/admin/CoreAdminOperation.java  |  11 +-
 .../org/apache/solr/servlet/HttpSolrCall.java   |  11 +-
 .../processor/DistributedUpdateProcessor.java   |   9 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  |   1 +
 .../org/apache/solr/util/SolrLogLayout.java     |  10 +-
 .../test/org/apache/solr/cloud/AssignTest.java  |   2 +-
 .../cloud/CollectionsAPIDistributedZkTest.java  |   8 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |   2 +-
 .../org/apache/solr/cloud/OverseerTest.java     |   3 +-
 .../test/org/apache/solr/core/SolrCoreTest.java |  40 ++
 .../org/apache/solr/handler/TestSQLHandler.java |   1 +
 .../client/solrj/io/stream/TopicStream.java     |   1 +
 .../apache/solr/common/cloud/ClusterState.java  |  48 +-
 .../solr/common/cloud/ClusterStateUtil.java     |   1 +
 .../apache/solr/common/cloud/DocCollection.java |   6 +
 .../apache/solr/common/cloud/ZkStateReader.java |  12 +-
 .../solr/client/solrj/io/sql/JdbcTest.java      |   1 +
 73 files changed, 1941 insertions(+), 1731 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/506d61ab/solr/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/506d61ab/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------