Merge conflicts

Author: mridula-s109

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

@@ -58,7 +58,7 @@ public void testMultiFieldsParamsRewrite() {
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
             null,
-            null
+            false
         );
 
         // No wildcards, no per-field boosting
@@ -556,7 +556,7 @@ public void testSearchRemoteIndex() {
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
             null,
-            null
+            false
         );
 
         LinearRetrieverBuilder retriever = new LinearRetrieverBuilder(

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

@@ -69,11 +69,9 @@ public void testRetrieverExtractionErrors() throws IOException {
                             null,
                             null,
                             null,
-                            null,
-                            null,
                             new PointInTimeBuilder(new BytesArray("pitid")),
                             null,
-                            null
+                            false
                         )
                     )
             );
@@ -97,11 +95,9 @@ public void testRetrieverExtractionErrors() throws IOException {
                             null,
                             null,
                             null,
-                            null,
-                            null,
                             new PointInTimeBuilder(new BytesArray("pitid")),
                             null,
-                            null
+                            false
                         )
                     )
             );
@@ -177,7 +173,7 @@ public void testMultiFieldsParamsRewrite() {
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
             null,
-            null
+            false
         );
 
         // No wildcards, no per-field boosting
@@ -225,7 +221,8 @@ public void testMultiFieldsParamsRewriteWithWeights() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         // Simple per-field boosting
@@ -324,7 +321,8 @@ public void testNegativeWeightValidation() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         // Test negative weight validation
@@ -359,7 +357,7 @@ public void testSearchRemoteIndex() {
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
             null,
-            null
+            false
         );
 
         RRFRetrieverBuilder rrfRetrieverBuilder = new RRFRetrieverBuilder(
@@ -389,7 +387,8 @@ public void testPerFieldWeightsBasic() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         // Test with per-field weights in the simplified format
@@ -417,7 +416,8 @@ public void testLexicalFieldWeightPropagation() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         RRFRetrieverBuilder rrfRetrieverBuilder = new RRFRetrieverBuilder(
@@ -462,7 +462,8 @@ public void testInferenceFieldWeights() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         RRFRetrieverBuilder rrfRetrieverBuilder = new RRFRetrieverBuilder(
@@ -502,7 +503,8 @@ public void testNegativeWeightsRejected() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         RRFRetrieverBuilder rrfRetrieverBuilder = new RRFRetrieverBuilder(
@@ -530,7 +532,8 @@ public void testZeroWeightsAccepted() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         RRFRetrieverBuilder rrfRetrieverBuilder = new RRFRetrieverBuilder(
@@ -557,7 +560,8 @@ public void testLargeWeightValues() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         // Test very large weight values
@@ -585,7 +589,8 @@ public void testMixedWeightedAndUnweightedFields() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         // Test mixing weighted and unweighted fields in simplified syntax
@@ -613,7 +618,8 @@ public void testDecimalWeightPrecision() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         // Test various decimal weight precisions
@@ -641,7 +647,8 @@ public void testSimplifiedSyntaxWithGlobPatterns() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         // Test glob patterns with weights in simplified syntax
@@ -669,7 +676,8 @@ public void testExtremelyLargeWeights() {
             null,
             resolvedIndices,
             new PointInTimeBuilder(new BytesArray("pitid")),
-            null
+            null,
+            false
         );
 
         // Test potential overflow scenarios with very large float values