Restore final for the main method query argument

Signed-off-by: Martin Gaievski <[email protected]>
opensearch-project · Dec 1, 2023 · 379478a · 379478a
1 parent dbac80e
commit 379478a
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/main/java/org/opensearch/neuralsearch/search/query/HybridQueryPhaseSearcher.java b/src/main/java/org/opensearch/neuralsearch/search/query/HybridQueryPhaseSearcher.java
@@ -62,14 +62,14 @@ public HybridQueryPhaseSearcher() {
     public boolean searchWith(
         final SearchContext searchContext,
         final ContextIndexSearcher searcher,
-        Query query,
+        final Query query,
         final LinkedList<QueryCollectorContext> collectors,
         final boolean hasFilterCollector,
         final boolean hasTimeout
     ) throws IOException {
         if (isHybridQuery(query, searchContext)) {
-            query = extractHybridQuery(searchContext, query);
-            return searchWithCollector(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout);
+            Query hybridQuery = extractHybridQuery(searchContext, query);
+            return searchWithCollector(searchContext, searcher, hybridQuery, collectors, hasFilterCollector, hasTimeout);
         }
         validateQuery(searchContext, query);
         return super.searchWith(searchContext, searcher, query, collectors, hasFilterCollector, hasTimeout);
@@ -78,7 +78,7 @@ public boolean searchWith(
     private boolean isHybridQuery(final Query query, final SearchContext searchContext) {
         if (query instanceof HybridQuery) {
             return true;
-        } else if (hasNestedFieldOrNestedDocs(query, searchContext) && isWrappedHybridQuery(query)) {
+        } else if (isWrappedHybridQuery(query) && hasNestedFieldOrNestedDocs(query, searchContext)) {
             /* Checking if this is a hybrid query that is wrapped into a Bool query by core Opensearch code
             https://github.com/opensearch-project/OpenSearch/blob/main/server/src/main/java/org/opensearch/search/DefaultSearchContext.java#L367-L370.
             main reason for that is performance optimization, at time of writing we are ok with loosing on performance if that's unblocks
@@ -101,9 +101,7 @@ private boolean isHybridQuery(final Query query, final SearchContext searchConte
                }
             }
             TODO Need to add logic for passing hybrid sub-queries through the same logic in core to ensure there is no latency regression */
-            if (query instanceof BooleanQuery == false) {
-                return false;
-            }
+            // we have already checked if query in instance of Boolean in higher level else if condition
             return ((BooleanQuery) query).clauses()
                 .stream()
                 .filter(clause -> clause.getQuery() instanceof HybridQuery == false)