Skip to content

Commit

Permalink
Add searchQuery is passed creating scroll (#59)
Browse files Browse the repository at this point in the history
Embrace searchQuery parameter in order to fix that scroll of
search query always returns all data of given indices without
considering parameter.
  • Loading branch information
keybod authored and VanRoy committed Apr 13, 2018
1 parent 39f629f commit a480020
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,9 @@ private SearchResult doScroll(SearchSourceBuilder searchSourceBuilder, SearchQue
Assert.notNull(searchQuery.getTypes(), "No type define for Query");
Assert.notNull(searchQuery.getPageable(), "Query.pageable is required for scan & scroll");

QueryBuilder elasticsearchQuery = searchQuery.getQuery();
searchSourceBuilder.query(elasticsearchQuery != null ? elasticsearchQuery : QueryBuilders.matchAllQuery());

if (searchQuery.getFilter() != null) {
searchSourceBuilder.postFilter(searchQuery.getFilter());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -844,12 +844,14 @@ public void shouldReturnResultsWithScanAndScrollForGivenCriteriaQuery() {
public void shouldReturnResultsWithScanAndScrollForGivenSearchQuery() {
//given
List<IndexQuery> entities = createSampleEntitiesWithMessage("Test message", 30);
entities.addAll(createSampleEntitiesWithMessage("Filtered out message", 30));
// when
elasticsearchTemplate.bulkIndex(entities);
elasticsearchTemplate.refresh(SampleEntity.class);
// then

SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).withIndices(INDEX_NAME)
SearchQuery searchQuery = new NativeSearchQueryBuilder()
.withQuery(QueryBuilders.matchQuery("message", "Test")).withIndices(INDEX_NAME)
.withTypes(TYPE_NAME).withPageable(PageRequest.of(0, 10)).build();

ScrolledPage<SampleEntity> scroll = (ScrolledPage<SampleEntity>) elasticsearchTemplate.startScroll(1000, searchQuery, SampleEntity.class);
Expand Down

0 comments on commit a480020

Please sign in to comment.