You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2017/01/23 15:43:17 UTC

[39/39] lucene-solr:jira/solr-8593: Merge branch 'apache-https-master' into jira/solr-8593

Merge branch 'apache-https-master' into jira/solr-8593


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

Branch: refs/heads/jira/solr-8593
Commit: aaee7513e6df030370df70d7a9bf11045c523108
Parents: db6a339 ca50e5b
Author: Kevin Risden <kr...@apache.org>
Authored: Mon Jan 23 10:42:08 2017 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Mon Jan 23 10:42:08 2017 -0500

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                       |    7 +-
 dev-tools/doap/solr.rdf                         |    9 +-
 lucene/CHANGES.txt                              |   19 +
 .../analysis/charfilter/BaseCharFilter.java     |   26 +-
 .../lucene/analysis/core/TestRandomChains.java  |    3 +
 .../index/TestBackwardsCompatibility.java       |    4 +-
 .../org/apache/lucene/index/index.6.4.0-cfs.zip |  Bin 0 -> 15829 bytes
 .../apache/lucene/index/index.6.4.0-nocfs.zip   |  Bin 0 -> 15831 bytes
 lucene/common-build.xml                         |   26 +-
 .../lucene/document/NumericDocValuesField.java  |   48 +
 .../lucene/document/SortedDocValuesField.java   |   42 +
 .../document/SortedNumericDocValuesField.java   |   54 +
 .../SortedNumericDocValuesRangeQuery.java       |  144 ++
 .../document/SortedSetDocValuesField.java       |   43 +
 .../document/SortedSetDocValuesRangeQuery.java  |  188 +++
 .../lucene/search/DoubleValuesSource.java       |    2 +-
 .../lucene/search/FieldComparatorSource.java    |    8 +-
 .../lucene/search/FieldValueHitQueue.java       |   11 +-
 .../lucene/search/IndexOrDocValuesQuery.java    |  166 ++
 .../apache/lucene/search/LongValuesSource.java  |    2 +-
 .../org/apache/lucene/search/SortField.java     |    2 +-
 .../lucene/search/SortedNumericSortField.java   |    2 +-
 .../lucene/search/SortedSetSortField.java       |    2 +-
 .../java/org/apache/lucene/search/TopDocs.java  |   14 +-
 .../apache/lucene/search/TopFieldCollector.java |    4 +-
 .../lucene60/TestLucene60PointsFormat.java      |   47 +-
 .../lucene/search/TestDocValuesQueries.java     |  271 ++++
 .../lucene/search/TestElevationComparator.java  |   22 +-
 .../search/TestIndexOrDocValuesQuery.java       |   89 ++
 .../org/apache/lucene/util/bkd/TestBKD.java     |   37 +-
 .../search/grouping/BlockGroupingCollector.java |    2 +-
 .../grouping/FirstPassGroupingCollector.java    |    3 +-
 .../lucene/search/grouping/SearchGroup.java     |    8 +-
 .../lucene/search/grouping/TopGroups.java       |    5 +-
 lucene/ivy-versions.properties                  |    2 +-
 .../search/join/ToParentBlockJoinCollector.java |    2 +-
 .../search/join/ToParentBlockJoinSortField.java |    2 +-
 .../randomizedtesting-runner-2.4.0.jar.sha1     |    1 -
 .../randomizedtesting-runner-2.5.0.jar.sha1     |    1 +
 .../lucene/queries/function/ValueSource.java    |    2 +-
 .../lucene/document/LatLonPointSortField.java   |    6 +-
 .../lucene/search/DocValuesRangeQuery.java      |  276 ----
 .../lucene/search/IndexOrDocValuesQuery.java    |  116 --
 .../lucene/search/TestDocValuesRangeQuery.java  |  307 ----
 .../search/TestIndexOrDocValuesQuery.java       |   89 --
 lucene/site/changes/changes2html.pl             |    3 +-
 .../spatial3d/Geo3DPointOutsideSortField.java   |    5 +-
 .../lucene/spatial3d/Geo3DPointSortField.java   |    5 +-
 lucene/tools/prettify/inject-javadocs.js        |   27 +
 lucene/tools/prettify/lang-apollo.js            |   18 -
 lucene/tools/prettify/lang-css.js               |   18 -
 lucene/tools/prettify/lang-hs.js                |   18 -
 lucene/tools/prettify/lang-lisp.js              |   19 -
 lucene/tools/prettify/lang-lua.js               |   18 -
 lucene/tools/prettify/lang-ml.js                |   18 -
 lucene/tools/prettify/lang-proto.js             |   17 -
 lucene/tools/prettify/lang-sql.js               |   18 -
 lucene/tools/prettify/lang-vb.js                |   18 -
 lucene/tools/prettify/lang-wiki.js              |   18 -
 lucene/tools/prettify/prettify.css              |   30 +-
 lucene/tools/prettify/prettify.js               |   90 +-
 solr/CHANGES.txt                                |   45 +-
 solr/bin/solr                                   |   11 +-
 solr/bin/solr.cmd                               |   13 +-
 solr/bin/solr.in.cmd                            |    5 +
 solr/bin/solr.in.sh                             |    5 +
 .../apache/solr/schema/ICUCollationField.java   |   10 +-
 .../org/apache/solr/core/CoreContainer.java     |  109 +-
 .../org/apache/solr/core/DirectoryFactory.java  |   27 +
 .../src/java/org/apache/solr/core/SolrCore.java |  120 +-
 .../org/apache/solr/handler/IndexFetcher.java   |   60 +-
 .../org/apache/solr/handler/RestoreCore.java    |    2 +-
 .../solr/handler/admin/CoreAdminOperation.java  |    1 +
 .../solr/handler/admin/LukeRequestHandler.java  |    7 +-
 .../solr/handler/component/FacetComponent.java  |   12 +-
 .../component/MoreLikeThisComponent.java        |   12 +-
 .../solr/handler/component/QueryComponent.java  |   25 +-
 .../component/QueryElevationComponent.java      |   60 +-
 .../handler/component/RangeFacetProcessor.java  |    3 +-
 .../handler/component/RangeFacetRequest.java    |   31 +-
 .../component/ShardFieldSortedHitQueue.java     |    8 +-
 .../solr/handler/component/StatsComponent.java  |    6 +
 .../handler/component/StatsValuesFactory.java   |    2 +-
 .../handler/component/TermVectorComponent.java  |    9 +
 .../solr/index/SlowCompositeReaderWrapper.java  |    3 -
 .../org/apache/solr/request/IntervalFacets.java |    4 +
 .../org/apache/solr/request/SimpleFacets.java   |   37 +-
 .../apache/solr/request/json/RequestUtil.java   |   16 +-
 .../org/apache/solr/response/DocsStreamer.java  |    8 +
 .../org/apache/solr/schema/CollationField.java  |    3 +-
 .../apache/solr/schema/DoublePointField.java    |  186 +++
 .../java/org/apache/solr/schema/EnumField.java  |   20 +-
 .../java/org/apache/solr/schema/FieldType.java  |   25 +-
 .../org/apache/solr/schema/FloatPointField.java |  186 +++
 .../org/apache/solr/schema/IntPointField.java   |  186 +++
 .../org/apache/solr/schema/LongPointField.java  |  185 +++
 .../apache/solr/schema/NumericFieldType.java    |  151 ++
 .../java/org/apache/solr/schema/PointField.java |  233 +++
 .../org/apache/solr/schema/SchemaField.java     |   10 +
 .../org/apache/solr/schema/TrieDateField.java   |    2 +-
 .../org/apache/solr/schema/TrieDoubleField.java |    2 +-
 .../java/org/apache/solr/schema/TrieField.java  |  150 +-
 .../org/apache/solr/schema/TrieFloatField.java  |    2 +-
 .../org/apache/solr/schema/TrieIntField.java    |    2 +-
 .../org/apache/solr/schema/TrieLongField.java   |    2 +-
 .../solr/search/CollapsingQParserPlugin.java    |    2 +-
 .../apache/solr/search/SolrIndexSearcher.java   |   45 +-
 .../apache/solr/search/TermQParserPlugin.java   |   10 +-
 .../apache/solr/search/TermsQParserPlugin.java  |   10 +
 .../apache/solr/search/facet/FacetRange.java    |   28 +-
 .../distributed/command/GroupConverter.java     |    2 +-
 .../SearchGroupShardResponseProcessor.java      |  160 +-
 .../TopGroupsShardResponseProcessor.java        |  114 +-
 .../solr/security/GenericHadoopAuthPlugin.java  |  266 ----
 .../apache/solr/security/HadoopAuthPlugin.java  |    2 +-
 .../DocumentExpressionDictionaryFactory.java    |   12 +-
 .../conf/schema-distrib-interval-faceting.xml   |   14 +-
 .../conf/schema-docValuesFaceting.xml           |   12 +
 .../solr/collection1/conf/schema-point.xml      |   92 ++
 .../solr/collection1/conf/schema-sorts.xml      |   44 +-
 .../test-files/solr/collection1/conf/schema.xml |   26 +-
 .../solr/collection1/conf/schema11.xml          |   19 +-
 .../solr/collection1/conf/schema12.xml          |   15 +-
 .../solr/collection1/conf/schema_latest.xml     |   21 +-
 .../configsets/cloud-hdfs/conf/solrconfig.xml   |    2 +
 .../apache/solr/TestDistributedGrouping.java    |   10 +-
 .../org/apache/solr/TestDistributedSearch.java  |   46 +-
 .../core/src/test/org/apache/solr/TestJoin.java |    6 +-
 .../org/apache/solr/TestRandomDVFaceting.java   |    8 +
 .../org/apache/solr/TestRandomFaceting.java     |   12 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |   34 -
 .../solr/cloud/MissingSegmentRecoveryTest.java  |  123 ++
 .../apache/solr/cloud/OverseerRolesTest.java    |  173 +-
 .../apache/solr/cloud/TestCloudPivotFacet.java  |    2 +
 .../HdfsCollectionsAPIDistributedZkTest.java    |    1 +
 .../handler/XsltUpdateRequestHandlerTest.java   |    2 +-
 .../handler/admin/LukeRequestHandlerTest.java   |    8 +-
 .../component/DistributedMLTComponentTest.java  |   23 +
 .../TermVectorComponentDistributedTest.java     |   18 +
 .../handler/component/TestExpandComponent.java  |    8 +-
 .../apache/solr/request/TestFacetMethods.java   |   12 +
 .../apache/solr/schema/SortableBinaryField.java |    3 +-
 .../org/apache/solr/schema/TestPointFields.java | 1495 ++++++++++++++++++
 .../solr/search/TestCollapseQParserPlugin.java  |    4 +-
 .../solr/search/TestMaxScoreQueryParser.java    |    2 +-
 .../search/TestRandomCollapseQParserPlugin.java |    2 +
 .../apache/solr/search/TestSolrQueryParser.java |    8 +
 .../solr/search/facet/TestJsonFacets.java       |    2 +
 solr/licenses/junit4-ant-2.4.0.jar.sha1         |    1 -
 solr/licenses/junit4-ant-2.5.0.jar.sha1         |    1 +
 .../randomizedtesting-runner-2.4.0.jar.sha1     |    1 -
 .../randomizedtesting-runner-2.5.0.jar.sha1     |    1 +
 solr/server/scripts/cloud-scripts/zkcli.bat     |    2 +-
 solr/server/scripts/cloud-scripts/zkcli.sh      |    2 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   44 +-
 155 files changed, 5266 insertions(+), 2134 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/aaee7513/lucene/ivy-versions.properties
----------------------------------------------------------------------