This is an automated email from the ASF dual-hosted git repository.
dsmiley pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
from 11840af4181 SOLR-17934: Remove Request ID based tracing (#3709)
add 42cd889e8f0 SOLR-17319 : New Combined Query / hybrid search (RRF)
(#3418)
No new revisions were added by this update.
Summary of changes:
.../SOLR-17319-added_combined_query_RRF.yml | 8 +
.../handler/component/CombinedQueryComponent.java | 614 +++++++++++++++++++++
.../component/CombinedQueryResponseBuilder.java | 55 ++
.../component/CombinedQuerySearchHandler.java | 63 +++
.../solr/handler/component/QueryComponent.java | 144 +++--
.../combine/QueryAndResponseCombiner.java | 130 +++++
.../component/combine/ReciprocalRankFusion.java | 166 ++++++
.../handler/component/combine}/package-info.java | 6 +-
.../collection1/conf/solrconfig-combined-query.xml | 168 ++++++
.../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 +++
.../query-guide/pages/json-combined-query-dsl.adoc | 107 ++++
.../modules/query-guide/querying-nav.adoc | 1 +
.../apache/solr/common/params/CombinerParams.java} | 36 +-
19 files changed, 2556 insertions(+), 79 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
