You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2021/03/10 09:56:15 UTC

[lucene] 04/04: Merge branch 'master' into jira/solr-15130

This is an automated email from the ASF dual-hosted git repository.

dweiss pushed a commit to branch jira/solr-15130
in repository https://gitbox.apache.org/repos/asf/lucene.git

commit a96d8ba0dc70d89735de61d09dcc9a4edddaddf6
Merge: 9bd4c42 227ef3b
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Feb 15 18:07:29 2021 +0100

    Merge branch 'master' into jira/solr-15130

 build.gradle                                       |   1 +
 gradle/ant-compat/folder-layout.gradle             |  20 +
 gradle/documentation/render-javadoc.gradle         |   2 -
 gradle/generation/icu.gradle                       | 210 ++++++
 gradle/validation/forbidden-apis.gradle            |  17 +
 gradle/validation/rat-sources.gradle               |  10 +-
 lucene/CHANGES.txt                                 |   4 +-
 .../lucene/analysis/hunspell/Dictionary.java       |  37 +-
 .../analysis/hunspell/GeneratingSuggester.java     |  61 +-
 .../hunspell/{SpellChecker.java => Hunspell.java}  | 106 ++-
 .../analysis/hunspell/ModifyingSuggester.java      |   4 +-
 .../org/apache/lucene/analysis/hunspell/Root.java} |  39 +-
 .../apache/lucene/analysis/hunspell/Stemmer.java   |  44 +-
 .../lucene/analysis/hunspell/package-info.java     |   6 +-
 .../analysis/hunspell/TestAllDictionaries.java     |  52 +-
 .../lucene/analysis/hunspell/TestDutchIJ.java      |   1 -
 .../hunspell/TestHunspellRepositoryTestCases.java  |   7 +-
 .../lucene/analysis/hunspell/TestPerformance.java  |   2 +-
 ...pellCheckerTest.java => TestSpellChecking.java} |  22 +-
 .../lucene/analysis/hunspell/forbiddenword.aff     |  11 +
 .../lucene/analysis/hunspell/forbiddenword.dic     |  11 +
 .../lucene/analysis/hunspell/forbiddenword.good    |   3 +
 .../lucene/analysis/hunspell/forbiddenword.wrong   |   4 +
 .../apache/lucene/analysis/hunspell/forceucase.sug |   2 +
 .../apache/lucene/analysis/hunspell/nosuggest.aff  |   5 +
 .../apache/lucene/analysis/hunspell/nosuggest.dic  |   3 +
 .../apache/lucene/analysis/hunspell/nosuggest.good |   3 +
 .../apache/lucene/analysis/hunspell/nosuggest.sug  |   0
 .../lucene/analysis/hunspell/nosuggest.wrong       |   3 +
 .../analysis/hunspell/opentaal_forbiddenword1.aff  |   9 +
 .../analysis/hunspell/opentaal_forbiddenword1.dic  |   5 +
 .../analysis/hunspell/opentaal_forbiddenword1.good |   3 +
 .../analysis/hunspell/opentaal_forbiddenword1.sug  |   1 +
 .../hunspell/opentaal_forbiddenword1.wrong         |   5 +
 .../analysis/hunspell/opentaal_forbiddenword2.aff  |   7 +
 .../analysis/hunspell/opentaal_forbiddenword2.dic  |   5 +
 .../analysis/hunspell/opentaal_forbiddenword2.good |   4 +
 .../analysis/hunspell/opentaal_forbiddenword2.sug  |   1 +
 .../hunspell/opentaal_forbiddenword2.wrong         |   5 +
 .../analysis/standard/GenerateJflexTLDMacros.java  |  16 +-
 .../analysis/icu/GenerateUTR30DataFiles.java       |  97 +--
 .../lucene/analysis/icu/RBBIRuleCompiler.java      |  51 +-
 .../codecs/lucene86/Lucene86PointsFormat.java      |   5 +-
 .../codecs/lucene90/Lucene90FieldInfosFormat.java  |   8 +-
 .../codecs/lucene90/Lucene90VectorWriter.java      |  15 +-
 .../java/org/apache/lucene/document/FieldType.java |   3 +-
 .../java/org/apache/lucene/index/CodecReader.java  |  15 +
 .../org/apache/lucene/index/ReadersAndUpdates.java |   4 +-
 .../codecs/lucene90/TestLucene90VectorFormat.java} |  19 +-
 .../lucene/index/BaseFieldInfoFormatTestCase.java  |  55 +-
 .../lucene/index/BaseVectorFormatTestCase.java}    | 150 ++--
 solr/CHANGES.txt                                   |  22 +-
 .../org/apache/solr/ltr/model/LTRScoringModel.java |   2 +-
 .../org/apache/solr/ltr/model/LinearModel.java     |   4 +-
 .../solr/ltr/store/rest/ManagedModelStore.java     |  17 +-
 .../linear-model_notExistentFeature.json           |  19 +
 .../linear-model_notExistentStore.json             |  46 ++
 ...ultipleadditivetreesmodel_notExistentStore.json |  39 +
 .../multipleadditivetreesmodel_unknownFeature.json |  38 +
 .../org/apache/solr/ltr/model/TestLinearModel.java |  47 ++
 .../ltr/model/TestMultipleAdditiveTreesModel.java  |  25 +
 .../solr/cloud/DistributedClusterStateUpdater.java | 822 +++++++++++++++++++++
 .../src/java/org/apache/solr/cloud/Overseer.java   |  88 ++-
 .../apache/solr/cloud/OverseerNodePrioritizer.java |  18 +-
 .../solr/cloud/RefreshCollectionMessage.java       |  50 ++
 .../solr/cloud/ShardLeaderElectionContext.java     |  15 +-
 .../solr/cloud/ShardLeaderElectionContextBase.java |   9 +-
 .../java/org/apache/solr/cloud/ZkController.java   |  82 +-
 .../solr/cloud/api/collections/AddReplicaCmd.java  |  18 +-
 .../solr/cloud/api/collections/AliasCmd.java       |   2 +-
 .../solr/cloud/api/collections/BackupCmd.java      |  53 +-
 .../cloud/api/collections/CreateCollectionCmd.java | 166 ++++-
 .../solr/cloud/api/collections/CreateShardCmd.java |  16 +-
 .../cloud/api/collections/DeleteBackupCmd.java     | 214 +++++-
 .../cloud/api/collections/DeleteCollectionCmd.java |  11 +-
 .../solr/cloud/api/collections/DeleteShardCmd.java |  22 +-
 .../solr/cloud/api/collections/MigrateCmd.java     |   8 +-
 .../OverseerCollectionMessageHandler.java          |  97 ++-
 .../cloud/api/collections/OverseerStatusCmd.java   |  10 +
 .../api/collections/ReindexCollectionCmd.java      |  29 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |  52 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |  62 +-
 .../solr/cloud/overseer/CollectionMutator.java     |  23 +-
 .../apache/solr/cloud/overseer/NodeMutator.java    |  90 ++-
 .../apache/solr/cloud/overseer/SliceMutator.java   |   2 +-
 .../apache/solr/cloud/overseer/ZkStateWriter.java  |  31 +-
 .../apache/solr/cloud/overseer/ZkWriteCommand.java |  43 +-
 .../src/java/org/apache/solr/core/CloudConfig.java |  17 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   3 +
 .../java/org/apache/solr/core/SolrXmlConfig.java   |   3 +
 .../apache/solr/core/backup/BackupProperties.java  |   2 +-
 .../repository/LocalFileSystemRepository.java      |  32 +-
 .../apache/solr/handler/CollectionBackupsAPI.java  |  70 ++
 .../org/apache/solr/handler/CollectionsAPI.java    |   1 -
 .../apache/solr/handler/admin/BackupCoreOp.java    |   2 +-
 .../solr/handler/admin/CollectionsHandler.java     | 146 +++-
 .../java/org/apache/solr/response/JSONWriter.java  |   8 +-
 .../org/apache/solr/search/MaxScoreCollector.java  |   7 +-
 .../processor/DistributedZkUpdateProcessor.java    |  12 +-
 .../conf/solrconfig-cache-enable-disable.xml       |  15 +-
 .../conf/solrconfig-memory-circuitbreaker.xml      |   8 +-
 .../solr/cloud/CreateCollectionCleanupTest.java    |   4 +-
 .../org/apache/solr/cloud/DeleteReplicaTest.java   |  34 +-
 .../org/apache/solr/cloud/DeleteShardTest.java     |  13 +-
 .../test/org/apache/solr/cloud/MockSolrSource.java |  15 +-
 .../OverseerCollectionConfigSetProcessorTest.java  | 266 +++++--
 .../org/apache/solr/cloud/OverseerRolesTest.java   |   7 +-
 .../org/apache/solr/cloud/OverseerStatusTest.java  |  35 +-
 .../test/org/apache/solr/cloud/OverseerTest.java   |  43 +-
 .../solr/cloud/TestRandomRequestDistribution.java  |  11 +-
 .../solr/cloud/TestSkipOverseerOperations.java     |  29 +-
 .../org/apache/solr/cloud/ZkControllerTest.java    |  21 +-
 .../BackupRestoreApiErrorConditionsTest.java       | 211 ++++++
 .../LocalFSCloudIncrementalBackupTest.java         |  13 +-
 .../solr/cloud/api/collections/PurgeGraphTest.java | 187 +++++
 .../apache/solr/core/DirectoryFactoriesTest.java   |   4 +-
 .../src/test/org/apache/solr/core/TestConfig.java  |  18 +-
 .../solr/handler/TestIncrementalCoreBackup.java    |  76 +-
 .../solr/handler/TestStressIncrementalBackup.java  |  22 +-
 .../solr/handler/TestStressThreadBackup.java       |   5 +-
 .../solr/handler/admin/AdminHandlersProxyTest.java |  33 -
 .../admin/V2CollectionBackupsAPIMappingTest.java   | 136 ++++
 solr/server/solr/solr.xml                          |   1 +
 solr/solr-ref-guide/src/_layouts/default.html      |   2 +-
 solr/solr-ref-guide/src/_layouts/home.html         |   2 +-
 solr/solr-ref-guide/src/collection-management.adoc | 205 +++++
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |   4 +
 .../src/major-changes-in-solr-9.adoc               |   9 +
 .../src/making-and-restoring-backups.adoc          |   4 +-
 .../solr-ref-guide/src/parallel-sql-interface.adoc |   2 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |  10 +
 .../client/solrj/io/graph/GatherNodesStream.java   | 108 ++-
 .../apache/solr/client/solrj/io/graph/Node.java    |   2 +-
 .../solrj/request/CollectionAdminRequest.java      | 202 ++++-
 .../solrj/request/beans/DeleteBackupPayload.java   |  36 +-
 .../solrj/request/beans/ListBackupPayload.java     |  24 +-
 .../apache/solr/common/cloud/PerReplicaStates.java |  13 +
 .../solr/common/cloud/PerReplicaStatesOps.java     |  58 +-
 .../org/apache/solr/common/cloud/ZkNodeProps.java  |  25 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |  12 +-
 .../apache/solr/common/params/CoreAdminParams.java |   5 +
 .../client/solrj/impl/CloudSolrClientTest.java     |   8 +
 .../client/solrj/io/graph/GraphExpressionTest.java |  72 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |   1 +
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |  54 ++
 .../collections/AbstractIncrementalBackupTest.java |  74 +-
 146 files changed, 4813 insertions(+), 1094 deletions(-)