You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2018/10/15 11:53:44 UTC

[3/4] lucene-solr:branch_7x: Merge branch 'branch_7x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_7x

Merge branch 'branch_7x' of https://git-wip-us.apache.org/repos/asf/lucene-solr into branch_7x


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

Branch: refs/heads/branch_7x
Commit: 156f6b56a755f6e5c232385277abcc966f8fe540
Parents: 90608ea 05ec77e
Author: Dawid Weiss <dw...@apache.org>
Authored: Mon Oct 15 13:53:17 2018 +0200
Committer: Dawid Weiss <dw...@apache.org>
Committed: Mon Oct 15 13:53:17 2018 +0200

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                       |    7 +
 dev-tools/doap/solr.rdf                         |    9 +-
 dev-tools/scripts/buildAndPushRelease.py        |   35 +-
 dev-tools/scripts/prep-solr-ref-guide-rc.sh     |    4 +-
 dev-tools/scripts/smokeTestRelease.py           |   66 +-
 lucene/CHANGES.txt                              |   64 +-
 .../lucene/analysis/cjk/CJKBigramFilter.java    |    8 +
 .../analysis/core/LowerCaseTokenizer.java       |    3 +
 .../core/LowerCaseTokenizerFactory.java         |    3 +
 .../lucene/analysis/util/CharTokenizer.java     |   15 +
 .../ja/JapaneseNumberFilterFactory.java         |    2 +-
 .../index/TestBackwardsCompatibility.java       |    7 +-
 .../org/apache/lucene/index/index.7.5.0-cfs.zip |  Bin 0 -> 15632 bytes
 .../apache/lucene/index/index.7.5.0-nocfs.zip   |  Bin 0 -> 15628 bytes
 .../org/apache/lucene/index/sorted.7.5.0.zip    |  Bin 0 -> 84341 bytes
 lucene/build.xml                                |   15 +-
 lucene/common-build.xml                         |   29 +-
 .../apache/lucene/index/FilterCodecReader.java  |   18 +-
 .../lucene/index/FilterDirectoryReader.java     |    2 +-
 .../apache/lucene/index/FilterLeafReader.java   |    2 +-
 .../apache/lucene/search/TermInSetQuery.java    |    2 +-
 .../lucene/store/ByteBuffersIndexInput.java     |    2 +-
 .../org/apache/lucene/util/QueryBuilder.java    |   10 +
 .../java/org/apache/lucene/util/Version.java    |   11 +-
 .../org/apache/lucene/util/bkd/BKDReader.java   |   57 +-
 .../org/apache/lucene/util/bkd/BKDWriter.java   |   55 +-
 .../org/apache/lucene/index/TestAddIndexes.java |    2 +
 .../lucene/index/TestFilterCodecReader.java     |   18 +
 .../lucene/index/TestIndexWriterOnVMError.java  |    1 +
 .../apache/lucene/util/TestQueryBuilder.java    |   28 +
 .../facet/taxonomy/SearcherTaxonomyManager.java |   14 +
 .../taxonomy/TestSearcherTaxonomyManager.java   |   14 +
 .../function/valuesource/MultiFunction.java     |    4 +-
 .../document/FloatPointNearestNeighbor.java     |    2 +-
 .../java/org/apache/lucene/geo/Tessellator.java |  101 +-
 .../apache/lucene/search/NearestNeighbor.java   |    2 +-
 .../document/BaseLatLonShapeTestCase.java       |    2 +-
 .../document/TestLatLonPolygonShapeQueries.java |    6 +
 .../apache/lucene/document/TestLatLonShape.java |   23 +
 .../org/apache/lucene/geo/TestTessellator.java  |   22 +
 .../spatial/spatial4j/Geo3dShapeFactory.java    |    3 +
 .../lucene/spatial/spatial4j/Geo3dRptTest.java  |   41 -
 .../Geo3dShapeWGS84ModelRectRelationTest.java   |    2 +-
 .../lucene/spatial/spatial4j/Geo3dTest.java     |   85 ++
 .../spatial3d/geom/GeoComplexPolygon.java       |  115 +-
 .../spatial3d/geom/GeoPolygonFactory.java       |   15 +-
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |   18 +
 lucene/version.properties                       |    2 +-
 solr/CHANGES.txt                                |  192 ++-
 solr/bin/solr.cmd                               |    4 +-
 solr/build.xml                                  |   12 +-
 .../ExtractingRequestHandlerTest.java           |   12 +-
 .../solr/ltr/model/NeuralNetworkModel.java      |   34 +-
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java |    4 +-
 solr/core/ivy.xml                               |    2 +-
 .../java/org/apache/solr/cloud/CloudUtil.java   |   21 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |  206 ++--
 .../org/apache/solr/cloud/ZkController.java     |    3 +-
 .../cloud/api/collections/AddReplicaCmd.java    |  328 +++--
 .../solr/cloud/api/collections/Assign.java      |  409 +++++--
 .../api/collections/CreateCollectionCmd.java    |   51 +-
 .../cloud/api/collections/CreateShardCmd.java   |  157 +--
 .../api/collections/DeleteCollectionCmd.java    |    2 +
 .../api/collections/MaintainRoutedAliasCmd.java |    7 +-
 .../cloud/api/collections/MoveReplicaCmd.java   |   15 +-
 .../OverseerCollectionMessageHandler.java       |    2 +-
 .../cloud/api/collections/ReplaceNodeCmd.java   |   35 +-
 .../solr/cloud/api/collections/RestoreCmd.java  |   16 +-
 .../cloud/api/collections/SplitShardCmd.java    |   17 +-
 .../cloud/api/collections/TimeRoutedAlias.java  |   19 +
 .../cloud/autoscaling/AutoScalingHandler.java   |   13 +-
 .../cloud/autoscaling/ComputePlanAction.java    |    8 +-
 .../cloud/autoscaling/IndexSizeTrigger.java     |   46 +-
 .../solr/cloud/overseer/ReplicaMutator.java     |    4 +-
 .../java/org/apache/solr/core/SolrConfig.java   |    2 +-
 .../solr/handler/HaversineMetersEvaluator.java  |   59 +
 .../solr/handler/SolrDefaultStreamFactory.java  |    1 +
 .../solr/handler/UpdateRequestHandler.java      |    2 +-
 .../solr/handler/admin/CollectionsHandler.java  |   19 +-
 .../solr/handler/component/ExpandComponent.java |   17 +-
 .../PhrasesIdentificationComponent.java         | 1129 ++++++++++++++++++
 .../solr/handler/component/StatsField.java      |    4 +-
 .../solr/handler/loader/JavabinLoader.java      |   58 +
 .../UninvertDocValuesMergePolicyFactory.java    |    5 +-
 .../apache/solr/metrics/SolrMetricManager.java  |    2 +-
 .../reporters/jmx/JmxMetricsReporter.java       |   10 +-
 .../apache/solr/schema/CurrencyFieldType.java   |    8 +-
 .../java/org/apache/solr/schema/FieldType.java  |    4 +-
 .../org/apache/solr/schema/IndexSchema.java     |   53 +-
 .../solr/search/CollapsingQParserPlugin.java    |   33 +-
 .../java/org/apache/solr/search/Insanity.java   |    5 +-
 .../apache/solr/search/SolrIndexSearcher.java   |   17 +-
 .../solr/uninverting/UninvertingReader.java     |  103 +-
 .../solr/update/DeleteByQueryWrapper.java       |    2 +-
 .../apache/solr/update/SolrCmdDistributor.java  |   58 +-
 .../CloneFieldUpdateProcessorFactory.java       |    4 +-
 .../processor/DistributedUpdateProcessor.java   |  106 +-
 .../DistributedUpdateProcessorFactory.java      |    2 +-
 .../TimeRoutedAliasUpdateProcessor.java         |  355 ++++--
 .../TolerantUpdateProcessorFactory.java         |    2 +-
 solr/core/src/test-files/log4j2.xml             |   12 +-
 .../conf/schema-phrases-identification.xml      |   97 ++
 .../conf/solrconfig-phrases-identification.xml  |   53 +
 .../conf/solrconfig-update-processor-chains.xml |    2 +-
 .../configsets/_default/conf/solrconfig.xml     |    2 +-
 .../org/apache/solr/BasicFunctionalityTest.java |    2 +-
 .../org/apache/solr/cloud/AddReplicaTest.java   |   92 +-
 .../cloud/AssignBackwardCompatibilityTest.java  |    1 +
 .../solr/cloud/BasicDistributedZkTest.java      |    1 +
 .../org/apache/solr/cloud/CloudTestUtils.java   |   10 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |  150 ++-
 .../apache/solr/cloud/DeleteReplicaTest.java    |    3 +-
 .../org/apache/solr/cloud/DeleteShardTest.java  |    2 +-
 .../solr/cloud/DocValuesNotIndexedTest.java     |    3 +-
 .../cloud/FullSolrCloudDistribCmdsTest.java     |    3 +-
 .../apache/solr/cloud/HttpPartitionTest.java    |  103 +-
 .../solr/cloud/LIRRollingUpdatesTest.java       |    6 +-
 .../cloud/LeaderElectionIntegrationTest.java    |    3 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |    2 +
 .../solr/cloud/LegacyCloudClusterPropTest.java  |    2 +-
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |   11 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java  |   14 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java |    2 +-
 ...verseerCollectionConfigSetProcessorTest.java |    7 +
 .../apache/solr/cloud/OverseerRolesTest.java    |    1 +
 .../solr/cloud/ReplicationFactorTest.java       |   61 +-
 .../solr/cloud/RestartWhileUpdatingTest.java    |    2 +-
 .../solr/cloud/SaslZkACLProviderTest.java       |    1 +
 .../apache/solr/cloud/TestCloudConsistency.java |    1 +
 .../cloud/TestCloudJSONFacetJoinDomain.java     |    8 +-
 .../solr/cloud/TestCloudJSONFacetSKG.java       |    4 +-
 ...TestCloudPhrasesIdentificationComponent.java |  200 ++++
 .../apache/solr/cloud/TestCloudRecovery.java    |    3 +-
 .../solr/cloud/TestClusterProperties.java       |   25 +-
 .../org/apache/solr/cloud/TestCryptoKeys.java   |   13 +-
 .../cloud/TestDeleteCollectionOnDownNodes.java  |    2 +
 .../TestLeaderInitiatedRecoveryThread.java      |    1 +
 .../solr/cloud/TestSkipOverseerOperations.java  |    3 +
 .../TestSolrCloudWithDelegationTokens.java      |    2 +-
 .../TestStressCloudBlindAtomicUpdates.java      |    2 +-
 .../apache/solr/cloud/TestWithCollection.java   |    7 +-
 .../solr/cloud/UnloadDistributedZkTest.java     |    1 +
 .../org/apache/solr/cloud/ZkShardTermsTest.java |    1 +
 .../solr/cloud/api/collections/AssignTest.java  |   39 +-
 .../CollectionTooManyReplicasTest.java          |   10 +-
 .../CollectionsAPIAsyncDistributedZkTest.java   |    5 +-
 .../cloud/api/collections/ShardSplitTest.java   |    5 +-
 .../collections/TestHdfsCloudBackupRestore.java |    2 +-
 .../TestLocalFSCloudBackupRestore.java          |    2 +-
 .../AutoAddReplicasIntegrationTest.java         |   13 +-
 .../AutoAddReplicasPlanActionTest.java          |    7 +
 .../autoscaling/AutoScalingHandlerTest.java     |   13 +-
 .../solr/cloud/autoscaling/CapturedEvent.java   |    2 +-
 .../autoscaling/ComputePlanActionTest.java      |   15 +-
 .../autoscaling/ExecutePlanActionTest.java      |    1 +
 .../cloud/autoscaling/IndexSizeTriggerTest.java |  151 ++-
 .../MetricTriggerIntegrationTest.java           |    4 +-
 .../ScheduledMaintenanceTriggerTest.java        |   23 +-
 .../ScheduledTriggerIntegrationTest.java        |    4 +-
 .../cloud/autoscaling/ScheduledTriggerTest.java |    1 +
 .../SearchRateTriggerIntegrationTest.java       |   20 +-
 .../autoscaling/SearchRateTriggerTest.java      |    3 +-
 .../solr/cloud/autoscaling/TestPolicyCloud.java |    1 +
 .../cloud/autoscaling/sim/SimCloudManager.java  |   67 +-
 .../sim/SimClusterStateProvider.java            |  903 ++++++++++----
 .../autoscaling/sim/SimDistribStateManager.java |    7 +
 .../autoscaling/sim/SimNodeStateProvider.java   |   21 +-
 .../autoscaling/sim/SimSolrCloudTestCase.java   |    6 +-
 .../sim/TestSimComputePlanAction.java           |    6 +-
 .../sim/TestSimExecutePlanAction.java           |    5 +-
 .../autoscaling/sim/TestSimExtremeIndexing.java |  163 +++
 .../sim/TestSimGenericDistributedQueue.java     |    7 +-
 .../autoscaling/sim/TestSimLargeCluster.java    |    6 +-
 .../autoscaling/sim/TestSimNodeLostTrigger.java |    2 +-
 .../autoscaling/sim/TestSimPolicyCloud.java     |   15 +-
 .../sim/TestSimTriggerIntegration.java          |   51 +-
 .../solr/cloud/cdcr/CdcrBidirectionalTest.java  |    1 +
 .../solr/cloud/cdcr/CdcrBootstrapTest.java      |    5 +-
 .../cloud/cdcr/CdcrOpsAndBoundariesTest.java    |    1 +
 .../cloud/cdcr/CdcrWithNodesRestartsTest.java   |    1 +
 .../cloud/hdfs/HdfsUnloadDistributedZkTest.java |    3 +-
 .../HdfsWriteToMultipleCollectionsTest.java     |    3 +-
 .../apache/solr/cloud/hdfs/StressHdfsTest.java  |    1 +
 .../apache/solr/core/TestDynamicLoading.java    |   22 +-
 .../apache/solr/core/TestSolrConfigHandler.java |  175 ++-
 .../apache/solr/handler/RequestLoggingTest.java |   27 +-
 .../apache/solr/handler/TestBlobHandler.java    |   45 +-
 .../apache/solr/handler/TestConfigReload.java   |   19 +-
 .../solr/handler/TestReplicationHandler.java    |    2 +-
 .../org/apache/solr/handler/TestSQLHandler.java |    1 +
 .../handler/TestSolrConfigHandlerCloud.java     |    3 +-
 .../TestSolrConfigHandlerConcurrent.java        |   44 +-
 .../admin/MetricsHistoryHandlerTest.java        |    1 +
 .../admin/ZookeeperStatusHandlerTest.java       |    1 +
 .../component/CustomHighlightComponentTest.java |    1 +
 .../DistributedDebugComponentTest.java          |    4 +-
 .../component/DistributedMLTComponentTest.java  |    3 +-
 .../PhrasesIdentificationComponentTest.java     |  796 ++++++++++++
 .../handler/component/StatsComponentTest.java   |   10 +-
 ...estDistributedStatsComponentCardinality.java |    2 +-
 .../org/apache/solr/logging/TestLogWatcher.java |   79 +-
 .../reporters/SolrJmxReporterCloudTest.java     |    3 +-
 .../reporters/solr/SolrCloudReportersTest.java  |    5 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java  |    1 +
 .../apache/solr/request/SimpleFacetsTest.java   |    2 +-
 .../solr/rest/TestManagedResourceStorage.java   |    3 +-
 .../solr/schema/CurrencyFieldTypeTest.java      |    2 +-
 .../solr/schema/SchemaApiFailureTest.java       |    2 +-
 .../org/apache/solr/schema/TestPointFields.java |    2 +-
 .../solr/schema/TestSortableTextField.java      |    4 +-
 .../search/CurrencyRangeFacetCloudTest.java     |    2 +-
 .../apache/solr/search/QueryEqualityTest.java   |    2 +-
 .../solr/search/TestCollapseQParserPlugin.java  |   18 +-
 .../org/apache/solr/search/TestRangeQuery.java  |    2 +-
 .../apache/solr/search/TestStressRecovery.java  |    3 +
 .../search/function/SortByFunctionTest.java     |    8 +-
 .../solr/search/stats/TestDistribIDF.java       |    4 +-
 .../hadoop/TestDelegationWithHadoopAuth.java    |    3 +-
 .../solr/servlet/HttpSolrCallGetCoreTest.java   |    3 +-
 .../solr/store/hdfs/HdfsDirectoryTest.java      |    7 +-
 .../TestDocTermOrdsUninvertLimit.java           |    3 +-
 .../solr/uninverting/TestUninvertingReader.java |   18 +-
 .../solr/update/SolrCmdDistributorTest.java     |    4 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java  |    3 +-
 .../TimeRoutedAliasUpdateProcessorTest.java     |  238 +++-
 .../TrackingUpdateProcessorFactory.java         |  136 +--
 .../test/org/apache/solr/util/TestUtils.java    |   73 +-
 .../example-DIH/solr/atom/conf/solrconfig.xml   |    2 +-
 .../example-DIH/solr/db/conf/solrconfig.xml     |    2 +-
 .../example-DIH/solr/mail/conf/solrconfig.xml   |    2 +-
 .../example-DIH/solr/solr/conf/solrconfig.xml   |    2 +-
 .../example-DIH/solr/tika/conf/solrconfig.xml   |    2 +-
 solr/example/files/conf/solrconfig.xml          |    2 +-
 solr/server/resources/log4j2-console.xml        |    8 +-
 solr/server/resources/log4j2.xml                |   30 +-
 .../configsets/_default/conf/solrconfig.xml     |    2 +-
 .../conf/solrconfig.xml                         |    2 +-
 solr/solr-ref-guide/build.xml                   |   18 +-
 .../src/basic-authentication-plugin.adoc        |    4 +-
 solr/solr-ref-guide/src/collections-api.adoc    |  137 ++-
 .../src/common-query-parameters.adoc            |    6 +-
 solr/solr-ref-guide/src/css/ref-guide.css       |    5 +
 solr/solr-ref-guide/src/curve-fitting.adoc      |   26 +-
 .../src/distributed-requests.adoc               |    4 +-
 solr/solr-ref-guide/src/dsp.adoc                |   66 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc |    4 +-
 .../src/indexconfig-in-solrconfig.adoc          |   14 +-
 .../src/initparams-in-solrconfig.adoc           |    2 +-
 solr/solr-ref-guide/src/language-analysis.adoc  |   13 +-
 .../src/local-parameters-in-queries.adoc        |    2 +-
 solr/solr-ref-guide/src/machine-learning.adoc   |  238 ++--
 solr/solr-ref-guide/src/math-expressions.adoc   |    2 +-
 solr/solr-ref-guide/src/matrix-math.adoc        |   20 +-
 solr/solr-ref-guide/src/meta-docs/publish.adoc  |    7 +-
 solr/solr-ref-guide/src/numerical-analysis.adoc |  114 +-
 solr/solr-ref-guide/src/other-parsers.adoc      |    6 +-
 .../src/other-schema-elements.adoc              |    2 +-
 .../src/pagination-of-results.adoc              |    2 +-
 .../src/performance-statistics-reference.adoc   |   12 +-
 .../src/probability-distributions.adoc          |  100 +-
 solr/solr-ref-guide/src/regression.adoc         |   77 +-
 .../src/resource-and-plugin-loading.adoc        |   24 +-
 .../src/rule-based-replica-placement.adoc       |    2 +-
 solr/solr-ref-guide/src/scalar-math.adoc        |    4 +-
 solr/solr-ref-guide/src/simulations.adoc        |  130 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc |   72 +-
 .../src/solrcloud-autoscaling-overview.adoc     |   25 +-
 ...olrcloud-autoscaling-policy-preferences.adoc |  236 ++--
 .../src/solrcloud-autoscaling-triggers.adoc     |  326 ++---
 ...olrcloud-recoveries-and-write-tolerance.adoc |    6 +-
 solr/solr-ref-guide/src/spell-checking.adoc     |    2 +-
 solr/solr-ref-guide/src/statistics.adoc         |   22 +-
 .../src/stream-decorator-reference.adoc         |   25 +-
 .../src/stream-evaluator-reference.adoc         |    4 +-
 .../src/stream-source-reference.adoc            |    6 +-
 solr/solr-ref-guide/src/term-vectors.adoc       |   91 +-
 solr/solr-ref-guide/src/time-series.adoc        |   14 +-
 .../transforming-and-indexing-custom-json.adoc  |    2 +-
 .../src/transforming-result-documents.adoc      |   53 +-
 .../src/uploading-data-with-index-handlers.adoc |   83 +-
 ...zookeeper-to-manage-configuration-files.adoc |   12 +-
 solr/solr-ref-guide/src/variables.adoc          |   62 +-
 solr/solr-ref-guide/src/vector-math.adoc        |   50 +-
 solr/solr-ref-guide/src/vectorization.adoc      |  108 +-
 .../tools/CheckLinksAndAnchors.java             |    2 +-
 .../apache/solr/client/solrj/SolrClient.java    |    9 +-
 .../client/solrj/cloud/autoscaling/Clause.java  |  252 ++--
 .../solrj/cloud/autoscaling/Condition.java      |   18 +-
 .../solrj/cloud/autoscaling/CoresVariable.java  |    5 +-
 .../cloud/autoscaling/FreeDiskVariable.java     |   38 +-
 .../client/solrj/cloud/autoscaling/Operand.java |    1 +
 .../client/solrj/cloud/autoscaling/Policy.java  |   68 +-
 .../solrj/cloud/autoscaling/PolicyHelper.java   |  132 +-
 .../solrj/cloud/autoscaling/Preference.java     |    8 +
 .../solrj/cloud/autoscaling/ReplicaCount.java   |   59 +-
 .../solrj/cloud/autoscaling/ReplicaInfo.java    |    4 +-
 .../client/solrj/cloud/autoscaling/Row.java     |   37 +-
 .../solrj/cloud/autoscaling/Suggester.java      |    8 +-
 .../solrj/cloud/autoscaling/Suggestion.java     |   55 +-
 .../solrj/cloud/autoscaling/Variable.java       |   18 +-
 .../solrj/cloud/autoscaling/VariableBase.java   |   16 +-
 .../solrj/cloud/autoscaling/Violation.java      |   31 +-
 .../autoscaling/WithCollectionVariable.java     |    3 +-
 .../solrj/impl/ConcurrentUpdateSolrClient.java  |    6 +-
 .../solrj/impl/SolrClientNodeStateProvider.java |    2 +-
 .../org/apache/solr/client/solrj/io/Lang.java   |   17 +-
 .../solrj/io/eval/ConvexHullEvaluator.java      |   62 +
 .../solrj/io/eval/EnclosingDiskEvaluator.java   |   64 +
 .../solrj/io/eval/GetAmplitudeEvaluator.java    |   42 +
 .../io/eval/GetAngularFrequencyEvaluator.java   |   42 +
 .../client/solrj/io/eval/GetAreaEvaluator.java  |   43 +
 .../solrj/io/eval/GetBaryCenterEvaluator.java   |   50 +
 .../solrj/io/eval/GetBoundarySizeEvaluator.java |   43 +
 .../solrj/io/eval/GetCenterEvaluator.java       |   52 +
 .../client/solrj/io/eval/GetPhaseEvaluator.java |   42 +
 .../solrj/io/eval/GetRadiusEvaluator.java       |   44 +
 .../io/eval/GetSupportPointsEvaluator.java      |   56 +
 .../solrj/io/eval/GetVerticesEvaluator.java     |   51 +
 .../solrj/io/eval/HarmonicFitEvaluator.java     |   11 +-
 .../solrj/io/eval/LatLonVectorsEvaluator.java   |  115 ++
 .../solrj/io/eval/OscillateEvaluator.java       |   57 +
 .../client/solrj/io/eval/PairSortEvaluator.java |   93 ++
 .../client/solrj/io/stream/FacetStream.java     |    7 +-
 .../solr/client/solrj/io/stream/LetStream.java  |   11 +-
 .../client/solrj/io/stream/SelectStream.java    |   11 +-
 .../solrj/io/stream/TimeSeriesStream.java       |    2 +
 .../solrj/io/stream/expr/StreamFactory.java     |    5 +-
 .../solrj/request/CollectionAdminRequest.java   |   68 ++
 .../request/MultiContentWriterRequest.java      |  124 ++
 .../client/solrj/request/RequestWriter.java     |    4 +
 .../client/solrj/request/UpdateRequest.java     |    4 +
 .../client/solrj/response/SolrResponseBase.java |   12 +-
 .../solr/common/ConditionalMapWriter.java       |    2 +-
 .../org/apache/solr/common/IteratorWriter.java  |    9 +
 .../apache/solr/common/LinkedHashMapWriter.java |   60 +
 .../java/org/apache/solr/common/MapWriter.java  |   48 +-
 .../org/apache/solr/common/MapWriterMap.java    |   53 +
 .../org/apache/solr/common/StringUtils.java     |   10 +
 .../solr/common/cloud/ClusterProperties.java    |   64 +-
 .../apache/solr/common/cloud/DocCollection.java |    9 +
 .../solr/common/cloud/ReplicaPosition.java      |    2 +-
 .../apache/solr/common/cloud/ZkStateReader.java |    7 +-
 .../common/params/CollectionAdminParams.java    |   19 +
 .../solr/common/params/CollectionParams.java    |    2 +-
 .../org/apache/solr/common/util/NamedList.java  |   10 +-
 .../java/org/apache/solr/common/util/Utils.java |  148 ++-
 .../src/resources/apispec/cluster.Commands.json |   43 +-
 .../resources/apispec/collections.Commands.json |    4 +
 .../collections.collection.Commands.json        |    3 +-
 .../solr/autoscaling/testAddMissingReplica.json |  123 ++
 .../testAutoScalingHandlerFailure.json          |  141 +++
 .../testMoveReplicasInMultipleCollections.json  |   88 ++
 .../testScheduledTriggerFailure.json            |   52 +
 .../solrj/solr/autoscaling/testSortError.json   |  225 ++++
 .../autoscaling/testSuggestionsRebalance2.json  |  130 ++
 .../testSuggestionsRebalanceOnly.json           |  105 ++
 .../autoscaling/testSysPropSuggestions.json     |  119 ++
 .../autoscaling/testUtilizeNodeFailure.json     |   69 ++
 .../autoscaling/testUtilizeNodeFailure2.json    |   66 +
 .../ref_guide_examples/ZkConfigFilesTest.java   |   94 ++
 .../solr/client/solrj/SolrExampleTests.java     |   40 +-
 .../solr/client/solrj/SolrExceptionTest.java    |    3 +
 .../solrj/beans/TestDocumentObjectBinder.java   |    4 +
 .../solrj/cloud/autoscaling/TestPolicy.java     |  992 +++++----------
 .../solrj/cloud/autoscaling/TestPolicy2.java    |  300 ++---
 .../embedded/LargeVolumeBinaryJettyTest.java    |    2 +
 .../solrj/embedded/LargeVolumeJettyTest.java    |    3 +-
 .../solrj/impl/CloudSolrClientBadInputTest.java |   73 ++
 .../solrj/impl/CloudSolrClientBuilderTest.java  |    6 +
 .../CloudSolrClientMultiConstructorTest.java    |    3 +
 .../client/solrj/impl/CloudSolrClientTest.java  |   40 +-
 .../ConcurrentUpdateSolrClientBadInputTest.java |   91 ++
 .../ConcurrentUpdateSolrClientBuilderTest.java  |    1 +
 ...rentUpdateSolrClientMultiCollectionTest.java |   94 ++
 .../client/solrj/impl/HttpClientUtilTest.java   |    6 +-
 .../solrj/impl/HttpSolrClientBadInputTest.java  |   93 ++
 .../impl/LBHttpSolrClientBadInputTest.java      |   89 ++
 .../client/solrj/impl/LBHttpSolrClientTest.java |    2 +
 .../apache/solr/client/solrj/io/TestLang.java   |    7 +-
 .../solrj/io/graph/GraphExpressionTest.java     |    2 +-
 .../solr/client/solrj/io/graph/GraphTest.java   |    2 +-
 .../solrj/io/stream/MathExpressionTest.java     |  272 +++++
 .../solrj/io/stream/StreamDecoratorTest.java    |    3 +-
 .../solrj/io/stream/StreamExpressionTest.java   |   18 +-
 .../stream/StreamExpressionToExpessionTest.java |    2 +
 .../StreamExpressionToExplanationTest.java      |    2 +
 .../client/solrj/io/stream/StreamingTest.java   |   11 +
 .../request/TestCollectionAdminRequest.java     |    5 +
 .../solrj/request/TestUpdateRequestCodec.java   |    5 +-
 .../solrj/request/TestV1toV2ApiMapper.java      |   11 +-
 .../solrj/response/QueryResponseTest.java       |    6 +-
 .../response/TestDelegationTokenResponse.java   |    2 +
 .../solr/common/TestToleratedUpdateError.java   |    5 +-
 .../cloud/TestCollectionStateWatchers.java      |    7 +-
 .../solr/common/params/ShardParamsTest.java     |    5 +-
 .../apache/solr/common/util/NamedListTest.java  |    7 +-
 .../solr/common/util/TestFastInputStream.java   |    1 +
 .../solr/common/util/TestNamedListCodec.java    |   11 +-
 .../solr/BaseDistributedSearchTestCase.java     |    4 +-
 .../cloud/AbstractFullDistribZkTestBase.java    |    1 -
 .../apache/solr/cloud/SolrCloudTestCase.java    |   40 +-
 401 files changed, 12608 insertions(+), 4493 deletions(-)
----------------------------------------------------------------------