This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a change to branch branch_10x
in repository https://gitbox.apache.org/repos/asf/solr.git
from 56a40fed1d4 SOLR-17933: Remove DirectSolrConnection from test (#3708)
new d2914651451 SOLR-17319 : New Combined Query / hybrid search (RRF)
(#3418)
new 1751d9ca185 SOLR-17933: fix imports & indentation
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:
.../SOLR-17319-added_combined_query_RRF.yml | 8 +
gradle/libs.versions.toml | 11 +-
.../handler/component/CombinedQueryComponent.java | 614 +++++++++++++++++++++
.../component/CombinedQueryResponseBuilder.java | 55 ++
.../component/CombinedQuerySearchHandler.java | 63 +++
.../solr/handler/component/QueryComponent.java | 144 +++--
.../solr/handler/component/SearchHandler.java | 2 +-
.../combine/QueryAndResponseCombiner.java | 130 +++++
.../component/combine/ReciprocalRankFusion.java | 166 ++++++
.../handler/component/combine}/package-info.java | 6 +-
.../collection1/conf/solrconfig-combined-query.xml | 168 ++++++
.../solr/handler/MoreLikeThisHandlerTest.java | 9 +-
.../component/CombinedQueryComponentTest.java | 250 +++++++++
.../component/CombinedQuerySearchHandlerTest.java | 76 +++
.../component/CombinedQuerySolrCloudTest.java | 284 ++++++++++
.../DistributedCombinedQueryComponentTest.java | 293 ++++++++++
.../combine/QueryAndResponseCombinerTest.java | 61 ++
.../combine/ReciprocalRankFusionTest.java | 109 ++++
.../handler/component/combine/TestCombiner.java | 64 +++
.../UniqFieldsUpdateProcessorFactoryTest.java | 2 -
.../xslt/XSLTUpdateRequestHandlerTest.java | 2 -
.../query-guide/pages/json-combined-query-dsl.adoc | 107 ++++
.../modules/query-guide/querying-nav.adoc | 1 +
.../apache/solr/client/solrj/util/ClientUtils.java | 1 -
.../apache/solr/common/params/CombinerParams.java} | 36 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 1 -
26 files changed, 2566 insertions(+), 97 deletions(-)
create mode 100644 changelog/unreleased/SOLR-17319-added_combined_query_RRF.yml
create mode 100644
solr/core/src/java/org/apache/solr/handler/component/CombinedQueryComponent.java
create mode 100644
solr/core/src/java/org/apache/solr/handler/component/CombinedQueryResponseBuilder.java
create mode 100644
solr/core/src/java/org/apache/solr/handler/component/CombinedQuerySearchHandler.java
create mode 100644
solr/core/src/java/org/apache/solr/handler/component/combine/QueryAndResponseCombiner.java
create mode 100644
solr/core/src/java/org/apache/solr/handler/component/combine/ReciprocalRankFusion.java
copy solr/{api/src/java/org/apache/solr/client/api/model =>
core/src/java/org/apache/solr/handler/component/combine}/package-info.java (80%)
create mode 100644
solr/core/src/test-files/solr/collection1/conf/solrconfig-combined-query.xml
create mode 100644
solr/core/src/test/org/apache/solr/handler/component/CombinedQueryComponentTest.java
create mode 100644
solr/core/src/test/org/apache/solr/handler/component/CombinedQuerySearchHandlerTest.java
create mode 100644
solr/core/src/test/org/apache/solr/handler/component/CombinedQuerySolrCloudTest.java
create mode 100644
solr/core/src/test/org/apache/solr/handler/component/DistributedCombinedQueryComponentTest.java
create mode 100644
solr/core/src/test/org/apache/solr/handler/component/combine/QueryAndResponseCombinerTest.java
create mode 100644
solr/core/src/test/org/apache/solr/handler/component/combine/ReciprocalRankFusionTest.java
create mode 100644
solr/core/src/test/org/apache/solr/handler/component/combine/TestCombiner.java
create mode 100644
solr/solr-ref-guide/modules/query-guide/pages/json-combined-query-dsl.adoc
copy solr/solrj/src/{test/org/apache/solr/common/params/CommonParamsTest.java
=> java/org/apache/solr/common/params/CombinerParams.java} (52%)
mode change 100755 => 100644
