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 2021/01/20 14:25:17 UTC
[lucene-solr] 02/02: Merge branch 'master' into jira/solr-15055-2
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-15055-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit c8144dd88af9f9f762cd4867f9ed449a8411583b
Merge: 301a0ee 939699f
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Jan 20 15:24:49 2021 +0100
Merge branch 'master' into jira/solr-15055-2
gradle/native/disable-native.gradle | 4 +-
gradle/testing/randomization/policies/tests.policy | 2 +-
gradle/validation/rat-sources.gradle | 2 +
lucene/CHANGES.txt | 25 +-
lucene/MIGRATE.md | 12 +
.../lucene/analysis/hunspell/Dictionary.java | 472 ++++++----
.../lucene/analysis/hunspell/SpellChecker.java | 104 +++
.../apache/lucene/analysis/hunspell/Stemmer.java | 282 +++---
.../apache/lucene/analysis/hunspell/WordCase.java | 61 ++
.../org/apache/lucene/analysis/hunspell/IJ.aff | 8 +
.../org/apache/lucene/analysis/hunspell/IJ.dic | 3 +
.../lucene/analysis/hunspell/SpellCheckerTest.java | 71 ++
.../{TestEscaped.java => TestAllCaps.java} | 25 +-
.../lucene/analysis/hunspell/TestDictionary.java | 41 +-
.../{TestEscaped.java => TestDutchIJ.java} | 12 +-
.../lucene/analysis/hunspell/TestEscaped.java | 2 +-
.../apache/lucene/analysis/hunspell/allcaps.aff | 5 +
.../apache/lucene/analysis/hunspell/allcaps.dic | 3 +
.../org/apache/lucene/analysis/hunspell/break.aff | 10 +
.../org/apache/lucene/analysis/hunspell/break.dic | 7 +
.../org/apache/lucene/analysis/hunspell/break.good | 12 +
.../apache/lucene/analysis/hunspell/break.wrong | 13 +
.../lucene/analysis/hunspell/breakdefault.aff | 6 +
.../lucene/analysis/hunspell/breakdefault.dic | 6 +
.../lucene/analysis/hunspell/breakdefault.good | 7 +
.../lucene/analysis/hunspell/breakdefault.wrong | 6 +
.../apache/lucene/analysis/hunspell/breakoff.aff | 7 +
.../apache/lucene/analysis/hunspell/breakoff.dic | 6 +
.../apache/lucene/analysis/hunspell/breakoff.good | 3 +
.../apache/lucene/analysis/hunspell/breakoff.wrong | 5 +
.../apache/lucene/analysis/hunspell/escaped.aff | 1 +
.../backward_codecs/lucene70/IndexedDISI.java | 326 +++++++
.../backward_codecs/lucene70/Lucene70Codec.java | 140 +++
.../lucene70/Lucene70DocValuesConsumer.java} | 490 +++--------
.../lucene70/Lucene70DocValuesFormat.java} | 65 +-
.../lucene70/Lucene70DocValuesProducer.java} | 458 +++-------
.../lucene70/Lucene70NormsConsumer.java | 169 ++++
.../lucene70/Lucene70NormsFormat.java | 106 +++
.../lucene70/Lucene70NormsProducer.java | 464 ++++++++++
.../services/org.apache.lucene.codecs.Codec | 1 +
.../org.apache.lucene.codecs.DocValuesFormat | 1 +
.../backward_codecs/lucene70/Lucene70RWCodec.java | 55 ++
.../backward_codecs/lucene70/TestIndexedDISI.java | 248 ++++++
.../lucene70/TestLucene70DocValuesFormat.java | 694 +++++++++++++++
.../lucene70/TestLucene70NormsFormat.java | 19 +-
.../backward_index/TestBackwardsCompatibility.java | 72 +-
.../codecs/lucene80/Lucene80DocValuesConsumer.java | 3 +-
.../codecs/lucene80/Lucene80DocValuesFormat.java | 3 +
.../codecs/lucene80/Lucene80DocValuesProducer.java | 43 +-
.../java/org/apache/lucene/index/CheckIndex.java | 4 +-
.../org/apache/lucene/index/DirectoryReader.java | 21 +-
.../lucene/index/IndexFormatTooOldException.java | 9 +-
.../java/org/apache/lucene/index/IndexWriter.java | 8 +
.../apache/lucene/index/ParallelLeafReader.java | 1 +
.../java/org/apache/lucene/index/SegmentInfos.java | 31 +-
.../lucene/index/StandardDirectoryReader.java | 19 +-
.../java/org/apache/lucene/index/TermsEnum.java | 15 +-
.../lucene/search/similarities/BM25Similarity.java | 54 +-
.../src/java/org/apache/lucene/util/Version.java | 6 +
.../apache/lucene/index/TestDirectoryReader.java | 15 +
.../search/similarities/TestBooleanSimilarity.java | 1 -
.../search/similarities/TestClassicSimilarity.java | 1 -
.../search/similarities/TestSimilarityBase.java | 5 +-
.../lucene/luke/models/search/SearchImpl.java | 4 +-
lucene/misc/native/build.gradle | 10 +-
.../misc/native/src/main/posix/NativePosixUtil.cpp | 346 --------
.../search/similarity/LegacyBM25Similarity.java | 25 +-
.../lucene/misc/store/DirectIODirectory.java | 443 ++++++++++
.../apache/lucene/misc/store/NativePosixUtil.java | 55 --
.../lucene/misc/store/NativeUnixDirectory.java | 451 ----------
lucene/misc/src/java/overview.html | 27 +-
.../lucene/misc/store/NativeUnixDirectoryTest.java | 48 -
.../lucene/misc/store/TestDirectIODirectory.java | 139 +++
.../apache/lucene/store/BaseDirectoryTestCase.java | 4 +-
solr/CHANGES.txt | 31 +
.../solr/ltr/feature/TestEdisMaxSolrFeature.java | 21 +
.../solr/cloud/ShardLeaderElectionContextBase.java | 18 +-
.../java/org/apache/solr/cloud/ZkController.java | 55 +-
.../OverseerCollectionMessageHandler.java | 7 +-
.../solr/cloud/overseer/CollectionMutator.java | 32 +-
.../apache/solr/cloud/overseer/NodeMutator.java | 11 +-
.../apache/solr/cloud/overseer/ReplicaMutator.java | 17 +-
.../apache/solr/cloud/overseer/SliceMutator.java | 46 +-
.../apache/solr/cloud/overseer/ZkStateWriter.java | 73 +-
.../apache/solr/cloud/overseer/ZkWriteCommand.java | 20 +
.../org/apache/solr/core/DirectoryFactory.java | 2 +-
.../src/java/org/apache/solr/core/PluginBag.java | 1 -
.../src/java/org/apache/solr/core/SolrCore.java | 47 +-
.../org/apache/solr/core/SolrResourceLoader.java | 70 +-
.../org/apache/solr/handler/SolrConfigHandler.java | 29 +-
.../solr/handler/admin/CollectionsHandler.java | 14 +-
.../solr/handler/component/SearchHandler.java | 26 +-
.../solr/handler/export/BoolFieldWriter.java | 34 +-
.../solr/handler/export/DateFieldWriter.java | 23 +-
.../solr/handler/export/DoubleFieldWriter.java | 21 +-
.../apache/solr/handler/export/DoubleValue.java | 8 +-
.../solr/handler/export/DoubleValueSortDoc.java | 38 +-
.../apache/solr/handler/export/ExportBuffers.java | 76 +-
.../apache/solr/handler/export/ExportWriter.java | 329 +++++--
.../solr/handler/export/ExportWriterStream.java | 32 +-
.../apache/solr/handler/export/FieldWriter.java | 4 +-
.../solr/handler/export/FloatFieldWriter.java | 22 +-
.../org/apache/solr/handler/export/FloatValue.java | 8 +-
.../apache/solr/handler/export/IntFieldWriter.java | 22 +-
.../org/apache/solr/handler/export/IntValue.java | 8 +-
.../solr/handler/export/LongFieldWriter.java | 23 +-
.../org/apache/solr/handler/export/LongValue.java | 4 +
.../solr/handler/export/MultiFieldWriter.java | 57 +-
.../solr/handler/export/QuadValueSortDoc.java | 47 +-
.../solr/handler/export/SingleValueSortDoc.java | 33 +-
.../org/apache/solr/handler/export/SortDoc.java | 35 +-
.../org/apache/solr/handler/export/SortValue.java | 19 +-
.../solr/handler/export/StringFieldWriter.java | 94 +-
.../apache/solr/handler/export/StringValue.java | 31 +-
.../solr/handler/export/TripleValueSortDoc.java | 44 +-
.../solr/index/SlowCompositeReaderWrapper.java | 3 +-
.../java/org/apache/solr/pkg/PackageListeners.java | 15 +-
.../solr/pkg/PackageListeningClassLoader.java | 73 +-
.../org/apache/solr/pkg/PackagePluginHolder.java | 16 +-
.../java/org/apache/solr/search/CacheConfig.java | 44 +-
.../solr/search/CollapsingQParserPlugin.java | 607 ++++++++++++-
.../search/similarities/BM25SimilarityFactory.java | 24 +-
.../similarities/LegacyBM25SimilarityFactory.java | 24 +-
.../java/org/apache/solr/update/UpdateHandler.java | 13 +-
.../java/org/apache/solr/util/SolrLogPostTool.java | 27 +-
.../solr/configsets/conf2/conf/schema.xml | 43 +
.../solr/configsets/conf2/conf/solrconfig.xml | 68 ++
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 25 +-
.../org/apache/solr/cloud/ZkSolrClientTest.java | 31 +
.../solr/handler/PingRequestHandlerTest.java | 2 +
.../org/apache/solr/handler/TestSQLHandler.java | 4 +-
.../solr/handler/TestStressThreadBackup.java | 12 +-
.../solr/handler/admin/HealthCheckHandlerTest.java | 1 +
.../handler/admin/MetricsHistoryHandlerTest.java | 3 +-
.../solr/handler/component/SearchHandlerTest.java | 4 +
.../src/test/org/apache/solr/pkg/TestPackages.java | 95 +-
.../transform/TestSubQueryTransformerDistrib.java | 2 +
.../apache/solr/schema/TestManagedSchemaAPI.java | 2 +
.../org/apache/solr/search/TestBlockCollapse.java | 972 +++++++++++++++++++++
.../search/facet/TestCloudJSONFacetJoinDomain.java | 1 +
.../solr/search/facet/TestCloudJSONFacetSKG.java | 1 +
.../search/facet/TestCloudJSONFacetSKGEquiv.java | 1 +
.../search/join/CrossCollectionJoinQueryTest.java | 2 +
.../apache/solr/search/stats/TestDistribIDF.java | 3 +-
.../processor/TemplateUpdateProcessorTest.java | 2 +-
.../solr/util/tracing/TestDistributedTracing.java | 1 +
.../src/cert-authentication-plugin.adoc | 3 +-
solr/solr-ref-guide/src/cluster-plugins.adoc | 56 +-
.../src/collapse-and-expand-results.adoc | 31 +-
solr/solr-ref-guide/src/collection-management.adoc | 3 +
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 2 +-
solr/solr-ref-guide/src/highlighting.adoc | 2 +-
solr/solr-ref-guide/src/json-facet-api.adoc | 44 +-
solr/solr-ref-guide/src/learning-to-rank.adoc | 18 +-
.../src/major-changes-in-solr-9.adoc | 2 +-
solr/solr-ref-guide/src/metrics-reporting.adoc | 2 +-
...onitoring-solr-with-prometheus-and-grafana.adoc | 8 +-
solr/solr-ref-guide/src/pagination-of-results.adoc | 11 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 47 +-
.../src/updating-parts-of-documents.adoc | 2 +-
.../client/solrj/cloud/DistribStateManager.java | 7 +
.../client/solrj/impl/SolrClientCloudManager.java | 5 +-
.../client/solrj/impl/ZkDistribStateManager.java | 6 +
.../solrj/request/CollectionAdminRequest.java | 8 +
.../org/apache/solr/common/cloud/ClusterState.java | 73 ++
.../apache/solr/common/cloud/DocCollection.java | 83 +-
.../apache/solr/common/cloud/PerReplicaStates.java | 312 +++++++
.../solr/common/cloud/PerReplicaStatesOps.java | 305 +++++++
.../java/org/apache/solr/common/cloud/Replica.java | 73 +-
.../java/org/apache/solr/common/cloud/Slice.java | 22 +-
.../org/apache/solr/common/cloud/SolrZkClient.java | 12 +
.../apache/solr/common/cloud/ZkStateReader.java | 88 +-
.../resources/apispec/collections.Commands.json | 5 +
.../IndexingNestedDocuments.java | 7 +-
.../JsonRequestApiHeatmapFacetingTest.java | 4 +-
.../ref_guide_examples/JsonRequestApiTest.java | 3 +-
.../UsingSolrJRefGuideExamplesTest.java | 1 +
.../client/solrj/impl/CloudSolrClientTest.java | 72 +-
.../solrj/io/stream/CloudAuthStreamTest.java | 8 +-
.../client/solrj/io/stream/JDBCStreamTest.java | 4 +-
.../client/solrj/io/stream/MathExpressionTest.java | 5 +-
.../solrj/io/stream/SelectWithEvaluatorsTest.java | 4 +-
.../solrj/io/stream/StreamDecoratorTest.java | 51 +-
...ectJsonQueryRequestFacetingIntegrationTest.java | 8 +-
.../JsonQueryRequestFacetingIntegrationTest.java | 8 +-
.../json/JsonQueryRequestHeatmapFacetingTest.java | 4 +-
.../cloud/TestCloudCollectionsListeners.java | 4 +
.../common/cloud/TestCollectionStateWatchers.java | 21 +-
.../solr/common/cloud/TestPerReplicaStates.java | 133 +++
.../org/apache/solr/cloud/SolrCloudTestCase.java | 1 +
190 files changed, 8668 insertions(+), 2875 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java
index be8f07a,ecf06e4..32e27c7
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java
@@@ -39,11 -39,13 +39,14 @@@ import org.apache.solr.cloud.api.collec
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection;
+ import org.apache.solr.common.cloud.PerReplicaStatesOps;
import org.apache.solr.common.cloud.Replica;
+ import org.apache.solr.common.cloud.PerReplicaStates;
import org.apache.solr.common.cloud.Slice;
+ import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CollectionAdminParams;
import org.apache.solr.common.util.Utils;
import org.apache.solr.util.TestInjection;
import org.slf4j.Logger;
diff --cc solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
index 71c88f9,019339e..2594ee4
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java
@@@ -25,13 -25,18 +25,17 @@@ import java.util.Set
import com.google.common.collect.ImmutableSet;
import org.apache.solr.client.solrj.cloud.DistribStateManager;
import org.apache.solr.client.solrj.cloud.SolrCloudManager;
+ import org.apache.solr.client.solrj.impl.SolrClientCloudManager;
import org.apache.solr.cloud.Overseer;
import org.apache.solr.cloud.api.collections.Assign;
-import org.apache.solr.cloud.api.collections.OverseerCollectionMessageHandler;
import org.apache.solr.common.cloud.ClusterState;
import org.apache.solr.common.cloud.DocCollection;
+ import org.apache.solr.common.cloud.PerReplicaStatesOps;
import org.apache.solr.common.cloud.Replica;
+ import org.apache.solr.common.cloud.PerReplicaStates;
import org.apache.solr.common.cloud.RoutingRule;
import org.apache.solr.common.cloud.Slice;
+ import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;