Hybrid query should call rewrite before creating weight (opensearch-project#1268)

* Hybrid query should call rewrite before creating weight

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>

* Awaits fix

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>

* Rewrite with searcher

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>

* Feature flag issue

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>

---------

Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
Signed-off-by: yeonghyeonKo <[email protected]>

Author: harshavamsi

src/main/java/org/opensearch/neuralsearch/query/HybridQueryWeight.java

@@ -47,7 +47,7 @@ public HybridQueryWeight(HybridQuery hybridQuery, IndexSearcher searcher, ScoreM
         super(hybridQuery);
         weights = hybridQuery.getSubQueries().stream().map(q -> {
             try {
-                return searcher.createWeight(q, scoreMode, boost);
+                return searcher.createWeight(searcher.rewrite(q), scoreMode, boost);
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }

src/test/java/org/opensearch/neuralsearch/plugin/NeuralSearchTests.java

@@ -117,6 +117,7 @@ public void testQuerySpecs() {
         assertTrue(querySpecs.stream().anyMatch(spec -> HybridQueryBuilder.NAME.equals(spec.getName().getPreferredName())));
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/17940")
     public void testQueryPhaseSearcher() {
         Optional<QueryPhaseSearcher> queryPhaseSearcherWithFeatureFlagDisabled = plugin.getQueryPhaseSearcher();