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 2020/09/01 07:30:20 UTC
[lucene-solr] 02/08: Merge branch 'master' into
datcm/bloomberg-abdicate-leadership
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch datcm/bloomberg-abdicate-leadership
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 7a9203760ddc66d94fa6b9229dd9a6a4ada5f149
Merge: b495dc0 6abce32
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Wed Aug 26 11:10:15 2020 +0700
Merge branch 'master' into datcm/bloomberg-abdicate-leadership
README.md | 2 +-
build.gradle | 33 +-
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/maven/pom.xml.template | 2 +-
dev-tools/scripts/SOLR-2452.patch.hack.pl | 4 +-
dev-tools/scripts/jenkins.build.ref.guide.sh | 73 --
dev-tools/scripts/releaseWizard.py | 4 +
dev-tools/scripts/releaseWizard.yaml | 63 +-
dev-tools/scripts/smokeTestRelease.py | 2 +-
gradle/defaults-java.gradle | 7 +-
gradle/documentation/changes-to-html.gradle | 2 +-
gradle/generation/jflex.gradle | 2 +-
gradle/generation/kuromoji.gradle | 2 +-
gradle/generation/snowball.gradle | 2 +-
gradle/generation/util.gradle | 4 +-
.../hacks/gradle.gradle | 43 +-
gradle/help.gradle | 1 +
gradle/ide/eclipse.gradle | 102 ++
gradle/testing/beasting.gradle | 82 ++
gradle/testing/defaults-tests.gradle | 6 +-
gradle/testing/fail-on-no-tests.gradle | 2 +-
gradle/testing/randomization.gradle | 9 +-
gradle/validation/check-broken-links.gradle | 2 +-
gradle/validation/forbidden-apis.gradle | 8 +-
gradle/validation/missing-docs-check.gradle | 2 +-
gradlew | 13 +-
gradlew.bat | 7 +-
help/IDEs.txt | 20 +
help/tests.txt | 15 +
lucene/CHANGES.txt | 36 +-
.../lucene/index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.8.6.1-cfs.zip | Bin 0 -> 16384 bytes
.../org/apache/lucene/index/index.8.6.1-nocfs.zip | Bin 0 -> 16379 bytes
.../test/org/apache/lucene/index/sorted.8.6.1.zip | Bin 0 -> 132476 bytes
.../lucene/index/DocumentsWriterDeleteQueue.java | 8 +-
.../lucene/index/DocumentsWriterFlushControl.java | 6 +-
.../lucene/index/DocumentsWriterPerThreadPool.java | 14 +-
.../java/org/apache/lucene/index/IndexWriter.java | 313 ++++-
.../org/apache/lucene/index/IndexWriterConfig.java | 15 +-
.../apache/lucene/index/LiveIndexWriterConfig.java | 10 +-
.../java/org/apache/lucene/index/MergePolicy.java | 17 +-
.../java/org/apache/lucene/index/MergeTrigger.java | 4 +
.../java/org/apache/lucene/index/ReaderPool.java | 2 +-
.../java/org/apache/lucene/index/SegmentInfos.java | 17 +-
.../lucene/index/StandardDirectoryReader.java | 24 +-
.../org/apache/lucene/search/BooleanQuery.java | 12 +-
.../lucene/search/DisjunctionMatchesIterator.java | 3 +-
.../java/org/apache/lucene/search/FuzzyQuery.java | 6 +-
.../search/MultiTermQueryConstantScoreWrapper.java | 3 -
.../org/apache/lucene/search/SynonymQuery.java | 2 +-
.../java/org/apache/lucene/search/TermQuery.java | 3 -
.../src/java/org/apache/lucene/util/Version.java | 7 +
.../index/TestDocumentsWriterDeleteQueue.java | 21 +
.../index/TestDocumentsWriterPerThreadPool.java | 96 ++
.../apache/lucene/index/TestForTooMuchCloning.java | 5 +-
.../org/apache/lucene/index/TestIndexWriter.java | 2 +-
.../apache/lucene/index/TestIndexWriterDelete.java | 7 +-
.../lucene/index/TestIndexWriterExceptions.java | 104 ++
.../lucene/index/TestIndexWriterMergePolicy.java | 232 +++-
.../lucene/index/TestIndexWriterOnVMError.java | 4 +-
.../apache/lucene/index/TestIndexWriterReader.java | 33 +-
.../lucene/index/TestIndexWriterWithThreads.java | 1 -
.../index/TestSoftDeletesRetentionMergePolicy.java | 2 +-
.../apache/lucene/search/MultiCollectorTest.java | 338 ------
.../apache/lucene/search/TestBooleanRewrites.java | 18 +-
.../apache/lucene/search/TestMatchesIterator.java | 93 +-
.../apache/lucene/search/TestMultiCollector.java | 309 +++++
lucene/highlighter/build.gradle | 1 +
lucene/highlighter/build.xml | 1 +
.../BreakIteratorShrinkingAdjuster.java | 86 ++
.../matchhighlight/CharSequenceIterator.java | 104 ++
.../matchhighlight/MatchRegionRetriever.java | 304 +++++
.../lucene/search/matchhighlight/OffsetRange.java | 65 +
.../matchhighlight/OffsetsFromMatchIterator.java | 49 +
.../matchhighlight/OffsetsFromPositions.java | 154 +++
.../search/matchhighlight/OffsetsFromTokens.java | 97 ++
.../search/matchhighlight/OffsetsFromValues.java | 74 ++
.../matchhighlight/OffsetsRetrievalStrategy.java} | 46 +-
.../OffsetsRetrievalStrategySupplier.java} | 18 +-
.../lucene/search/matchhighlight/Passage.java | 29 +-
.../search/matchhighlight/PassageAdjuster.java} | 21 +-
.../search/matchhighlight/PassageFormatter.java | 214 ++++
.../search/matchhighlight/PassageSelector.java | 273 +++++
.../search/matchhighlight/package-info.java} | 37 +-
.../matchhighlight/AsciiMatchRangeHighlighter.java | 81 ++
.../search/matchhighlight/MissingAnalyzer.java | 27 +-
.../matchhighlight/TestMatchRegionRetriever.java | 767 ++++++++++++
.../search/matchhighlight/TestPassageSelector.java | 284 +++++
.../uhighlight/TestUnifiedHighlighterMTQ.java | 11 +-
lucene/ivy-versions.properties | 2 +-
lucene/licenses/hamcrest-2.2.jar.sha1 | 1 +
.../licenses/hamcrest-LICENSE-BSD.txt | 0
.../licenses/hamcrest-NOTICE.txt | 0
lucene/licenses/hamcrest-core-1.3.jar.sha1 | 1 -
lucene/luke/build.gradle | 132 ++-
lucene/luke/src/distribution/README.md | 8 +
.../queries/function/FunctionMatchQuery.java | 19 +-
.../queries/function/TestFunctionMatchQuery.java | 26 +-
.../apache/lucene/search/spell/SuggestWord.java | 5 +
lucene/test-framework/build.gradle | 10 +-
lucene/test-framework/ivy.xml | 2 +-
.../apache/lucene/store/MockDirectoryWrapper.java | 2 +-
.../org/apache/lucene/util/LuceneTestCase.java | 2 +-
solr/CHANGES.txt | 53 +-
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
.../org/apache/solr/handler/AnalyticsHandler.java | 7 +-
.../collection1/conf/dataimport-solrconfig.xml | 2 +-
.../apache/solr/handler/dataimport/DataSource.java | 3 +-
.../apache/solr/handler/dataimport/DocBuilder.java | 30 +-
.../solr/handler/dataimport/EntityProcessor.java | 3 +-
.../collection1/conf/contentstream-solrconfig.xml | 2 +-
.../conf/dataimport-nodatasource-solrconfig.xml | 2 +-
.../collection1/conf/dataimport-solrconfig.xml | 2 +-
.../configsets/dihconfigset/conf/solrconfig.xml | 2 +-
.../dataimport/TestContentStreamDataSource.java | 2 +-
.../conf/solr-exporter-config.xml | 8 +-
.../collector/MetricsCollectorFactory.java | 6 +-
.../collector/SchedulerMetricsCollector.java | 52 +-
.../org/apache/solr/prometheus/scraper/Async.java | 61 -
.../solr/prometheus/scraper/SolrCloudScraper.java | 4 +-
.../solr/prometheus/scraper/SolrScraper.java | 43 +-
.../prometheus/scraper/SolrStandaloneScraper.java | 4 +-
...theus-solr-exporter-integration-test-config.xml | 8 +-
.../apache/solr/prometheus/scraper/AsyncTest.java | 78 --
.../org/apache/solr/cloud/RecoveryStrategy.java | 4 +-
.../org/apache/solr/cloud/ReplicateFromLeader.java | 10 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 28 +
.../org/apache/solr/core/ConfigSetService.java | 5 +-
.../java/org/apache/solr/core/CoreContainer.java | 2 +-
.../java/org/apache/solr/core/MemClassLoader.java | 203 ----
.../src/java/org/apache/solr/core/PluginBag.java | 208 +---
.../src/java/org/apache/solr/core/SolrConfig.java | 38 +-
.../src/java/org/apache/solr/core/SolrCore.java | 30 +-
.../org/apache/solr/core/SolrResourceLoader.java | 11 +-
.../apache/solr/filestore/DistribPackageStore.java | 5 +-
.../apache/solr/handler/CdcrReplicatorManager.java | 2 +-
.../apache/solr/handler/CdcrRequestHandler.java | 14 +-
.../java/org/apache/solr/handler/IndexFetcher.java | 112 +-
.../apache/solr/handler/MoreLikeThisHandler.java | 5 +-
.../apache/solr/handler/ReplicationHandler.java | 245 ++--
.../org/apache/solr/handler/SolrConfigHandler.java | 23 +-
.../org/apache/solr/handler/StreamHandler.java | 2 +-
.../solr/handler/admin/ConfigSetsHandlerApi.java | 4 +
.../solr/handler/component/FacetComponent.java | 6 +-
.../solr/handler/component/HttpShardHandler.java | 4 +-
.../handler/component/RealTimeGetComponent.java | 10 +-
.../solr/handler/component/SearchHandler.java | 5 +-
.../solr/handler/component/StatsValuesFactory.java | 2 +-
.../apache/solr/packagemanager/PackageManager.java | 106 +-
.../solr/packagemanager/SolrPackageInstance.java | 4 +-
.../java/org/apache/solr/schema/IndexSchema.java | 2 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 5 +
.../java/org/apache/solr/schema/SchemaManager.java | 4 +-
.../apache/solr/search/ExtendedDismaxQParser.java | 6 +
.../org/apache/solr/search/JoinQParserPlugin.java | 50 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 29 +-
.../apache/solr/search/SolrQueryTimeoutImpl.java | 36 +-
.../org/apache/solr/search/facet/FacetRequest.java | 35 +-
.../solr/search/join/ScoreJoinQParserPlugin.java | 14 +
.../similarities/BooleanSimilarityFactory.java} | 34 +-
.../solr/search/stats/ExactSharedStatsCache.java | 2 +-
.../apache/solr/search/stats/LRUStatsCache.java | 2 +-
.../org/apache/solr/search/stats/StatsCache.java | 2 +-
.../solr/security/JWTVerificationkeyResolver.java | 2 +-
.../org/apache/solr/servlet/QueryRateLimiter.java | 55 +
.../org/apache/solr/servlet/RateLimitManager.java | 181 +++
.../apache/solr/servlet/RequestRateLimiter.java | 168 +++
.../apache/solr/servlet/SolrDispatchFilter.java | 37 +-
.../src/java/org/apache/solr/update/PeerSync.java | 68 +-
.../org/apache/solr/update/PeerSyncWithLeader.java | 25 +-
.../org/apache/solr/update/SolrIndexConfig.java | 22 +-
.../src/java/org/apache/solr/util/PackageTool.java | 10 +
.../java/org/apache/solr/util/TestInjection.java | 12 +-
.../util/circuitbreaker/CPUCircuitBreaker.java | 116 ++
.../solr/util/circuitbreaker/CircuitBreaker.java | 8 +
.../util/circuitbreaker/CircuitBreakerManager.java | 13 +-
.../util/circuitbreaker/MemoryCircuitBreaker.java | 20 +-
.../resources/EditableSolrConfigAttributes.json | 16 +-
.../collection1/conf/schema-booleansimilarity.xml | 35 +
...olrconfig-slave.xml => solrconfig-follower.xml} | 4 +-
...rconfig-slave1.xml => solrconfig-follower1.xml} | 0
...rottled.xml => solrconfig-leader-throttled.xml} | 0
...solrconfig-master.xml => solrconfig-leader.xml} | 2 +-
...up.xml => solrconfig-leader1-keepOneBackup.xml} | 2 +-
...lrconfig-master1.xml => solrconfig-leader1.xml} | 2 +-
...lrconfig-master2.xml => solrconfig-leader2.xml} | 2 +-
...lrconfig-master3.xml => solrconfig-leader3.xml} | 2 +-
.../conf/solrconfig-memory-circuitbreaker.xml | 11 +-
.../solr/collection1/conf/solrconfig-repeater.xml | 6 +-
...slave.xml => solrconfig-replication-legacy.xml} | 3 +
.../solr/collection1/conf/solrconfig-tlog.xml | 4 -
.../conf/solrconfig.snippet.randomindexconfig.xml | 1 +
.../solr/analysis/TestDeprecatedFilters.java | 2 +-
.../TestEmbeddedSolrServerAdminHandler.java | 5 +
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 6 +-
.../test/org/apache/solr/cloud/TestCryptoKeys.java | 209 ----
.../org/apache/solr/cloud/TestLazySolrCluster.java | 97 ++
.../SimpleCollectionCreateDeleteTest.java | 198 +++-
.../cloud/cdcr/CdcrReplicationHandlerTest.java | 88 +-
.../solr/core/BlobRepositoryMockingTest.java | 2 +-
.../test/org/apache/solr/core/SolrCoreTest.java | 3 +-
.../src/test/org/apache/solr/core/TestConfig.java | 2 +
.../org/apache/solr/core/TestConfigOverlay.java | 7 +-
.../org/apache/solr/core/TestDynamicLoading.java | 290 -----
.../apache/solr/core/TestDynamicLoadingUrl.java | 128 --
.../test/org/apache/solr/core/TestDynamicURP.java | 111 --
.../apache/solr/core/TestSolrConfigHandler.java | 57 +-
.../solr/core/snapshots/TestSolrCoreSnapshots.java | 22 +-
.../solr/filestore/TestDistribPackageStore.java | 2 +-
.../apache/solr/handler/BackupRestoreUtils.java | 20 +-
.../solr/handler/TestHdfsBackupRestoreCore.java | 14 +-
.../solr/handler/TestReplicationHandler.java | 1238 +++++++++++---------
.../solr/handler/TestReplicationHandlerBackup.java | 68 +-
.../TestReplicationHandlerDiskOverFlow.java | 76 +-
.../org/apache/solr/handler/TestRestoreCore.java | 78 +-
.../solr/handler/export/TestExportWriter.java | 16 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 9 +-
.../solr/search/TestExtendedDismaxParser.java | 146 ++-
.../search/facet/TestCloudJSONFacetJoinDomain.java | 38 +-
.../TestBooleanSimilarityFactory.java} | 23 +-
.../solr/security/BasicAuthStandaloneTest.java | 2 +-
.../solr/servlet/TestRequestRateLimiter.java | 235 ++++
.../apache/solr/update/SolrIndexConfigTest.java | 19 +
.../apache/solr/update/processor/RuntimeUrp.java | 40 -
.../processor/TestNamedUpdateProcessors.java | 163 ---
.../org/apache/solr/util/TestCircuitBreaker.java | 112 +-
solr/licenses/hamcrest-2.2.jar.sha1 | 1 +
.../licenses/hamcrest-LICENSE-BSD.txt | 0
.../licenses/hamcrest-NOTICE.txt | 0
solr/licenses/hamcrest-core-1.3.jar.sha1 | 1 -
.../solr/configsets/_default/conf/solrconfig.xml | 40 +-
.../adding-custom-plugins-in-solrcloud-mode.adoc | 333 ------
solr/solr-ref-guide/src/circuit-breakers.adoc | 38 +-
solr/solr-ref-guide/src/cloud-screens.adoc | 2 +-
.../src/collection-specific-tools.adoc | 2 +-
.../combining-distribution-and-replication.adoc | 12 +-
solr/solr-ref-guide/src/config-api.adoc | 3 -
solr/solr-ref-guide/src/coreadmin-api.adoc | 2 +-
.../distributed-search-with-index-sharding.adoc | 2 +-
.../src/implicit-requesthandlers.adoc | 2 +-
solr/solr-ref-guide/src/index-replication.adoc | 156 +--
solr/solr-ref-guide/src/index.adoc | 3 +
.../src/json-faceting-domain-changes.adoc | 8 +-
.../src/major-changes-in-solr-8.adoc | 4 +-
.../src/major-changes-in-solr-9.adoc | 5 +
solr/solr-ref-guide/src/meta-docs/publish.adoc | 2 +-
.../src/near-real-time-searching.adoc | 2 +-
solr/solr-ref-guide/src/package-manager.adoc | 9 +
.../src/query-settings-in-solrconfig.adoc | 2 +-
solr/solr-ref-guide/src/rate-limiters.adoc | 131 +++
solr/solr-ref-guide/src/replication-screen.adoc | 8 +-
.../solr-ref-guide/src/request-parameters-api.adoc | 2 +-
.../src/shards-and-indexing-data-in-solrcloud.adoc | 4 +-
solr/solr-ref-guide/src/solr-glossary.adoc | 2 +-
solr/solr-ref-guide/src/solr-plugins.adoc | 9 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 2 -
solr/solr-ref-guide/src/solrcloud.adoc | 2 +-
.../src/updatehandlers-in-solrconfig.adoc | 2 +-
.../org/apache/solr/client/solrj/SolrClient.java | 8 +
.../org/apache/solr/client/solrj/SolrRequest.java | 19 +
.../solr/client/solrj/impl/HttpSolrClient.java | 52 +-
.../solr/client/solrj/impl/LBHttp2SolrClient.java | 4 +-
.../solr/client/solrj/impl/LBHttpSolrClient.java | 4 +-
.../solr/client/solrj/impl/LBSolrClient.java | 3 +-
.../solr/client/solrj/io/stream/TupleStream.java | 38 +-
.../solrj/request/AbstractUpdateRequest.java | 5 +
.../solrj/request/CollectionAdminRequest.java | 5 +
.../solrj/request/ConfigSetAdminRequest.java | 5 +
.../client/solrj/request/CoreAdminRequest.java | 5 +
.../solrj/request/DelegationTokenRequest.java | 15 +
.../client/solrj/request/DirectXmlRequest.java | 5 +
.../solrj/request/DocumentAnalysisRequest.java | 5 +
.../client/solrj/request/FieldAnalysisRequest.java | 5 +
.../client/solrj/request/GenericSolrRequest.java | 5 +
.../client/solrj/request/HealthCheckRequest.java | 5 +-
.../solr/client/solrj/request/LukeRequest.java | 5 +
.../solr/client/solrj/request/QueryRequest.java | 4 +
.../apache/solr/client/solrj/request/SolrPing.java | 5 +
.../solr/client/solrj/request/V2Request.java | 5 +
.../request/schema/AbstractSchemaRequest.java | 4 +
.../java/org/apache/solr/cluster/api/ApiType.java | 21 +-
.../apache/solr/cluster/api/CollectionConfig.java | 13 +-
.../org/apache/solr/cluster/api/HashRange.java} | 28 +-
.../java/org/apache/solr/cluster/api/Resource.java | 41 +
.../java/org/apache/solr/cluster/api/Router.java | 15 +-
.../java/org/apache/solr/cluster/api/Shard.java | 42 +-
.../org/apache/solr/cluster/api/ShardReplica.java | 57 +
.../org/apache/solr/cluster/api/SimpleMap.java | 80 ++
.../org/apache/solr/cluster/api/SolrCluster.java | 52 +-
.../apache/solr/cluster/api/SolrCollection.java | 20 +-
.../java/org/apache/solr/cluster/api/SolrNode.java | 22 +-
.../org/apache/solr/cluster/api/package-info.java | 19 +-
.../org/apache/solr/common/LazySolrCluster.java | 446 +++++++
.../java/org/apache/solr/common/SimpleZkMap.java | 139 +++
.../java/org/apache/solr/common/SolrException.java | 1 +
...lrSingleThreaded.java => SolrThreadUnsafe.java} | 2 +-
.../java/org/apache/solr/common/cloud/Aliases.java | 8 +
.../org/apache/solr/common/cloud/ClusterState.java | 4 +
.../org/apache/solr/common/cloud/DocRouter.java | 13 +-
.../org/apache/solr/common/cloud/SolrZkClient.java | 3 +
.../apache/solr/common/cloud/ZkStateReader.java | 10 +-
.../apache/solr/common/params/CommonParams.java | 6 +-
.../solr/common/util/LinkedSimpleHashMap.java | 21 +-
.../org/apache/solr/common/util/NamedList.java | 39 +-
.../java/org/apache/solr/common/util/Utils.java | 5 +-
.../apache/solr/common/util/WrappedSimpleMap.java} | 39 +-
...rconfig-slave1.xml => solrconfig-follower1.xml} | 0
.../solr/client/solrj/TestLBHttp2SolrClient.java | 2 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 2 +-
.../solr/client/solrj/io/stream/StreamingTest.java | 7 +
solr/test-framework/ivy.xml | 2 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 -
.../java/org/apache/solr/cloud/ConfigRequest.java | 5 +
solr/webapp/web/css/angular/collections.css | 2 +-
solr/webapp/web/css/angular/dashboard.css | 4 +-
solr/webapp/web/css/angular/menu.css | 2 +-
solr/webapp/web/css/angular/replication.css | 10 +-
.../img/ico/{node-slave.png => node-follower.png} | Bin
.../img/ico/{node-master.png => node-leader.png} | Bin
.../web/js/angular/controllers/core-overview.js | 4 +-
.../web/js/angular/controllers/replication.js | 108 +-
solr/webapp/web/partials/core_overview.html | 38 +-
solr/webapp/web/partials/replication.html | 62 +-
versions.lock | 4 +-
versions.props | 2 +-
327 files changed, 9239 insertions(+), 4458 deletions(-)