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/07/27 13:42:37 UTC

[lucene-solr] 01/01: Merge branch 'master' into jira/SOLR-14608-export

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

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

commit bf8d954ca1289d82eb5334719fb97bbabacacb09
Merge: b610dda 6bf5f4a
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Jul 27 15:42:04 2020 +0200

    Merge branch 'master' into jira/SOLR-14608-export

 .gitignore                                         |     7 +-
 build.gradle                                       |     4 +-
 dev-tools/doap/lucene.rdf                          |     7 +
 dev-tools/doap/solr.rdf                            |     7 +
 gradle/defaults-java.gradle                        |     6 +
 gradle/{ => documentation}/render-javadoc.gradle   |    21 +-
 gradle/help.gradle                                 |     1 +
 gradle/testing/alternative-jdk-support.gradle      |    72 +
 gradle/testing/runtime-jvm-support.gradle          |    52 -
 gradle/validation/validate-log-calls.gradle        |     2 +-
 help/jvms.txt                                      |    18 +
 help/tests.txt                                     |    15 -
 lucene/CHANGES.txt                                 |    36 +
 .../lucene/index/TestBackwardsCompatibility.java   |     7 +-
 .../org/apache/lucene/index/index.8.6.0-cfs.zip    |   Bin 0 -> 16442 bytes
 .../org/apache/lucene/index/index.8.6.0-nocfs.zip  |   Bin 0 -> 16428 bytes
 .../test/org/apache/lucene/index/sorted.8.6.0.zip  |   Bin 0 -> 140450 bytes
 lucene/benchmark/build.gradle                      |     6 +-
 lucene/core/src/java/overview.html                 |     2 +-
 .../expressions/CachingExpressionValueSource.java  |    75 +
 .../expressions/ExpressionFunctionValues.java      |    14 +-
 .../lucene/expressions/ExpressionValueSource.java  |     7 +-
 .../expressions/TestExpressionValueSource.java     |    29 +
 .../facet/taxonomy/DocValuesOrdinalsReader.java    |    15 +-
 lucene/ivy-versions.properties                     |     3 +-
 .../lucene/queryparser/classic/FastCharStream.java |     9 +-
 .../flexible/standard/parser/FastCharStream.java   |    11 +-
 .../surround/parser/FastCharStream.java            |    11 +-
 solr/CHANGES.txt                                   |    40 +-
 solr/bin/solr                                      |     7 +-
 solr/bin/solr.cmd                                  |    10 +-
 .../solr/handler/dataimport/ContextImpl.java       |     3 +-
 .../handler/dataimport/EntityProcessorWrapper.java |     4 +-
 .../handler/dataimport/XPathEntityProcessor.java   |     3 +-
 .../dataimport/TestFileListEntityProcessor.java    |     6 +-
 .../dataimport/TestLineEntityProcessor.java        |     6 +-
 .../solr/response/VelocityResponseWriter.java      |     2 -
 solr/core/build.gradle                             |     1 +
 solr/core/ivy.xml                                  |     1 +
 .../apache/solr/api/CustomContainerPlugins.java    |    12 +-
 .../src/java/org/apache/solr/cloud/CloudUtil.java  |     1 -
 .../src/java/org/apache/solr/cloud/Overseer.java   |    13 +-
 .../solr/cloud/ShardLeaderElectionContextBase.java |     9 +-
 .../java/org/apache/solr/cloud/ZkController.java   |    55 +-
 .../solr/cloud/api/collections/AddReplicaCmd.java  |    17 +-
 .../apache/solr/cloud/api/collections/Assign.java  |   139 +-
 .../cloud/api/collections/CreateCollectionCmd.java |    20 +-
 .../OverseerCollectionMessageHandler.java          |     8 +-
 .../api/collections/ReindexCollectionCmd.java      |     5 +-
 .../solr/cloud/api/collections/ReplaceNodeCmd.java |     7 -
 .../solr/cloud/api/collections/RestoreCmd.java     |   364 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |    61 +-
 .../solr/cloud/api/collections/UtilizeNodeCmd.java |   139 -
 .../solr/cloud/autoscaling/ActionContext.java      |    68 -
 .../autoscaling/AutoAddReplicasPlanAction.java     |    40 -
 .../apache/solr/cloud/autoscaling/AutoScaling.java |   246 -
 .../solr/cloud/autoscaling/AutoScalingHandler.java |   742 --
 .../solr/cloud/autoscaling/ComputePlanAction.java  |   355 -
 .../solr/cloud/autoscaling/ExecutePlanAction.java  |   250 -
 .../cloud/autoscaling/HttpTriggerListener.java     |   164 -
 .../autoscaling/InactiveMarkersPlanAction.java     |   141 -
 .../cloud/autoscaling/InactiveShardPlanAction.java |   163 -
 .../solr/cloud/autoscaling/IndexSizeTrigger.java   |   563 -
 .../solr/cloud/autoscaling/LoggingListener.java    |    38 -
 .../solr/cloud/autoscaling/MetricTrigger.java      |   220 -
 .../solr/cloud/autoscaling/NodeAddedTrigger.java   |   250 -
 .../solr/cloud/autoscaling/NodeLostTrigger.java    |   240 -
 .../cloud/autoscaling/OverseerTriggerThread.java   |   407 -
 .../solr/cloud/autoscaling/ScheduledTrigger.java   |   227 -
 .../solr/cloud/autoscaling/ScheduledTriggers.java  |   913 --
 .../solr/cloud/autoscaling/SearchRateTrigger.java  |   806 --
 .../solr/cloud/autoscaling/SystemLogListener.java  |   221 -
 .../solr/cloud/autoscaling/TriggerAction.java      |    51 -
 .../solr/cloud/autoscaling/TriggerActionBase.java  |    87 -
 .../apache/solr/cloud/autoscaling/TriggerBase.java |   300 -
 .../solr/cloud/autoscaling/TriggerEvent.java       |   315 -
 .../solr/cloud/autoscaling/TriggerEventQueue.java  |   121 -
 .../solr/cloud/autoscaling/TriggerListener.java    |    65 -
 .../cloud/autoscaling/TriggerListenerBase.java     |    97 -
 .../solr/cloud/autoscaling/TriggerUtils.java       |    88 -
 .../autoscaling/TriggerValidationException.java    |    74 -
 .../solr/cloud/autoscaling/package-info.java       |    21 -
 .../solr/cloud/autoscaling/sim/ActionError.java    |    24 -
 .../cloud/autoscaling/sim/FakeDocIterator.java     |    56 -
 .../autoscaling/sim/GenericDistributedQueue.java   |   601 -
 .../solr/cloud/autoscaling/sim/LiveNodesSet.java   |   113 -
 .../sim/NoopDistributedQueueFactory.java           |    94 -
 .../cloud/autoscaling/sim/SimCloudManager.java     |  1061 --
 .../autoscaling/sim/SimClusterStateProvider.java   |  2568 ----
 .../autoscaling/sim/SimDistribStateManager.java    |   649 -
 .../sim/SimDistributedQueueFactory.java            |   287 -
 .../autoscaling/sim/SimNodeStateProvider.java      |   359 -
 .../solr/cloud/autoscaling/sim/SimScenario.java    |  1129 --
 .../solr/cloud/autoscaling/sim/SimUtils.java       |   435 -
 .../autoscaling/sim/SnapshotCloudManager.java      |   260 -
 .../sim/SnapshotClusterStateProvider.java          |   152 -
 .../sim/SnapshotDistribStateManager.java           |   228 -
 .../autoscaling/sim/SnapshotNodeStateProvider.java |   203 -
 .../solr/cloud/autoscaling/sim/package-info.java   |    94 -
 .../apache/solr/cloud/overseer/NodeMutator.java    |     4 +-
 .../apache/solr/cloud/overseer/ReplicaMutator.java |     6 +-
 .../src/java/org/apache/solr/core/ConfigSet.java   |    26 +-
 .../org/apache/solr/core/ConfigSetService.java     |     8 +-
 .../java/org/apache/solr/core/CoreContainer.java   |    45 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |     8 +
 .../src/java/org/apache/solr/core/PluginInfo.java  |    50 +-
 .../SolrClassLoader.java}                          |    22 +-
 .../src/java/org/apache/solr/core/SolrConfig.java  |    18 +
 .../src/java/org/apache/solr/core/SolrCore.java    |    63 +-
 .../src/java/org/apache/solr/core/SolrCores.java   |     2 +
 .../org/apache/solr/core/SolrResourceLoader.java   |    17 +-
 .../backup/repository/HdfsBackupRepository.java    |     2 +-
 .../java/org/apache/solr/handler/IndexFetcher.java |    22 +-
 .../apache/solr/handler/ReplicationHandler.java    |     3 +-
 .../org/apache/solr/handler/SchemaHandler.java     |    46 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |     2 +-
 .../org/apache/solr/handler/StreamHandler.java     |     4 +-
 .../handler/admin/AutoscalingHistoryHandler.java   |   166 -
 .../solr/handler/admin/CollectionsHandler.java     |    12 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |     3 +-
 .../solr/handler/admin/MetricsHistoryHandler.java  |    11 +-
 .../solr/handler/admin/ThreadDumpHandler.java      |    54 +-
 .../solr/handler/component/SearchHandler.java      |     7 +-
 .../apache/solr/metrics/SolrCoreMetricManager.java |     4 +-
 .../apache/solr/packagemanager/PackageManager.java |    24 +-
 .../solr/packagemanager/RepositoryManager.java     |     6 +-
 .../org/apache/solr/parser/FastCharStream.java     |    12 +
 .../apache/solr/parser/SolrQueryParserBase.java    |    27 +-
 .../src/java/org/apache/solr/pkg/PackageAPI.java   |    11 +-
 .../java/org/apache/solr/pkg/PackageListeners.java |    51 +-
 .../solr/pkg/PackageListeningClassLoader.java      |   151 +
 .../java/org/apache/solr/pkg/PackageLoader.java    |     5 +
 .../org/apache/solr/pkg/PackagePluginHolder.java   |    33 +-
 .../java/org/apache/solr/response/XMLWriter.java   |    46 +
 .../org/apache/solr/schema/DatePointField.java     |     1 -
 .../apache/solr/schema/FieldTypePluginLoader.java  |    12 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |   109 +-
 .../org/apache/solr/schema/ManagedIndexSchema.java |     2 +-
 .../java/org/apache/solr/schema/PointField.java    |     2 +-
 .../org/apache/solr/schema/PreAnalyzedField.java   |     2 +-
 .../java/org/apache/solr/schema/TrieDateField.java |     1 +
 .../org/apache/solr/schema/TrieDoubleField.java    |     1 +
 .../src/java/org/apache/solr/schema/TrieField.java |     1 +
 .../org/apache/solr/schema/TrieFloatField.java     |     1 +
 .../java/org/apache/solr/schema/TrieIntField.java  |     1 +
 .../java/org/apache/solr/schema/TrieLongField.java |     1 +
 .../src/java/org/apache/solr/search/Grouping.java  |     5 +-
 .../apache/solr/search/SolrDocumentFetcher.java    |     2 +-
 .../solr/search/facet/FacetFieldProcessor.java     |    81 +-
 .../search/facet/FacetFieldProcessorByArray.java   |    34 +
 .../search/facet/FacetFieldProcessorByArrayDV.java |   177 +-
 .../apache/solr/search/facet/FacetProcessor.java   |     1 -
 .../solr/search/facet/ReadOnlyCountSlotAcc.java}   |    21 +-
 .../apache/solr/search/facet/RelatednessAgg.java   |   174 +-
 .../facet/SingletonDISI.java}                      |    33 +-
 .../solr/search/facet/SingletonDocIterator.java}   |    37 +-
 .../java/org/apache/solr/search/facet/SlotAcc.java |   218 +-
 .../apache/solr/search/facet/SweepCountAware.java  |   187 +
 .../org/apache/solr/search/facet/SweepDISI.java    |    85 +
 .../apache/solr/search/facet/SweepDocIterator.java |    87 +
 .../apache/solr/search/facet/UnInvertedField.java  |    71 +-
 .../org/apache/solr/search/facet/UnionDISI.java    |   100 +
 .../apache/solr/search/facet/UnionDocIterator.java |   107 +
 .../distance/GeoDistValueSourceParser.java         |     3 +-
 .../GroupedEndResultTransformer.java               |     5 +-
 .../solr/security/PermissionNameProvider.java      |     3 -
 .../java/org/apache/solr/servlet/HttpSolrCall.java |     3 +-
 .../src/java/org/apache/solr/util/SolrCLI.java     |   391 -
 .../solr/util/plugin/AbstractPluginLoader.java     |     8 +-
 .../test-files/runtimecode/schema-plugins.jar.bin  |   Bin 0 -> 6814 bytes
 solr/core/src/test-files/runtimecode/sig.txt       |     5 +
 .../solr/simSnapshot/autoscalingState.json         |  3923 ------
 .../test-files/solr/simSnapshot/clusterState.json  |  2838 ----
 .../test-files/solr/simSnapshot/distribState.json  |   206 -
 .../test-files/solr/simSnapshot/managerState.json  |     1 -
 .../src/test-files/solr/simSnapshot/nodeState.json |  3823 ------
 .../test-files/solr/simSnapshot/statistics.json    |  2029 ---
 .../src/test/org/apache/hadoop/fs/FileUtil.java    |     5 +-
 .../test/org/apache/solr/cloud/CloudTestUtils.java |   195 -
 .../apache/solr/cloud/CollectionsAPISolrJTest.java |    18 +-
 .../DistribDocExpirationUpdateProcessorTest.java   |     4 +-
 .../org/apache/solr/cloud/HttpPartitionTest.java   |     2 +-
 .../solr/cloud/MetricsHistoryIntegrationTest.java  |    24 +-
 .../solr/cloud/MoveReplicaHDFSFailoverTest.java    |     4 +
 .../org/apache/solr/cloud/MoveReplicaHDFSTest.java |     4 +
 .../org/apache/solr/cloud/MoveReplicaTest.java     |     2 -
 .../OverseerCollectionConfigSetProcessorTest.java  |    11 +-
 .../apache/solr/cloud/ReplaceNodeNoTargetTest.java |   127 -
 .../org/apache/solr/cloud/RollingRestartTest.java  |     2 +-
 .../test/org/apache/solr/cloud/RouteFieldTest.java |   163 +
 .../cloud/RoutingToNodesWithPropertiesTest.java    |   242 -
 .../apache/solr/cloud/SaslZkACLProviderTest.java   |     4 +
 .../cloud/SharedFSAutoReplicaFailoverTest.java     |    19 +-
 .../apache/solr/cloud/TestClusterProperties.java   |    12 -
 .../solr/cloud/TestSolrCloudWithKerberosAlt.java   |     4 +
 .../org/apache/solr/cloud/TestTlogReplica.java     |    77 +
 .../org/apache/solr/cloud/TestUtilizeNode.java     |   184 -
 .../org/apache/solr/cloud/TestWithCollection.java  |   611 -
 .../AbstractCloudBackupRestoreTestCase.java        |     4 -
 .../solr/cloud/api/collections/AssignTest.java     |   204 -
 .../collections/CollectionTooManyReplicasTest.java |    13 +-
 .../ConcurrentCreateCollectionTest.java            |   292 -
 .../HdfsCollectionsAPIDistributedZkTest.java       |     4 +
 .../collections/TestHdfsCloudBackupRestore.java    |     5 +
 .../collections/TestLocalFSCloudBackupRestore.java |     3 +-
 .../AutoAddReplicasIntegrationTest.java            |   472 -
 .../autoscaling/AutoAddReplicasPlanActionTest.java |   263 -
 .../cloud/autoscaling/AutoScalingHandlerTest.java  |  1114 --
 .../solr/cloud/autoscaling/CapturedEvent.java      |    65 -
 .../cloud/autoscaling/ComputePlanActionTest.java   |   795 --
 .../cloud/autoscaling/ExecutePlanActionTest.java   |   381 -
 .../HdfsAutoAddReplicasIntegrationTest.java        |    57 -
 .../cloud/autoscaling/HttpTriggerListenerTest.java |   208 -
 .../IndexSizeTriggerMixedBoundsTest.java           |   374 -
 .../IndexSizeTriggerSizeEstimationTest.java        |   323 -
 .../cloud/autoscaling/IndexSizeTriggerTest.java    |   795 --
 .../autoscaling/MetricTriggerIntegrationTest.java  |   242 -
 .../solr/cloud/autoscaling/MetricTriggerTest.java  |   135 -
 .../NodeAddedTriggerIntegrationTest.java           |   320 -
 .../cloud/autoscaling/NodeAddedTriggerTest.java    |   345 -
 .../NodeLostTriggerIntegrationTest.java            |   356 -
 .../cloud/autoscaling/NodeLostTriggerTest.java     |   394 -
 .../autoscaling/NodeMarkersRegistrationTest.java   |   356 -
 .../cloud/autoscaling/RestoreTriggerStateTest.java |   168 -
 .../ScheduledMaintenanceTriggerTest.java           |   384 -
 .../ScheduledTriggerIntegrationTest.java           |   150 -
 .../cloud/autoscaling/ScheduledTriggerTest.java    |   141 -
 .../SearchRateTriggerIntegrationTest.java          |   748 --
 .../cloud/autoscaling/SearchRateTriggerTest.java   |   357 -
 .../cloud/autoscaling/SystemLogListenerTest.java   |   293 -
 .../solr/cloud/autoscaling/TestPolicyCloud.java    |   543 -
 .../TriggerCooldownIntegrationTest.java            |   228 -
 .../cloud/autoscaling/TriggerEventQueueTest.java   |    99 -
 .../cloud/autoscaling/TriggerIntegrationTest.java  |   729 -
 .../TriggerSetPropertiesIntegrationTest.java       |   275 -
 .../autoscaling/sim/SimSolrCloudTestCase.java      |   256 -
 .../sim/TestSimClusterStateProvider.java           |   228 -
 .../autoscaling/sim/TestSimComputePlanAction.java  |   401 -
 .../sim/TestSimDistribStateManager.java            |   380 -
 .../autoscaling/sim/TestSimDistributedQueue.java   |   221 -
 .../autoscaling/sim/TestSimExecutePlanAction.java  |   224 -
 .../autoscaling/sim/TestSimExtremeIndexing.java    |   147 -
 .../sim/TestSimGenericDistributedQueue.java        |    38 -
 .../cloud/autoscaling/sim/TestSimLargeCluster.java |   870 --
 .../autoscaling/sim/TestSimNodeAddedTrigger.java   |   331 -
 .../autoscaling/sim/TestSimNodeLostTrigger.java    |   350 -
 .../cloud/autoscaling/sim/TestSimPolicyCloud.java  |   380 -
 .../cloud/autoscaling/sim/TestSimScenario.java     |   173 -
 .../autoscaling/sim/TestSimTriggerIntegration.java |  1551 ---
 .../solr/cloud/autoscaling/sim/TestSimUtils.java   |    95 -
 .../autoscaling/sim/TestSnapshotCloudManager.java  |   276 -
 .../solr/cloud/hdfs/HDFSCollectionsAPITest.java    |     4 +
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java    |     4 +
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java     |     4 +
 .../hdfs/HdfsChaosMonkeyNothingIsSafeTest.java     |     4 +
 .../cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java  |     4 +
 .../apache/solr/cloud/hdfs/HdfsNNFailoverTest.java |     4 +
 .../solr/cloud/hdfs/HdfsRecoverLeaseTest.java      |     4 +
 .../apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java |     4 +
 .../cloud/hdfs/HdfsRestartWhileUpdatingTest.java   |     4 +
 .../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java  |     4 +
 .../apache/solr/cloud/hdfs/HdfsThreadLeakTest.java |     4 +
 .../HdfsTlogReplayBufferedWhileIndexingTest.java   |     4 +
 .../cloud/hdfs/HdfsUnloadDistributedZkTest.java    |     4 +
 .../hdfs/HdfsWriteToMultipleCollectionsTest.java   |     4 +
 .../org/apache/solr/cloud/hdfs/StressHdfsTest.java |     4 +
 .../org/apache/solr/cloud/rule/RuleEngineTest.java |     6 +-
 .../test/org/apache/solr/cloud/rule/RulesTest.java |    67 -
 .../test/org/apache/solr/core/CoreSorterTest.java  |     2 +-
 .../apache/solr/core/HdfsDirectoryFactoryTest.java |     4 +
 .../org/apache/solr/core/TestCodecSupport.java     |     2 +-
 .../solr/handler/TestHdfsBackupRestoreCore.java    |     4 +
 .../TestReplicationHandlerDiskOverFlow.java        |     2 +-
 .../apache/solr/handler/V2ApiIntegrationTest.java  |     4 +-
 .../admin/AutoscalingHistoryHandlerTest.java       |   463 -
 .../handler/admin/MetricsHistoryHandlerTest.java   |    45 +-
 .../solr/handler/admin/TestCollectionAPIs.java     |     4 +-
 .../solr/handler/admin/ThreadDumpHandlerTest.java  |   239 +
 .../apache/solr/index/hdfs/CheckHdfsIndexTest.java |     4 +
 .../solr/parser/SolrQueryParserBaseTest.java       |   137 +
 .../src/test/org/apache/solr/pkg/TestPackages.java |   140 +-
 .../org/apache/solr/response/TestPushWriter.java   |    66 +-
 .../apache/solr/schema/WrappedTrieIntField.java    |     1 +
 .../org/apache/solr/search/TestRecoveryHdfs.java   |     4 +
 .../search/facet/TestCloudJSONFacetSKGEquiv.java   |   268 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |    48 +
 .../security/JWTAuthPluginIntegrationTest.java     |     6 +-
 .../hadoop/TestSolrCloudWithHadoopAuthPlugin.java  |     6 +-
 .../solr/store/blockcache/BlockCacheTest.java      |    12 -
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |     4 +
 .../solr/store/hdfs/HdfsLockFactoryTest.java       |     4 +
 .../org/apache/solr/update/TestHdfsUpdateLog.java  |     4 +
 .../org/apache/solr/util/TestCircuitBreaker.java   |    31 +-
 .../apache/solr/util/TestSolrCLIRunExample.java    |   117 -
 .../src/test/org/apache/solr/util/TestUtils.java   |     1 -
 .../solr/util/tracing/TestHttpServletCarrier.java  |     3 +-
 solr/licenses/commons-collections4-4.2.jar.sha1    |     1 -
 solr/licenses/commons-collections4-4.4.jar.sha1    |     1 +
 solr/solr-ref-guide/src/_config.yml.template       |     1 +
 .../src/_includes/mathjax-support.html             |    22 +
 solr/solr-ref-guide/src/_layouts/default.html      |     2 +
 solr/solr-ref-guide/src/_templates/ulist.html.slim |     2 +-
 solr/solr-ref-guide/src/aliases.adoc               |     9 +-
 .../src/cluster-node-management.adoc               |    19 +-
 solr/solr-ref-guide/src/collection-management.adoc |    46 +-
 .../solr-ref-guide/src/colocating-collections.adoc |    75 -
 solr/solr-ref-guide/src/enabling-ssl.adoc          |     2 +-
 solr/solr-ref-guide/src/json-facet-api.adoc        |     4 +
 .../src/kerberos-authentication-plugin.adoc        |     3 +-
 .../src/major-changes-in-solr-7.adoc               |     2 -
 .../src/major-changes-in-solr-8.adoc               |     6 +-
 .../src/major-changes-in-solr-9.adoc               |    10 +
 .../src/meta-docs/asciidoc-syntax.adoc             |    45 +
 solr/solr-ref-guide/src/metrics-history.adoc       |     2 +-
 .../solr-ref-guide/src/migrate-to-policy-rule.adoc |   198 -
 solr/solr-ref-guide/src/replica-management.adoc    |     2 -
 .../src/rule-based-authorization-plugin.adoc       |    15 -
 solr/solr-ref-guide/src/running-solr-on-hdfs.adoc  |    39 -
 solr/solr-ref-guide/src/shard-management.adoc      |     6 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |    37 +-
 .../src/solrcloud-autoscaling-api.adoc             |   808 --
 .../solrcloud-autoscaling-auto-add-replicas.adoc   |    73 -
 .../src/solrcloud-autoscaling-fault-tolerance.adoc |    59 -
 .../src/solrcloud-autoscaling-listeners.adoc       |   220 -
 .../src/solrcloud-autoscaling-overview.adoc        |   116 -
 .../solrcloud-autoscaling-policy-preferences.adoc  |   638 -
 .../src/solrcloud-autoscaling-trigger-actions.adoc |   145 -
 .../src/solrcloud-autoscaling-triggers.adoc        |   627 -
 solr/solr-ref-guide/src/solrcloud-autoscaling.adoc |    35 -
 solr/solr-ref-guide/src/solrcloud.adoc             |     6 +-
 solr/solr-ref-guide/src/suggestions-screen.adoc    |    40 -
 .../src/the-query-elevation-component.adoc         |     2 +-
 solr/solr-ref-guide/src/using-solrj.adoc           |    23 +
 ...ing-the-solr-administration-user-interface.adoc |     3 +-
 solr/solr-ref-guide/src/v2-api.adoc                |     7 +-
 .../{autoscaling => }/AlreadyExistsException.java  |     2 +-
 .../{autoscaling => }/BadVersionException.java     |     2 +-
 .../client/solrj/cloud/DelegatingCloudManager.java |    89 +
 .../cloud/DelegatingClusterStateProvider.java      |   130 +
 .../client/solrj/cloud/DistribStateManager.java    |    11 -
 .../solr/client/solrj/cloud/NodeStateProvider.java |     5 +-
 .../cloud/{autoscaling => }/NotEmptyException.java |     2 +-
 .../cloud/{autoscaling => }/VersionedData.java     |     2 +-
 .../cloud/autoscaling/AddReplicaSuggester.java     |    84 -
 .../solrj/cloud/autoscaling/AutoScalingConfig.java |   616 -
 .../solr/client/solrj/cloud/autoscaling/Cell.java  |    74 -
 .../client/solrj/cloud/autoscaling/Clause.java     |   839 --
 .../solrj/cloud/autoscaling/ComputedType.java      |    99 -
 .../client/solrj/cloud/autoscaling/Condition.java  |   125 -
 .../solrj/cloud/autoscaling/CoresVariable.java     |   125 -
 .../cloud/autoscaling/DelegatingCloudManager.java  |    93 -
 .../DelegatingClusterStateProvider.java            |   130 -
 .../autoscaling/DelegatingDistribStateManager.java |   107 -
 .../autoscaling/DelegatingNodeStateProvider.java   |    56 -
 .../cloud/autoscaling/DeleteNodeSuggester.java     |    48 -
 .../cloud/autoscaling/DeleteReplicaSuggester.java  |    78 -
 .../solrj/cloud/autoscaling/FreeDiskVariable.java  |   175 -
 .../cloud/autoscaling/MoveReplicaSuggester.java    |   114 -
 .../solrj/cloud/autoscaling/NodeVariable.java      |    44 -
 .../client/solrj/cloud/autoscaling/Operand.java    |   210 -
 .../client/solrj/cloud/autoscaling/Policy.java     |   792 --
 .../solrj/cloud/autoscaling/PolicyHelper.java      |   734 --
 .../client/solrj/cloud/autoscaling/Preference.java |   157 -
 .../client/solrj/cloud/autoscaling/RangeVal.java   |    61 -
 .../solrj/cloud/autoscaling/ReplicaCount.java      |   134 -
 .../solrj/cloud/autoscaling/ReplicaInfo.java       |   224 -
 .../solrj/cloud/autoscaling/ReplicaVariable.java   |   176 -
 .../solr/client/solrj/cloud/autoscaling/Row.java   |   403 -
 .../solrj/cloud/autoscaling/SealedClause.java      |    29 -
 .../cloud/autoscaling/SplitShardSuggester.java     |    68 -
 .../client/solrj/cloud/autoscaling/Suggester.java  |   530 -
 .../client/solrj/cloud/autoscaling/Suggestion.java |   133 -
 .../solrj/cloud/autoscaling/TriggerEventType.java  |    33 -
 .../cloud/autoscaling/UnsupportedSuggester.java    |    61 -
 .../client/solrj/cloud/autoscaling/Variable.java   |   409 -
 .../solrj/cloud/autoscaling/VariableBase.java      |   213 -
 .../client/solrj/cloud/autoscaling/Violation.java  |   181 -
 .../cloud/autoscaling/WithCollectionVariable.java  |   170 -
 .../solrj/cloud/autoscaling/package-info.java      |    23 -
 .../client/solrj/impl/BaseCloudSolrClient.java     |    37 +-
 .../solrj/impl/SolrClientNodeStateProvider.java    |   115 +-
 .../client/solrj/impl/ZkDistribStateManager.java   |    34 +-
 .../solrj/io/eval/StandardDeviationEvaluator.java  |     2 -
 .../client/solrj/io/eval/VarianceEvaluator.java    |     2 -
 .../solrj/io/stream/SignificantTermsStream.java    |     8 +-
 .../solrj/request/CollectionAdminRequest.java      |    42 -
 .../client/solrj/request/CollectionApiMapping.java |     5 -
 .../solrj/request/JavaBinUpdateRequestCodec.java   |     2 +-
 .../java/org/apache/solr/common/SolrDocument.java  |     2 +
 .../org/apache/solr/common/SolrInputDocument.java  |     1 +
 .../solr/common/cloud/CompositeIdRouter.java       |     3 +-
 .../apache/solr/common/cloud/DocCollection.java    |    19 -
 .../org/apache/solr/common/cloud/DocRouter.java    |     3 +-
 .../java/org/apache/solr/common/cloud/Replica.java |   189 +-
 .../solr/common/cloud/ZkMaintenanceUtils.java      |    31 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |    44 -
 .../solr/common/params/AutoScalingParams.java      |    76 -
 .../solr/common/params/CollectionAdminParams.java  |     6 -
 .../solr/common/params/CollectionParams.java       |     1 -
 .../apache/solr/common/params/CommonParams.java    |    10 +-
 .../org/apache/solr/common/util/TextWriter.java    |    13 +-
 .../java/org/apache/solr/common/util/Utils.java    |     2 +-
 .../resources/apispec/autoscaling.Commands.json    |   199 -
 .../src/resources/apispec/autoscaling.history.json |    61 -
 .../src/resources/apispec/cluster.Commands.json    |    25 -
 .../resources/apispec/collections.Commands.json    |    11 -
 .../collections.collection.Commands.modify.json    |    11 -
 .../solr/autoscaling/testAddMissingReplica.json    |   122 -
 .../solr/autoscaling/testAddTooManyPerPolicy.json  |   129 -
 .../autoscaling/testAutoScalingHandlerFailure.json |   141 -
 ...testAutoscalingPreferencesUsedWithNoPolicy.json |    52 -
 .../autoscaling/testComputePlanAfterNodeAdded.json |    16 -
 .../solr/autoscaling/testCoresSuggestions.json     |    17 -
 .../testCreateCollectionWithEmptyPolicy.json       |    20 -
 .../solrj/solr/autoscaling/testDiskSpaceHint.json  |    16 -
 .../solr/autoscaling/testEmptyCollection.json      |    26 -
 .../solrj/solr/autoscaling/testEqualOnNonNode.json |    83 -
 .../solr/autoscaling/testFreeDiskDeviation.json    |    35 -
 .../solr/autoscaling/testFreeDiskSuggestions.json  |    27 -
 .../solr/autoscaling/testFreediskPercentage.json   |    25 -
 .../solrj/solr/autoscaling/testHostAttribute.json  |   119 -
 .../solrj/solr/autoscaling/testInfiniteLoop.json   | 13173 -------------------
 .../solr/autoscaling/testMoveReplicaSuggester.json |    15 -
 .../testMoveReplicasInMultipleCollections.json     |    86 -
 .../solrj/solr/autoscaling/testPolicy.json         |    41 -
 .../solr/autoscaling/testPortSuggestions.json      |    22 -
 .../autoscaling/testReplicaCountSuggestions.json   |    15 -
 .../solr/autoscaling/testReplicaPercentage.json    |    46 -
 .../autoscaling/testReplicaZonesPercentage.json    |    15 -
 .../autoscaling/testScheduledTriggerFailure.json   |    52 -
 .../solrj/solr/autoscaling/testSortError.json      |   225 -
 .../autoscaling/testSuggestionsRebalance2.json     |   131 -
 .../autoscaling/testSuggestionsRebalanceOnly.json  |   105 -
 .../solr/autoscaling/testSysPropSuggestions.json   |   127 -
 .../solr/autoscaling/testSyspropSuggestions1.json  |    24 -
 .../solr/autoscaling/testUnresolvedSuggestion.json |   211 -
 .../solr/autoscaling/testUtilizeNodeFailure.json   |    69 -
 .../solr/autoscaling/testUtilizeNodeFailure2.json  |    66 -
 .../solr/autoscaling/testViolationOutput.json      |    22 -
 .../solrj/solr/autoscaling/testWithCollection.json |    21 -
 .../autoscaling/testWithCollectionMoveReplica.json |    28 -
 .../testWithCollectionMoveVsAddSuggestions.json    |    49 -
 .../autoscaling/testWithCollectionSuggestions.json |    21 -
 .../UsingSolrJRefGuideExamplesTest.java            |    54 +-
 .../solr/client/solrj/TestLBHttp2SolrClient.java   |     7 -
 .../solr/client/solrj/TestLBHttpSolrClient.java    |     7 -
 .../solrj/cloud/autoscaling/ConditionTest.java     |    80 -
 .../autoscaling/MoveReplicaSuggesterTest.java      |   104 -
 .../client/solrj/cloud/autoscaling/TestPolicy.java |  3352 -----
 .../solrj/cloud/autoscaling/TestPolicy2.java       |   539 -
 .../solrj/cloud/autoscaling/TestPolicy2Old.java    |    26 -
 .../solrj/cloud/autoscaling/TestPolicyOld.java     |    25 -
 .../solrj/impl/CloudSolrClientCacheTest.java       |     3 +-
 .../io/stream/eval/ConversionEvaluatorsTest.java   |     5 +-
 .../io/stream/eval/TemporalEvaluatorsTest.java     |     5 +-
 .../solrj/io/stream/ops/ConcatOperationTest.java   |     5 +-
 .../client/solrj/io/stream/ops/OperationsTest.java |     5 +-
 .../solr/client/solrj/request/TestCoreAdmin.java   |     8 -
 .../org/apache/solr/common/SolrDocumentTest.java   |     2 +-
 .../solr/common/util/TestZkMaintenanceUtils.java   |    55 +
 .../org/apache/solr/SolrIgnoredThreadsFilter.java  |     5 +
 .../src/java/org/apache/solr/SolrTestCase.java     |    10 +
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |     9 +-
 solr/webapp/web/css/angular/menu.css               |     1 -
 solr/webapp/web/css/angular/suggestions.css        |    64 -
 solr/webapp/web/index.html                         |     3 -
 solr/webapp/web/js/angular/app.js                  |     4 -
 solr/webapp/web/js/angular/controllers/cloud.js    |     2 -
 .../js/angular/controllers/cluster-suggestions.js  |    62 -
 .../web/js/angular/controllers/collections.js      |     6 +-
 solr/webapp/web/partials/cluster_suggestions.html  |    49 -
 solr/webapp/web/partials/collection_overview.html  |     3 -
 solr/webapp/web/partials/collections.html          |    12 -
 versions.lock                                      |     2 +-
 versions.props                                     |     2 +-
 475 files changed, 4737 insertions(+), 81014 deletions(-)