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/07/02 12:17:51 UTC
[lucene-solr] branch jira/solr-14537 updated (534033b -> 0c8a3b5)
This is an automated email from the ASF dual-hosted git repository.
ab pushed a change to branch jira/solr-14537
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 534033b SOLR-14537: Don't flush the output stream directly, it's causing exceptions. Use a specialized SortQueue that directly incorporates the code from PriorityQueue, thus avoiding casts and allowing for static / final methods.
add 62dd94d SOLR-12823: fix TestZKPropertiesWriter (#1575)
add 5d43e73 Revert "LUCENE-8962: add ability to selectively merge on commit (#1552)"
add 4774c6f Include delegate in AssertingSimilarity toString (#1596)
add a1be1de SOLR-14554: Let Solr use WAND algorithm when scores are requested (#1566)
add 3e42286 SOLR-14546: OverseerTaskProcessor can process messages out of order (#1561)
add dc1e359 fixes SOLR-14584
add 3f4f5e2 SOLR-14584: CHANGES.txt entry
add 6b55d79 SOLR-14702: increase bin/solr's post kill sleep (from 1s to 10s)
add b4b641e Revert "SOLR-14702: increase bin/solr's post kill sleep (from 1s to 10s)"
add 710fe3a SOLR-14502: increase bin/solr's post kill sleep (from 1s to 10s)
add 3c6e092 SOLR-14546: add a Bug Fixes section for Solr 9.0.0 in CHANGES.txt (#1607)
add ea1bb9f SOLR-13268: Clean up any test failures resulting from defaulting to async logging
add b0333ab LUCENE-9280: Collectors to skip noncompetitive documents (#1351)
add 9c1772f LUCENE-9411: Fail complation on warnings, 9x gradle-only
add db98608 SOLR-14541: Remove IntelliJ //noinspection comments
add 7030bb5 SOLR-14591: Move JoinQuery To Its Own File (#1609)
add 6a45586 Change JoinQuery class's visibility to package again (#1611)
add f47de19 LUCENE-9408: Ensure OneMerge#mergeFinished is only called once (#1590)
add 2542801 SOLR-14462: cache more than one autoscaling session (#1504)
add fa44f82 LUCENE-6669 Fix repeated "the the"
add 419560e SOLR-14409: Existing violations allow bypassing policy rules when add… (#1598)
add 57a892f SOLR-14404 CoreContainer level custom requesthandlers (#1432)
add 3000bbd SOLR Move "userfiles" stuff from SolrPaths to CoreContainer. (#1600)
add 73a5016 Use simplified API signatures. @EndPoint annotation can be attached to a method and it's posisble to have just a single parameter for an end point
add 54e6528 SOLR-13749: XCJF -> Cross-Collection Join change solrUrlWhitelist -> allowSolrUrls ref guide: update join parser section to be inline with the unit tests.
add 7b54902 SOLR-14588: Implement Circuit Breakers (#1606)
add aba7a61 CHANGES.txt entry for SOLR-14588
add 1ab9835 SOLR-14307: add enabled parameter to cache documents; typos in common-query-parameters in cache section
add df81ba9 SOLR-14594: Make titles bold in Admin UI Dashboard screen
add aad8c98 SOLR-14237: refguide: update dashboard screenshot to show security panel; add'l text edits
add f1650d5 Ref Guide: prep for 8.6: upgrade notes, typos
add 11538e5 SOLR-14541: Ensure classes that implement equals implement hashCode or suppress warnings
add 31de01f SOLR-14578: Update solrcloud-autoscaling-triggers.adoc and test (#1591)
add cb6b031 SOLR-14588: fix failing test
add ed02574 LUCENE-9389: Enhance logging messages in Lucene's Luke module
add 74ac97e SOLR-14588: Follow Up Fixes and Documentation (#1615)
add 68a9e8f SOLR-14376: remove no-longer-needed 'not no filter queries' check in SolrFeatureWeight
add 455f2e6 SOLR-13286 Quiet down metrics logging, add a marker to allow any handler to be silenced via log4j2.xml
add b7f8baa SOLR-13286 changes comment to correct section
add e6ffa8e SOLR-14598: Granting reflection access for using annotations in SOLR-14404
add 20f39b9 Revert "SOLR-14598: Granting reflection access for using annotations in SOLR-14404"
add 80bc86d SOLR Revert change in path separator exposed by cat() Previous change *should* have been purely a refactor but accidentally changed the path separator this streaming expression exposed to always be '/'. Apparently this is controversial so the previous behavior is re-instated here (and fixes a failing test on Windows).
add 45763b6 Revert "SOLR-14588: Follow Up Fixes and Documentation (#1615)"
add 529faf1 Revert "SOLR-14588: Implement Circuit Breakers (#1606)"
add 698c9cc Revert "CHANGES.txt entry for SOLR-14588"
add 7f352a9 LUCENE-8962: Merge small segments on commit (#1617)
add fb3c5d2 LUCENE-8962: Fix changes entry. This feature is added to 8.6
add 1590ed5 SOLR-14404: support for openResource() in PackageResourceLoader & path-prefix for container plugins
add 584e4d5 syncing with branch_8x
add 3377b09 LUCENE-8962: Ensure we never flush by ram buffer or doc count in test
add 7bb9926 SOLR-14481: Add drill Streaming Expression
add 94684cc SOLR-14481: precommit error
add d883cd6 SOLR-14481: use classloader to open resource
add 574e399 SOLR-14588: Fix failing DebugComponentTest by reverting test to pre-patch state
add 49a3f0a SOLR-14561 Followup - validate params for more core operations (#1629)
add 0cef29f LUCENE-9417: Tessellator might fail when several holes share are connected to the same vertex (#1614)
add 0cc45f6 SOLR-14481: Update CHANGES.txt
add 3ff3310 LUCENE-9418: Fix ordered intervals over interleaved terms (#1618)
add 1ec78ac LUCENE-9418: Add CHANGES entry
add adf3361 SOLR-14599: Package manager support for cluster level plugins
add f0764db SOLR-14561: Fix failing @Nightly test
add 20c1fdb SOLR-14404: use MethodHandles in AnnotatedAPI (#1624)
add f647400 SOLR-14539: Introducing {!bool excludeTags=foo,bar}
add ccbdb77 Remove Unused Import in BoolQParserPlugin
add d1c29ae SOLR-14609: Fix Unused Imports in TestJsonFacetsWithNestedObjects
add 6eb7bc3 SOLR-14590 : Add support for Lucene's FeatureField in Solr (#1620)
add 1f6de31 SOLR-14539 Ref Guide update {!bool excludeTags}
add 76e1d90 SOLR-14592: Upgrade Zookeeper to 3.6.1
add d0864a1 SOLR-14523: Enhance gradle logging calls validation: eliminate getMessage()
add 2e60e1f SOLR-14404: Unregister was not working for plugins with $path-prefix
add ccdfee2 Remove Redundant Import in TestContainerPlugin
add 3f9cc22 SOLR-14588: Implement Circuit Breakers (#1626)
new 0c8a3b5 Merge branch 'master' into jira/solr-14537
The 1 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:
build.gradle | 2 +
gradle/defaults-java.gradle | 1 +
gradle/hacks/findbugs.gradle | 46 ++
gradle/validation/jar-checks.gradle | 4 +-
lucene/CHANGES.txt | 26 +-
lucene/MIGRATE.md | 6 +
.../compound/hyphenation/HyphenationTree.java | 2 +-
.../java/org/apache/lucene/geo/Tessellator.java | 11 +-
.../lucene/index/DocumentsWriterFlushControl.java | 2 +-
.../java/org/apache/lucene/index/IndexWriter.java | 270 +++++++----
.../org/apache/lucene/index/IndexWriterConfig.java | 23 +-
.../apache/lucene/index/LiveIndexWriterConfig.java | 10 +-
.../java/org/apache/lucene/index/MergePolicy.java | 89 +++-
.../org/apache/lucene/index/ReadersAndUpdates.java | 14 +-
.../apache/lucene/search/ConstantScoreQuery.java | 2 +-
.../org/apache/lucene/search/FieldComparator.java | 16 +-
.../apache/lucene/search/FieldValueHitQueue.java | 29 +-
.../lucene/search/FilteringFieldComparator.java | 93 ++++
.../search/FilteringLeafFieldComparator.java | 39 ++
.../lucene/search/FilteringNumericComparator.java | 52 ++
.../search/FilteringNumericLeafComparator.java | 336 +++++++++++++
.../org/apache/lucene/search/LeafCollector.java | 12 +
.../apache/lucene/search/MatchAllDocsQuery.java | 2 +-
.../java/org/apache/lucene/search/ScoreMode.java | 54 ++-
.../java/org/apache/lucene/search/SortField.java | 4 +
.../apache/lucene/search/TopFieldCollector.java | 69 ++-
.../src/java/org/apache/lucene/search/Weight.java | 18 +-
.../src/java/org/apache/lucene/util/IOUtils.java | 10 +
.../org/apache/lucene/geo/TestTessellator.java | 14 +
.../lucene/index/TestDemoParallelLeafReader.java | 5 +-
.../org/apache/lucene/index/TestIndexWriter.java | 5 +-
.../lucene/index/TestIndexWriterMergePolicy.java | 173 ++++++-
.../org/apache/lucene/index/TestMergePolicy.java | 11 +-
.../search/TestFieldSortOptimizationSkipping.java | 294 ++++++++++++
.../lucene/facet/taxonomy/TaxonomyReader.java | 2 +-
lucene/ivy-versions.properties | 12 +-
.../org/apache/lucene/luke/app/IndexHandler.java | 2 +-
.../dialog/documents/AddDocumentDialogFactory.java | 4 +-
.../dialog/menubar/CheckIndexDialogFactory.java | 2 +-
.../dialog/menubar/OpenIndexDialogFactory.java | 2 +-
.../luke/app/desktop/util/ExceptionHandler.java | 4 +-
.../apache/lucene/luke/models/util/IndexUtils.java | 8 +-
.../queries/intervals/OrderedIntervalsSource.java | 4 +-
.../queries/intervals/TestIntervalQuery.java | 10 +-
.../lucene/queries/intervals/TestIntervals.java | 15 +-
.../queryparser/docs/xml/LuceneCoreQuery.dtd.html | 2 +-
.../docs/xml/LuceneCoreQuery.dtd.org.html | 2 +-
.../flexible/core/nodes/QueryNodeImpl.java | 2 +-
.../lucene/queryparser/xml/LuceneCoreQuery.dtd | 2 +-
.../lucene/search/TestPhraseWildcardQuery.java | 7 +-
lucene/site/changes/changes2html.pl | 2 +-
.../suggest/analyzing/FreeTextSuggester.java | 4 +-
.../lucene/search/AssertingLeafCollector.java | 6 +-
.../search/similarities/AssertingSimilarity.java | 2 +-
.../org/apache/lucene/util/LuceneTestCase.java | 2 +-
.../org/apache/lucene/geo/lucene-9417.geojson.gz | Bin 0 -> 79049 bytes
solr/CHANGES.txt | 79 ++-
solr/bin/solr | 2 +-
solr/bin/solr.in.cmd | 4 +-
solr/bin/solr.in.sh | 4 +-
.../handler/dataimport/MailEntityProcessor.java | 6 +-
.../dataimporthandler/src/test-files/log4j2.xml | 42 ++
.../src/test-files/solr/collection1/README | 1 +
.../solr/configsets/dihconfigset/conf/README | 2 +
.../configsets/dihconfigset/conf/schema.xml} | 0
.../configsets/dihconfigset/conf/solrconfig.xml} | 0
.../src/test-files/{dih => }/solr/solr.xml | 0
.../TestSolrEntityProcessorEndToEnd.java | 16 +-
.../handler/dataimport/TestZKPropertiesWriter.java | 207 ++++++--
.../org/apache/solr/ltr/feature/SolrFeature.java | 8 +-
.../test/org/apache/solr/ltr/TestRerankBase.java | 25 -
.../solr/prometheus/scraper/SolrScraper.java | 2 +-
solr/core/build.gradle | 3 +
.../src/java/org/apache/solr/api/AnnotatedApi.java | 179 ++++---
solr/core/src/java/org/apache/solr/api/ApiBag.java | 9 +
.../apache/solr/api/CustomContainerPlugins.java | 341 +++++++++++++
.../src/java/org/apache/solr/api/PayloadObj.java | 35 +-
.../src/java/org/apache/solr/api/V2HttpCall.java | 29 +-
.../src/java/org/apache/solr/cloud/LockTree.java | 54 ++-
.../cloud/OverseerConfigSetMessageHandler.java | 2 +-
.../apache/solr/cloud/OverseerMessageHandler.java | 7 +-
.../apache/solr/cloud/OverseerTaskProcessor.java | 180 +++----
.../java/org/apache/solr/cloud/SolrZkServer.java | 70 ---
.../java/org/apache/solr/cloud/ZkController.java | 5 +-
.../OverseerCollectionMessageHandler.java | 18 +-
.../solr/cloud/api/collections/RoutedAlias.java | 1 -
.../autoscaling/InactiveMarkersPlanAction.java | 2 +-
.../cloud/autoscaling/OverseerTriggerThread.java | 4 +-
.../src/java/org/apache/solr/cloud/rule/Rule.java | 2 +-
.../org/apache/solr/core/ConfigSetProperties.java | 2 +-
.../java/org/apache/solr/core/CoreContainer.java | 43 +-
.../apache/solr/core/CorePropertiesLocator.java | 4 +-
.../src/java/org/apache/solr/core/PluginInfo.java | 4 +-
.../src/java/org/apache/solr/core/SolrConfig.java | 21 +-
.../src/java/org/apache/solr/core/SolrCore.java | 16 +-
.../src/java/org/apache/solr/core/SolrPaths.java | 30 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 2 +-
.../solr/core/TransientSolrCoreCacheFactory.java | 6 +-
.../org/apache/solr/filestore/PackageStoreAPI.java | 19 +-
.../java/org/apache/solr/handler/CatStream.java | 72 ++-
.../apache/solr/handler/CdcrReplicatorState.java | 2 +-
.../solr/handler/CdcrUpdateLogSynchronizer.java | 8 +-
.../apache/solr/handler/MoreLikeThisHandler.java | 2 +-
.../apache/solr/handler/ReplicationHandler.java | 25 +-
.../java/org/apache/solr/handler/SnapShooter.java | 3 +
.../org/apache/solr/handler/SolrConfigHandler.java | 2 +-
.../solr/handler/admin/ContainerPluginsApi.java | 179 +++++++
.../apache/solr/handler/admin/MergeIndexesOp.java | 8 +-
.../solr/handler/component/HttpShardHandler.java | 2 +-
.../component/PivotFacetFieldValueCollection.java | 2 +-
.../handler/component/QueryElevationComponent.java | 1 -
.../solr/handler/component/SearchHandler.java | 32 +-
.../component/ShardFieldSortedHitQueue.java | 1 -
.../apache/solr/packagemanager/PackageManager.java | 301 ++++++++++--
.../apache/solr/packagemanager/PackageUtils.java | 3 +
.../solr/packagemanager/RepositoryManager.java | 12 +-
.../apache/solr/packagemanager/SolrPackage.java | 4 +
.../solr/packagemanager/SolrPackageInstance.java | 18 +-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 27 +-
.../java/org/apache/solr/pkg/PackageLoader.java | 28 +-
.../src/java/org/apache/solr/schema/RankField.java | 140 ++++++
.../org/apache/solr/search/BoolQParserPlugin.java | 53 +-
.../src/java/org/apache/solr/search/Grouping.java | 2 +-
.../org/apache/solr/search/JoinQParserPlugin.java | 531 ++-------------------
.../{JoinQParserPlugin.java => JoinQuery.java} | 149 +-----
.../org/apache/solr/search/MaxScoreCollector.java | 6 +-
.../java/org/apache/solr/search/QParserPlugin.java | 3 +-
.../org/apache/solr/search/RankQParserPlugin.java | 158 ++++++
.../org/apache/solr/search/SolrIndexSearcher.java | 2 +-
.../solr/search/grouping/CommandHandler.java | 2 +-
...Parser.java => CrossCollectionJoinQParser.java} | 26 +-
...CJFQuery.java => CrossCollectionJoinQuery.java} | 17 +-
.../apache/solr/search/join/FiltersQParser.java | 91 ++--
.../solr/search/join/ScoreJoinQParserPlugin.java | 5 +-
.../apache/solr/search/join/XCJFQParserPlugin.java | 66 ---
.../security/Sha256AuthenticationProvider.java | 2 +-
.../apache/solr/servlet/DirectSolrConnection.java | 2 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 23 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 1 -
.../java/org/apache/solr/update/HdfsUpdateLog.java | 2 +-
.../src/java/org/apache/solr/update/UpdateLog.java | 2 +-
.../processor/AtomicUpdateProcessorFactory.java | 3 +-
.../CountFieldValuesUpdateProcessorFactory.java | 2 +-
...DocBasedVersionConstraintsProcessorFactory.java | 2 +-
.../DocExpirationUpdateProcessorFactory.java | 10 +-
.../MaxFieldValueUpdateProcessorFactory.java | 2 +-
.../MinFieldValueUpdateProcessorFactory.java | 2 +-
.../update/processor/TolerantUpdateProcessor.java | 2 +-
.../update/processor/URLClassifyProcessor.java | 2 +-
.../src/java/org/apache/solr/util/PackageTool.java | 11 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 17 +-
.../solr/util/circuitbreaker/CircuitBreaker.java | 56 +++
.../util/circuitbreaker/CircuitBreakerManager.java | 134 ++++++
.../util/circuitbreaker/MemoryCircuitBreaker.java | 114 +++++
.../resources/EditableSolrConfigAttributes.json | 2 +
solr/core/src/test-files/log4j2.xml | 44 +-
.../runtimecode/MyPlugin.java} | 28 +-
.../runtimecode/containerplugin.v.1.jar.bin | Bin 0 -> 867 bytes
.../runtimecode/containerplugin.v.2.jar.bin | Bin 0 -> 867 bytes
solr/core/src/test-files/runtimecode/sig.txt | 8 +
.../conf/schema-rank-fields.xml} | 23 +-
.../test-files/solr/collection1/conf/schema15.xml | 3 +
.../conf/solrconfig-memory-circuitbreaker.xml | 95 ++++
.../configsets/{xcjf => ccjoin}/conf/schema.xml | 0
.../{xcjf => ccjoin}/conf/solrconfig.xml | 22 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 1 -
.../apache/solr/cloud/BasicDistributedZk2Test.java | 5 +-
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 4 +-
.../solr/cloud/TestConfigSetsAPIZkFailure.java | 28 +-
.../AbstractCloudBackupRestoreTestCase.java | 7 +
.../api/collections/CollectionReloadTest.java | 2 +-
.../CollectionsAPIAsyncDistributedZkTest.java | 2 +-
.../AutoAddReplicasIntegrationTest.java | 2 +-
.../org/apache/solr/core/ResourceLoaderTest.java | 2 -
.../test/org/apache/solr/core/SolrCoreTest.java | 2 +
.../org/apache/solr/core/TestConfigOverlay.java | 2 +
.../core/snapshots/TestSolrCloudSnapshots.java | 2 +
.../solr/core/snapshots/TestSolrCoreSnapshots.java | 2 +
.../solr/filestore/TestDistribPackageStore.java | 27 +-
.../apache/solr/handler/TestContainerPlugin.java | 377 +++++++++++++++
.../org/apache/solr/handler/TestCoreBackup.java | 22 +-
.../solr/handler/TestReplicationHandler.java | 4 +-
.../org/apache/solr/handler/TestRestoreCore.java | 11 +
.../solr/handler/TestStressThreadBackup.java | 13 +
.../apache/solr/handler/V2ApiIntegrationTest.java | 19 +-
.../admin/CoreMergeIndexesAdminHandlerTest.java | 8 +-
.../solr/handler/admin/TestApiFramework.java | 49 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 2 +-
.../apache/solr/schema/ChangedSchemaMergeTest.java | 4 +-
.../test/org/apache/solr/schema/RankFieldTest.java | 285 +++++++++++
.../apache/solr/search/MaxScoreCollectorTest.java | 91 ++++
.../org/apache/solr/search/QueryEqualityTest.java | 18 +-
.../apache/solr/search/RankQParserPluginTest.java | 258 ++++++++++
.../apache/solr/search/SolrIndexSearcherTest.java | 8 +-
.../facet/TestJsonFacetsWithNestedObjects.java | 58 +++
...Test.java => CrossCollectionJoinQueryTest.java} | 88 ++--
.../org/apache/solr/util/TestCircuitBreaker.java | 218 +++++++++
solr/example/files/conf/solrconfig.xml | 38 ++
solr/licenses/commons-lang-2.6.jar.sha1 | 1 +
.../commons-lang-LICENSE-ASL.txt} | 0
solr/licenses/commons-lang-NOTICE.txt | 5 +
solr/licenses/netty-buffer-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-buffer-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/netty-codec-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-codec-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/netty-common-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-common-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/netty-handler-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-handler-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/netty-resolver-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-resolver-4.1.50.Final.jar.sha1 | 1 +
.../licenses/netty-transport-4.1.47.Final.jar.sha1 | 1 -
.../licenses/netty-transport-4.1.50.Final.jar.sha1 | 1 +
...ty-transport-native-epoll-4.1.47.Final.jar.sha1 | 1 -
...ty-transport-native-epoll-4.1.50.Final.jar.sha1 | 1 +
...nsport-native-unix-common-4.1.47.Final.jar.sha1 | 1 -
...nsport-native-unix-common-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/snappy-java-1.1.7.6.jar.sha1 | 1 +
.../snappy-java-LICENSE-ASL.txt} | 0
solr/licenses/snappy-java-NOTICE.txt | 17 +
solr/licenses/zookeeper-3.5.7.jar.sha1 | 1 -
solr/licenses/zookeeper-3.6.1.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.5.7.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.6.1.jar.sha1 | 1 +
solr/server/resources/log4j2-console.xml | 28 +-
solr/server/resources/log4j2.xml | 72 +--
.../solr/configsets/_default/conf/managed-schema | 7 +
.../solr/configsets/_default/conf/solrconfig.xml | 59 +++
.../conf/solrconfig.xml | 42 ++
.../adding-custom-plugins-in-solrcloud-mode.adoc | 2 +-
solr/solr-ref-guide/src/circuit-breakers.adoc | 68 +++
.../src/cluster-node-management.adoc | 6 +-
.../src/collapse-and-expand-results.adoc | 15 +-
.../src/common-query-parameters.adoc | 17 +-
solr/solr-ref-guide/src/config-api.adoc | 7 +
solr/solr-ref-guide/src/distributed-requests.adoc | 4 +-
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 2 +-
.../overview-of-the-solr-admin-ui/dashboard.png | Bin 92750 -> 172175 bytes
.../src/implicit-requesthandlers.adoc | 28 +-
solr/solr-ref-guide/src/index-replication.adoc | 25 +-
solr/solr-ref-guide/src/index.adoc | 3 +
solr/solr-ref-guide/src/json-query-dsl.adoc | 34 +-
solr/solr-ref-guide/src/jvm-settings.adoc | 2 +-
.../src/major-changes-in-solr-9.adoc | 2 +-
solr/solr-ref-guide/src/meta-docs/publish.adoc | 2 +-
solr/solr-ref-guide/src/other-parsers.adoc | 208 ++++----
.../src/overview-of-the-solr-admin-ui.adoc | 16 +-
.../src/query-settings-in-solrconfig.adoc | 22 +
.../src/rule-based-authorization-plugin.adoc | 14 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 49 +-
.../src/solrcloud-autoscaling-trigger-actions.adoc | 8 +-
.../src/solrcloud-autoscaling-triggers.adoc | 2 +-
solr/solr-ref-guide/src/the-stats-component.adoc | 2 +-
solr/solr-ref-guide/src/the-tagger-handler.adoc | 2 +-
solr/solrj/ivy.xml | 4 +
.../solrj/cloud/autoscaling/AutoScalingConfig.java | 42 +-
.../client/solrj/cloud/autoscaling/Policy.java | 7 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 310 ++++++++----
.../client/solrj/cloud/autoscaling/Preference.java | 10 +-
.../solrj/cloud/autoscaling/ReplicaCount.java | 10 +-
.../solrj/cloud/autoscaling/ReplicaInfo.java | 9 +-
.../client/solrj/cloud/autoscaling/Suggester.java | 2 +-
.../solrj/cloud/autoscaling/VersionedData.java | 10 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 2 +-
.../solr/client/solrj/impl/XMLResponseParser.java | 2 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 100 +++-
.../client/solrj/io/stream/CloudSolrStream.java | 6 +-
.../client/solrj/io/stream/DeepRandomStream.java | 6 +-
.../solr/client/solrj/io/stream/DrillStream.java | 280 +++++++++++
.../solrj/io/stream/expr/StreamExpression.java | 7 +-
.../expr/StreamExpressionNamedParameter.java | 8 +-
.../io/stream/expr/StreamExpressionValue.java | 10 +-
.../client/solrj/request/beans/PluginMeta.java | 64 +++
.../solrj/response/AnalysisResponseBase.java | 2 +-
.../apache/solr/common/cloud/DocCollection.java | 9 +-
.../java/org/apache/solr/common/cloud/Replica.java | 11 +-
.../org/apache/solr/common/cloud/ZkNodeProps.java | 15 +-
.../apache/solr/common/cloud/ZkStateReader.java | 14 +-
.../solr/common/params/CollectionParams.java | 33 +-
.../org/apache/solr/common/params/FacetParams.java | 4 +-
.../apache/solr/common/util/CommandOperation.java | 1 -
.../solr/common/util/JsonSchemaValidator.java | 11 +-
.../org/apache/solr/common/util/NamedList.java | 2 +-
.../java/org/apache/solr/common/util/PathTrie.java | 50 +-
.../org/apache/solr/common/util/RetryUtil.java | 2 +-
.../apache/solr/common/util/ValidatingJsonMap.java | 10 +-
.../apache/solr/common/util/XMLErrorLogger.java | 2 +-
solr/solrj/src/test-files/log4j2.xml | 45 +-
.../solr/autoscaling/testAddTooManyPerPolicy.json | 129 +++++
.../solr/client/solrj/LargeVolumeTestBase.java | 2 +-
.../client/solrj/MergeIndexesExampleTestBase.java | 3 +-
.../client/solrj/cloud/autoscaling/TestPolicy.java | 134 +++++-
.../solrj/cloud/autoscaling/TestPolicy2.java | 12 +
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/stream/StreamExpressionTest.java | 115 +++--
.../org/apache/solr/common/util/TestPathTrie.java | 8 +
.../apache/solr/cloud/MiniSolrCloudCluster.java | 1 +
.../java/org/apache/solr/cloud/ZkTestServer.java | 5 +-
solr/webapp/web/css/angular/index.css | 4 +-
versions.lock | 26 +-
versions.props | 7 +-
301 files changed, 7431 insertions(+), 2491 deletions(-)
create mode 100644 gradle/hacks/findbugs.gradle
create mode 100644 lucene/core/src/java/org/apache/lucene/search/FilteringFieldComparator.java
create mode 100644 lucene/core/src/java/org/apache/lucene/search/FilteringLeafFieldComparator.java
create mode 100644 lucene/core/src/java/org/apache/lucene/search/FilteringNumericComparator.java
create mode 100644 lucene/core/src/java/org/apache/lucene/search/FilteringNumericLeafComparator.java
create mode 100644 lucene/core/src/test/org/apache/lucene/search/TestFieldSortOptimizationSkipping.java
create mode 100644 lucene/test-framework/src/resources/org/apache/lucene/geo/lucene-9417.geojson.gz
create mode 100644 solr/contrib/dataimporthandler/src/test-files/log4j2.xml
create mode 100644 solr/contrib/dataimporthandler/src/test-files/solr/collection1/README
create mode 100644 solr/contrib/dataimporthandler/src/test-files/solr/configsets/dihconfigset/conf/README
copy solr/contrib/dataimporthandler/src/test-files/{dih/solr/collection1/conf/dataimport-schema.xml => solr/configsets/dihconfigset/conf/schema.xml} (100%)
copy solr/contrib/dataimporthandler/src/test-files/{dih/solr/collection1/conf/dataimport-solrconfig.xml => solr/configsets/dihconfigset/conf/solrconfig.xml} (100%)
copy solr/contrib/dataimporthandler/src/test-files/{dih => }/solr/solr.xml (100%)
create mode 100644 solr/core/src/java/org/apache/solr/api/CustomContainerPlugins.java
create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/ContainerPluginsApi.java
create mode 100644 solr/core/src/java/org/apache/solr/schema/RankField.java
copy solr/core/src/java/org/apache/solr/search/{JoinQParserPlugin.java => JoinQuery.java} (77%)
create mode 100644 solr/core/src/java/org/apache/solr/search/RankQParserPlugin.java
rename solr/core/src/java/org/apache/solr/search/join/{XCJFQParser.java => CrossCollectionJoinQParser.java} (75%)
rename solr/core/src/java/org/apache/solr/search/join/{XCJFQuery.java => CrossCollectionJoinQuery.java} (94%)
delete mode 100644 solr/core/src/java/org/apache/solr/search/join/XCJFQParserPlugin.java
create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreaker.java
create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerManager.java
create mode 100644 solr/core/src/java/org/apache/solr/util/circuitbreaker/MemoryCircuitBreaker.java
copy solr/core/src/{java/org/apache/solr/api/PayloadObj.java => test-files/runtimecode/MyPlugin.java} (52%)
create mode 100644 solr/core/src/test-files/runtimecode/containerplugin.v.1.jar.bin
create mode 100644 solr/core/src/test-files/runtimecode/containerplugin.v.2.jar.bin
copy solr/core/src/test-files/solr/{configsets/xcjf/conf/schema.xml => collection1/conf/schema-rank-fields.xml} (61%)
create mode 100644 solr/core/src/test-files/solr/collection1/conf/solrconfig-memory-circuitbreaker.xml
rename solr/core/src/test-files/solr/configsets/{xcjf => ccjoin}/conf/schema.xml (100%)
rename solr/core/src/test-files/solr/configsets/{xcjf => ccjoin}/conf/solrconfig.xml (70%)
create mode 100644 solr/core/src/test/org/apache/solr/handler/TestContainerPlugin.java
create mode 100644 solr/core/src/test/org/apache/solr/schema/RankFieldTest.java
create mode 100644 solr/core/src/test/org/apache/solr/search/MaxScoreCollectorTest.java
create mode 100644 solr/core/src/test/org/apache/solr/search/RankQParserPluginTest.java
rename solr/core/src/test/org/apache/solr/search/join/{XCJFQueryTest.java => CrossCollectionJoinQueryTest.java} (68%)
create mode 100644 solr/core/src/test/org/apache/solr/util/TestCircuitBreaker.java
create mode 100644 solr/licenses/commons-lang-2.6.jar.sha1
copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/commons-lang-LICENSE-ASL.txt} (100%)
mode change 100755 => 100644
create mode 100644 solr/licenses/commons-lang-NOTICE.txt
delete mode 100644 solr/licenses/netty-buffer-4.1.47.Final.jar.sha1
create mode 100644 solr/licenses/netty-buffer-4.1.50.Final.jar.sha1
delete mode 100644 solr/licenses/netty-codec-4.1.47.Final.jar.sha1
create mode 100644 solr/licenses/netty-codec-4.1.50.Final.jar.sha1
delete mode 100644 solr/licenses/netty-common-4.1.47.Final.jar.sha1
create mode 100644 solr/licenses/netty-common-4.1.50.Final.jar.sha1
delete mode 100644 solr/licenses/netty-handler-4.1.47.Final.jar.sha1
create mode 100644 solr/licenses/netty-handler-4.1.50.Final.jar.sha1
delete mode 100644 solr/licenses/netty-resolver-4.1.47.Final.jar.sha1
create mode 100644 solr/licenses/netty-resolver-4.1.50.Final.jar.sha1
delete mode 100644 solr/licenses/netty-transport-4.1.47.Final.jar.sha1
create mode 100644 solr/licenses/netty-transport-4.1.50.Final.jar.sha1
delete mode 100644 solr/licenses/netty-transport-native-epoll-4.1.47.Final.jar.sha1
create mode 100644 solr/licenses/netty-transport-native-epoll-4.1.50.Final.jar.sha1
delete mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.47.Final.jar.sha1
create mode 100644 solr/licenses/netty-transport-native-unix-common-4.1.50.Final.jar.sha1
create mode 100644 solr/licenses/snappy-java-1.1.7.6.jar.sha1
copy solr/{solr-ref-guide/src/fonts/Noto_Sans/LICENSE.txt => licenses/snappy-java-LICENSE-ASL.txt} (100%)
mode change 100755 => 100644
create mode 100644 solr/licenses/snappy-java-NOTICE.txt
delete mode 100644 solr/licenses/zookeeper-3.5.7.jar.sha1
create mode 100644 solr/licenses/zookeeper-3.6.1.jar.sha1
delete mode 100644 solr/licenses/zookeeper-jute-3.5.7.jar.sha1
create mode 100644 solr/licenses/zookeeper-jute-3.6.1.jar.sha1
create mode 100644 solr/solr-ref-guide/src/circuit-breakers.adoc
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DrillStream.java
create mode 100644 solr/solrj/src/java/org/apache/solr/client/solrj/request/beans/PluginMeta.java
create mode 100644 solr/solrj/src/test-files/solrj/solr/autoscaling/testAddTooManyPerPolicy.json
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-14537
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-14537
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 0c8a3b556c1f27139c929d5e636f09feef3ba1be
Merge: 534033b 3f9cc22
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Jul 2 12:46:02 2020 +0200
Merge branch 'master' into jira/solr-14537
build.gradle | 2 +
gradle/defaults-java.gradle | 1 +
gradle/hacks/findbugs.gradle | 46 ++
gradle/validation/jar-checks.gradle | 4 +-
lucene/CHANGES.txt | 26 +-
lucene/MIGRATE.md | 6 +
.../compound/hyphenation/HyphenationTree.java | 2 +-
.../java/org/apache/lucene/geo/Tessellator.java | 11 +-
.../lucene/index/DocumentsWriterFlushControl.java | 2 +-
.../java/org/apache/lucene/index/IndexWriter.java | 270 +++++++----
.../org/apache/lucene/index/IndexWriterConfig.java | 23 +-
.../apache/lucene/index/LiveIndexWriterConfig.java | 10 +-
.../java/org/apache/lucene/index/MergePolicy.java | 89 +++-
.../org/apache/lucene/index/ReadersAndUpdates.java | 14 +-
.../apache/lucene/search/ConstantScoreQuery.java | 2 +-
.../org/apache/lucene/search/FieldComparator.java | 16 +-
.../apache/lucene/search/FieldValueHitQueue.java | 29 +-
.../lucene/search/FilteringFieldComparator.java | 93 ++++
.../search/FilteringLeafFieldComparator.java | 39 ++
.../lucene/search/FilteringNumericComparator.java | 52 ++
.../search/FilteringNumericLeafComparator.java | 336 +++++++++++++
.../org/apache/lucene/search/LeafCollector.java | 12 +
.../apache/lucene/search/MatchAllDocsQuery.java | 2 +-
.../java/org/apache/lucene/search/ScoreMode.java | 54 ++-
.../java/org/apache/lucene/search/SortField.java | 4 +
.../apache/lucene/search/TopFieldCollector.java | 69 ++-
.../src/java/org/apache/lucene/search/Weight.java | 18 +-
.../src/java/org/apache/lucene/util/IOUtils.java | 10 +
.../org/apache/lucene/geo/TestTessellator.java | 14 +
.../lucene/index/TestDemoParallelLeafReader.java | 5 +-
.../org/apache/lucene/index/TestIndexWriter.java | 5 +-
.../lucene/index/TestIndexWriterMergePolicy.java | 173 ++++++-
.../org/apache/lucene/index/TestMergePolicy.java | 11 +-
.../search/TestFieldSortOptimizationSkipping.java | 294 ++++++++++++
.../lucene/facet/taxonomy/TaxonomyReader.java | 2 +-
lucene/ivy-versions.properties | 12 +-
.../org/apache/lucene/luke/app/IndexHandler.java | 2 +-
.../dialog/documents/AddDocumentDialogFactory.java | 4 +-
.../dialog/menubar/CheckIndexDialogFactory.java | 2 +-
.../dialog/menubar/OpenIndexDialogFactory.java | 2 +-
.../luke/app/desktop/util/ExceptionHandler.java | 4 +-
.../apache/lucene/luke/models/util/IndexUtils.java | 8 +-
.../queries/intervals/OrderedIntervalsSource.java | 4 +-
.../queries/intervals/TestIntervalQuery.java | 10 +-
.../lucene/queries/intervals/TestIntervals.java | 15 +-
.../queryparser/docs/xml/LuceneCoreQuery.dtd.html | 2 +-
.../docs/xml/LuceneCoreQuery.dtd.org.html | 2 +-
.../flexible/core/nodes/QueryNodeImpl.java | 2 +-
.../lucene/queryparser/xml/LuceneCoreQuery.dtd | 2 +-
.../lucene/search/TestPhraseWildcardQuery.java | 7 +-
lucene/site/changes/changes2html.pl | 2 +-
.../suggest/analyzing/FreeTextSuggester.java | 4 +-
.../lucene/search/AssertingLeafCollector.java | 6 +-
.../search/similarities/AssertingSimilarity.java | 2 +-
.../org/apache/lucene/util/LuceneTestCase.java | 2 +-
.../org/apache/lucene/geo/lucene-9417.geojson.gz | Bin 0 -> 79049 bytes
solr/CHANGES.txt | 79 ++-
solr/bin/solr | 2 +-
solr/bin/solr.in.cmd | 4 +-
solr/bin/solr.in.sh | 4 +-
.../handler/dataimport/MailEntityProcessor.java | 6 +-
.../dataimporthandler/src/test-files/log4j2.xml | 42 ++
.../src/test-files/solr/collection1/README | 1 +
.../solr/configsets/dihconfigset/conf/README | 2 +
.../solr/configsets/dihconfigset/conf/schema.xml | 70 +++
.../configsets/dihconfigset/conf/solrconfig.xml | 287 +++++++++++
.../src/test-files/solr/solr.xml} | 21 +-
.../TestSolrEntityProcessorEndToEnd.java | 16 +-
.../handler/dataimport/TestZKPropertiesWriter.java | 207 ++++++--
.../org/apache/solr/ltr/feature/SolrFeature.java | 8 +-
.../test/org/apache/solr/ltr/TestRerankBase.java | 25 -
.../solr/prometheus/scraper/SolrScraper.java | 2 +-
solr/core/build.gradle | 3 +
.../src/java/org/apache/solr/api/AnnotatedApi.java | 179 ++++---
solr/core/src/java/org/apache/solr/api/ApiBag.java | 9 +
.../apache/solr/api/CustomContainerPlugins.java | 341 +++++++++++++
.../src/java/org/apache/solr/api/PayloadObj.java | 35 +-
.../src/java/org/apache/solr/api/V2HttpCall.java | 29 +-
.../src/java/org/apache/solr/cloud/LockTree.java | 54 ++-
.../cloud/OverseerConfigSetMessageHandler.java | 2 +-
.../apache/solr/cloud/OverseerMessageHandler.java | 7 +-
.../apache/solr/cloud/OverseerTaskProcessor.java | 180 +++----
.../java/org/apache/solr/cloud/SolrZkServer.java | 70 ---
.../java/org/apache/solr/cloud/ZkController.java | 5 +-
.../OverseerCollectionMessageHandler.java | 18 +-
.../solr/cloud/api/collections/RoutedAlias.java | 1 -
.../autoscaling/InactiveMarkersPlanAction.java | 2 +-
.../cloud/autoscaling/OverseerTriggerThread.java | 4 +-
.../src/java/org/apache/solr/cloud/rule/Rule.java | 2 +-
.../org/apache/solr/core/ConfigSetProperties.java | 2 +-
.../java/org/apache/solr/core/CoreContainer.java | 43 +-
.../apache/solr/core/CorePropertiesLocator.java | 4 +-
.../src/java/org/apache/solr/core/PluginInfo.java | 4 +-
.../src/java/org/apache/solr/core/SolrConfig.java | 21 +-
.../src/java/org/apache/solr/core/SolrCore.java | 16 +-
.../src/java/org/apache/solr/core/SolrPaths.java | 30 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 2 +-
.../solr/core/TransientSolrCoreCacheFactory.java | 6 +-
.../org/apache/solr/filestore/PackageStoreAPI.java | 19 +-
.../java/org/apache/solr/handler/CatStream.java | 72 ++-
.../apache/solr/handler/CdcrReplicatorState.java | 2 +-
.../solr/handler/CdcrUpdateLogSynchronizer.java | 8 +-
.../apache/solr/handler/MoreLikeThisHandler.java | 2 +-
.../apache/solr/handler/ReplicationHandler.java | 25 +-
.../java/org/apache/solr/handler/SnapShooter.java | 3 +
.../org/apache/solr/handler/SolrConfigHandler.java | 2 +-
.../solr/handler/admin/ContainerPluginsApi.java | 179 +++++++
.../apache/solr/handler/admin/MergeIndexesOp.java | 8 +-
.../solr/handler/component/HttpShardHandler.java | 2 +-
.../component/PivotFacetFieldValueCollection.java | 2 +-
.../handler/component/QueryElevationComponent.java | 1 -
.../solr/handler/component/SearchHandler.java | 32 +-
.../component/ShardFieldSortedHitQueue.java | 1 -
.../apache/solr/packagemanager/PackageManager.java | 301 ++++++++++--
.../apache/solr/packagemanager/PackageUtils.java | 3 +
.../solr/packagemanager/RepositoryManager.java | 12 +-
.../apache/solr/packagemanager/SolrPackage.java | 4 +
.../solr/packagemanager/SolrPackageInstance.java | 18 +-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 27 +-
.../java/org/apache/solr/pkg/PackageLoader.java | 28 +-
.../src/java/org/apache/solr/schema/RankField.java | 140 ++++++
.../org/apache/solr/search/BoolQParserPlugin.java | 53 +-
.../src/java/org/apache/solr/search/Grouping.java | 2 +-
.../org/apache/solr/search/JoinQParserPlugin.java | 531 ++-------------------
.../{JoinQParserPlugin.java => JoinQuery.java} | 149 +-----
.../org/apache/solr/search/MaxScoreCollector.java | 6 +-
.../java/org/apache/solr/search/QParserPlugin.java | 3 +-
.../org/apache/solr/search/RankQParserPlugin.java | 158 ++++++
.../org/apache/solr/search/SolrIndexSearcher.java | 2 +-
.../solr/search/grouping/CommandHandler.java | 2 +-
...Parser.java => CrossCollectionJoinQParser.java} | 26 +-
...CJFQuery.java => CrossCollectionJoinQuery.java} | 17 +-
.../apache/solr/search/join/FiltersQParser.java | 91 ++--
.../solr/search/join/ScoreJoinQParserPlugin.java | 5 +-
.../apache/solr/search/join/XCJFQParserPlugin.java | 66 ---
.../security/Sha256AuthenticationProvider.java | 2 +-
.../apache/solr/servlet/DirectSolrConnection.java | 2 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 23 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 1 -
.../java/org/apache/solr/update/HdfsUpdateLog.java | 2 +-
.../src/java/org/apache/solr/update/UpdateLog.java | 2 +-
.../processor/AtomicUpdateProcessorFactory.java | 3 +-
.../CountFieldValuesUpdateProcessorFactory.java | 2 +-
...DocBasedVersionConstraintsProcessorFactory.java | 2 +-
.../DocExpirationUpdateProcessorFactory.java | 10 +-
.../MaxFieldValueUpdateProcessorFactory.java | 2 +-
.../MinFieldValueUpdateProcessorFactory.java | 2 +-
.../update/processor/TolerantUpdateProcessor.java | 2 +-
.../update/processor/URLClassifyProcessor.java | 2 +-
.../src/java/org/apache/solr/util/PackageTool.java | 11 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 17 +-
.../solr/util/circuitbreaker/CircuitBreaker.java | 56 +++
.../util/circuitbreaker/CircuitBreakerManager.java | 134 ++++++
.../util/circuitbreaker/MemoryCircuitBreaker.java | 114 +++++
.../resources/EditableSolrConfigAttributes.json | 2 +
solr/core/src/test-files/log4j2.xml | 44 +-
.../runtimecode/MyPlugin.java} | 28 +-
.../runtimecode/containerplugin.v.1.jar.bin | Bin 0 -> 867 bytes
.../runtimecode/containerplugin.v.2.jar.bin | Bin 0 -> 867 bytes
solr/core/src/test-files/runtimecode/sig.txt | 8 +
.../conf/schema-rank-fields.xml} | 23 +-
.../test-files/solr/collection1/conf/schema15.xml | 3 +
.../conf/solrconfig-memory-circuitbreaker.xml | 95 ++++
.../configsets/{xcjf => ccjoin}/conf/schema.xml | 0
.../{xcjf => ccjoin}/conf/solrconfig.xml | 22 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 1 -
.../apache/solr/cloud/BasicDistributedZk2Test.java | 5 +-
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 4 +-
.../solr/cloud/TestConfigSetsAPIZkFailure.java | 28 +-
.../AbstractCloudBackupRestoreTestCase.java | 7 +
.../api/collections/CollectionReloadTest.java | 2 +-
.../CollectionsAPIAsyncDistributedZkTest.java | 2 +-
.../AutoAddReplicasIntegrationTest.java | 2 +-
.../org/apache/solr/core/ResourceLoaderTest.java | 2 -
.../test/org/apache/solr/core/SolrCoreTest.java | 2 +
.../org/apache/solr/core/TestConfigOverlay.java | 2 +
.../core/snapshots/TestSolrCloudSnapshots.java | 2 +
.../solr/core/snapshots/TestSolrCoreSnapshots.java | 2 +
.../solr/filestore/TestDistribPackageStore.java | 27 +-
.../apache/solr/handler/TestContainerPlugin.java | 377 +++++++++++++++
.../org/apache/solr/handler/TestCoreBackup.java | 22 +-
.../solr/handler/TestReplicationHandler.java | 4 +-
.../org/apache/solr/handler/TestRestoreCore.java | 11 +
.../solr/handler/TestStressThreadBackup.java | 13 +
.../apache/solr/handler/V2ApiIntegrationTest.java | 19 +-
.../admin/CoreMergeIndexesAdminHandlerTest.java | 8 +-
.../solr/handler/admin/TestApiFramework.java | 49 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 2 +-
.../apache/solr/schema/ChangedSchemaMergeTest.java | 4 +-
.../test/org/apache/solr/schema/RankFieldTest.java | 285 +++++++++++
.../apache/solr/search/MaxScoreCollectorTest.java | 91 ++++
.../org/apache/solr/search/QueryEqualityTest.java | 18 +-
.../apache/solr/search/RankQParserPluginTest.java | 258 ++++++++++
.../apache/solr/search/SolrIndexSearcherTest.java | 8 +-
.../facet/TestJsonFacetsWithNestedObjects.java | 58 +++
...Test.java => CrossCollectionJoinQueryTest.java} | 88 ++--
.../org/apache/solr/util/TestCircuitBreaker.java | 218 +++++++++
solr/example/files/conf/solrconfig.xml | 38 ++
solr/licenses/commons-lang-2.6.jar.sha1 | 1 +
solr/licenses/commons-lang-LICENSE-ASL.txt | 202 ++++++++
solr/licenses/commons-lang-NOTICE.txt | 5 +
solr/licenses/netty-buffer-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-buffer-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/netty-codec-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-codec-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/netty-common-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-common-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/netty-handler-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-handler-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/netty-resolver-4.1.47.Final.jar.sha1 | 1 -
solr/licenses/netty-resolver-4.1.50.Final.jar.sha1 | 1 +
.../licenses/netty-transport-4.1.47.Final.jar.sha1 | 1 -
.../licenses/netty-transport-4.1.50.Final.jar.sha1 | 1 +
...ty-transport-native-epoll-4.1.47.Final.jar.sha1 | 1 -
...ty-transport-native-epoll-4.1.50.Final.jar.sha1 | 1 +
...nsport-native-unix-common-4.1.47.Final.jar.sha1 | 1 -
...nsport-native-unix-common-4.1.50.Final.jar.sha1 | 1 +
solr/licenses/snappy-java-1.1.7.6.jar.sha1 | 1 +
solr/licenses/snappy-java-LICENSE-ASL.txt | 202 ++++++++
solr/licenses/snappy-java-NOTICE.txt | 17 +
solr/licenses/zookeeper-3.5.7.jar.sha1 | 1 -
solr/licenses/zookeeper-3.6.1.jar.sha1 | 1 +
solr/licenses/zookeeper-jute-3.5.7.jar.sha1 | 1 -
solr/licenses/zookeeper-jute-3.6.1.jar.sha1 | 1 +
solr/server/resources/log4j2-console.xml | 28 +-
solr/server/resources/log4j2.xml | 72 +--
.../solr/configsets/_default/conf/managed-schema | 7 +
.../solr/configsets/_default/conf/solrconfig.xml | 59 +++
.../conf/solrconfig.xml | 42 ++
.../adding-custom-plugins-in-solrcloud-mode.adoc | 2 +-
solr/solr-ref-guide/src/circuit-breakers.adoc | 68 +++
.../src/cluster-node-management.adoc | 6 +-
.../src/collapse-and-expand-results.adoc | 15 +-
.../src/common-query-parameters.adoc | 17 +-
solr/solr-ref-guide/src/config-api.adoc | 7 +
solr/solr-ref-guide/src/distributed-requests.adoc | 4 +-
solr/solr-ref-guide/src/format-of-solr-xml.adoc | 2 +-
.../overview-of-the-solr-admin-ui/dashboard.png | Bin 92750 -> 172175 bytes
.../src/implicit-requesthandlers.adoc | 28 +-
solr/solr-ref-guide/src/index-replication.adoc | 25 +-
solr/solr-ref-guide/src/index.adoc | 3 +
solr/solr-ref-guide/src/json-query-dsl.adoc | 34 +-
solr/solr-ref-guide/src/jvm-settings.adoc | 2 +-
.../src/major-changes-in-solr-9.adoc | 2 +-
solr/solr-ref-guide/src/meta-docs/publish.adoc | 2 +-
solr/solr-ref-guide/src/other-parsers.adoc | 208 ++++----
.../src/overview-of-the-solr-admin-ui.adoc | 16 +-
.../src/query-settings-in-solrconfig.adoc | 22 +
.../src/rule-based-authorization-plugin.adoc | 14 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 49 +-
.../src/solrcloud-autoscaling-trigger-actions.adoc | 8 +-
.../src/solrcloud-autoscaling-triggers.adoc | 2 +-
solr/solr-ref-guide/src/the-stats-component.adoc | 2 +-
solr/solr-ref-guide/src/the-tagger-handler.adoc | 2 +-
solr/solrj/ivy.xml | 4 +
.../solrj/cloud/autoscaling/AutoScalingConfig.java | 42 +-
.../client/solrj/cloud/autoscaling/Policy.java | 7 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 310 ++++++++----
.../client/solrj/cloud/autoscaling/Preference.java | 10 +-
.../solrj/cloud/autoscaling/ReplicaCount.java | 10 +-
.../solrj/cloud/autoscaling/ReplicaInfo.java | 9 +-
.../client/solrj/cloud/autoscaling/Suggester.java | 2 +-
.../solrj/cloud/autoscaling/VersionedData.java | 10 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 2 +-
.../solr/client/solrj/impl/XMLResponseParser.java | 2 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 100 +++-
.../client/solrj/io/stream/CloudSolrStream.java | 6 +-
.../client/solrj/io/stream/DeepRandomStream.java | 6 +-
.../solr/client/solrj/io/stream/DrillStream.java | 280 +++++++++++
.../solrj/io/stream/expr/StreamExpression.java | 7 +-
.../expr/StreamExpressionNamedParameter.java | 8 +-
.../io/stream/expr/StreamExpressionValue.java | 10 +-
.../client/solrj/request/beans/PluginMeta.java | 64 +++
.../solrj/response/AnalysisResponseBase.java | 2 +-
.../apache/solr/common/cloud/DocCollection.java | 9 +-
.../java/org/apache/solr/common/cloud/Replica.java | 11 +-
.../org/apache/solr/common/cloud/ZkNodeProps.java | 15 +-
.../apache/solr/common/cloud/ZkStateReader.java | 14 +-
.../solr/common/params/CollectionParams.java | 33 +-
.../org/apache/solr/common/params/FacetParams.java | 4 +-
.../apache/solr/common/util/CommandOperation.java | 1 -
.../solr/common/util/JsonSchemaValidator.java | 11 +-
.../org/apache/solr/common/util/NamedList.java | 2 +-
.../java/org/apache/solr/common/util/PathTrie.java | 50 +-
.../org/apache/solr/common/util/RetryUtil.java | 2 +-
.../apache/solr/common/util/ValidatingJsonMap.java | 10 +-
.../apache/solr/common/util/XMLErrorLogger.java | 2 +-
solr/solrj/src/test-files/log4j2.xml | 45 +-
.../solr/autoscaling/testAddTooManyPerPolicy.json | 129 +++++
.../solr/client/solrj/LargeVolumeTestBase.java | 2 +-
.../client/solrj/MergeIndexesExampleTestBase.java | 3 +-
.../client/solrj/cloud/autoscaling/TestPolicy.java | 134 +++++-
.../solrj/cloud/autoscaling/TestPolicy2.java | 12 +
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../solrj/io/stream/StreamExpressionTest.java | 115 +++--
.../org/apache/solr/common/util/TestPathTrie.java | 8 +
.../apache/solr/cloud/MiniSolrCloudCluster.java | 1 +
.../java/org/apache/solr/cloud/ZkTestServer.java | 5 +-
solr/webapp/web/css/angular/index.css | 4 +-
versions.lock | 26 +-
versions.props | 7 +-
301 files changed, 8200 insertions(+), 2504 deletions(-)