Spring/spring-data-elasticsearch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAES-907 - Track Total Hits not working when set to false.

Browse Source 
Original PR: #515
This commit is contained in:
Peter-Josef Meisch
2020-08-28 23:06:42 +02:00
committed by GitHub
parent 4344a65dc2
commit ef1cbc35f6
11 changed files with 162 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchRestTemplateTests.java
View File

@@ -32,6 +32,7 @@ import org.elasticsearch.action.support.ActiveShardCount;
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.common.unit.TimeValue;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.data.annotation.Id;
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
@@ -59,6 +60,7 @@ import org.springframework.test.context.ContextConfiguration;
*/
@SpringIntegrationTest
@ContextConfiguration(classes = { ElasticsearchRestTemplateConfiguration.class })
@DisplayName("ElasticsearchRestTemplate")
public class ElasticsearchRestTemplateTests extends ElasticsearchTemplateTests {
@Test

94
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
View File

@@ -44,7 +44,9 @@ import java.util.Set;
import java.util.UUID;
import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.assertj.core.api.SoftAssertions;
import org.assertj.core.util.Lists;
import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.support.IndicesOptions;
@@ -61,6 +63,7 @@ import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.OptimisticLockingFailureException;
@@ -3511,6 +3514,97 @@ public abstract class ElasticsearchTemplateTests {
assertThatSeqNoPrimaryTermIsFilled(entity2);
}
@Test // DATAES-907
@DisplayName("should track_total_hits with default value")
void shouldTrackTotalHitsWithDefaultValue() {
NativeSearchQuery queryAll = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
operations.delete(queryAll, SampleEntity.class);
List<SampleEntity> entities = IntStream.rangeClosed(1, 15_000)
.mapToObj(i -> SampleEntity.builder().id("" + i).build()).collect(Collectors.toList());
operations.save(entities);
indexOperations.refresh();
queryAll.setTrackTotalHits(null);
SearchHits<SampleEntity> searchHits = operations.search(queryAll, SampleEntity.class);
SoftAssertions softly = new SoftAssertions();
softly.assertThat(searchHits.getTotalHits()).isEqualTo((long) RequestFactory.INDEX_MAX_RESULT_WINDOW);
softly.assertThat(searchHits.getTotalHitsRelation()).isEqualTo(TotalHitsRelation.GREATER_THAN_OR_EQUAL_TO);
softly.assertAll();
}
@Test // DATAES-907
@DisplayName("should track total hits")
void shouldTrackTotalHits() {
NativeSearchQuery queryAll = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
operations.delete(queryAll, SampleEntity.class);
List<SampleEntity> entities = IntStream.rangeClosed(1, 15_000)
.mapToObj(i -> SampleEntity.builder().id("" + i).build()).collect(Collectors.toList());
operations.save(entities);
indexOperations.refresh();
queryAll.setTrackTotalHits(true);
queryAll.setTrackTotalHitsUpTo(12_345);
SearchHits<SampleEntity> searchHits = operations.search(queryAll, SampleEntity.class);
SoftAssertions softly = new SoftAssertions();
softly.assertThat(searchHits.getTotalHits()).isEqualTo(15_000L);
softly.assertThat(searchHits.getTotalHitsRelation()).isEqualTo(TotalHitsRelation.EQUAL_TO);
softly.assertAll();
}
@Test // DATAES-907
@DisplayName("should track total hits to specific value")
void shouldTrackTotalHitsToSpecificValue() {
NativeSearchQuery queryAll = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
operations.delete(queryAll, SampleEntity.class);
List<SampleEntity> entities = IntStream.rangeClosed(1, 15_000)
.mapToObj(i -> SampleEntity.builder().id("" + i).build()).collect(Collectors.toList());
operations.save(entities);
indexOperations.refresh();
queryAll.setTrackTotalHits(null);
queryAll.setTrackTotalHitsUpTo(12_345);
SearchHits<SampleEntity> searchHits = operations.search(queryAll, SampleEntity.class);
SoftAssertions softly = new SoftAssertions();
softly.assertThat(searchHits.getTotalHits()).isEqualTo(12_345L);
softly.assertThat(searchHits.getTotalHitsRelation()).isEqualTo(TotalHitsRelation.GREATER_THAN_OR_EQUAL_TO);
softly.assertAll();
}
@Test
@DisplayName("should track total hits is off")
void shouldTrackTotalHitsIsOff() {
NativeSearchQuery queryAll = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).build();
operations.delete(queryAll, SampleEntity.class);
List<SampleEntity> entities = IntStream.rangeClosed(1, 15_000)
.mapToObj(i -> SampleEntity.builder().id("" + i).build()).collect(Collectors.toList());
operations.save(entities);
indexOperations.refresh();
queryAll.setTrackTotalHits(false);
queryAll.setTrackTotalHitsUpTo(12_345);
SearchHits<SampleEntity> searchHits = operations.search(queryAll, SampleEntity.class);
SoftAssertions softly = new SoftAssertions();
softly.assertThat(searchHits.getTotalHits()).isEqualTo(10_000L);
softly.assertThat(searchHits.getTotalHitsRelation()).isEqualTo(TotalHitsRelation.OFF);
softly.assertAll();
}
@Data
@NoArgsConstructor
@AllArgsConstructor

2
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTransportTemplateTests.java
View File

@@ -34,6 +34,7 @@ import org.elasticsearch.action.update.UpdateRequestBuilder;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.engine.DocumentMissingException;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.annotation.Id;
@@ -56,6 +57,7 @@ import org.springframework.test.context.ContextConfiguration;
*/
@SpringIntegrationTest
@ContextConfiguration(classes = { ElasticsearchTemplateConfiguration.class })
@DisplayName("ElasticsearchTransportTemplate")
public class ElasticsearchTransportTemplateTests extends ElasticsearchTemplateTests {
@Autowired private Client client;