iter

Author: pmpailis

server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java

@@ -18,7 +18,6 @@
 import org.elasticsearch.common.io.stream.DelayableWriteable;
 import org.elasticsearch.common.lucene.search.TopDocsAndMaxScore;
 import org.elasticsearch.common.util.concurrent.AbstractRunnable;
-import org.elasticsearch.index.query.RankDocsQueryBuilder;
 import org.elasticsearch.search.SearchPhaseResult;
 import org.elasticsearch.search.SearchService;
 import org.elasticsearch.search.SearchShardTarget;
@@ -63,7 +62,6 @@ public class QueryPhaseResultConsumer extends ArraySearchPhaseResults<SearchPhas
     private final boolean hasTopDocs;
     private final boolean hasAggs;
     private final boolean performFinalReduce;
-    private final boolean isRankQuery;
 
     private final Consumer<Exception> onPartialMergeFailure;
 
@@ -118,7 +116,6 @@ public QueryPhaseResultConsumer(
         this.aggReduceContextBuilder = hasAggs ? controller.getReduceContext(isCanceled, source.aggregations()) : null;
         batchReduceSize = (hasAggs || hasTopDocs) ? Math.min(request.getBatchedReduceSize(), expectedResultSize) : expectedResultSize;
         topDocsStats = new TopDocsStats(request.resolveTrackTotalHitsUpTo());
-        isRankQuery = source != null && source.query() instanceof RankDocsQueryBuilder;
     }
 
     @Override

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

@@ -181,8 +181,7 @@ public void onResponse(MultiSearchResponse items) {
                         failures.forEach(ex::addSuppressed);
                         listener.onFailure(ex);
                     } else {
-                        RankDoc[] combinedResults = combineInnerRetrieverResults(topDocs, ctx.isExplain());
-                        results.set(normalizeRankDocs(combinedResults));
+                        results.set(combineInnerRetrieverResults(topDocs, ctx.isExplain()));
                         listener.onResponse(null);
                     }
                 }

server/src/test/java/org/elasticsearch/index/query/RankDocsQueryBuilderTests.java

@@ -251,4 +251,16 @@ public void testUnknownField() throws IOException {
     public void testValidOutput() throws IOException {
         // no-op since RankDocsQueryBuilder is an internal only API
     }
+
+    public void shouldThrowForNegativeScores() throws IOException {
+        try (Directory directory = newDirectory(); RandomIndexWriter iw = new RandomIndexWriter(random(), directory)) {
+            iw.addDocument(new Document());
+            try (IndexReader reader = iw.getReader()) {
+                SearchExecutionContext context = createSearchExecutionContext(newSearcher(reader));
+                RankDocsQueryBuilder queryBuilder = new RankDocsQueryBuilder(new RankDoc[] { new RankDoc(0, -1.0f, 0) }, null, false);
+                IllegalArgumentException ex = expectThrows(IllegalArgumentException.class, () -> queryBuilder.doToQuery(context));
+                assertEquals("RankDoc scores must be positive values. Missing a normalization step?", ex.getMessage());
+            }
+        }
+    }
 }