You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/06/04 15:11:49 UTC

[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14470-2

This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch jira/solr-14470-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit a4ff7116e4c13400fcc19dbdf56b8ca1f67d8dfe
Merge: 56ec965 bab4fcc
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Jun 4 17:11:28 2020 +0200

    Merge branch 'master' into jira/solr-14470-2

 build.gradle                                       |    4 +-
 dev-tools/doap/lucene.rdf                          |    7 +
 dev-tools/doap/solr.rdf                            |    7 +
 dev-tools/maven/pom.xml.template                   |    2 +-
 dev-tools/scripts/releaseWizard.py                 |    2 +-
 dev-tools/scripts/releaseWizard.yaml               |   27 +-
 gradle/jar-manifest.gradle                         |    9 +-
 gradle/validation/check-environment.gradle         |    2 +-
 gradle/validation/validate-log-calls.gradle        |   41 +-
 gradle/wrapper/gradle-wrapper.jar                  |  Bin 58702 -> 58910 bytes
 gradle/wrapper/gradle-wrapper.jar.sha256           |    2 +-
 gradle/wrapper/gradle-wrapper.jar.version          |    2 +-
 gradle/wrapper/gradle-wrapper.properties           |    2 +-
 lucene/CHANGES.txt                                 |   29 +-
 .../codecs/lucene70/Lucene70SegmentInfoFormat.java |  168 +---
 .../lucene/codecs/lucene70/package-info.java       |    2 +-
 .../lucene/codecs/lucene84/Lucene84Codec.java      |   46 +-
 .../lucene/codecs/lucene84}/package-info.java      |    4 +-
 .../services/org.apache.lucene.codecs.Codec        |    1 +
 .../lucene70/Lucene70RWSegmentInfoFormat.java      |  204 ++++
 .../lucene70/TestLucene70SegmentInfoFormat.java    |   13 +-
 .../lucene/index/TestBackwardsCompatibility.java   |   11 +-
 .../org/apache/lucene/index/index.8.5.2-cfs.zip    |  Bin 0 -> 15897 bytes
 .../org/apache/lucene/index/index.8.5.2-nocfs.zip  |  Bin 0 -> 15902 bytes
 .../test/org/apache/lucene/index/sorted.8.5.2.zip  |  Bin 0 -> 80768 bytes
 .../apache/lucene/index/unsupported.7.7.3-cfs.zip  |  Bin 0 -> 15646 bytes
 .../lucene/index/unsupported.7.7.3-nocfs.zip       |  Bin 0 -> 15643 bytes
 .../lucene/index/unsupported.sorted.7.7.3.zip      |  Bin 0 -> 86356 bytes
 .../benchmark/byTask/tasks/CreateIndexTask.java    |    4 +-
 .../simpletext/SimpleTextSegmentInfoFormat.java    |  306 +-----
 lucene/common-build.xml                            |    2 +-
 .../src/java/org/apache/lucene/codecs/Codec.java   |    2 +-
 .../lucene/codecs/lucene84/package-info.java       |  396 +-------
 .../Lucene86Codec.java}                            |   72 +-
 .../codecs/lucene86/Lucene86SegmentInfoFormat.java |  217 ++++
 .../{lucene84 => lucene86}/package-info.java       |   60 +-
 .../apache/lucene/index/BinaryDocValuesWriter.java |   29 +-
 .../apache/lucene/index/DefaultIndexingChain.java  |  183 ++--
 .../apache/lucene/index/DocValuesLeafReader.java   |   89 ++
 .../org/apache/lucene/index/DocValuesWriter.java   |    8 +-
 .../java/org/apache/lucene/index/IndexSorter.java  |  448 +++++++++
 .../org/apache/lucene/index/IndexWriterConfig.java |   17 +-
 .../java/org/apache/lucene/index/MultiSorter.java  |  144 +--
 .../lucene/index/NumericDocValuesWriter.java       |   33 +-
 .../java/org/apache/lucene/index/SegmentInfos.java |  236 ++---
 .../org/apache/lucene/index/SortFieldProvider.java |  118 +++
 .../apache/lucene/index/SortedDocValuesWriter.java |   50 +-
 .../lucene/index/SortedNumericDocValuesWriter.java |   33 +-
 .../lucene/index/SortedSetDocValuesWriter.java     |   45 +-
 .../src/java/org/apache/lucene/index/Sorter.java   |  238 +----
 .../java/org/apache/lucene/search/FuzzyQuery.java  |    2 +-
 .../java/org/apache/lucene/search/SortField.java   |  135 +++
 .../lucene/search/SortedNumericSortField.java      |  106 ++
 .../apache/lucene/search/SortedSetSortField.java   |   69 +-
 .../src/java/org/apache/lucene/util/Version.java   |    7 +
 .../services/org.apache.lucene.codecs.Codec        |    2 +-
 .../org.apache.lucene.index.SortFieldProvider      |   20 +
 ...tLucene50StoredFieldsFormatHighCompression.java |   11 +-
 .../codecs/lucene80/TestLucene80NormsFormat.java   |    4 +-
 .../TestLucene86SegmentInfoFormat.java}            |    6 +-
 .../org/apache/lucene/index/TestIndexSorting.java  |    5 +-
 .../org/apache/lucene/index/TestPointValues.java   |    4 +-
 .../org/apache/lucene/index/TestSegmentInfos.java  |   64 ++
 .../org/apache/lucene/search/TestBoolean2.java     |    8 +-
 .../org/apache/lucene/search/TestFuzzyQuery.java   |   46 +-
 .../apache/lucene/search/TestLRUQueryCache.java    |   17 +-
 .../lucene/search/TestSameScoresWithThreads.java   |    1 +
 .../apache/lucene/search/TestSearcherManager.java  |    1 +
 .../org/apache/lucene/search/TestTermQuery.java    |    7 +-
 .../search/uhighlight/UnifiedHighlighter.java      |    2 +
 .../lucene/search/highlight/HighlighterTest.java   |   27 +-
 .../lucene/search/highlight/TokenSourcesTest.java  |    2 +
 .../highlight/custom/HighlightCustomQueryTest.java |   23 +-
 lucene/ivy-versions.properties                     |    3 +-
 .../function/valuesource/DocFreqValueSource.java   |  175 ++--
 .../function/valuesource/IDFValueSource.java       |    2 +-
 .../function/valuesource/MaxDocValueSource.java    |    2 +-
 .../function/valuesource/NumDocsValueSource.java   |    2 +-
 .../document/TestFloatPointNearestNeighbor.java    |    2 +-
 .../test/org/apache/lucene/search/TestNearest.java |    2 +-
 .../lucene/search/TestTermAutomatonQuery.java      |    3 +-
 .../suggest/analyzing/TestFreeTextSuggester.java   |    1 +
 .../suggest/analyzing/TestSuggestStopFilter.java   |    9 -
 .../search/suggest/document/TestSuggestField.java  |   13 +-
 .../apache/lucene/geo/BaseGeoPointTestCase.java    |    2 +-
 .../org/apache/lucene/geo/BaseXYPointTestCase.java |    2 +-
 .../lucene/search/ShardSearchingTestBase.java      |    3 +-
 .../util/TestRuleSetupAndRestoreClassEnv.java      |   29 +-
 .../src/java/org/apache/lucene/util/TestUtil.java  |    4 +-
 solr/CHANGES.txt                                   |   74 +-
 solr/core/build.gradle                             |    1 -
 solr/core/ivy.xml                                  |    1 -
 .../org/apache/solr/cloud/ElectionContext.java     |  709 -------------
 .../apache/solr/cloud/ExclusiveSliceProperty.java  |    2 +-
 .../apache/solr/cloud/OverseerElectionContext.java |  110 +++
 ...ontext.java => ShardLeaderElectionContext.java} |  423 ++------
 .../solr/cloud/ShardLeaderElectionContextBase.java |  194 ++++
 .../java/org/apache/solr/cloud/ZkController.java   |    2 +-
 .../autoscaling/AutoAddReplicasPlanAction.java     |   47 +-
 .../apache/solr/cloud/autoscaling/AutoScaling.java |    2 +
 .../solr/cloud/autoscaling/AutoScalingHandler.java |   10 +
 .../solr/cloud/autoscaling/ComputePlanAction.java  |  174 ++--
 .../solr/cloud/autoscaling/ExecutePlanAction.java  |    2 +
 .../cloud/autoscaling/InactiveShardPlanAction.java |    1 +
 .../solr/cloud/autoscaling/IndexSizeTrigger.java   |    2 +
 .../solr/cloud/autoscaling/MetricTrigger.java      |    1 +
 .../solr/cloud/autoscaling/NodeAddedTrigger.java   |    2 +
 .../solr/cloud/autoscaling/NodeLostTrigger.java    |    2 +
 .../solr/cloud/autoscaling/ScheduledTriggers.java  |    3 +
 .../solr/cloud/autoscaling/SearchRateTrigger.java  |    5 +
 .../solr/cloud/autoscaling/SystemLogListener.java  |    2 +
 .../apache/solr/cloud/autoscaling/TriggerBase.java |    3 +
 .../solr/cloud/autoscaling/TriggerEvent.java       |    4 +
 .../solr/cloud/autoscaling/TriggerEventQueue.java  |    2 +
 .../solr/cloud/autoscaling/TriggerUtils.java       |    1 +
 .../cloud/autoscaling/sim/SimCloudManager.java     |    6 +
 .../autoscaling/sim/SimClusterStateProvider.java   |   19 +
 .../autoscaling/sim/SimDistribStateManager.java    |    1 +
 .../sim/SimDistributedQueueFactory.java            |    1 +
 .../autoscaling/sim/SimNodeStateProvider.java      |    3 +
 .../solr/cloud/autoscaling/sim/SimScenario.java    |    8 +
 .../solr/cloud/autoscaling/sim/SimUtils.java       |    1 +
 .../autoscaling/sim/SnapshotCloudManager.java      |    3 +
 .../sim/SnapshotClusterStateProvider.java          |    2 +
 .../sim/SnapshotDistribStateManager.java           |    2 +
 .../autoscaling/sim/SnapshotNodeStateProvider.java |    3 +
 .../solr/core/AbstractSolrEventListener.java       |    5 +-
 .../java/org/apache/solr/core/BlobRepository.java  |    9 +-
 .../apache/solr/core/CachingDirectoryFactory.java  |    4 +-
 .../java/org/apache/solr/core/CodecFactory.java    |    2 +-
 .../java/org/apache/solr/core/ConfigOverlay.java   |   14 +
 .../src/java/org/apache/solr/core/ConfigSet.java   |    3 +
 .../org/apache/solr/core/ConfigSetProperties.java  |    2 +
 .../org/apache/solr/core/ConfigSetService.java     |    3 +
 .../java/org/apache/solr/core/CoreContainer.java   |   13 +-
 .../java/org/apache/solr/core/CoreDescriptor.java  |    6 +-
 .../apache/solr/core/CorePropertiesLocator.java    |    6 +-
 .../org/apache/solr/core/DirectoryFactory.java     |   19 +-
 .../org/apache/solr/core/HdfsDirectoryFactory.java |    2 +-
 .../solr/core/IndexDeletionPolicyWrapper.java      |    4 +-
 .../org/apache/solr/core/IndexReaderFactory.java   |    2 +-
 .../src/java/org/apache/solr/core/InitParams.java  |   12 +-
 .../org/apache/solr/core/MMapDirectoryFactory.java |    1 +
 .../java/org/apache/solr/core/MemClassLoader.java  |    5 +-
 .../solr/core/NRTCachingDirectoryFactory.java      |    1 +
 .../src/java/org/apache/solr/core/NodeConfig.java  |   20 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |   27 +-
 .../src/java/org/apache/solr/core/PluginInfo.java  |    6 +-
 .../org/apache/solr/core/QuerySenderListener.java  |    1 +
 .../java/org/apache/solr/core/RequestParams.java   |   22 +-
 .../org/apache/solr/core/SchemaCodecFactory.java   |    5 +-
 .../apache/solr/core/SimpleTextCodecFactory.java   |    1 +
 .../src/java/org/apache/solr/core/SolrConfig.java  |   13 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   24 +-
 .../org/apache/solr/core/SolrDeletionPolicy.java   |    2 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |   82 +-
 .../solr/core/TransientSolrCoreCacheDefault.java   |    6 +-
 .../backup/repository/HdfsBackupRepository.java    |    1 +
 .../repository/LocalFileSystemRepository.java      |    3 +-
 .../solr/core/snapshots/SolrSnapshotManager.java   |    4 +-
 .../solr/core/snapshots/SolrSnapshotsTool.java     |    1 +
 .../java/org/apache/solr/handler/GraphHandler.java |    3 +-
 .../apache/solr/handler/RequestHandlerBase.java    |    1 +
 .../org/apache/solr/handler/SolrConfigHandler.java |    5 +-
 .../org/apache/solr/handler/StreamHandler.java     |    4 +-
 .../solr/handler/admin/AdminHandlersProxy.java     |    2 +
 .../handler/admin/AutoscalingHistoryHandler.java   |    1 +
 .../solr/handler/admin/BaseHandlerApiSupport.java  |    5 +-
 .../apache/solr/handler/admin/ClusterStatus.java   |    4 +-
 .../org/apache/solr/handler/admin/ColStatus.java   |    1 +
 .../solr/handler/admin/CollectionsHandler.java     |   12 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |    3 +
 .../solr/handler/admin/CoreAdminHandler.java       |    2 +-
 .../solr/handler/admin/CoreAdminOperation.java     |    7 +-
 .../solr/handler/admin/HealthCheckHandler.java     |    2 +-
 .../solr/handler/admin/IndexSizeEstimator.java     |    3 +
 .../org/apache/solr/handler/admin/InfoHandler.java |    2 +-
 .../apache/solr/handler/admin/LoggingHandler.java  |    2 +
 .../solr/handler/admin/LukeRequestHandler.java     |    1 +
 .../handler/admin/MetricsCollectorHandler.java     |    2 +-
 .../apache/solr/handler/admin/MetricsHandler.java  |    7 +-
 .../solr/handler/admin/MetricsHistoryHandler.java  |    4 +
 .../solr/handler/admin/RebalanceLeaders.java       |    8 +-
 .../solr/handler/admin/SecurityConfHandler.java    |    7 +-
 .../solr/handler/admin/ShowFileRequestHandler.java |    2 +-
 .../solr/handler/admin/SolrInfoMBeanHandler.java   |    4 +
 .../org/apache/solr/handler/admin/SplitOp.java     |    2 +
 .../solr/handler/admin/SystemInfoHandler.java      |    1 +
 .../solr/handler/admin/ZookeeperInfoHandler.java   |    1 +
 .../solr/handler/admin/ZookeeperStatusHandler.java |    3 +-
 .../solr/handler/component/HttpShardHandler.java   |  140 +--
 .../handler/component/HttpShardHandlerFactory.java |    1 +
 .../handler/component/PivotFacetProcessor.java     |    4 +-
 .../solr/handler/component/QueryComponent.java     |   12 +-
 .../handler/component/RealTimeGetComponent.java    |   22 +-
 .../solr/handler/component/ShardRequestor.java     |  178 ++++
 .../solr/handler/component/StatsComponent.java     |  110 +--
 .../apache/solr/handler/component/StatsInfo.java   |  108 ++
 .../export/{DoubleCmp.java => DoubleComp.java}     |   30 +-
 .../apache/solr/handler/export/ExportWriter.java   |   28 +-
 .../export/{FloatCmp.java => FloatComp.java}       |   30 +-
 .../org/apache/solr/handler/export/IntComp.java    |   32 +-
 .../handler/export/{LongCmp.java => LongComp.java} |   31 +-
 .../apache/solr/handler/loader/JavabinLoader.java  |    6 +-
 .../apache/solr/metrics/SolrMetricProducer.java    |    9 +-
 .../java/org/apache/solr/pkg/PackageListeners.java |    4 +-
 .../java/org/apache/solr/pkg/PackageLoader.java    |   41 +-
 .../org/apache/solr/pkg/PackagePluginHolder.java   |   34 +-
 .../solr/request/json/JsonQueryConverter.java      |   50 +-
 .../apache/solr/response/JSONResponseWriter.java   |    8 +-
 .../apache/solr/response/PythonResponseWriter.java |    2 +-
 .../apache/solr/response/RubyResponseWriter.java   |    2 +-
 .../response/transform/ShardAugmenterFactory.java  |    2 +-
 .../response/transform/ValueAugmenterFactory.java  |   78 +-
 .../java/org/apache/solr/search/CaffeineCache.java |    3 +-
 .../apache/solr/search/ExtendedDismaxQParser.java  |    2 +-
 .../org/apache/solr/search/FunctionRangeQuery.java |    3 +
 .../java/org/apache/solr/search/QueryCommand.java  |   10 +-
 .../java/org/apache/solr/search/QueryContext.java  |    1 +
 .../org/apache/solr/search/QueryResultKey.java     |   10 +-
 .../src/java/org/apache/solr/search/SolrCache.java |    3 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   20 +-
 .../apache/solr/search/facet/AggValueSource.java   |    3 +-
 .../java/org/apache/solr/search/facet/AvgAgg.java  |   28 +-
 .../org/apache/solr/search/facet/CountAgg.java     |    6 +-
 .../org/apache/solr/search/facet/CountValsAgg.java |   20 +-
 .../org/apache/solr/search/facet/DocValuesAcc.java |  577 +++++------
 .../org/apache/solr/search/facet/FacetBucket.java  |   10 +-
 .../org/apache/solr/search/facet/FacetContext.java |   74 ++
 .../apache/solr/search/facet/FacetDebugInfo.java   |    2 +-
 .../org/apache/solr/search/facet/FacetField.java   |   45 +-
 .../apache/solr/search/facet/FacetFieldMerger.java |    7 +-
 .../solr/search/facet/FacetFieldProcessor.java     |   23 +-
 .../search/facet/FacetFieldProcessorByArray.java   |   10 +-
 .../search/facet/FacetFieldProcessorByArrayDV.java |    2 +-
 .../facet/FacetFieldProcessorByArrayUIF.java       |    2 +-
 .../FacetFieldProcessorByEnumTermsStream.java      |    3 +-
 .../search/facet/FacetFieldProcessorByHashDV.java  |    9 +-
 .../org/apache/solr/search/facet/FacetHeatmap.java |    8 +-
 .../org/apache/solr/search/facet/FacetModule.java  |  315 +++---
 .../org/apache/solr/search/facet/FacetParser.java  |  637 ++++++++++++
 .../apache/solr/search/facet/FacetProcessor.java   |   21 +-
 .../org/apache/solr/search/facet/FacetQuery.java   |    7 +-
 .../org/apache/solr/search/facet/FacetRange.java   | 1038 +-------------------
 .../apache/solr/search/facet/FacetRangeMerger.java |    4 +-
 .../apache/solr/search/facet/FacetRangeParser.java |   76 ++
 .../{FacetRange.java => FacetRangeProcessor.java}  |  278 +++---
 .../org/apache/solr/search/facet/FacetRequest.java |  706 +------------
 .../solr/search/facet/FacetRequestSorted.java      |   58 ++
 .../search/facet/FacetRequestSortedMerger.java     |   10 +-
 .../java/org/apache/solr/search/facet/HLLAgg.java  |   16 +-
 .../org/apache/solr/search/facet/LegacyFacet.java  |    1 +
 .../org/apache/solr/search/facet/MinMaxAgg.java    |   35 +-
 .../org/apache/solr/search/facet/MissingAgg.java   |    8 +-
 .../apache/solr/search/facet/PercentileAgg.java    |   18 +-
 .../apache/solr/search/facet/RelatednessAgg.java   |   16 +-
 .../solr/search/facet/SimpleAggValueSource.java    |    1 +
 .../java/org/apache/solr/search/facet/SlotAcc.java |  750 +++++++-------
 .../org/apache/solr/search/facet/StddevAgg.java    |   18 +-
 .../java/org/apache/solr/search/facet/SumAgg.java  |   18 +-
 .../org/apache/solr/search/facet/SumsqAgg.java     |   16 +-
 .../apache/solr/search/facet/UnInvertedField.java  |    4 +-
 .../solr/search/facet/UnInvertedFieldAcc.java      |  176 ++--
 .../org/apache/solr/search/facet/UniqueAgg.java    |   14 +-
 .../apache/solr/search/facet/UniqueBlockAgg.java   |    6 +-
 .../solr/search/facet/UniqueBlockFieldAgg.java     |    2 +-
 .../solr/search/facet/UniqueBlockQueryAgg.java     |    8 +-
 .../solr/search/facet/UniqueMultiDvSlotAcc.java    |    2 +-
 .../search/facet/UniqueMultivaluedSlotAcc.java     |    2 +-
 .../search/facet/UniqueSinglevaluedSlotAcc.java    |    2 +-
 .../apache/solr/search/facet/UniqueSlotAcc.java    |    4 +-
 .../org/apache/solr/search/facet/VarianceAgg.java  |   18 +-
 .../search/function/CollapseScoreFunction.java     |    2 +
 .../solr/search/function/FieldNameValueSource.java |    1 +
 .../solr/search/function/FileFloatSource.java      |   11 +-
 .../solr/search/function/MultiStringFunction.java  |    1 +
 .../solr/search/function/OrdFieldSource.java       |    1 +
 .../search/function/ReverseOrdFieldSource.java     |    1 +
 .../search/function/ValueSourceRangeFilter.java    |    2 +
 .../distance/GeoDistValueSourceParser.java         |    3 +-
 .../search/function/distance/GeohashFunction.java  |    1 +
 .../distance/GeohashHaversineFunction.java         |    2 +
 .../function/distance/HaversineConstFunction.java  |    2 +
 .../function/distance/HaversineFunction.java       |    2 +
 .../function/distance/StringDistanceFunction.java  |    1 +
 .../function/distance/VectorDistanceFunction.java  |    2 +
 .../solr/search/join/BlockJoinChildQParser.java    |    7 +-
 .../solr/search/join/BlockJoinParentQParser.java   |  105 +-
 .../search/join/ChildFieldValueSourceParser.java   |    4 +-
 ...TermsCollector.java => GraphEdgeCollector.java} |  149 +--
 .../org/apache/solr/search/join/GraphQuery.java    |    2 +-
 .../org/apache/solr/security/KerberosPlugin.java   |   27 +
 .../apache/solr/servlet/SolrDispatchFilter.java    |   18 +-
 .../apache/solr/servlet/SolrRequestParsers.java    |  149 +--
 .../java/org/apache/solr/update/SolrCoreState.java |    3 +-
 .../org/apache/solr/update/TransactionLog.java     |  160 +--
 .../processor/DistributedZkUpdateProcessor.java    |    2 +-
 .../processor/RunUpdateProcessorFactory.java       |  123 ++-
 .../apache/solr/util/SolrFileCleaningTracker.java  |  147 ---
 .../java/org/apache/solr/util/SolrLogPostTool.java |  182 ++--
 .../java/org/apache/solr/util/SolrPluginUtils.java |   16 +-
 .../org/apache/solr/TestDistributedSearch.java     |   16 +-
 .../test/org/apache/solr/TestGroupingSearch.java   |    4 +-
 .../autoscaling/AutoAddReplicasPlanActionTest.java |   12 +-
 .../cloud/autoscaling/ComputePlanActionTest.java   |   80 +-
 .../autoscaling/sim/TestSnapshotCloudManager.java  |    4 +-
 .../org/apache/solr/core/QueryResultKeyTest.java   |    2 +-
 .../org/apache/solr/core/TestCoreDiscovery.java    |    2 +-
 .../handler/BinaryUpdateRequestHandlerTest.java    |   29 +-
 .../solr/handler/MoreLikeThisHandlerTest.java      |   11 +-
 .../org/apache/solr/handler/TestCoreBackup.java    |   20 +-
 .../solr/handler/XsltUpdateRequestHandlerTest.java |    7 +-
 .../solr/handler/admin/CoreAdminHandlerTest.java   |    4 +-
 .../handler/admin/CoreAdminRequestStatusTest.java  |    1 +
 .../admin/CoreMergeIndexesAdminHandlerTest.java    |    5 +-
 .../solr/handler/admin/MBeansHandlerTest.java      |    1 +
 .../solr/handler/admin/MetricsHandlerTest.java     |    5 +
 .../handler/admin/SecurityConfHandlerTest.java     |    5 +-
 .../solr/handler/admin/TestCollectionAPIs.java     |   10 +-
 .../apache/solr/handler/admin/TestConfigsApi.java  |   19 +-
 .../solr/handler/admin/TestCoreAdminApis.java      |   10 +-
 .../handler/admin/ZookeeperStatusHandlerTest.java  |   14 +-
 .../component/QueryElevationComponentTest.java     |   71 +-
 .../solr/handler/component/SearchHandlerTest.java  |   74 +-
 .../handler/component/SpellCheckComponentTest.java |    1 +
 .../solr/handler/component/StatsComponentTest.java |    2 -
 .../solr/handler/component/TermsComponentTest.java |   13 +-
 .../component/TestHttpShardHandlerFactory.java     |    2 +
 .../component/TestTrackingShardHandlerFactory.java |    2 +
 .../org/apache/solr/highlight/HighlighterTest.java |   18 +
 .../src/test/org/apache/solr/pkg/TestPackages.java |  146 ++-
 .../test/org/apache/solr/request/TestFaceting.java |    6 +-
 .../org/apache/solr/response/JSONWriterTest.java   |    4 +-
 .../apache/solr/search/SolrIndexSearcherTest.java  |  296 ++++--
 .../solr/search/TestCollapseQParserPlugin.java     |   29 +
 .../solr/search/TestExtendedDismaxParser.java      |   41 +-
 .../org/apache/solr/search/facet/DebugAgg.java     |   10 +-
 .../solr/search/facet/TestCloudJSONFacetSKG.java   |  278 ++++--
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   |  989 +++++++++++++++++++
 .../solr/search/facet/TestJsonFacetRefinement.java |   21 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |  105 +-
 .../join/another/BJQFilterAccessibleTest.java      |    2 +-
 .../apache/solr/search/json/TestJsonRequest.java   |   39 +-
 .../UpdateRequestProcessorFactoryTest.java         |    2 +-
 .../org/apache/solr/util/SolrLogPostToolTest.java  |   18 +
 solr/licenses/caffeine-2.8.0.jar.sha1              |    1 -
 solr/licenses/caffeine-2.8.4.jar.sha1              |    1 +
 solr/licenses/commons-fileupload-1.3.3.jar.sha1    |    1 -
 solr/licenses/commons-fileupload-LICENSE-ASL.txt   |  202 ----
 solr/licenses/commons-fileupload-NOTICE.txt        |    5 -
 .../src/cluster-node-management.adoc               |   19 +-
 .../src/common-query-parameters.adoc               |   42 +-
 solr/solr-ref-guide/src/css/decoration.css         |    2 +-
 solr/solr-ref-guide/src/css/ref-guide.css          |    6 +-
 solr/solr-ref-guide/src/distributed-requests.adoc  |    4 +
 solr/solr-ref-guide/src/enabling-ssl.adoc          |  238 ++---
 solr/solr-ref-guide/src/metrics-reporting.adoc     |    2 +-
 .../src/solrcloud-autoscaling-trigger-actions.adoc |   71 +-
 .../apache/solr/common/params/CommonParams.java    |    4 +-
 solr/solrj/src/java/org/noggit/CharArr.java        |  262 ++---
 solr/solrj/src/java/org/noggit/JSONParser.java     |    2 +-
 .../solr/common/params/CommonParamsTest.java       |    2 +-
 .../component/TrackingShardHandlerFactory.java     |    1 +
 solr/webapp/web/js/angular/controllers/index.js    |    2 +-
 versions.lock                                      |    5 +-
 versions.props                                     |    3 +-
 366 files changed, 8922 insertions(+), 8035 deletions(-)