fixing for match subquery

Author: Samiul-TheSoccerFan

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticMatchQueryRewriteInterceptor.java

@@ -54,13 +54,13 @@ protected QueryBuilder buildCombinedInferenceAndNonInferenceQuery(
         assert (queryBuilder instanceof MatchQueryBuilder);
         MatchQueryBuilder matchQueryBuilder = (MatchQueryBuilder) queryBuilder;
         BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
-        SemanticQueryBuilder semanticQueryBuilder = createSemanticSubQuery(
+        QueryBuilder semanticQueryBuilder = createSemanticSubQuery(
             indexInformation.getInferenceIndices(),
             matchQueryBuilder.fieldName(),
-            (String) matchQueryBuilder.value()
+            (String) matchQueryBuilder.value(),
+            matchQueryBuilder.boost(),
+            matchQueryBuilder.queryName()
         );
-        semanticQueryBuilder.boost(matchQueryBuilder.boost());
-        semanticQueryBuilder.queryName(matchQueryBuilder.queryName());
         boolQueryBuilder.should(semanticQueryBuilder);
         boolQueryBuilder.should(createSubQueryForIndices(indexInformation.nonInferenceIndices(), matchQueryBuilder));
         return boolQueryBuilder;

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/queries/SemanticQueryRewriteInterceptor.java

@@ -114,9 +114,13 @@ protected QueryBuilder createSubQueryForIndices(Collection<String> indices, Quer
         return boolQueryBuilder;
     }
 
-    protected QueryBuilder createSemanticSubQuery(Collection<String> indices, String fieldName, String value) {
+    protected QueryBuilder createSemanticSubQuery(Collection<String> indices, String fieldName, String value, Float boost, String queryName) {
+        SemanticQueryBuilder semanticQueryBuilder = new SemanticQueryBuilder(fieldName, value, true);
+        semanticQueryBuilder.boost(boost);
+        semanticQueryBuilder.queryName(queryName);
+
         BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
-        boolQueryBuilder.must(new SemanticQueryBuilder(fieldName, value, true));
+        boolQueryBuilder.must(semanticQueryBuilder);
         boolQueryBuilder.filter(new TermsQueryBuilder(IndexFieldMapper.NAME, indices));
         return boolQueryBuilder;
     }