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/16 22:54:05 UTC
[50/50] [abbrv] lucene-solr:jira/http2: merge with master
merge with master
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9a36e87f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9a36e87f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9a36e87f
Branch: refs/heads/jira/http2
Commit: 9a36e87f85a3de78ff4fb473673005f8cca3613a
Parents: 6558203 d2f7272
Author: Cao Manh Dat <da...@apache.org>
Authored: Wed Oct 17 05:53:02 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Wed Oct 17 05:53:02 2018 +0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 16 +
.../lucene/analysis/cjk/CJKBigramFilter.java | 8 +
.../ja/JapaneseNumberFilterFactory.java | 2 +-
.../codecs/simpletext/SimpleTextBKDReader.java | 59 +-
.../codecs/simpletext/SimpleTextBKDWriter.java | 144 ++--
.../simpletext/SimpleTextFieldInfosFormat.java | 21 +-
.../simpletext/SimpleTextPointsReader.java | 20 +-
.../simpletext/SimpleTextPointsWriter.java | 6 +-
.../org/apache/lucene/codecs/PointsWriter.java | 13 +-
.../lucene50/Lucene50FieldInfosFormat.java | 2 +-
.../lucene60/Lucene60FieldInfosFormat.java | 21 +-
.../codecs/lucene60/Lucene60PointsReader.java | 2 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 14 +-
.../codecs/perfield/PerFieldMergeState.java | 2 +-
.../org/apache/lucene/document/BinaryPoint.java | 4 +-
.../org/apache/lucene/document/DoublePoint.java | 10 +-
.../org/apache/lucene/document/DoubleRange.java | 10 +-
.../org/apache/lucene/document/FieldType.java | 66 +-
.../org/apache/lucene/document/FloatPoint.java | 10 +-
.../org/apache/lucene/document/FloatRange.java | 10 +-
.../org/apache/lucene/document/IntPoint.java | 10 +-
.../org/apache/lucene/document/IntRange.java | 10 +-
.../org/apache/lucene/document/LatLonPoint.java | 6 +-
.../org/apache/lucene/document/LongPoint.java | 10 +-
.../org/apache/lucene/document/LongRange.java | 10 +-
.../apache/lucene/document/RangeFieldQuery.java | 4 +-
.../org/apache/lucene/index/CheckIndex.java | 37 +-
.../org/apache/lucene/index/CodecReader.java | 2 +-
.../lucene/index/DefaultIndexingChain.java | 15 +-
.../java/org/apache/lucene/index/FieldInfo.java | 73 +-
.../org/apache/lucene/index/FieldInfos.java | 61 +-
.../org/apache/lucene/index/IndexWriter.java | 6 +-
.../apache/lucene/index/IndexableFieldType.java | 9 +-
.../org/apache/lucene/index/PointValues.java | 11 +-
.../apache/lucene/index/PointValuesWriter.java | 20 +-
.../apache/lucene/index/SortingLeafReader.java | 9 +-
.../apache/lucene/search/PointInSetQuery.java | 4 +-
.../apache/lucene/search/PointRangeQuery.java | 4 +-
.../org/apache/lucene/util/bkd/BKDReader.java | 140 ++--
.../org/apache/lucene/util/bkd/BKDWriter.java | 174 +++--
.../apache/lucene/document/TestFieldType.java | 11 +-
.../lucene/index/TestIndexWriterOnVMError.java | 1 +
.../apache/lucene/index/TestIndexableField.java | 7 +-
.../lucene/index/TestPendingSoftDeletes.java | 10 +-
.../apache/lucene/index/TestPointValues.java | 14 +-
.../apache/lucene/search/TestPointQueries.java | 2 +-
.../apache/lucene/util/TestDocIdSetBuilder.java | 7 +-
.../apache/lucene/util/bkd/Test2BBKDPoints.java | 4 +-
.../org/apache/lucene/util/bkd/TestBKD.java | 142 ++--
.../util/bkd/TestMutablePointsReaderUtils.java | 7 +-
.../org/apache/lucene/util/fst/TestFSTs.java | 2 +-
.../search/highlight/TermVectorLeafReader.java | 2 +-
.../join/PointInSetIncludingScoreQuery.java | 4 +-
.../apache/lucene/index/memory/MemoryIndex.java | 24 +-
.../apache/lucene/document/BigIntegerPoint.java | 10 +-
.../apache/lucene/document/HalfFloatPoint.java | 10 +-
.../lucene/spatial/bbox/BBoxStrategy.java | 2 +-
.../spatial/spatial4j/Geo3dShapeFactory.java | 3 +
.../spatial/vector/PointVectorStrategy.java | 2 +-
.../lucene/spatial/spatial4j/Geo3dRptTest.java | 41 -
.../lucene/spatial/spatial4j/Geo3dTest.java | 85 ++
.../codecs/asserting/AssertingPointsFormat.java | 4 +-
.../codecs/cranky/CrankyPointsFormat.java | 12 +-
.../lucene/index/AssertingLeafReader.java | 41 +-
.../index/BaseIndexFileFormatTestCase.java | 2 +-
.../lucene/index/BasePointsFormatTestCase.java | 76 +-
.../lucene/index/MismatchedLeafReader.java | 3 +-
.../org/apache/lucene/index/RandomCodec.java | 9 +-
.../lucene/index/RandomPostingsTester.java | 4 +-
.../org/apache/lucene/util/LuceneTestCase.java | 18 +-
.../java/org/apache/lucene/util/TestUtil.java | 2 +-
solr/CHANGES.txt | 32 +-
.../solr/ltr/model/NeuralNetworkModel.java | 34 +-
.../org/apache/solr/ltr/TestLTROnSolrCloud.java | 1 +
.../java/org/apache/solr/cloud/CloudUtil.java | 37 -
.../org/apache/solr/cloud/ElectionContext.java | 118 ---
.../cloud/LeaderInitiatedRecoveryThread.java | 366 ---------
.../org/apache/solr/cloud/ZkController.java | 356 +--------
.../cloud/api/collections/AddReplicaCmd.java | 19 +-
.../solr/cloud/api/collections/Assign.java | 70 +-
.../api/collections/CreateCollectionCmd.java | 19 +-
.../api/collections/DeleteCollectionCmd.java | 2 +
.../cloud/api/collections/SplitShardCmd.java | 37 +-
.../autoscaling/InactiveShardPlanAction.java | 48 +-
.../solr/cloud/overseer/ReplicaMutator.java | 9 +
.../solr/cloud/overseer/SliceMutator.java | 14 +-
.../solr/handler/UpdateRequestHandler.java | 2 +-
.../solr/handler/admin/CollectionsHandler.java | 9 -
.../solr/handler/component/ExpandComponent.java | 3 +-
.../solr/handler/loader/JavabinLoader.java | 58 ++
.../org/apache/solr/legacy/BBoxStrategy.java | 2 +-
.../apache/solr/legacy/PointVectorStrategy.java | 2 +-
.../solr/logging/log4j2/Log4j2Watcher.java | 2 +-
.../org/apache/solr/schema/SchemaField.java | 7 +-
.../solr/search/CollapsingQParserPlugin.java | 2 +-
.../java/org/apache/solr/search/Insanity.java | 2 +-
.../org/apache/solr/search/ReturnFields.java | 2 +-
.../apache/solr/uninverting/FieldCacheImpl.java | 6 +-
.../solr/uninverting/UninvertingReader.java | 6 +-
.../processor/DistributedUpdateProcessor.java | 30 +-
.../org/apache/solr/util/TestInjection.java | 17 +
.../solr/cloud/BasicDistributedZkTest.java | 1 +
.../solr/cloud/CollectionsAPISolrJTest.java | 11 +
.../apache/solr/cloud/DeleteReplicaTest.java | 16 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 190 -----
.../apache/solr/cloud/HttpPartitionTest.java | 62 --
.../solr/cloud/LIRRollingUpdatesTest.java | 473 ------------
.../solr/cloud/LegacyCloudClusterPropTest.java | 2 +-
.../apache/solr/cloud/MoveReplicaHDFSTest.java | 3 +-
...verseerCollectionConfigSetProcessorTest.java | 7 +
.../apache/solr/cloud/OverseerRolesTest.java | 2 +-
.../solr/cloud/RestartWhileUpdatingTest.java | 2 +-
.../apache/solr/cloud/TestCloudRecovery.java | 1 +
.../cloud/TestDeleteCollectionOnDownNodes.java | 2 +
.../TestLeaderInitiatedRecoveryThread.java | 242 ------
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 2 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 1 +
.../org/apache/solr/cloud/TestUtilizeNode.java | 10 +-
.../apache/solr/cloud/TestWithCollection.java | 4 +-
.../org/apache/solr/cloud/ZkShardTermsTest.java | 3 +-
.../solr/cloud/api/collections/AssignTest.java | 39 +-
.../CollectionsAPIAsyncDistributedZkTest.java | 1 +
.../cloud/api/collections/ShardSplitTest.java | 62 ++
.../TestLocalFSCloudBackupRestore.java | 2 +-
.../AutoAddReplicasIntegrationTest.java | 10 +-
.../AutoAddReplicasPlanActionTest.java | 7 +
.../autoscaling/AutoScalingHandlerTest.java | 13 +-
.../autoscaling/ComputePlanActionTest.java | 13 +-
.../autoscaling/ExecutePlanActionTest.java | 1 +
.../MetricTriggerIntegrationTest.java | 1 +
.../ScheduledMaintenanceTriggerTest.java | 47 +-
.../ScheduledTriggerIntegrationTest.java | 1 +
.../sim/SimClusterStateProvider.java | 41 +-
.../sim/TestSimComputePlanAction.java | 6 +-
.../sim/TestSimExecutePlanAction.java | 1 +
.../autoscaling/sim/TestSimExtremeIndexing.java | 4 +
.../sim/TestSimGenericDistributedQueue.java | 1 +
.../autoscaling/sim/TestSimLargeCluster.java | 2 +
.../autoscaling/sim/TestSimPolicyCloud.java | 2 +-
.../sim/TestSimTriggerIntegration.java | 5 +
.../solr/cloud/cdcr/CdcrBootstrapTest.java | 1 +
.../cloud/cdcr/CdcrOpsAndBoundariesTest.java | 1 +
.../cloud/cdcr/CdcrWithNodesRestartsTest.java | 1 +
.../cloud/hdfs/HdfsUnloadDistributedZkTest.java | 3 +-
.../HdfsWriteToMultipleCollectionsTest.java | 3 +-
.../admin/MetricsHistoryHandlerTest.java | 2 +-
.../component/CustomHighlightComponentTest.java | 1 +
.../handler/component/StatsComponentTest.java | 2 +-
...estDistributedStatsComponentCardinality.java | 2 +-
.../reporters/SolrJmxReporterCloudTest.java | 3 +-
.../search/TestRandomCollapseQParserPlugin.java | 2 +-
.../search/facet/TestJsonFacetRefinement.java | 2 +-
.../solr/search/stats/TestDistribIDF.java | 1 +
.../TestDocTermOrdsUninvertLimit.java | 1 +
.../solr/uninverting/TestUninvertingReader.java | 6 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 1 +
solr/solr-ref-guide/src/cloud-screens.adoc | 8 +-
solr/solr-ref-guide/src/collections-api.adoc | 4 +-
.../src/images/cloud-screens/cloud-radial.png | Bin 102878 -> 0 bytes
.../src/migrate-to-policy-rule.adoc | 170 ++++
.../src/solrcloud-autoscaling-overview.adoc | 2 +-
.../src/solrcloud-autoscaling.adoc | 3 +-
.../solr-ref-guide/src/time-routed-aliases.adoc | 7 +-
...zookeeper-to-manage-configuration-files.adoc | 12 +-
...rking-with-external-files-and-processes.adoc | 2 +-
.../tools/BuildNavAndPDFBody.java | 2 +-
.../apache/solr/client/solrj/SolrClient.java | 9 +-
.../cloud/autoscaling/AddReplicaSuggester.java | 7 +-
.../client/solrj/cloud/autoscaling/Clause.java | 31 +-
.../cloud/autoscaling/FreeDiskVariable.java | 22 +-
.../cloud/autoscaling/MoveReplicaSuggester.java | 4 +-
.../client/solrj/cloud/autoscaling/Policy.java | 7 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 2 +-
.../solrj/cloud/autoscaling/Suggester.java | 39 +-
.../solrj/cloud/autoscaling/Variable.java | 20 +
.../org/apache/solr/client/solrj/io/Lang.java | 2 +
.../client/solrj/io/eval/Log10Evaluator.java | 50 ++
.../client/solrj/io/eval/PairSortEvaluator.java | 93 +++
.../client/solrj/io/eval/PowerEvaluator.java | 55 +-
.../solr/client/solrj/io/stream/LetStream.java | 11 +-
.../client/solrj/io/stream/SelectStream.java | 11 +-
.../client/solrj/io/stream/TopicStream.java | 2 +-
.../solrj/io/stream/expr/StreamFactory.java | 5 +-
.../request/MultiContentWriterRequest.java | 124 +++
.../client/solrj/request/RequestWriter.java | 4 +
.../common/params/CollectionAdminParams.java | 16 +-
.../src/resources/apispec/cluster.Commands.json | 9 +
...tAutoscalingPreferencesUsedWithNoPolicy.json | 53 ++
.../testComputePlanAfterNodeAdded.json | 16 +
.../solr/autoscaling/testCoresSuggestions.json | 17 +
.../testCreateCollectionWithEmptyPolicy.json | 20 +
.../solr/autoscaling/testDiskSpaceHint.json | 16 +
.../solr/autoscaling/testEqualOnNonNode.json | 83 ++
.../solr/autoscaling/testFreeDiskDeviation.json | 35 +
.../autoscaling/testFreeDiskSuggestions.json | 27 +
.../autoscaling/testFreediskPercentage.json | 25 +
.../autoscaling/testMoveReplicaSuggester.json | 15 +
.../solrj/solr/autoscaling/testPolicy.json | 41 +
.../solr/autoscaling/testPortSuggestions.json | 22 +
.../testReplicaCountSuggestions.json | 15 +
.../solr/autoscaling/testReplicaPercentage.json | 46 ++
.../autoscaling/testReplicaZonesPercentage.json | 15 +
.../autoscaling/testSyspropSuggestions1.json | 24 +
.../solr/autoscaling/testViolationOutput.json | 22 +
.../solr/autoscaling/testWithCollection.json | 21 +
.../testWithCollectionMoveReplica.json | 28 +
.../testWithCollectionMoveVsAddSuggestions.json | 49 ++
.../testWithCollectionSuggestions.json | 21 +
.../ref_guide_examples/ZkConfigFilesTest.java | 94 +++
.../solr/client/solrj/SolrExampleTests.java | 40 +-
.../solrj/cloud/autoscaling/TestPolicy.java | 771 +++----------------
.../solrj/cloud/autoscaling/TestPolicy2.java | 117 +--
.../embedded/LargeVolumeBinaryJettyTest.java | 2 +
.../solrj/embedded/LargeVolumeJettyTest.java | 2 +
.../solrj/impl/CloudSolrClientBadInputTest.java | 73 ++
.../client/solrj/impl/CloudSolrClientTest.java | 35 +-
.../ConcurrentUpdateSolrClientBadInputTest.java | 91 +++
.../solrj/impl/HttpSolrClientBadInputTest.java | 93 +++
.../impl/LBHttpSolrClientBadInputTest.java | 89 +++
.../apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/stream/MathExpressionTest.java | 130 ++++
.../solrj/io/stream/StreamDecoratorTest.java | 3 +-
.../cloud/TestCollectionStateWatchers.java | 8 +-
.../solr/common/params/ShardParamsTest.java | 3 +-
solr/webapp/web/css/angular/menu.css | 1 -
solr/webapp/web/index.html | 1 -
solr/webapp/web/js/angular/controllers/cloud.js | 70 +-
solr/webapp/web/partials/cloud.html | 2 +-
228 files changed, 3631 insertions(+), 3593 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9a36e87f/solr/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9a36e87f/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 0d1bbeb,004f4f7..8a58b6a
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
@@@ -858,22 -869,9 +853,9 @@@ public class DistributedUpdateProcesso
String coreNodeName = ((Replica) stdNode.getNodeProps().getNodeProps()).getName();
// if false, then the node is probably not "live" anymore
// and we do not need to send a recovery message
- Throwable rootCause = SolrException.getRootCause(error.e);
+ Throwable rootCause = SolrException.getRootCause(error.t);
- if (!isOldLIRMode && zkController.getShardTerms(collection, shardId).registered(coreNodeName)) {
- log.error("Setting up to try to start recovery on replica {} with url {} by increasing leader term", coreNodeName, replicaUrl, rootCause);
- replicasShouldBeInLowerTerms.add(coreNodeName);
- } else {
- // The replica did not registered its term, so it must run with old LIR implementation
- log.error("Setting up to try to start recovery on replica {}", replicaUrl, rootCause);
- zkController.ensureReplicaInLeaderInitiatedRecovery(
- req.getCore().getCoreContainer(),
- collection,
- shardId,
- stdNode.getNodeProps(),
- req.getCore().getCoreDescriptor(),
- false /* forcePublishState */
- );
- }
+ log.error("Setting up to try to start recovery on replica {} with url {} by increasing leader term", coreNodeName, replicaUrl, rootCause);
+ replicasShouldBeInLowerTerms.add(coreNodeName);
} catch (Exception exc) {
Throwable setLirZnodeFailedCause = SolrException.getRootCause(exc);
log.error("Leader failed to set replica " +
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9a36e87f/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java
----------------------------------------------------------------------