Skip to content

Fix Bug in RankDocRetrieverBuilder when from is set to Default (-1) #137637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 7, 2025
Merged

Fix Bug in RankDocRetrieverBuilder when from is set to Default (-1) #137637

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
635bb9c
correct `from` in extractToSearchSourceBuilder
markjhoy Nov 5, 2025
b39ba2f
Update docs/changelog/137637.yaml
markjhoy Nov 5, 2025
359ffdc
fix tests; simplify from check
markjhoy Nov 6, 2025
b00fc52
revert auto-formatting
markjhoy Nov 6, 2025
7bf6e2d
Merge branch 'main' into markjhoy/fix_bug_rank_docs_retriever_builder…
markjhoy Nov 6, 2025
2491054
fix failing test; additional tests; changelog area
markjhoy Nov 6, 2025
29b1197
remove comment
markjhoy Nov 6, 2025
d027200
[CI] Auto commit changes from spotless
Nov 6, 2025
12420c4
cleanup unit and YAML tests
markjhoy Nov 6, 2025
bccb08a
[CI] Auto commit changes from spotless
Nov 6, 2025
e5ac4f4
remove old, commented code
markjhoy Nov 6, 2025
600332a
Merge branch 'main' into markjhoy/fix_bug_rank_docs_retriever_builder…
markjhoy Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...yamlRestTest/resources/rest-api-spec/test/inference/70_text_similarity_rank_retriever.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ setup:
rank_window_size: 10
inference_id: my-rerank-model
inference_text: "How often does the moon hide the sun?"
field: topic
field: text
size: 10

- match: { hits.total.value: 1 }
Expand Down
34 changes: 25 additions & 9 deletions .../src/internalClusterTest/java/org/elasticsearch/xpack/rank/rrf/RRFRetrieverBuilderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ public void testRRFPagination() {
private void assertRRFPagination(
SearchSourceBuilder source,
int from,
int expectedSize,
int maxExpectedSize,
int rankWindowSize,
int rankConstant,
List<String> expectedDocIds
Expand Down Expand Up @@ -231,23 +231,39 @@ private void assertRRFPagination(
)
);
SearchRequestBuilder req = client().prepareSearch(INDEX).setSource(source);

int innerFrom = Math.max(from, 0);
int originalFrom = from;
ElasticsearchAssertions.assertResponse(req, resp -> {
assertNull(resp.pointInTimeId());
assertNotNull(resp.getHits().getTotalHits());
assertThat(resp.getHits().getTotalHits().value(), equalTo(6L));
assertThat(resp.getHits().getTotalHits().relation(), equalTo(TotalHits.Relation.EQUAL_TO));
assertThat(resp.getHits().getHits().length, lessThanOrEqualTo(expectedSize));
for (int k = 0; k < Math.min(expectedSize, resp.getHits().getHits().length); k++) {
assertThat(resp.getHits().getAt(k).getId(), equalTo(expectedDocIds.get(k + innerFrom)));
}

if (originalFrom < 0) {
// assertThat(source.from(), equalTo(SearchService.DEFAULT_FROM));
assertThat(resp.getHits().getHits().length, equalTo(expectedSize));
int expectedSize = innerFrom + maxExpectedSize > 6 ? 6 - innerFrom : maxExpectedSize;
assertThat(resp.getHits().getHits().length, equalTo(expectedSize));

for (int k = 0; k < expectedSize; k++) {
assertThat(resp.getHits().getAt(k).getId(), equalTo(expectedDocIds.get(k + innerFrom)));
}
});

// int innerFrom = Math.max(from, 0);
// int originalFrom = from;
// ElasticsearchAssertions.assertResponse(req, resp -> {
// assertNull(resp.pointInTimeId());
// assertNotNull(resp.getHits().getTotalHits());
// assertThat(resp.getHits().getTotalHits().value(), equalTo(6L));
// assertThat(resp.getHits().getTotalHits().relation(), equalTo(TotalHits.Relation.EQUAL_TO));
// assertThat(resp.getHits().getHits().length, lessThanOrEqualTo(maxExpectedSize));
// for (int k = 0; k < Math.min(maxExpectedSize, resp.getHits().getHits().length); k++) {
// assertThat(resp.getHits().getAt(k).getId(), equalTo(expectedDocIds.get(k + innerFrom)));
// }
//
// if (originalFrom < 0) {
// // assertThat(source.from(), equalTo(SearchService.DEFAULT_FROM));
// assertThat(resp.getHits().getHits().length, equalTo(maxExpectedSize));
// }
// });
}

public void testRRFWithAggs() {
Expand Down