editing bugs but cleaning it up

Author: mridula-s109

server/src/main/java/org/elasticsearch/search/retriever/RankDocsRetrieverBuilder.java

@@ -135,7 +135,7 @@ public void extractToSearchSourceBuilder(SearchSourceBuilder searchSourceBuilder
             searchSourceBuilder.size(rankWindowSize);
         }
         if (sourceHasMinScore()) {
-            searchSourceBuilder.minScore(this.minScore() == null ? Float.MIN_VALUE : this.minScore());
+            searchSourceBuilder.minScore(effectiveMinScore);
         }
         if (searchSourceBuilder.size() + searchSourceBuilder.from() > rankDocResults.length) {
             searchSourceBuilder.size(Math.max(0, rankDocResults.length - searchSourceBuilder.from()));

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

@@ -31,8 +31,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.index.query.RankDocsQueryBuilder.DEFAULT_MIN_SCORE;
-import static org.elasticsearch.search.retriever.CompoundRetrieverBuilder.RANK_WINDOW_SIZE_FIELD;
 import static org.elasticsearch.xcontent.ConstructingObjectParser.constructorArg;
 import static org.elasticsearch.xcontent.ConstructingObjectParser.optionalConstructorArg;
 import static org.elasticsearch.xpack.rank.RankRRFFeatures.LINEAR_RETRIEVER_SUPPORTED;
@@ -56,7 +54,6 @@ public final class LinearRetrieverBuilder extends CompoundRetrieverBuilder<Linea
 
     private final float[] weights;
     private final ScoreNormalizer[] normalizers;
-    private float minScore;
 
     @SuppressWarnings("unchecked")
     static final ConstructingObjectParser<LinearRetrieverBuilder, RetrieverParserContext> PARSER = new ConstructingObjectParser<>(
@@ -75,7 +72,7 @@ public final class LinearRetrieverBuilder extends CompoundRetrieverBuilder<Linea
                 normalizers[index] = component.normalizer;
                 index++;
             }
-            return new LinearRetrieverBuilder(innerRetrievers, rankWindowSize, weights, normalizers, DEFAULT_MIN_SCORE);
+            return new LinearRetrieverBuilder(innerRetrievers, rankWindowSize, weights, normalizers);
         }
     );
 
