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:15 UTC
[lucene-solr] branch jira/solr-15055-2 updated (bb0c600 -> c8144dd)
This is an automated email from the ASF dual-hosted git repository.
ab pushed a change to branch jira/solr-15055-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from bb0c600 SOLR-15055: Minor refactoring for clarity.
new 301a0ee SOLR-15055: Add javadocs + fix precommit.
add 9466af5 SOLR-14155: Load all other SolrCore plugins from packages (#1666)
add f285f02 SOLR-15071: add TestEdisMaxSolrFeature.testEdisMaxSolrFeatureCustomMM() test case (#2201)
add 90131a6 LUCENE-9665: Hunspell: support default encoding (#2203, Peter Gromov via Dawid Weiss)
add 82f6f16 LUCENE-9664: Hunspell support: fix most IntelliJ warnings, cleanup (#2202)
add cc1d902 fix typo in Adrien's name!
add cb46504 SOLR-14560: ref guide: remove references to XML output when examples are all JSON
add 90aabbd Ref guide: add license to cluster-plugins.adoc; fix section title case throughout
add 30aa0f5 Ref Guide: copy edits for 8.8 release
add eb24e95 LUCENE-9661: Fix deadlock in TermsEnum.EMPTY
add a7747b6 LUCENE-8982: Make NativeUnixDirectory pure java with FileChannel direct IO flag, and rename to DirectIODirectory (#2052)
add 4b508ae LUCENE-8982: Add a note to MIGRATE.md
add 8505d4d SOLR-15052: Per-replica states for reducing overseer bottlenecks (trunk) (#2177)
add ab08fdc LUCENE-9671: Hunspell: shorten Stemmer.applyAffix (#2209)
add 426c902 LUCENE-9677: simplify Dictionary.affixData storage (#2218)
add c1ae6dc LUCENE-9669: Add an expert API to allow opening indices created < N-1 (#2212)
add 422c89b LUCENE-9676: Hunspell: improve stemming of all-caps words (#2217)
add 9f5bdf4 LUCENE-9678: Hunspell: fix off-by-one error to support prefixes of word.length - 1 (#2219)
add 227256d LUCENE-9646: Set BM25Similarity discountOverlaps via the constructor
add 5af12b5 LUCENE-9675: Binary doc values fields now expose their configured compression mode in the attributes of the field info.
add 12e42a2 Ref Guide: update upgrade notes for 8.8 release
add a4aa3d1 SOLR-15079: Block Collapse - Faster collapse code when groups are co-located via Block Join style nested doc indexing.
add df69207 rectify 8.9 CHANGES sections from branch_8x
add 1aeb1dc LUCENE-9669: Restore Lucene70Codec (#2221)
add 64df5a6 SOLR-14608: Faster sorting for the /export handler
add 5328ced SOLR-14608: Reduce percentage of priority queue size above total hits
add a233ed2 SOLR-15081: Metrics for core: isLeader, replicaState (#2198)
add 939699f LUCENE-9667: Hunspell: add spellchecker API, support BREAK and FORBIDDENWORD affix rules (#2207)
new c8144dd Merge branch 'master' into jira/solr-15055-2
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 | 20 +-
.../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 +-
.../apache/solr/cloud/api/collections/Assign.java | 1 -
.../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 +
.../cluster/placement/DeleteCollectionRequest.java | 2 +-
.../cluster/placement/DeleteReplicasRequest.java | 2 +-
.../cluster/placement/DeleteShardsRequest.java | 2 +-
.../cluster/placement/ModificationRequest.java | 2 +-
.../solr/cluster/placement/PlacementContext.java | 2 +-
.../placement/PlacementModificationException.java | 12 +-
.../placement/impl/ModificationRequestImpl.java | 1 -
.../cluster/placement/impl/ReplicaMetricImpl.java | 3 +
.../placement/impl/SimplePlacementContextImpl.java | 3 +-
.../plugins/MinimizeCoresPlacementFactory.java | 1 -
.../placement/plugins/RandomPlacementFactory.java | 1 -
.../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 +
.../plugins/AffinityPlacementFactoryTest.java | 1 -
.../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 +
203 files changed, 8688 insertions(+), 2889 deletions(-)
create mode 100644 lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/SpellChecker.java
create mode 100644 lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/WordCase.java
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/IJ.aff
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/IJ.dic
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/SpellCheckerTest.java
copy lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/{TestEscaped.java => TestAllCaps.java} (64%)
copy lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/{TestEscaped.java => TestDutchIJ.java} (76%)
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/allcaps.aff
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/allcaps.dic
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/break.aff
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/break.dic
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/break.good
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/break.wrong
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/breakdefault.aff
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/breakdefault.dic
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/breakdefault.good
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/breakdefault.wrong
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/breakoff.aff
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/breakoff.dic
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/breakoff.good
create mode 100644 lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/breakoff.wrong
create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/IndexedDISI.java
create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70Codec.java
copy lucene/{core/src/java/org/apache/lucene/codecs/lucene80/Lucene80DocValuesConsumer.java => backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesConsumer.java} (54%)
copy lucene/{core/src/java/org/apache/lucene/codecs/lucene80/Lucene80DocValuesFormat.java => backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesFormat.java} (76%)
copy lucene/{core/src/java/org/apache/lucene/codecs/lucene80/Lucene80DocValuesProducer.java => backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70DocValuesProducer.java} (76%)
create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70NormsConsumer.java
create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70NormsFormat.java
create mode 100644 lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene70/Lucene70NormsProducer.java
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/Lucene70RWCodec.java
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestIndexedDISI.java
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70DocValuesFormat.java
copy solr/core/src/java/org/apache/solr/cluster/placement/ModificationRequest.java => lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/TestLucene70NormsFormat.java (70%)
delete mode 100644 lucene/misc/native/src/main/posix/NativePosixUtil.cpp
create mode 100644 lucene/misc/src/java/org/apache/lucene/misc/store/DirectIODirectory.java
delete mode 100644 lucene/misc/src/java/org/apache/lucene/misc/store/NativePosixUtil.java
delete mode 100644 lucene/misc/src/java/org/apache/lucene/misc/store/NativeUnixDirectory.java
delete mode 100644 lucene/misc/src/test/org/apache/lucene/misc/store/NativeUnixDirectoryTest.java
create mode 100644 lucene/misc/src/test/org/apache/lucene/misc/store/TestDirectIODirectory.java
create mode 100644 solr/core/src/test-files/solr/configsets/conf2/conf/schema.xml
create mode 100644 solr/core/src/test-files/solr/configsets/conf2/conf/solrconfig.xml
create mode 100644 solr/core/src/test/org/apache/solr/search/TestBlockCollapse.java
create mode 100644 solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStates.java
create mode 100644 solr/solrj/src/java/org/apache/solr/common/cloud/PerReplicaStatesOps.java
create mode 100644 solr/solrj/src/test/org/apache/solr/common/cloud/TestPerReplicaStates.java
[lucene-solr] 02/02: Merge branch 'master' into jira/solr-15055-2
Posted by ab...@apache.org.
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;
[lucene-solr] 01/02: SOLR-15055: Add javadocs + fix precommit.
Posted by ab...@apache.org.
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 301a0ee680b480dbaea6f32589d79b4ce407c844
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Wed Jan 20 15:23:47 2021 +0100
SOLR-15055: Add javadocs + fix precommit.
---
.../java/org/apache/solr/cloud/api/collections/Assign.java | 1 -
.../solr/cluster/placement/DeleteCollectionRequest.java | 2 +-
.../apache/solr/cluster/placement/DeleteReplicasRequest.java | 2 +-
.../apache/solr/cluster/placement/DeleteShardsRequest.java | 2 +-
.../apache/solr/cluster/placement/ModificationRequest.java | 2 +-
.../org/apache/solr/cluster/placement/PlacementContext.java | 2 +-
.../cluster/placement/PlacementModificationException.java | 12 +++++++++++-
.../solr/cluster/placement/impl/ModificationRequestImpl.java | 1 -
.../solr/cluster/placement/impl/ReplicaMetricImpl.java | 3 +++
.../cluster/placement/impl/SimplePlacementContextImpl.java | 3 ++-
.../placement/plugins/MinimizeCoresPlacementFactory.java | 1 -
.../cluster/placement/plugins/RandomPlacementFactory.java | 1 -
.../placement/plugins/AffinityPlacementFactoryTest.java | 1 -
13 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
index d0d1f88..3c40d46 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
@@ -40,7 +40,6 @@ import org.apache.solr.client.solrj.cloud.SolrCloudManager;
import org.apache.solr.client.solrj.cloud.AlreadyExistsException;
import org.apache.solr.client.solrj.cloud.BadVersionException;
import org.apache.solr.client.solrj.cloud.VersionedData;
-import org.apache.solr.cluster.placement.ModificationRequest;
import org.apache.solr.cluster.placement.PlacementPlugin;
import org.apache.solr.cluster.placement.impl.PlacementPluginAssignStrategy;
import org.apache.solr.common.SolrException;
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/DeleteCollectionRequest.java b/solr/core/src/java/org/apache/solr/cluster/placement/DeleteCollectionRequest.java
index b5dabc5..fdd3f8b 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/DeleteCollectionRequest.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/DeleteCollectionRequest.java
@@ -17,7 +17,7 @@
package org.apache.solr.cluster.placement;
/**
- *
+ * Delete collection request.
*/
public interface DeleteCollectionRequest extends ModificationRequest {
}
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/DeleteReplicasRequest.java b/solr/core/src/java/org/apache/solr/cluster/placement/DeleteReplicasRequest.java
index 09f5762..3ce755d 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/DeleteReplicasRequest.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/DeleteReplicasRequest.java
@@ -22,7 +22,7 @@ import org.apache.solr.cluster.Replica;
import java.util.Set;
/**
- *
+ * Delete replicas request.
*/
public interface DeleteReplicasRequest extends ModificationRequest {
Set<Replica> getReplicas();
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/DeleteShardsRequest.java b/solr/core/src/java/org/apache/solr/cluster/placement/DeleteShardsRequest.java
index 5bff54f..3638223 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/DeleteShardsRequest.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/DeleteShardsRequest.java
@@ -20,7 +20,7 @@ package org.apache.solr.cluster.placement;
import java.util.Set;
/**
- *
+ * Delete shards request.
*/
public interface DeleteShardsRequest extends ModificationRequest {
Set<String> getShardNames();
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/ModificationRequest.java b/solr/core/src/java/org/apache/solr/cluster/placement/ModificationRequest.java
index 964d9bf..4aed2ba 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/ModificationRequest.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/ModificationRequest.java
@@ -20,7 +20,7 @@ package org.apache.solr.cluster.placement;
import org.apache.solr.cluster.SolrCollection;
/**
- *
+ * Collection modification request.
*/
public interface ModificationRequest {
/**
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/PlacementContext.java b/solr/core/src/java/org/apache/solr/cluster/placement/PlacementContext.java
index 89deecd..617f6f6 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/PlacementContext.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/PlacementContext.java
@@ -20,7 +20,7 @@ package org.apache.solr.cluster.placement;
import org.apache.solr.cluster.Cluster;
/**
- *
+ * Placement context makes it easier to pass around and access main placement-related components.
*/
public interface PlacementContext {
/**
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/PlacementModificationException.java b/solr/core/src/java/org/apache/solr/cluster/placement/PlacementModificationException.java
index 19a7dd7..d9162e1 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/PlacementModificationException.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/PlacementModificationException.java
@@ -4,7 +4,9 @@ import java.util.HashMap;
import java.util.Map;
/**
- *
+ * Exception thrown when a placement modification is rejected by the placement plugin.
+ * Additional details about the reasons are provided if available
+ * in {@link #getRejectedModifications()} or in the {@link #toString()} methods.
*/
public class PlacementModificationException extends PlacementException {
private final Map<String, String> rejectedModifications = new HashMap<>();
@@ -25,10 +27,18 @@ public class PlacementModificationException extends PlacementException {
super(cause);
}
+ /**
+ * Add information about the modification that cause this exception.
+ * @param modification requested modification details
+ * @param reason reason for rejection
+ */
public void addRejectedModification(String modification, String reason) {
rejectedModifications.put(modification, reason);
}
+ /**
+ * Return rejected modifications and reasons for rejections.
+ */
public Map<String, String> getRejectedModifications() {
return rejectedModifications;
}
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/ModificationRequestImpl.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/ModificationRequestImpl.java
index f6889d2..7daff45 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/ModificationRequestImpl.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/ModificationRequestImpl.java
@@ -69,7 +69,6 @@ public class ModificationRequestImpl {
* @param docCollection Solr collection
* @param shardName shard name
* @param replicaNames replica names (aka. core-node names)
- * @return
*/
public static DeleteReplicasRequest deleteReplicasRequest(DocCollection docCollection, String shardName, Set<String> replicaNames) {
SolrCollection solrCollection = SimpleClusterAbstractionsImpl.SolrCollectionImpl.fromDocCollection(docCollection);
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/ReplicaMetricImpl.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/ReplicaMetricImpl.java
index f793a64..1d822b2 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/ReplicaMetricImpl.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/ReplicaMetricImpl.java
@@ -26,9 +26,12 @@ import java.util.function.Function;
*/
public class ReplicaMetricImpl<T> extends MetricImpl<T> implements ReplicaMetric<T> {
+ /** Replica index size in GB. */
public static final ReplicaMetricImpl<Double> INDEX_SIZE_GB = new ReplicaMetricImpl<>("sizeGB", "INDEX.sizeInBytes", BYTES_TO_GB_CONVERTER);
+ /** 1-min query rate of the /select handler. */
public static final ReplicaMetricImpl<Double> QUERY_RATE_1MIN = new ReplicaMetricImpl<>("queryRate", "QUERY./select.requestTimes:1minRate");
+ /** 1-min update rate of the /update handler. */
public static final ReplicaMetricImpl<Double> UPDATE_RATE_1MIN = new ReplicaMetricImpl<>("updateRate", "UPDATE./update.requestTimes:1minRate");
public ReplicaMetricImpl(String name, String internalName) {
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/impl/SimplePlacementContextImpl.java b/solr/core/src/java/org/apache/solr/cluster/placement/impl/SimplePlacementContextImpl.java
index c04812c..6850a95 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/impl/SimplePlacementContextImpl.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/impl/SimplePlacementContextImpl.java
@@ -9,7 +9,8 @@ import org.apache.solr.cluster.placement.PlacementPlanFactory;
import java.io.IOException;
/**
- *
+ * Implementation of {@link PlacementContext} that uses {@link SimpleClusterAbstractionsImpl}
+ * to create components necessary for the placement plugins to use.
*/
public class SimplePlacementContextImpl implements PlacementContext {
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.java
index b28b518..c26b08d 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/MinimizeCoresPlacementFactory.java
@@ -26,7 +26,6 @@ import java.util.Map;
import com.google.common.collect.Ordering;
import com.google.common.collect.TreeMultimap;
-import org.apache.solr.cluster.Cluster;
import org.apache.solr.cluster.Node;
import org.apache.solr.cluster.Replica;
import org.apache.solr.cluster.SolrCollection;
diff --git a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java
index 3043d2c..aec0893 100644
--- a/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java
+++ b/solr/core/src/java/org/apache/solr/cluster/placement/plugins/RandomPlacementFactory.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.Random;
import java.util.Set;
-import org.apache.solr.cluster.Cluster;
import org.apache.solr.cluster.Node;
import org.apache.solr.cluster.Replica;
import org.apache.solr.cluster.SolrCollection;
diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
index b0e28aa..e9478a4 100644
--- a/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/cluster/placement/plugins/AffinityPlacementFactoryTest.java
@@ -26,7 +26,6 @@ import org.apache.solr.cluster.SolrCollection;
import org.apache.solr.cluster.placement.*;
import org.apache.solr.cluster.placement.Builders;
import org.apache.solr.cluster.placement.impl.ModificationRequestImpl;
-import org.apache.solr.cluster.placement.impl.PlacementPlanFactoryImpl;
import org.apache.solr.cluster.placement.impl.PlacementRequestImpl;
import org.apache.solr.common.util.Pair;
import org.junit.BeforeClass;