Made hybrid QPS extending QueryPhaseSearcherWrapper (#356) (#364)

Signed-off-by: Martin Gaievski <[email protected]> (cherry picked from commit 2c5d150) Co-authored-by: Martin Gaievski <[email protected]>
opensearch-project · Sep 29, 2023 · 9e12de8 · 9e12de8
1 parent 848ec21
commit 9e12de8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,4 +20,5 @@ Support sparse semantic retrieval by introducing `sparse_encoding` ingest proces
 ### Infrastructure
 ### Documentation
 ### Maintenance
+Consumed latest changes from core, use QueryPhaseSearcherWrapper as parent class for Hybrid QPS ([#356](https://github.com/opensearch-project/neural-search/pull/356))
 ### Refactoring
diff --git a/src/main/java/org/opensearch/neuralsearch/search/query/HybridQueryPhaseSearcher.java b/src/main/java/org/opensearch/neuralsearch/search/query/HybridQueryPhaseSearcher.java
@@ -33,6 +33,7 @@
 import org.opensearch.search.internal.SearchContext;
 import org.opensearch.search.query.QueryCollectorContext;
 import org.opensearch.search.query.QueryPhase;
+import org.opensearch.search.query.QueryPhaseSearcherWrapper;
 import org.opensearch.search.query.QuerySearchResult;
 import org.opensearch.search.query.TopDocsCollectorContext;
 import org.opensearch.search.rescore.RescoreContext;
@@ -45,7 +46,11 @@
  * upstream standard implementation of searcher is called.
  */
 @Log4j2
-public class HybridQueryPhaseSearcher extends QueryPhase.DefaultQueryPhaseSearcher {
+public class HybridQueryPhaseSearcher extends QueryPhaseSearcherWrapper {
+
+    public HybridQueryPhaseSearcher() {
+        super();
+    }
 
     public boolean searchWith(
         final SearchContext searchContext,
@@ -58,7 +63,7 @@ public boolean searchWith(
         if (query instanceof HybridQuery) {
             return searchWithCollector(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout);
         }
-        return super.searchWithCollector(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout);
+        return super.searchWith(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout);
     }
 
     @VisibleForTesting