You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2016/03/21 01:44:08 UTC
[46/50] lucene-solr:jira/SOLR-445: SOLR-445: Merge branch 'master'
into jira/SOLR-445
SOLR-445: Merge branch 'master' into jira/SOLR-445
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8cc0a384
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8cc0a384
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8cc0a384
Branch: refs/heads/jira/SOLR-445
Commit: 8cc0a38453b389bdb031d78ad638b76dfa27f2d5
Parents: a0d48f8 a22099a
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Mar 17 10:37:54 2016 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Mar 17 10:37:54 2016 -0700
----------------------------------------------------------------------
dev-tools/idea/solr/core/src/java/solr-core.iml | 1 +
.../idea/solr/core/src/solr-core-tests.iml | 1 +
lucene/CHANGES.txt | 30 +-
.../simpletext/SimpleTextPointsWriter.java | 8 +-
.../org/apache/lucene/codecs/PointsWriter.java | 14 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 20 +-
.../org/apache/lucene/document/DoublePoint.java | 8 +-
.../org/apache/lucene/document/FloatPoint.java | 8 +-
.../org/apache/lucene/document/IntPoint.java | 8 +-
.../org/apache/lucene/document/LongPoint.java | 6 +-
.../org/apache/lucene/index/PointValues.java | 90 ++-
.../apache/lucene/index/PointValuesWriter.java | 16 +-
.../org/apache/lucene/util/IntroSorter.java | 6 +-
.../org/apache/lucene/util/OfflineSorter.java | 44 +-
.../org/apache/lucene/util/bkd/BKDWriter.java | 221 ++++---
.../apache/lucene/util/bkd/HeapPointReader.java | 17 +-
.../apache/lucene/util/bkd/HeapPointWriter.java | 47 +-
.../lucene/util/bkd/OfflinePointReader.java | 101 ++-
.../lucene/util/bkd/OfflinePointWriter.java | 21 +-
.../org/apache/lucene/util/bkd/PointReader.java | 37 +-
.../org/apache/lucene/index/Test2BPoints.java | 36 +-
.../apache/lucene/index/TestPointValues.java | 64 +-
.../apache/lucene/search/TestTermScorer.java | 2 +-
.../lucene/search/spans/TestSpanCollection.java | 2 +-
.../apache/lucene/util/TestOfflineSorter.java | 2 +-
.../apache/lucene/util/bkd/Test2BBKDPoints.java | 121 ++++
.../org/apache/lucene/util/bkd/TestBKD.java | 22 +-
lucene/ivy-versions.properties | 2 +-
.../jetty-continuation-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-continuation-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-http-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-http-9.3.8.v20160314.jar.sha1 | 1 +
.../licenses/jetty-io-9.3.6.v20151106.jar.sha1 | 1 -
.../licenses/jetty-io-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-server-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-server-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-servlet-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-servlet-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-util-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-util-9.3.8.v20160314.jar.sha1 | 1 +
.../apache/lucene/index/memory/MemoryIndex.java | 622 ++++++++++++++++---
.../lucene/index/memory/TestMemoryIndex.java | 293 +++++++++
.../memory/TestMemoryIndexAgainstRAMDir.java | 192 ++++++
.../queries/payloads/TestPayloadSpans.java | 11 +-
.../org/apache/lucene/document/LatLonPoint.java | 78 ++-
.../document/LatLonPointDistanceComparator.java | 213 +++++++
.../document/LatLonPointDistanceQuery.java | 148 ++++-
.../document/LatLonPointInPolygonQuery.java | 65 +-
.../lucene/document/LatLonPointSortField.java | 106 ++++
.../lucene/document/TestBigIntegerPoint.java | 4 +-
.../lucene/document/TestInetAddressPoint.java | 4 +-
.../apache/lucene/document/TestLatLonPoint.java | 15 +-
.../document/TestLatLonPointDistanceQuery.java | 4 +-
.../document/TestLatLonPointDistanceSort.java | 289 +++++++++
.../document/TestLatLonPointInPolygonQuery.java | 49 ++
solr/CHANGES.txt | 47 +-
solr/common-build.xml | 4 +-
.../src/java/org/apache/solr/core/SolrCore.java | 3 +-
.../apache/solr/handler/loader/JsonLoader.java | 6 +-
.../solr/response/GeoJSONResponseWriter.java | 345 ++++++++++
.../solr/response/JSONResponseWriter.java | 2 +-
.../transform/GeoTransformerFactory.java | 224 +++++++
.../response/transform/TransformerFactory.java | 1 +
.../response/transform/WriteableGeoJSON.java | 55 ++
.../solr/schema/AbstractSpatialFieldType.java | 87 ++-
.../org/apache/solr/schema/DateRangeField.java | 4 +-
.../apache/solr/search/SolrIndexSearcher.java | 4 +-
.../apache/solr/search/facet/FacetField.java | 13 +-
.../org/apache/solr/update/TransactionLog.java | 4 +-
.../ClassificationUpdateProcessor.java | 102 +++
.../ClassificationUpdateProcessorFactory.java | 223 +++++++
.../collection1/conf/schema-classification.xml | 43 ++
.../solr/collection1/conf/schema-spatial.xml | 1 +
.../conf/solrconfig-classification.xml | 53 ++
.../org/apache/solr/handler/JsonLoaderTest.java | 20 +
.../response/TestGeoJSONResponseWriter.java | 279 +++++++++
.../solr/schema/SpatialRPTFieldTypeTest.java | 38 +-
.../solr/schema/TestUseDocValuesAsStored.java | 157 +++--
.../solr/search/facet/TestJsonFacets.java | 50 +-
.../test/org/apache/solr/update/TestUpdate.java | 21 +
...lassificationUpdateProcessorFactoryTest.java | 234 +++++++
.../jetty-continuation-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-continuation-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-deploy-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-deploy-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-http-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-http-9.3.8.v20160314.jar.sha1 | 1 +
solr/licenses/jetty-io-9.3.6.v20151106.jar.sha1 | 1 -
solr/licenses/jetty-io-9.3.8.v20160314.jar.sha1 | 1 +
.../licenses/jetty-jmx-9.3.6.v20151106.jar.sha1 | 1 -
.../licenses/jetty-jmx-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-rewrite-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-rewrite-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-security-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-security-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-server-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-server-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-servlet-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-servlet-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-servlets-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-servlets-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-util-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-util-9.3.8.v20160314.jar.sha1 | 1 +
.../jetty-webapp-9.3.6.v20151106.jar.sha1 | 1 -
.../jetty-webapp-9.3.8.v20160314.jar.sha1 | 1 +
.../licenses/jetty-xml-9.3.6.v20151106.jar.sha1 | 1 -
.../licenses/jetty-xml-9.3.8.v20160314.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
.../basic_configs/conf/managed-schema | 32 +-
.../conf/managed-schema | 53 +-
.../conf/managed-schema | 43 +-
.../org/apache/solr/common/cloud/DocRouter.java | 27 +-
.../apache/solr/common/util/JavaBinCodec.java | 4 +-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 100 +--
114 files changed, 4735 insertions(+), 632 deletions(-)
----------------------------------------------------------------------