Resolved merge conflict

Author: mridula-s109

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

@@ -332,10 +332,11 @@ public int doHashCode() {
         return Objects.hash(super.doHashCode(), fields, query, rankConstant, Arrays.hashCode(weights));
     }
 
-    /**
-     * Creates an RRFRetrieverBuilder from a list of weighted retrievers for simplified syntax.
-     */
-    private RRFRetrieverBuilder createRRFFromWeightedRetrievers(List<WeightedRetrieverSource> r, int rankWindowSize, int rankConstant) {
+    private static RRFRetrieverBuilder createRRFFromWeightedRetrievers(
+        List<WeightedRetrieverSource> r,
+        int rankWindowSize,
+        int rankConstant
+    ) {
         int size = r.size();
         List<RetrieverSource> retrievers = new ArrayList<>(size);
         float[] weights = new float[size];
@@ -347,10 +348,7 @@ private RRFRetrieverBuilder createRRFFromWeightedRetrievers(List<WeightedRetriev
         return new RRFRetrieverBuilder(retrievers, null, null, rankWindowSize, rankConstant, weights);
     }
 
-    /**
-     * Validates that field weights are non-negative for simplified syntax.
-     */
-    private void validateNonNegativeWeight(float w) {
+    private static void validateNonNegativeWeight(float w) {
         if (w < 0) {
             throw new IllegalArgumentException("[" + NAME + "] per-field weights must be non-negative");
         }

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

@@ -54,8 +54,8 @@ public static RRFRetrieverBuilder createRandomRRFRetrieverBuilder() {
             fields = randomList(1, 10, () -> {
                 String field = randomAlphaOfLengthBetween(1, 10);
                 if (randomBoolean()) {
-                    float weight = randomFloat() * 10 + 0.1f;
-                    return field + "^" + weight;
+                    float weight = randomFloatBetween(0.1f, 10.0f, true);
+                    field = field + "^" + weight;
                 }
                 return field;
             });
@@ -367,111 +367,20 @@ public void testRRFRetrieverComponentErrorCases() throws IOException {
     }
 
     public void testSimplifiedWeightedFieldsParsing() throws IOException {
-        SearchUsageHolder searchUsageHolder = new UsageService().getSearchUsageHolder();
-
-        // Test basic weighted field syntax parsing
-        String basicWeightedContent = """
-            {
-              "retriever": {
-                "rrf": {
-                  "fields": ["name^2.0", "description^0.5"],
-                  "query": "test"
-                }
-              }
-            }
-            """;
-
-        try (XContentParser jsonParser = createParser(JsonXContent.jsonXContent, basicWeightedContent)) {
-            SearchSourceBuilder source = new SearchSourceBuilder().parseXContent(jsonParser, true, searchUsageHolder, nf -> true);
-            assertThat(source.retriever(), instanceOf(RRFRetrieverBuilder.class));
-            RRFRetrieverBuilder parsed = (RRFRetrieverBuilder) source.retriever();
-            assertNotNull(parsed);
-            assertEquals("rrf", parsed.getName());
-        }
-    }
-
-    public void testMixedWeightedAndUnweightedFields() throws IOException {
-        SearchUsageHolder searchUsageHolder = new UsageService().getSearchUsageHolder();
-
-        // Test mixing weighted and unweighted fields
-        String mixedContent = """
-            {
-              "retriever": {
-                "rrf": {
-                  "fields": ["title^3.0", "content", "tags^1.5", "summary"],
-                  "query": "search term"
-                }
-              }
-            }
-            """;
-
-        try (XContentParser jsonParser = createParser(JsonXContent.jsonXContent, mixedContent)) {
-            SearchSourceBuilder source = new SearchSourceBuilder().parseXContent(jsonParser, true, searchUsageHolder, nf -> true);
-            assertThat(source.retriever(), instanceOf(RRFRetrieverBuilder.class));
-        }
-    }
-
-    public void testDecimalWeights() throws IOException {
-        SearchUsageHolder searchUsageHolder = new UsageService().getSearchUsageHolder();
-
-        // Test various decimal weight values
-        String decimalWeightsContent = """
-            {
-              "retriever": {
-                "rrf": {
-                  "fields": ["field1^0.1", "field2^2.75", "field3^10.5"],
-                  "query": "test"
-                }
-              }
-            }
-            """;
-
-        try (XContentParser jsonParser = createParser(JsonXContent.jsonXContent, decimalWeightsContent)) {
-            SearchSourceBuilder source = new SearchSourceBuilder().parseXContent(jsonParser, true, searchUsageHolder, nf -> true);
-            assertThat(source.retriever(), instanceOf(RRFRetrieverBuilder.class));
-        }
-    }
-
-    public void testZeroWeight() throws IOException {
-        SearchUsageHolder searchUsageHolder = new UsageService().getSearchUsageHolder();
-
-        // Test zero weight (should be valid)
-        String zeroWeightContent = """
-            {
-              "retriever": {
-                "rrf": {
-                  "fields": ["field1^0.0", "field2^1.0"],
-                  "query": "test"
-                }
-              }
-            }
-            """;
-
-        try (XContentParser jsonParser = createParser(JsonXContent.jsonXContent, zeroWeightContent)) {
-            SearchSourceBuilder source = new SearchSourceBuilder().parseXContent(jsonParser, true, searchUsageHolder, nf -> true);
-            assertThat(source.retriever(), instanceOf(RRFRetrieverBuilder.class));
-        }
-    }
-
-    public void testLargeWeightValues() throws IOException {
-        SearchUsageHolder searchUsageHolder = new UsageService().getSearchUsageHolder();
-
-        // Test very large weight values
-        String largeWeightContent = """
+        // Test that weighted fields are parsed correctly
+        String restContent = """
             {
               "retriever": {
                 "rrf": {
-                  "fields": ["field1^1000.0", "field2^999999.99"],
-                  "query": "test"
+                  "fields": ["name^2.0", "description^0.5", "content"],
+                  "query": "test query",
+                  "min_score": 20.0,
+                  "_name": "foo_rrf"
                 }
               }
             }
             """;
-
-        try (XContentParser jsonParser = createParser(JsonXContent.jsonXContent, largeWeightContent)) {
-            SearchSourceBuilder source = new SearchSourceBuilder().parseXContent(jsonParser, true, searchUsageHolder, nf -> true);
-            assertThat(source.retriever(), instanceOf(RRFRetrieverBuilder.class));
-        }
+        checkRRFRetrieverParsing(restContent);
     }
 
     private void expectParsingException(String restContent, String expectedMessageFragment) throws IOException {

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

@@ -348,13 +348,17 @@ public void testMultiFieldsParamsRewriteWithWeights() {
             RRFRetrieverBuilder.DEFAULT_RANK_CONSTANT,
             new float[0]
         );
+<<<<<<< HEAD
         assertMultiFieldsParamsRewriteWithWeights(
             rrfRetrieverBuilder,
             queryRewriteContext,
             Map.of("field", 0.0f),
             Map.of(),
             "test query"
         );
+=======
+        assertMultiFieldsParamsRewrite(rrfRetrieverBuilder, queryRewriteContext, Map.of("field", 0.0f), Map.of(), "test query");
+>>>>>>> 9c3b02a0421 (Addressed all comments and cleaned up)
 
         // Large weight values are handled correctly
         rrfRetrieverBuilder = new RRFRetrieverBuilder(
@@ -527,9 +531,6 @@ public void testSearchRemoteIndex() {
         assertEquals("[rrf] cannot specify [query] when querying remote indices", iae.getMessage());
     }
 
-
-
-
     public void testNegativeWeightsRejected() {
         final String indexName = "test-index";
         final ResolvedIndices resolvedIndices = createMockResolvedIndices(indexName, List.of(), null);
@@ -562,12 +563,6 @@ public void testNegativeWeightsRejected() {
         assertEquals("[rrf] per-field weights must be non-negative", iae.getMessage());
     }
 
-
-
-
-
-
-
     @Override
     protected NamedXContentRegistry xContentRegistry() {
         List<NamedXContentRegistry.Entry> entries = new SearchModule(Settings.EMPTY, List.of()).getNamedXContents();

x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/rrf/310_rrf_retriever_simplified.yml

@@ -567,19 +567,6 @@ setup:
   - match: { hits.hits.1._id: "1" }
   - match: { hits.hits.2._id: "3" }
 
----
-"Negative per-field weights are rejected":
-  - do:
-      catch: bad_request
-      search:
-        index: test-index
-        body:
-          retriever:
-            rrf:
-              fields: [ "text_1^-1" ]
-              query: "foo"
-  - contains: { error.root_cause.0.reason: "[rrf] per-field weights must be non-negative" }
-
 ---
 "Zero per-field weights are accepted":
   - do:
@@ -611,19 +598,3 @@ setup:
   - match: { hits.total.value: 3 }
   - length: { hits.hits: 3 }
 
----
-"Large weight values":
-  - requires:
-      cluster_features: ["rrf_retriever.simplified_weighted_support"]
-      reason: "Simplified weighted fields syntax support"
-
-  - do:
-      search:
-        index: test-index
-        body:
-          retriever:
-            rrf:
-              fields: ["text_1^1000000", "text_2^1"]
-              query: "foo"
-
-  - gte: { hits.total.value: 1 }