refactoring sparse query to adjust boost and queryname and move to copy constructor

Author: Samiul-TheSoccerFan

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/search/SparseVectorQueryBuilder.java

@@ -170,8 +170,8 @@ public static SparseVectorQueryBuilder from(
             shouldPruneTokens,
             tokenPruningConfig
         );
-        sparseVectorQueryBuilder.boost(queryBuilder.boost());
-        sparseVectorQueryBuilder.queryName(queryBuilder.queryName());
+//        sparseVectorQueryBuilder.boost(queryBuilder.boost());
+//        sparseVectorQueryBuilder.queryName(queryBuilder.queryName());
         return sparseVectorQueryBuilder;
     }
 

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

@@ -43,14 +43,18 @@ protected String getQuery(QueryBuilder queryBuilder) {
     @Override
     protected QueryBuilder buildInferenceQuery(QueryBuilder queryBuilder, InferenceIndexInformationForField indexInformation) {
         Map<String, List<String>> inferenceIdsIndices = indexInformation.getInferenceIdsIndices();
+        QueryBuilder finalQueryBuilder;
         if (inferenceIdsIndices.size() == 1) {
             // Simple case, everything uses the same inference ID
             String searchInferenceId = inferenceIdsIndices.keySet().iterator().next();
-            return buildNestedQueryFromSparseVectorQuery(queryBuilder, searchInferenceId);
+            finalQueryBuilder = buildNestedQueryFromSparseVectorQuery(queryBuilder, searchInferenceId);
         } else {
             // Multiple inference IDs, construct a boolean query
-            return buildInferenceQueryWithMultipleInferenceIds(queryBuilder, inferenceIdsIndices);
+            finalQueryBuilder = buildInferenceQueryWithMultipleInferenceIds(queryBuilder, inferenceIdsIndices);
         }
+        finalQueryBuilder.queryName(queryBuilder.queryName());
+        finalQueryBuilder.boost(queryBuilder.boost());
+        return finalQueryBuilder;
     }
 
     private QueryBuilder buildInferenceQueryWithMultipleInferenceIds(
@@ -95,6 +99,8 @@ protected QueryBuilder buildCombinedInferenceAndNonInferenceQuery(
                 )
             );
         }
+        boolQueryBuilder.boost(queryBuilder.boost());
+        boolQueryBuilder.queryName(queryBuilder.queryName());
         return boolQueryBuilder;
     }
 
@@ -114,8 +120,7 @@ private QueryBuilder buildNestedQueryFromSparseVectorQuery(QueryBuilder queryBui
                 sparseVectorQueryBuilder.shouldPruneTokens(),
                 sparseVectorQueryBuilder.getTokenPruningConfig()
             ),
-            ScoreMode.Max,
-            queryBuilder.queryName()
+            ScoreMode.Max
         );
     }
 

x-pack/plugin/inference/src/test/java/org/elasticsearch/index/query/SemanticSparseVectorQueryRewriteInterceptorTests.java

@@ -128,6 +128,8 @@ public void testBoostAndQueryNameOnSparseVectorQueryRewrite() throws IOException
             rewritten instanceof InterceptedQueryBuilderWrapper
         );
         InterceptedQueryBuilderWrapper intercepted = (InterceptedQueryBuilderWrapper) rewritten;
+        assertEquals(BOOST, intercepted.boost(), 1.0f);
+        assertEquals(QUERY_NAME, intercepted.queryName());
         assertTrue(intercepted.queryBuilder instanceof NestedQueryBuilder);
         NestedQueryBuilder nestedQueryBuilder = (NestedQueryBuilder) intercepted.queryBuilder;
         assertEquals(SemanticTextField.getChunksFieldName(FIELD_NAME), nestedQueryBuilder.path());
@@ -137,8 +139,7 @@ public void testBoostAndQueryNameOnSparseVectorQueryRewrite() throws IOException
         assertEquals(SemanticTextField.getEmbeddingsFieldName(FIELD_NAME), sparseVectorQueryBuilder.getFieldName());
         assertEquals(INFERENCE_ID, sparseVectorQueryBuilder.getInferenceId());
         assertEquals(QUERY, sparseVectorQueryBuilder.getQuery());
-        assertEquals(BOOST, sparseVectorQueryBuilder.boost(), 0.0f);
-        assertEquals(QUERY_NAME, sparseVectorQueryBuilder.queryName());
+        assertEquals(BOOST, sparseVectorQueryBuilder.boost(), 1.0f);
     }
 
     private QueryRewriteContext createQueryRewriteContext(Map<String, InferenceFieldMetadata> inferenceFields) {