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/06/22 13:53:20 UTC
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-14537
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14537
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 2dafcefcc8032058dc2ae01ba4193bdd5a8e119d
Merge: 830e357 aa5b26f
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Jun 22 13:33:31 2020 +0200
Merge branch 'master' into jira/solr-14537
dev-tools/scripts/reproduceJenkinsFailures.py | 5 +-
lucene/CHANGES.txt | 6 +
.../apache/lucene/index/DefaultIndexingChain.java | 100 ++--
.../java/org/apache/lucene/index/DocConsumer.java | 2 +-
.../org/apache/lucene/index/DocumentsWriter.java | 2 +-
.../lucene/index/DocumentsWriterPerThread.java | 51 +-
.../org/apache/lucene/index/FilterMergePolicy.java | 5 +
.../java/org/apache/lucene/index/IndexWriter.java | 66 ++-
.../org/apache/lucene/index/IndexWriterConfig.java | 25 +
.../apache/lucene/index/LiveIndexWriterConfig.java | 13 +
.../java/org/apache/lucene/index/MergePolicy.java | 26 +-
.../java/org/apache/lucene/index/MergeTrigger.java | 7 +-
.../org/apache/lucene/index/NoMergePolicy.java | 3 +
.../lucene/index/OneMergeWrappingMergePolicy.java | 5 +
.../apache/lucene/index/TermVectorsConsumer.java | 6 +-
.../java/org/apache/lucene/index/TermsHash.java | 10 +-
.../org/apache/lucene/search/MultiCollector.java | 111 +++--
.../lucene/index/TestAllFilesDetectTruncation.java | 4 +-
.../org/apache/lucene/index/TestIndexWriter.java | 166 ++++---
.../lucene/index/TestIndexWriterMergePolicy.java | 71 ++-
.../apache/lucene/search/MultiCollectorTest.java | 172 +++++++
.../apache/lucene/index/MockRandomMergePolicy.java | 32 ++
.../org/apache/lucene/util/LuceneTestCase.java | 1 +
solr/CHANGES.txt | 6 +-
solr/bin/solr.in.cmd | 4 +
solr/bin/solr.in.sh | 5 +
.../analytics/legacy/LegacyNoFacetCloudTest.java | 32 +-
.../solr/analytics/legacy/LegacyNoFacetTest.java | 32 +-
.../LegacyAbstractAnalyticsFacetCloudTest.java | 2 +-
.../facet/LegacyAbstractAnalyticsFacetTest.java | 4 +-
.../legacy/facet/LegacyFieldFacetTest.java | 1 +
.../extraction/ExtractingRequestHandlerTest.java | 3 +
.../apache/solr/jaeger/TestJaegerConfigurator.java | 4 +
.../TestFeatureExtractionFromMultipleSegments.java | 2 +
.../solr/ltr/feature/TestNoMatchSolrFeature.java | 4 +
.../solr/ltr/feature/TestOriginalScoreFeature.java | 6 +
.../solr/ltr/model/TestNeuralNetworkModel.java | 1 +
.../store/rest/TestModelManagerPersistence.java | 4 +
.../java/org/apache/solr/core/CoreContainer.java | 51 +-
.../java/org/apache/solr/core/CoreDescriptor.java | 8 +-
.../src/java/org/apache/solr/core/NodeConfig.java | 20 +-
.../src/java/org/apache/solr/core/SolrPaths.java | 41 +-
.../org/apache/solr/core/SolrResourceLoader.java | 18 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 16 +
.../apache/solr/filestore/DistribPackageStore.java | 2 +-
.../solr/highlight/DefaultSolrHighlighter.java | 511 +++++++++++----------
solr/core/src/test-files/solr/solr-50-all.xml | 1 +
.../core/src/test-files/solr/solr-solrreporter.xml | 2 +
solr/core/src/test-files/solr/solr.xml | 1 +
.../src/test/org/apache/hadoop/fs/FileUtil.java | 2 +
.../org/apache/solr/BasicFunctionalityTest.java | 7 +
.../src/test/org/apache/solr/CursorPagingTest.java | 8 +
.../org/apache/solr/TestDistributedSearch.java | 10 +-
.../test/org/apache/solr/TestGroupingSearch.java | 7 +-
solr/core/src/test/org/apache/solr/TestJoin.java | 12 +-
.../solr/cloud/ChaosMonkeyNothingIsSafeTest.java | 1 +
.../org/apache/solr/cloud/CollectionPropsTest.java | 1 +
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 8 +-
.../apache/solr/cloud/DistribCursorPagingTest.java | 1 +
.../DistribDocExpirationUpdateProcessorTest.java | 1 +
.../solr/cloud/FullSolrCloudDistribCmdsTest.java | 2 +-
.../solr/cloud/MetricsHistoryIntegrationTest.java | 4 +
.../test/org/apache/solr/cloud/MockSolrSource.java | 2 +-
.../apache/solr/cloud/MultiThreadedOCPTest.java | 1 +
.../solr/cloud/NestedShardedAtomicUpdateTest.java | 4 +
.../OverseerCollectionConfigSetProcessorTest.java | 1 +
.../solr/cloud/OverseerModifyCollectionTest.java | 1 +
.../test/org/apache/solr/cloud/OverseerTest.java | 1 +
.../apache/solr/cloud/ReindexCollectionTest.java | 2 +
.../apache/solr/cloud/ReplaceNodeNoTargetTest.java | 1 +
.../cloud/RoutingToNodesWithPropertiesTest.java | 1 +
.../apache/solr/cloud/SolrCloudExampleTest.java | 2 +
.../test/org/apache/solr/cloud/SyncSliceTest.java | 1 +
.../solr/cloud/SystemCollectionCompatTest.java | 1 +
.../apache/solr/cloud/TestBaseStatsCacheCloud.java | 1 +
.../apache/solr/cloud/TestCloudConsistency.java | 2 +
.../TestCloudPhrasesIdentificationComponent.java | 4 +
.../solr/cloud/TestCloudSearcherWarming.java | 2 +-
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 16 +-
.../solr/cloud/TestConfigSetsAPIExclusivity.java | 4 +
.../org/apache/solr/cloud/TestHashPartitioner.java | 1 +
.../org/apache/solr/cloud/TestPullReplica.java | 4 +-
.../apache/solr/cloud/TestRebalanceLeaders.java | 1 +
.../apache/solr/cloud/TestSSLRandomization.java | 12 +-
.../cloud/TestSolrCloudWithDelegationTokens.java | 12 +-
.../TestSolrCloudWithSecureImpersonation.java | 3 +
.../cloud/TestStressCloudBlindAtomicUpdates.java | 16 +-
.../org/apache/solr/cloud/TestWithCollection.java | 6 +
.../apache/solr/cloud/UnloadDistributedZkTest.java | 2 +
.../org/apache/solr/cloud/ZkSolrClientTest.java | 12 +-
.../solr/cloud/api/collections/AssignTest.java | 1 +
.../CollectionsAPIDistributedZkTest.java | 6 +
.../ConcurrentCreateCollectionTest.java | 1 +
.../SimpleCollectionCreateDeleteTest.java | 1 +
.../cloud/api/collections/TestCollectionAPI.java | 54 +++
.../api/collections/TestReplicaProperties.java | 2 +
.../TestRequestStatusCollectionAPI.java | 2 +
.../AutoAddReplicasIntegrationTest.java | 4 +
.../autoscaling/AutoAddReplicasPlanActionTest.java | 10 +-
.../cloud/autoscaling/AutoScalingHandlerTest.java | 26 +-
.../cloud/autoscaling/ComputePlanActionTest.java | 27 +-
.../cloud/autoscaling/ExecutePlanActionTest.java | 5 +
.../cloud/autoscaling/HttpTriggerListenerTest.java | 1 +
.../IndexSizeTriggerMixedBoundsTest.java | 2 +
.../IndexSizeTriggerSizeEstimationTest.java | 3 +
.../cloud/autoscaling/IndexSizeTriggerTest.java | 15 +
.../autoscaling/MetricTriggerIntegrationTest.java | 1 +
.../NodeAddedTriggerIntegrationTest.java | 2 +
.../cloud/autoscaling/NodeAddedTriggerTest.java | 3 +
.../NodeLostTriggerIntegrationTest.java | 2 +
.../cloud/autoscaling/NodeLostTriggerTest.java | 3 +
.../autoscaling/NodeMarkersRegistrationTest.java | 2 +
.../cloud/autoscaling/RestoreTriggerStateTest.java | 2 +
.../ScheduledMaintenanceTriggerTest.java | 5 +
.../ScheduledTriggerIntegrationTest.java | 4 +-
.../SearchRateTriggerIntegrationTest.java | 4 +
.../cloud/autoscaling/SearchRateTriggerTest.java | 3 +
.../cloud/autoscaling/SystemLogListenerTest.java | 3 +
.../solr/cloud/autoscaling/TestPolicyCloud.java | 2 +
.../TriggerCooldownIntegrationTest.java | 1 +
.../cloud/autoscaling/TriggerEventQueueTest.java | 1 +
.../cloud/autoscaling/TriggerIntegrationTest.java | 5 +
.../autoscaling/sim/SimSolrCloudTestCase.java | 1 +
.../autoscaling/sim/TestSimComputePlanAction.java | 16 +-
.../autoscaling/sim/TestSimExecutePlanAction.java | 3 +
.../autoscaling/sim/TestSimExtremeIndexing.java | 1 +
.../cloud/autoscaling/sim/TestSimLargeCluster.java | 1 +
.../autoscaling/sim/TestSimNodeAddedTrigger.java | 2 +
.../autoscaling/sim/TestSimNodeLostTrigger.java | 3 +
.../cloud/autoscaling/sim/TestSimPolicyCloud.java | 2 +
.../cloud/autoscaling/sim/TestSimScenario.java | 4 +
.../autoscaling/sim/TestSimTriggerIntegration.java | 7 +
.../autoscaling/sim/TestSnapshotCloudManager.java | 1 +
.../solr/cloud/cdcr/BaseCdcrDistributedZkTest.java | 11 +
.../solr/cloud/cdcr/CdcrOpsAndBoundariesTest.java | 5 +-
.../solr/cloud/cdcr/CdcrRequestHandlerTest.java | 5 +
.../org/apache/solr/cloud/hdfs/StressHdfsTest.java | 2 +
.../solr/cloud/overseer/ZkStateWriterTest.java | 1 +
.../apache/solr/cloud/rule/ImplicitSnitchTest.java | 3 +
.../org/apache/solr/cloud/rule/RuleEngineTest.java | 8 +
.../test/org/apache/solr/cloud/rule/RulesTest.java | 7 +
.../org/apache/solr/core/DirectoryFactoryTest.java | 6 +-
.../org/apache/solr/core/ResourceLoaderTest.java | 2 +-
.../org/apache/solr/core/TestCoreContainer.java | 85 ++++
.../src/test/org/apache/solr/core/TestSolrXml.java | 10 +
.../solr/handler/admin/CoreAdminHandlerTest.java | 2 +
.../handler/admin/CoreAdminRequestStatusTest.java | 1 +
.../component/DistributedFacetPivotSmallTest.java | 12 +-
.../org/apache/solr/highlight/HighlighterTest.java | 2 +-
.../apache/solr/index/hdfs/CheckHdfsIndexTest.java | 2 +
.../org/apache/solr/logging/TestLogWatcher.java | 1 +
.../reporters/solr/SolrShardReporterTest.java | 12 +
.../src/test/org/apache/solr/pkg/TestPackages.java | 7 +-
.../org/apache/solr/request/SimpleFacetsTest.java | 1 +
.../apache/solr/request/TestIntervalFaceting.java | 2 +-
.../solr/request/macro/TestMacroExpander.java | 2 +
.../apache/solr/rest/schema/TestBulkSchemaAPI.java | 2 +-
.../solr/security/AuditLoggerIntegrationTest.java | 8 +
.../solr/spelling/DirectSolrSpellCheckerTest.java | 3 +
.../solr/spelling/FileBasedSpellCheckerTest.java | 7 +
.../solr/spelling/IndexBasedSpellCheckerTest.java | 8 +
.../solr/spelling/SpellCheckCollatorTest.java | 9 +
.../solr/spelling/SpellingQueryConverterTest.java | 6 +
.../solr/spelling/suggest/SuggesterTest.java | 2 +
.../solr/store/blockcache/BlockCacheTest.java | 4 +-
.../apache/solr/store/hdfs/HdfsDirectoryTest.java | 2 +-
.../apache/solr/update/SolrIndexSplitterTest.java | 3 +
.../org/apache/solr/util/MockCoreContainer.java | 2 +-
solr/server/solr/solr.xml | 1 +
solr/solr-ref-guide/src/coreadmin-api.adoc | 4 +-
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 4 +
.../solr/client/solrj/request/TestCoreAdmin.java | 4 +-
.../apache/solr/BaseDistributedSearchTestCase.java | 2 +-
.../solr/cloud/AbstractDistribZkTestBase.java | 2 +-
.../solr/cloud/AbstractFullDistribZkTestBase.java | 4 +-
175 files changed, 1780 insertions(+), 580 deletions(-)