Skip to content

Fix handling of page size and max results in search request preparation. #3106

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 1 commit into from
May 10, 2025
Merged

Fix handling of page size and max results in search request preparation. #3106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 17 additions & 20 deletions src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1295,11 +1295,15 @@ public MsearchRequest searchMsearchRequest(
.timeout(timeStringMs(query.getTimeout())) //
;

if (query.getPageable().isPaged()) {
bb //
.from((int) query.getPageable().getOffset()) //
.size(query.getPageable().getPageSize());
}
var offset = query.getPageable().isPaged() ? query.getPageable().getOffset() : 0;
var pageSize = query.getPageable().isPaged() ? query.getPageable().getPageSize()
: INDEX_MAX_RESULT_WINDOW;
// if we have both a page size and a max results, we take the min, this is necessary for
// searchForStream to work correctly (#3098) as there the page size defines what is
// returned in a single request, and the max result determines the total number of
// documents returned
var size = query.isLimiting() ? Math.min(pageSize, query.getMaxResults()) : pageSize;
bb.from((int) offset).size(size);

if (!isEmpty(query.getFields())) {
bb.fields(fb -> {
Expand All @@ -1312,10 +1316,6 @@ public MsearchRequest searchMsearchRequest(
bb.storedFields(query.getStoredFields());
}

if (query.isLimiting()) {
bb.size(query.getMaxResults());
}

if (query.getMinScore() > 0) {
bb.minScore((double) query.getMinScore());
}
Expand Down Expand Up @@ -1473,13 +1473,14 @@ private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nu
builder.seqNoPrimaryTerm(true);
}

if (query.getPageable().isPaged()) {
builder //
.from((int) query.getPageable().getOffset()) //
.size(query.getPageable().getPageSize());
} else {
builder.from(0).size(INDEX_MAX_RESULT_WINDOW);
}
var offset = query.getPageable().isPaged() ? query.getPageable().getOffset() : 0;
var pageSize = query.getPageable().isPaged() ? query.getPageable().getPageSize() : INDEX_MAX_RESULT_WINDOW;
// if we have both a page size and a max results, we take the min, this is necessary for
// searchForStream to work correctly (#3098) as there the page size defines what is
// returned in a single request, and the max result determines the total number of
// documents returned
var size = query.isLimiting() ? Math.min(pageSize, query.getMaxResults()) : pageSize;
builder.from((int) offset).size(size);

if (!isEmpty(query.getFields())) {
var fieldAndFormats = query.getFields().stream().map(field -> FieldAndFormat.of(b -> b.field(field))).toList();
Expand All @@ -1494,10 +1495,6 @@ private <T> void prepareSearchRequest(Query query, @Nullable String routing, @Nu
addIndicesOptions(builder, query.getIndicesOptions());
}

if (query.isLimiting()) {
builder.size(query.getMaxResults());
}

if (query.getMinScore() > 0) {
builder.minScore((double) query.getMinScore());
}
Expand Down