Renamed SimplifiedInnerRetrieverUtils to MultiFieldsInnerRetrieverUtils

Author: Mikep86

x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/simplified/SimplifiedInnerRetrieverUtils.java renamed to x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/MultiFieldsInnerRetrieverUtils.java

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-package org.elasticsearch.xpack.rank.simplified;
+package org.elasticsearch.xpack.rank;
 
 import org.elasticsearch.action.ActionRequestValidationException;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
@@ -32,12 +32,12 @@
 import static org.elasticsearch.action.ValidateActions.addValidationError;
 import static org.elasticsearch.index.IndexSettings.DEFAULT_FIELD_SETTING;
 
-public class SimplifiedInnerRetrieverUtils {
-    private SimplifiedInnerRetrieverUtils() {}
+public class MultiFieldsInnerRetrieverUtils {
+    private MultiFieldsInnerRetrieverUtils() {}
 
     public record WeightedRetrieverSource(CompoundRetrieverBuilder.RetrieverSource retrieverSource, float weight) {}
 
-    public static ActionRequestValidationException validateSimplifiedFormatParams(
+    public static ActionRequestValidationException validateParams(
         List<CompoundRetrieverBuilder.RetrieverSource> innerRetrievers,
         List<String> fields,
         @Nullable String query,
@@ -48,7 +48,7 @@ public static ActionRequestValidationException validateSimplifiedFormatParams(
         ActionRequestValidationException validationException
     ) {
         if (fields.isEmpty() == false || query != null) {
-            // Using the simplified query format
+            // Using the multi-fields query format
             if (query == null) {
                 // Return early here because the following validation checks assume a query param value is provided
                 return addValidationError(

x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/linear/LinearRetrieverBuilder.java

@@ -28,8 +28,8 @@
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xpack.core.XPackPlugin;
+import org.elasticsearch.xpack.rank.MultiFieldsInnerRetrieverUtils;
 import org.elasticsearch.xpack.rank.rrf.RRFRankPlugin;
-import org.elasticsearch.xpack.rank.simplified.SimplifiedInnerRetrieverUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -173,7 +173,7 @@ public ActionRequestValidationException validate(
         boolean allowPartialSearchResults
     ) {
         validationException = super.validate(source, validationException, isScroll, allowPartialSearchResults);
-        validationException = SimplifiedInnerRetrieverUtils.validateSimplifiedFormatParams(
+        validationException = MultiFieldsInnerRetrieverUtils.validateParams(
             innerRetrievers,
             fields,
             query,
@@ -284,7 +284,7 @@ protected RetrieverBuilder doRewrite(QueryRewriteContext ctx) {
 
         ResolvedIndices resolvedIndices = ctx.getResolvedIndices();
         if (resolvedIndices != null && query != null) {
-            // Using the simplified query format
+            // Using the multi-fields query format
             var localIndicesMetadata = resolvedIndices.getConcreteLocalIndicesMetadata();
             if (localIndicesMetadata.size() > 1) {
                 throw new IllegalArgumentException(
@@ -296,7 +296,7 @@ protected RetrieverBuilder doRewrite(QueryRewriteContext ctx) {
                 );
             }
 
-            List<RetrieverSource> fieldsInnerRetrievers = SimplifiedInnerRetrieverUtils.generateInnerRetrievers(
+            List<RetrieverSource> fieldsInnerRetrievers = MultiFieldsInnerRetrieverUtils.generateInnerRetrievers(
                 fields,
                 query,
                 localIndicesMetadata.values(),

x-pack/plugin/rank-rrf/src/test/java/org/elasticsearch/xpack/rank/linear/LinearRetrieverBuilderTests.java

@@ -37,7 +37,7 @@
 import static org.elasticsearch.search.rank.RankBuilder.DEFAULT_RANK_WINDOW_SIZE;
 
 public class LinearRetrieverBuilderTests extends ESTestCase {
-    public void testSimplifiedParamsRewrite() {
+    public void testMultiFieldsParamsRewrite() {
         final String indexName = "test-index";
         final List<String> testInferenceFields = List.of("semantic_field_1", "semantic_field_2");
         final ResolvedIndices resolvedIndices = createMockResolvedIndices(indexName, testInferenceFields, null);
@@ -60,7 +60,7 @@ public void testSimplifiedParamsRewrite() {
             new float[0],
             new ScoreNormalizer[0]
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             retriever,
             queryRewriteContext,
             Map.of("field_1", 1.0f, "field_2", 1.0f),
@@ -79,7 +79,7 @@ public void testSimplifiedParamsRewrite() {
             new float[0],
             new ScoreNormalizer[0]
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             retriever,
             queryRewriteContext,
             Map.of("field_1", 1.0f, "field_2", 1.0f),
@@ -98,7 +98,7 @@ public void testSimplifiedParamsRewrite() {
             new float[0],
             new ScoreNormalizer[0]
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             retriever,
             queryRewriteContext,
             Map.of("field_1", 1.0f, "field_2", 1.5f),
@@ -117,7 +117,7 @@ public void testSimplifiedParamsRewrite() {
             new float[0],
             new ScoreNormalizer[0]
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             retriever,
             queryRewriteContext,
             Map.of("field_*", 1.5f, "*_field_1", 2.5f),
@@ -136,7 +136,7 @@ public void testSimplifiedParamsRewrite() {
             new float[0],
             new ScoreNormalizer[0]
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             retriever,
             queryRewriteContext,
             Map.of("field_*", 1.5f, "field_1", 3.0f, "*_field_1", 2.5f, "semantic_*", 1.5f),
@@ -155,7 +155,7 @@ public void testSimplifiedParamsRewrite() {
             new float[0],
             new ScoreNormalizer[0]
         );
-        assertSimplifiedParamsRewrite(
+        assertMultiFieldsParamsRewrite(
             retriever,
             queryRewriteContext,
             Map.of("*", 1.0f),
@@ -229,7 +229,7 @@ private static ResolvedIndices createMockResolvedIndices(
         );
     }
 
-    private static void assertSimplifiedParamsRewrite(
+    private static void assertMultiFieldsParamsRewrite(
         LinearRetrieverBuilder retriever,
         QueryRewriteContext ctx,
         Map<String, Float> expectedNonInferenceFields,