@@ -108,21 +105,14 @@ public static LinearRetrieverBuilder fromXContent(XContentParser parser, Retriev
     }
 
     LinearRetrieverBuilder(List<RetrieverSource> innerRetrievers, int rankWindowSize) {
-        this(
-            innerRetrievers,
-            rankWindowSize,
-            getDefaultWeight(innerRetrievers.size()),
-            getDefaultNormalizers(innerRetrievers.size()),
-            DEFAULT_MIN_SCORE
-        );
+        this(innerRetrievers, rankWindowSize, getDefaultWeight(innerRetrievers.size()), getDefaultNormalizers(innerRetrievers.size()));
     }
 
     public LinearRetrieverBuilder(
         List<RetrieverSource> innerRetrievers,
         int rankWindowSize,
         float[] weights,
-        ScoreNormalizer[] normalizers,
-        float minScore
+        ScoreNormalizer[] normalizers
     ) {
         super(innerRetrievers, rankWindowSize);
         if (weights.length != innerRetrievers.size()) {
@@ -131,17 +121,13 @@ public LinearRetrieverBuilder(
         if (normalizers.length != innerRetrievers.size()) {
             throw new IllegalArgumentException("The number of normalizers must match the number of inner retrievers");
         }
-        if (minScore < 0) {
-            throw new IllegalArgumentException("[min_score] must be greater than 0, was: " + minScore);
-        }
         this.weights = weights;
         this.normalizers = normalizers;
-        this.minScore = minScore;
     }
 
     @Override
     protected LinearRetrieverBuilder clone(List<RetrieverSource> newChildRetrievers, List<QueryBuilder> newPreFilterQueryBuilders) {
-        LinearRetrieverBuilder clone = new LinearRetrieverBuilder(newChildRetrievers, rankWindowSize, weights, normalizers, minScore);
+        LinearRetrieverBuilder clone = new LinearRetrieverBuilder(newChildRetrievers, rankWindowSize, weights, normalizers);
         clone.preFilterQueryBuilders = newPreFilterQueryBuilders;
         clone.retrieverName = retrieverName;
         return clone;
@@ -150,7 +136,6 @@ protected LinearRetrieverBuilder clone(List<RetrieverSource> newChildRetrievers,
     @Override
     protected SearchSourceBuilder finalizeSourceBuilder(SearchSourceBuilder sourceBuilder) {
         sourceBuilder.trackScores(true);
-        sourceBuilder.trackTotalHits(true);
         return sourceBuilder;
     }
 
@@ -161,9 +146,6 @@ protected RankDoc[] combineInnerRetrieverResults(List<ScoreDoc[]> rankResults, b
         for (int result = 0; result < rankResults.size(); result++) {
             final ScoreNormalizer normalizer = normalizers[result] == null ? IdentityScoreNormalizer.INSTANCE : normalizers[result];
             ScoreDoc[] originalScoreDocs = rankResults.get(result);
-            if (originalScoreDocs == null) {
-                continue;
-            }
             ScoreDoc[] normalizedScoreDocs = normalizer.normalizeScores(originalScoreDocs);
             for (int scoreDocIndex = 0; scoreDocIndex < normalizedScoreDocs.length; scoreDocIndex++) {
                 LinearRankDoc rankDoc = docsToRankResults.computeIfAbsent(
@@ -193,18 +175,12 @@ protected RankDoc[] combineInnerRetrieverResults(List<ScoreDoc[]> rankResults, b
         // sort the results based on the final score, tiebreaker based on smaller doc id
         LinearRankDoc[] sortedResults = docsToRankResults.values().toArray(LinearRankDoc[]::new);
         Arrays.sort(sortedResults);
-        int validCount = 0;
-        while (validCount < sortedResults.length && sortedResults[validCount].score >= minScore) {
-            validCount++;
-        }
-        // trim the results to the minimum of rankWindowSize and the number of valid results
-        int finalSize = Math.min(rankWindowSize, validCount);
-        LinearRankDoc[] topResults = new LinearRankDoc[finalSize];
+        // trim the results if needed, otherwise each shard will always return `rank_window_size` results.
+        LinearRankDoc[] topResults = new LinearRankDoc[Math.min(rankWindowSize, sortedResults.length)];
         for (int rank = 0; rank < topResults.length; ++rank) {
             topResults[rank] = sortedResults[rank];
             topResults[rank].rank = rank + 1;
         }
-
         return topResults;
     }
 
@@ -228,17 +204,5 @@ public void doToXContent(XContentBuilder builder, Params params) throws IOExcept
             builder.endArray();
         }
         builder.field(RANK_WINDOW_SIZE_FIELD.getPreferredName(), rankWindowSize);
-        builder.field(MIN_SCORE_FIELD.getPreferredName(), minScore);
-    }
-
-    @Override
-    public Float minScore() {
-        return minScore;
-    }
-
-    @Override
-    public RetrieverBuilder minScore(Float minScore) {
-        this.minScore = minScore != null ? minScore : DEFAULT_MIN_SCORE;
-        return this;
     }
 }

x-pack/plugin/rank-rrf/src/yamlRestTest/resources/rest-api-spec/test/linear/10_linear_retriever.yml

@@ -1060,9 +1060,9 @@ setup:
   - match: { hits.total.value: 3 }
   - length: {hits.hits: 2}
   - match: { hits.hits.0._id: "2" }
-  - close_to: { hits.hits.0._score: { value: 10.5, error: 0.001 } }
+  - close_to: { hits.hits.0._score: { value: 1.5, error: 0.001 } }
   - match: { hits.hits.1._id: "1" }
-  - match: { hits.hits.1._score: 10 }
+  - close_to: { hits.hits.1._score: { value: 1.0, error: 0.001 } }
 
 ---
 "linear retriever with min_score filtering":
@@ -1103,9 +1103,9 @@ setup:
           size: 10
 
   - match: { hits.total.value: 4 }
-  - length: { hits.hits: 2 }
+  - length: { hits.hits: 1 }
   - match: { hits.hits.0._id: "1" }
-  - close_to: { hits.hits.0._score: { value: 3.4, error: 0.5 } }
+  - close_to: { hits.hits.0._score: { value: 3.0, error: 0.01 } }
 
 ---
 "linear retriever with default min_score":
@@ -1226,6 +1226,9 @@ setup:
               min_score: 0.0
           size: 10
 
+  - match: { hits.total.value: 4 }
+  - length: { hits.hits: 4 }
+
 ---
 "linear retriever with min_score should filter documents even with filters":
   - do:
@@ -1235,20 +1238,25 @@ setup:
           retriever:
             linear:
               retrievers:
-                - standard:
-                    query:
-                      term:
-                        text: "term"
-                - standard:
-                    query:
-                      term:
-                        topic: "technology"
-                - standard:
-                    query:
-                      range:
-                        price: 
-                          gte: 100
-              weights: [1.0, 1.0, 0.5]
+                - retriever:
+                    standard:
+                        query:
+                          term:
+                            text: "term"
+                  weight: 1.0
+                - retriever:
+                    standard:
+                        query:
+                          term:
+                            topic: "technology"
+                  weight: 1.0
+                - retriever:
+                    standard:
+                        query:
+                          range:
+                            price: 
+                              gte: 100
+                  weight: 0.5
               min_score: 0.5
   - match: { hits.total.value: 2 }
   - match: { hits.hits.0._id: "doc_1" }