You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2024/02/20 16:28:49 UTC

(solr) branch jira/solr-13350 updated (4a46b6d85c6 -> 43be691c4f3)

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

cpoerschke pushed a change to branch jira/solr-13350
in repository https://gitbox.apache.org/repos/asf/solr.git


    from 4a46b6d85c6 use factored out SolrIndexSearcher.populateScoresIfNeeded method on new code path too
     add 200c9bf325c Build: ge.gradle add tags (#2264)
     add f7c5ad3efd6 solr.xml: honor plugin enable=true|false (#2260)
     add c7e9949add2 GH Labeler action: Category labels (#2190)
     add 53a25d1b5d0 SOLR-17141: Create CpuQueryLimit implementation (#2244)
     add bb0675b037b SOLR-17159: Untangle PostTool and SimplePostTool code (#2275)
     add 2ec0cbff130 SOLR-16995: Configure replication behaviour for each replica type (#2207)
     add 6dbada39cbf ReqSupplier interface not actually needed, so simplify code (#2285)
     add d5b3038ab61 Prevent odd error from occasionally showing up. (#2286)
     add 61a67c00851 Use a System wide property to enable PRS (#2230)
     add 7c2edd75a81 remove unused local variable in SolrIndexSearcher.sortDocSet (#2281)
     add 43be691c4f3 Merge branch 'main' into jira/solr-13350

No new revisions were added by this update.

Summary of changes:
 .github/labeler.yml                                |   84 +-
 gradle/ge.gradle                                   |   25 +-
 solr/CHANGES.txt                                   |    5 +-
 .../src/java/org/apache/solr/cli/PostTool.java     | 1179 +++++++++++++++++++-
 .../java/org/apache/solr/cli/RunExampleTool.java   |    1 -
 .../org/apache/solr/cloud/CloudDescriptor.java     |    4 -
 .../org/apache/solr/cloud/RecoveryStrategy.java    |   24 +-
 .../org/apache/solr/cloud/ReplicateFromLeader.java |   29 +-
 .../solr/cloud/ShardLeaderElectionContext.java     |    4 +-
 .../java/org/apache/solr/cloud/ZkController.java   |   24 +-
 .../cloud/api/collections/CreateCollectionCmd.java |   11 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   15 +-
 .../java/org/apache/solr/core/SolrXmlConfig.java   |   22 +-
 .../apache/solr/handler/ReplicationHandler.java    |    2 +
 .../apache/solr/handler/RequestHandlerBase.java    |   23 +-
 .../solr/handler/component/SearchHandler.java      |    8 +-
 .../org/apache/solr/request/SolrRequestInfo.java   |   28 +-
 .../org/apache/solr/search/CpuAllowedLimit.java    |   84 ++
 .../java/org/apache/solr/search/QueryLimits.java   |    8 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |    3 -
 ...lrQueryTimeLimit.java => TimeAllowedLimit.java} |   10 +-
 .../java/org/apache/solr/update/UpdateHandler.java |    7 +-
 .../util/{ThreadStats.java => ThreadCpuTimer.java} |   62 +-
 .../test/org/apache/solr/TestCpuTimeSearch.java    |   12 +-
 .../src/test/org/apache/solr/cli/PostToolTest.java |  222 +++-
 .../apache/solr/cloud/CollectionsAPISolrJTest.java |    9 -
 .../org/apache/solr/cloud/OverseerStatusTest.java  |    4 +-
 .../solr/cloud/ParallelCommitExecutionTest.java    |    1 -
 .../apache/solr/cloud/SolrCloudExampleTest.java    |   59 +-
 .../SimpleCollectionCreateDeleteTest.java          |    5 +-
 .../solr/handler/PingRequestHandlerTest.java       |    2 +-
 .../solr/handler/TestStressThreadBackup.java       |    1 -
 .../solr/handler/admin/HealthCheckHandlerTest.java |    1 -
 .../solr/handler/component/SearchHandlerTest.java  |    6 +-
 .../apache/solr/response/TestRawTransformer.java   |    1 -
 .../transform/TestSubQueryTransformerDistrib.java  |    2 -
 .../apache/solr/schema/TestManagedSchemaAPI.java   |    1 -
 .../solr/search/DistributedReRankExplainTest.java  |    1 -
 .../solr/search/ExpensiveSearchComponent.java      |  207 ++++
 .../apache/solr/search/TestCpuAllowedLimit.java    |  211 ++++
 .../org/apache/solr/search/TestTaskManagement.java |    1 -
 .../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   |    2 +-
 .../processor/TemplateUpdateProcessorTest.java     |    4 +-
 .../apache/solr/handler/sql/TestSQLHandler.java    |    1 -
 solr/packaging/test/test_post.bats                 |   22 +-
 .../examples/UsingSolrJRefGuideExamplesTest.java   |    1 -
 .../examples/IndexingNestedDocuments.java          |    1 -
 .../JsonRequestApiHeatmapFacetingTest.java         |    1 -
 .../query-guide/examples/JsonRequestApiTest.java   |    1 -
 .../query-guide/pages/common-query-parameters.adoc |   17 +
 .../solrj/io/stream/CloudAuthStreamTest.java       |    1 -
 .../client/solrj/io/stream/JDBCStreamTest.java     |    1 -
 .../client/solrj/io/stream/MathExpressionTest.java |    2 -
 .../solrj/io/stream/SelectWithEvaluatorsTest.java  |    1 -
 .../solrj/io/stream/StreamDecoratorTest.java       |   17 -
 .../solr/client/solrj/request/UpdateRequest.java   |   21 +-
 .../java/org/apache/solr/common/cloud/Replica.java |   29 +-
 .../apache/solr/common/params/CommonParams.java    |    8 +-
 .../client/solrj/impl/CloudSolrClientTest.java     |   12 -
 ...ectJsonQueryRequestFacetingIntegrationTest.java |    1 -
 .../JsonQueryRequestFacetingIntegrationTest.java   |    1 -
 .../json/JsonQueryRequestHeatmapFacetingTest.java  |    1 -
 .../cloud/TestCloudCollectionsListeners.java       |    4 -
 .../common/cloud/TestCollectionStateWatchers.java  |    9 +-
 .../cloud/AbstractBasicDistributedZk2TestBase.java |   15 +
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |   37 +-
 70 files changed, 2290 insertions(+), 333 deletions(-)
 create mode 100644 solr/core/src/java/org/apache/solr/search/CpuAllowedLimit.java
 rename solr/core/src/java/org/apache/solr/search/{SolrQueryTimeLimit.java => TimeAllowedLimit.java} (86%)
 rename solr/core/src/java/org/apache/solr/util/{ThreadStats.java => ThreadCpuTimer.java} (60%)
 create mode 100644 solr/core/src/test/org/apache/solr/search/ExpensiveSearchComponent.java
 create mode 100644 solr/core/src/test/org/apache/solr/search/TestCpuAllowedLimit.java