From 6756f792c8be61fbb4786036c311deef3e4d8942 Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Sun, 1 Dec 2019 10:03:56 +0100 Subject: [PATCH] DATAES-699 - Fix count implementation. Original PR: #349 --- .../data/elasticsearch/core/ElasticsearchRestTemplate.java | 2 ++ .../data/elasticsearch/core/ElasticsearchTemplate.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java index b3fd1efc0..d87c96f7f 100644 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplate.java @@ -598,6 +598,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate if (elasticsearchQuery != null) { sourceBuilder.query(elasticsearchQuery); } + sourceBuilder.size(0); countRequest.source(sourceBuilder); try { @@ -616,6 +617,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate if (elasticsearchFilter != null) { searchRequest.source().postFilter(elasticsearchFilter); } + searchRequest.source().size(0); SearchResponse response; try { response = client.search(searchRequest, RequestOptions.DEFAULT); diff --git a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java index 18f9a86aa..a1caf3728 100755 --- a/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java +++ b/src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java @@ -508,6 +508,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate if (elasticsearchQuery != null) { countRequestBuilder.setQuery(elasticsearchQuery); } + countRequestBuilder.setSize(0); return countRequestBuilder.execute().actionGet().getHits().getTotalHits(); } @@ -521,6 +522,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate if (elasticsearchFilter != null) { searchRequestBuilder.setPostFilter(elasticsearchFilter); } + searchRequestBuilder.setSize(0); return searchRequestBuilder.execute().actionGet().getHits().getTotalHits(); }