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/10/08 02:30:52 UTC
[30/30] 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/2d51180b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2d51180b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2d51180b
Branch: refs/heads/jira/http2
Commit: 2d51180bb32081eafc8eca79302356186ea112e0
Parents: 75e9125 367bdf7
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Oct 8 09:29:58 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Oct 8 09:29:58 2018 +0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 10 +-
.../benchmark/byTask/TestPerfTasksLogic.java | 9 +-
.../codecs/perfield/PerFieldPostingsFormat.java | 14 +-
.../org/apache/lucene/index/MultiFields.java | 68 +---
.../org/apache/lucene/util/QueryBuilder.java | 10 +
.../lucene/index/TestDirectoryReader.java | 11 +-
.../org/apache/lucene/index/TestDocCount.java | 6 +-
.../lucene/index/TestIndexWriterMaxDocs.java | 5 +-
.../index/TestParallelCompositeReader.java | 27 +-
.../apache/lucene/index/TestSegmentReader.java | 4 +-
.../lucene/index/TestStressIndexing2.java | 26 +-
.../org/apache/lucene/index/TestSumDocFreq.java | 7 +-
.../apache/lucene/util/TestQueryBuilder.java | 28 ++
.../memory/TestMemoryIndexAgainstRAMDir.java | 2 +-
.../org/apache/lucene/misc/HighFreqTerms.java | 20 +-
.../index/BaseIndexFileFormatTestCase.java | 22 +-
.../org/apache/lucene/util/LuceneTestCase.java | 67 ++--
solr/CHANGES.txt | 53 +++
.../java/org/apache/solr/cloud/CloudUtil.java | 48 ++-
.../org/apache/solr/cloud/ZkController.java | 3 +-
.../solr/cloud/api/collections/Assign.java | 3 +-
.../api/collections/CreateCollectionCmd.java | 4 +-
.../cloud/autoscaling/IndexSizeTrigger.java | 34 +-
.../solr/handler/admin/CollectionsHandler.java | 10 +-
.../solr/handler/component/ExpandComponent.java | 17 +-
.../solr/index/SlowCompositeReaderWrapper.java | 46 ++-
.../UninvertDocValuesMergePolicyFactory.java | 5 +-
.../org/apache/solr/schema/IndexSchema.java | 53 ++-
.../solr/search/CollapsingQParserPlugin.java | 18 +-
.../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 | 2 +-
.../processor/DistributedUpdateProcessor.java | 106 ++----
.../ParseDateFieldUpdateProcessorFactory.java | 28 +-
.../org/apache/solr/cloud/CloudTestUtils.java | 4 +-
.../solr/cloud/CollectionsAPISolrJTest.java | 141 +++++++-
.../apache/solr/cloud/HttpPartitionTest.java | 103 +-----
.../apache/solr/cloud/MoveReplicaHDFSTest.java | 6 +
.../solr/cloud/ReplicationFactorTest.java | 61 +++-
.../org/apache/solr/cloud/TestCryptoKeys.java | 13 +-
.../solr/cloud/autoscaling/CapturedEvent.java | 2 +-
.../cloud/autoscaling/IndexSizeTriggerTest.java | 141 ++++++++
.../SearchRateTriggerIntegrationTest.java | 19 +-
.../cloud/autoscaling/sim/SimCloudManager.java | 3 +-
.../sim/SimClusterStateProvider.java | 112 +++---
.../autoscaling/sim/SimSolrCloudTestCase.java | 6 +-
.../autoscaling/sim/TestSimLargeCluster.java | 2 +-
.../sim/TestSimTriggerIntegration.java | 25 +-
.../solr/cloud/cdcr/CdcrBidirectionalTest.java | 1 +
.../apache/solr/core/TestDynamicLoading.java | 22 +-
.../apache/solr/core/TestSolrConfigHandler.java | 175 +++++-----
.../apache/solr/handler/TestBlobHandler.java | 45 +--
.../apache/solr/handler/TestConfigReload.java | 19 +-
.../handler/TestSolrConfigHandlerCloud.java | 3 +-
.../TestSolrConfigHandlerConcurrent.java | 44 ++-
.../index/TestSlowCompositeReaderWrapper.java | 29 +-
.../solr/uninverting/TestUninvertingReader.java | 18 +-
.../solr/update/SolrCmdDistributorTest.java | 4 +-
.../test/org/apache/solr/util/TestUtils.java | 73 +++-
solr/solr-ref-guide/src/collections-api.adoc | 41 ++-
.../src/performance-statistics-reference.adoc | 12 +-
.../src/solrcloud-autoscaling-triggers.adoc | 6 +
...olrcloud-recoveries-and-write-tolerance.adoc | 6 +-
.../client/solrj/cloud/autoscaling/Policy.java | 27 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 53 ++-
.../solrj/cloud/autoscaling/Preference.java | 8 +
.../solrj/cloud/autoscaling/ReplicaCount.java | 13 +-
.../solrj/cloud/autoscaling/Suggester.java | 6 +-
.../solrj/cloud/autoscaling/Suggestion.java | 7 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 6 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 2 +-
.../org/apache/solr/client/solrj/io/Lang.java | 10 +-
.../solrj/io/eval/EnclosingDiskEvaluator.java | 64 ++++
.../solrj/io/eval/GetAmplitudeEvaluator.java | 42 +++
.../io/eval/GetAngularFrequencyEvaluator.java | 42 +++
.../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/HarmonicFitEvaluator.java | 11 +-
.../solrj/io/eval/OscillateEvaluator.java | 57 +++
.../client/solrj/request/UpdateRequest.java | 4 +
.../client/solrj/response/SolrResponseBase.java | 12 +-
.../org/apache/solr/common/IteratorWriter.java | 9 +
.../apache/solr/common/LinkedHashMapWriter.java | 60 ++++
.../java/org/apache/solr/common/MapWriter.java | 38 +-
.../org/apache/solr/common/MapWriterMap.java | 53 +++
.../org/apache/solr/common/StringUtils.java | 10 +
.../solr/common/cloud/ClusterProperties.java | 41 ++-
.../apache/solr/common/cloud/DocCollection.java | 9 +
.../apache/solr/common/cloud/ZkStateReader.java | 7 +-
.../common/params/CollectionAdminParams.java | 5 +
.../solr/common/params/CollectionParams.java | 2 +-
.../org/apache/solr/common/util/NamedList.java | 10 +-
.../java/org/apache/solr/common/util/Utils.java | 117 ++++++-
.../src/resources/apispec/cluster.Commands.json | 34 +-
.../solr/autoscaling/testAddMissingReplica.json | 123 +++++++
.../testMoveReplicasInMultipleCollections.json | 88 +++++
.../solrj/cloud/autoscaling/TestPolicy.java | 348 ++++++++++++++-----
.../solrj/cloud/autoscaling/TestPolicy2.java | 36 +-
...rentUpdateSolrClientMultiCollectionTest.java | 94 +++++
.../apache/solr/client/solrj/io/TestLang.java | 6 +-
.../solrj/io/stream/MathExpressionTest.java | 85 ++++-
.../solr/BaseDistributedSearchTestCase.java | 2 +
.../cloud/AbstractFullDistribZkTestBase.java | 1 -
107 files changed, 2807 insertions(+), 958 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2d51180b/solr/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2d51180b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
index c8ad92f,9536f9d..66a251f
--- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
+++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java
@@@ -298,10 -386,10 +298,10 @@@ public class SolrCmdDistributor
// we need to add the data to the rollup tracker.
//
// In the case of a leaderTracker and rollupTracker both being present, then we need to take care when assembling
- // the final response to check both the rollup and leader trackers on the aggregator node.
- public void trackRequestResult(HttpResponse resp, boolean success) {
-
+ // the final response to check both the rollup and leader trackers on the aggrator node.
+ public void trackRequestResult(NamedList resp, boolean success) {
+
- // Returing Integer.MAX_VALUE here means there was no "rf" on the response, therefore we just need to increment
+ // Returning Integer.MAX_VALUE here means there was no "rf" on the response, therefore we just need to increment
// our achieved rf if we are a leader, i.e. have a leaderTracker.
int rfFromResp = getRfFromResponse(resp);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2d51180b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
index 2cb287e,bab8607..0d1bbeb
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
@@@ -2148,8 -2140,6 +2124,7 @@@ public class DistributedUpdateProcesso
// Since we only allocate one of these on the leader and, by definition, the leader has been found and is running,
// we have a replication factor of one by default.
private int achievedRf = 1;
- private final int requestedRf;
+ private Set<String> nodes = new HashSet<>();
private final String myShardId;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2d51180b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2d51180b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2d51180b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java
----------------------------------------------------------------------