Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-07-10 04:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-765 - Pageable.unpaged() is not used to build a query returning all documents.

Browse Source 
Original PR: #409
This commit is contained in:
Peter-Josef Meisch 2020-03-20 19:07:58 +01:00 committed by GitHub
parent 17af36702f
commit 39b318caa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/elasticsearch/core/AbstractElasticsearchTemplate.java
View File

@ -15,6 +15,8 @@ import org.springframework.util.StringUtils;
*/ */
public abstract class AbstractElasticsearchTemplate { public abstract class AbstractElasticsearchTemplate {
static final Integer INDEX_MAX_RESULT_WINDOW = 10_000;
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractElasticsearchTemplate.class); private static final Logger LOGGER = LoggerFactory.getLogger(AbstractElasticsearchTemplate.class);
protected ElasticsearchConverter elasticsearchConverter; protected ElasticsearchConverter elasticsearchConverter;

3
src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java
View File

@ -1347,6 +1347,9 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate
startRecord = (int) offset; startRecord = (int) offset;
sourceBuilder.size(query.getPageable().getPageSize()); sourceBuilder.size(query.getPageable().getPageSize());
} else {
startRecord = 0;
sourceBuilder.size(INDEX_MAX_RESULT_WINDOW);
} }
sourceBuilder.from(startRecord); sourceBuilder.from(startRecord);

3
src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
View File

@ -1124,6 +1124,9 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate
startRecord = (int) offset; startRecord = (int) offset;
searchRequestBuilder.setSize(query.getPageable().getPageSize()); searchRequestBuilder.setSize(query.getPageable().getPageSize());
} else {
startRecord = 0;
searchRequestBuilder.setSize(INDEX_MAX_RESULT_WINDOW);
} }
searchRequestBuilder.setFrom(startRecord); searchRequestBuilder.setFrom(startRecord);

2
src/main/java/org/springframework/data/elasticsearch/core/ReactiveElasticsearchTemplate.java
View File

@ -367,6 +367,8 @@ public class ReactiveElasticsearchTemplate implements ReactiveElasticsearchOpera
request.source(searchSourceBuilder); request.source(searchSourceBuilder);
} else { } else {
searchSourceBuilder.from(0);
searchSourceBuilder.size(AbstractElasticsearchTemplate.INDEX_MAX_RESULT_WINDOW);
request.source(searchSourceBuilder); request.source(searchSourceBuilder);
} }
return request; return request;