From a901d5f241814ad70b81ac4eea601ddd745dd69f Mon Sep 17 00:00:00 2001 From: Kathleen DeRusso Date: Mon, 8 Dec 2025 16:48:00 -0500 Subject: [PATCH 1/3] Don't use index() to populate rerank score array --- ...larityRankFeaturePhaseRankCoordinatorContext.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java index 725443bc01e0d..42e7a15d69d34 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java @@ -24,6 +24,7 @@ import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.List; import java.util.Map; @@ -193,9 +194,14 @@ protected InferenceAction.Request generateRequest(List docFeatures) { } float[] extractScoresFromRankedDocs(List rankedDocs) { - float[] scores = new float[rankedDocs.size()]; - for (RankedDocsResults.RankedDoc rankedDoc : rankedDocs) { - scores[rankedDoc.index()] = rankedDoc.relevanceScore(); + List sortedRankedDocs = + rankedDocs.stream() + .sorted(Comparator.comparingInt(RankedDocsResults.RankedDoc::index)) + .toList(); + + float[] scores = new float[sortedRankedDocs.size()]; + for (int i = 0; i < sortedRankedDocs.size(); i++) { + scores[i] = sortedRankedDocs.get(i).relevanceScore(); } return scores; } From 638a8e1c1a2ce364ff5a082af855bfc6f3f56e63 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Tue, 9 Dec 2025 19:14:12 +0000 Subject: [PATCH 2/3] [CI] Auto commit changes from spotless --- ...xtSimilarityRankFeaturePhaseRankCoordinatorContext.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java index 42e7a15d69d34..ba095965c6f26 100644 --- a/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java +++ b/x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/rank/textsimilarity/TextSimilarityRankFeaturePhaseRankCoordinatorContext.java @@ -194,10 +194,9 @@ protected InferenceAction.Request generateRequest(List docFeatures) { } float[] extractScoresFromRankedDocs(List rankedDocs) { - List sortedRankedDocs = - rankedDocs.stream() - .sorted(Comparator.comparingInt(RankedDocsResults.RankedDoc::index)) - .toList(); + List sortedRankedDocs = rankedDocs.stream() + .sorted(Comparator.comparingInt(RankedDocsResults.RankedDoc::index)) + .toList(); float[] scores = new float[sortedRankedDocs.size()]; for (int i = 0; i < sortedRankedDocs.size(); i++) { From 1f71a2f3bdfdd84f9589f98f8c374ce2b0d8c9ae Mon Sep 17 00:00:00 2001 From: Kathleen DeRusso Date: Tue, 9 Dec 2025 16:58:49 -0500 Subject: [PATCH 3/3] Update docs/changelog/139240.yaml --- docs/changelog/139240.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/139240.yaml diff --git a/docs/changelog/139240.yaml b/docs/changelog/139240.yaml new file mode 100644 index 0000000000000..ef5e7326452cc --- /dev/null +++ b/docs/changelog/139240.yaml @@ -0,0 +1,5 @@ +pr: 139240 +summary: Don't use index() to populate rerank score array +area: Relevance +type: bug +issues: []