lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject [2/2] lucene-solr:branch_6x: Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x
Date Fri, 22 Apr 2016 20:36:30 GMT
Merge branch 'branch_6x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_6x


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bb2293cf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bb2293cf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bb2293cf

Branch: refs/heads/branch_6x
Commit: bb2293cf7e144c163ca395db0dcaf4b15d668a2d
Parents: 38c0915 c3f62d1
Author: Karl Wright <DaddyWri@gmail.com>
Authored: Fri Apr 22 16:36:12 2016 -0400
Committer: Karl Wright <DaddyWri@gmail.com>
Committed: Fri Apr 22 16:36:12 2016 -0400

----------------------------------------------------------------------
 lucene/CHANGES.txt                              |  18 +-
 .../org/apache/lucene/search/LRUQueryCache.java | 303 +++++++++-----
 .../lucene/search/QueryCachingPolicy.java       |  69 +---
 .../search/UsageTrackingQueryCachingPolicy.java |  29 +-
 .../java/org/apache/lucene/util/BitUtil.java    |   4 +-
 .../apache/lucene/search/TestIndexSearcher.java |   2 +-
 .../apache/lucene/search/TestLRUQueryCache.java |  79 +++-
 .../lucene/search/TestQueryCachingPolicy.java   |  56 ---
 .../TestUsageTrackingFilterCachingPolicy.java   |  17 +-
 .../apache/lucene/index/memory/MemoryIndex.java |   1 +
 .../apache/lucene/queries/TermsQueryTest.java   |  16 +-
 .../org/apache/lucene/document/LatLonGrid.java  |  28 +-
 .../document/LatLonPointInPolygonQuery.java     |  66 +---
 .../org/apache/lucene/document/LatLonTree.java  | 396 +++++++++++++++++++
 .../apache/lucene/document/TestLatLonGrid.java  |   6 +-
 .../apache/lucene/document/TestLatLonTree.java  |  53 +++
 .../geopoint/document/GeoPointField.java        | 110 +++++-
 .../geopoint/document/GeoPointTokenStream.java  |   4 +-
 .../geopoint/search/GeoPointDistanceQuery.java  |   5 +-
 .../geopoint/search/GeoPointInBBoxQuery.java    |   2 -
 .../geopoint/search/GeoPointInPolygonQuery.java |   4 +-
 .../search/GeoPointNumericTermsEnum.java        |  17 +-
 .../search/GeoPointPrefixTermsEnum.java         |  26 +-
 .../GeoPointTermQueryConstantScoreWrapper.java  |   7 +-
 .../lucene/spatial/util/GeoEncodingUtils.java   | 152 -------
 .../lucene/spatial/util/MortonEncoder.java      | 103 +++++
 .../geopoint/search/TestGeoPointQuery.java      |   5 +-
 .../search/TestLegacyGeoPointQuery.java         |   5 +-
 .../spatial/util/TestGeoEncodingUtils.java      | 101 -----
 .../lucene/spatial/util/TestGeoPointField.java  |  51 +++
 .../lucene/spatial/util/TestMortonEncoder.java  | 108 +++++
 .../org/apache/lucene/util/LuceneTestCase.java  |   4 +-
 .../solr/cloud/ConnectionManagerTest.java       |  40 +-
 .../test/org/apache/solr/core/SolrCoreTest.java |  40 ++
 .../solr/common/cloud/ConnectionManager.java    |   8 +-
 35 files changed, 1254 insertions(+), 681 deletions(-)
----------------------------------------------------------------------



Mime
View raw message