You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/28 02:19:06 UTC

[29/29] lucene-solr:jira/http2: Merge branch 'master' into jira/http2

Merge branch 'master' into jira/http2


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

Branch: refs/heads/jira/http2
Commit: be332a26b0061a2f661bb82a12a5ce44cbbcc0be
Parents: 1664918 9481c1f
Author: Cao Manh Dat <da...@apache.org>
Authored: Fri Sep 28 09:18:20 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Fri Sep 28 09:18:20 2018 +0700

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                       |   7 +
 dev-tools/doap/solr.rdf                         |   7 +
 dev-tools/scripts/prep-solr-ref-guide-rc.sh     |   4 +-
 dev-tools/scripts/smokeTestRelease.py           |  13 +-
 lucene/CHANGES.txt                              |   8 +
 .../index/TestBackwardsCompatibility.java       |   7 +-
 .../org/apache/lucene/index/index.7.5.0-cfs.zip | Bin 0 -> 15615 bytes
 .../apache/lucene/index/index.7.5.0-nocfs.zip   | Bin 0 -> 15629 bytes
 .../org/apache/lucene/index/sorted.7.5.0.zip    | Bin 0 -> 82239 bytes
 lucene/common-build.xml                         |   1 -
 .../org/apache/lucene/index/IndexWriter.java    |  27 +-
 .../org/apache/lucene/index/MergeState.java     |  44 +-
 .../org/apache/lucene/index/MultiFields.java    |  27 +-
 .../apache/lucene/search/TermInSetQuery.java    |   2 +-
 .../apache/lucene/index/TestIndexSorting.java   |  49 +-
 .../document/BaseLatLonShapeTestCase.java       |   2 +-
 .../document/TestLatLonPolygonShapeQueries.java |   8 +-
 .../spatial3d/geom/GeoComplexPolygon.java       | 115 +--
 .../spatial3d/geom/GeoPolygonFactory.java       |  15 +-
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |  18 +
 solr/CHANGES.txt                                |  27 +-
 solr/bin/solr.cmd                               |   4 +-
 .../ExtractingRequestHandlerTest.java           |   6 +-
 .../org/apache/solr/cloud/ZkShardTerms.java     |   8 +-
 .../cloud/api/collections/AddReplicaCmd.java    | 325 +++++---
 .../solr/cloud/api/collections/Assign.java      | 372 +++++----
 .../api/collections/CreateCollectionCmd.java    |  34 +-
 .../cloud/api/collections/CreateShardCmd.java   | 157 +---
 .../cloud/api/collections/MoveReplicaCmd.java   |   2 +-
 .../OverseerCollectionMessageHandler.java       |   2 +-
 .../cloud/api/collections/ReplaceNodeCmd.java   |  35 +-
 .../solr/cloud/api/collections/RestoreCmd.java  |  16 +-
 .../cloud/api/collections/SplitShardCmd.java    |  17 +-
 .../cloud/autoscaling/ComputePlanAction.java    |   8 +-
 .../cloud/autoscaling/IndexSizeTrigger.java     |  12 +-
 .../solr/cloud/overseer/ReplicaMutator.java     |   4 +-
 .../java/org/apache/solr/core/SolrConfig.java   |   2 +-
 .../solr/handler/admin/CollectionsHandler.java  |   9 +-
 .../solr/handler/admin/MetricsHandler.java      |   4 +-
 .../handler/admin/MetricsHistoryHandler.java    |   4 +-
 .../apache/solr/metrics/SolrMetricManager.java  |  67 +-
 .../metrics/reporters/SolrSlf4jReporter.java    |   4 +-
 .../reporters/solr/SolrClusterReporter.java     |   8 +-
 .../solr/search/ExtendedDismaxQParser.java      |  89 ++-
 .../org/apache/solr/cloud/AddReplicaTest.java   |  92 ++-
 .../org/apache/solr/cloud/CloudTestUtils.java   |   6 +-
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |   3 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java |   2 +-
 .../TestLeaderInitiatedRecoveryThread.java      |   1 +
 .../solr/cloud/TestSkipOverseerOperations.java  |   3 +
 .../TestSolrCloudWithDelegationTokens.java      |   2 +-
 .../apache/solr/cloud/TestWithCollection.java   |   2 +
 .../solr/cloud/UnloadDistributedZkTest.java     |   1 +
 .../org/apache/solr/cloud/ZkShardTermsTest.java |  14 +-
 .../CollectionTooManyReplicasTest.java          |  10 +-
 .../CollectionsAPIAsyncDistributedZkTest.java   |   1 +
 .../cloud/api/collections/ShardSplitTest.java   |   2 +-
 .../cloud/autoscaling/IndexSizeTriggerTest.java |  10 +-
 .../cloud/autoscaling/ScheduledTriggerTest.java |   1 +
 .../solr/cloud/autoscaling/TestPolicyCloud.java |   1 +
 .../cloud/autoscaling/sim/SimCloudManager.java  |  66 +-
 .../sim/SimClusterStateProvider.java            | 797 ++++++++++++++-----
 .../autoscaling/sim/SimDistribStateManager.java |   7 +
 .../autoscaling/sim/SimNodeStateProvider.java   |  21 +-
 .../sim/TestSimExecutePlanAction.java           |   4 +-
 .../autoscaling/sim/TestSimExtremeIndexing.java | 163 ++++
 .../autoscaling/sim/TestSimNodeLostTrigger.java |   2 +-
 .../autoscaling/sim/TestSimPolicyCloud.java     |  13 +-
 .../sim/TestSimTriggerIntegration.java          |   8 +-
 .../solr/handler/TestReplicationHandler.java    |   2 +-
 .../DistributedDebugComponentTest.java          |   4 +-
 .../solr/metrics/SolrMetricManagerTest.java     |  14 -
 .../solr/search/TestExtendedDismaxParser.java   |  33 +-
 solr/solr-ref-guide/src/collections-api.adoc    |  68 +-
 solr/solr-ref-guide/src/meta-docs/publish.adoc  |   7 +-
 .../cloud/autoscaling/FreeDiskVariable.java     |  12 +-
 .../client/solrj/cloud/autoscaling/Policy.java  |  35 +-
 .../solrj/cloud/autoscaling/PolicyHelper.java   |  91 ++-
 .../solrj/cloud/autoscaling/ReplicaInfo.java    |   4 +-
 .../client/solrj/cloud/autoscaling/Row.java     |   2 +-
 .../solrj/cloud/autoscaling/Suggester.java      |   2 +-
 .../solrj/cloud/autoscaling/Suggestion.java     |   5 +
 .../solrj/request/CollectionAdminRequest.java   |  53 ++
 .../solr/common/ConditionalMapWriter.java       |   2 +-
 .../java/org/apache/solr/common/MapWriter.java  |  10 +
 .../solr/common/cloud/ReplicaPosition.java      |   2 +-
 .../java/org/apache/solr/common/util/Utils.java |  35 +-
 .../collections.collection.Commands.json        |   3 +-
 .../testAutoScalingHandlerFailure.json          | 141 ++++
 .../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 ++
 .../solr/client/solrj/SolrExceptionTest.java    |   3 +
 .../solrj/beans/TestDocumentObjectBinder.java   |   4 +
 .../solrj/cloud/autoscaling/TestPolicy.java     | 641 ++-------------
 .../solrj/cloud/autoscaling/TestPolicy2.java    | 387 ++-------
 .../solrj/impl/CloudSolrClientBuilderTest.java  |   6 +
 .../CloudSolrClientMultiConstructorTest.java    |   3 +
 .../ConcurrentUpdateSolrClientBuilderTest.java  |   1 +
 .../client/solrj/impl/HttpClientUtilTest.java   |   6 +-
 .../client/solrj/impl/LBHttpSolrClientTest.java |   2 +
 .../solrj/io/stream/MathExpressionTest.java     |   1 +
 .../stream/StreamExpressionToExpessionTest.java |   2 +
 .../StreamExpressionToExplanationTest.java      |   2 +
 .../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 +-
 .../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 +-
 118 files changed, 3238 insertions(+), 1971 deletions(-)
----------------------------------------------------------------------