Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-26 13:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-657 - Sort by _score not supported by ElasticsearchRestTemplate.

Browse Source 
Original pull request: #325
This commit is contained in:
xhaggi 2019-09-23 14:49:15 +02:00
parent 0899df94eb
commit 5f78ab8e25
3 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,7 @@ import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilder; import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
import org.elasticsearch.search.sort.FieldSortBuilder; import org.elasticsearch.search.sort.FieldSortBuilder;
import org.elasticsearch.search.sort.ScoreSortBuilder;
import org.elasticsearch.search.sort.SortBuilder; import org.elasticsearch.search.sort.SortBuilder;
import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.search.sort.SortOrder;
@ -93,7 +94,6 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort;
import org.springframework.data.elasticsearch.ElasticsearchException; import org.springframework.data.elasticsearch.ElasticsearchException;
import org.springframework.data.elasticsearch.annotations.Document; import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Mapping;
import org.springframework.data.elasticsearch.annotations.Setting; import org.springframework.data.elasticsearch.annotations.Setting;
import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage; import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
import org.springframework.data.elasticsearch.core.client.support.AliasData; import org.springframework.data.elasticsearch.core.client.support.AliasData;
@ -148,6 +148,7 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate
implements ElasticsearchOperations, EsClient<RestHighLevelClient>, ApplicationContextAware { implements ElasticsearchOperations, EsClient<RestHighLevelClient>, ApplicationContextAware {
private static final Logger logger = LoggerFactory.getLogger(ElasticsearchRestTemplate.class); private static final Logger logger = LoggerFactory.getLogger(ElasticsearchRestTemplate.class);
private RestHighLevelClient client; private RestHighLevelClient client;
private ResultsMapper resultsMapper; private ResultsMapper resultsMapper;
private String searchTimeout; private String searchTimeout;
@ -1353,19 +1354,34 @@ public class ElasticsearchRestTemplate extends AbstractElasticsearchTemplate
private void prepareSort(Query query, SearchSourceBuilder sourceBuilder, private void prepareSort(Query query, SearchSourceBuilder sourceBuilder,
@Nullable ElasticsearchPersistentEntity<?> entity) { @Nullable ElasticsearchPersistentEntity<?> entity) {
for (Sort.Order order : query.getSort()) { for (Sort.Order order : query.getSort()) {
ElasticsearchPersistentProperty property = entity != null // SortOrder sortOrder = order.getDirection().isDescending() ? SortOrder.DESC : SortOrder.ASC;
? entity.getPersistentProperty(order.getProperty()) //
: null; if (ScoreSortBuilder.NAME.equals(order.getProperty())) {
String fieldName = property != null ? property.getFieldName() : order.getProperty(); ScoreSortBuilder sort = SortBuilders //
FieldSortBuilder sort = SortBuilders.fieldSort(fieldName) .scoreSort() //
.order(order.getDirection().isDescending() ? SortOrder.DESC : SortOrder.ASC); .order(sortOrder);
if (order.getNullHandling() == Sort.NullHandling.NULLS_FIRST) {
sort.missing("_first"); sourceBuilder.sort(sort);
} else if (order.getNullHandling() == Sort.NullHandling.NULLS_LAST) { } else {
sort.missing("_last"); ElasticsearchPersistentProperty property = (entity != null) //
? entity.getPersistentProperty(order.getProperty()) //
: null;
String fieldName = property != null ? property.getFieldName() : order.getProperty();
FieldSortBuilder sort = SortBuilders //
.fieldSort(fieldName) //
.order(sortOrder);
if (order.getNullHandling() == Sort.NullHandling.NULLS_FIRST) {
sort.missing("_first");
} else if (order.getNullHandling() == Sort.NullHandling.NULLS_LAST) {
sort.missing("_last");
}
sourceBuilder.sort(sort);
} }
sourceBuilder.sort(sort);
} }
} }

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

@ -128,7 +128,6 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate impleme
private static final Logger QUERY_LOGGER = LoggerFactory private static final Logger QUERY_LOGGER = LoggerFactory
.getLogger("org.springframework.data.elasticsearch.core.QUERY"); .getLogger("org.springframework.data.elasticsearch.core.QUERY");
private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchTemplate.class); private static final Logger LOGGER = LoggerFactory.getLogger(ElasticsearchTemplate.class);
private static final String FIELD_SCORE = "_score";
private Client client; private Client client;
private ResultsMapper resultsMapper; private ResultsMapper resultsMapper;
@ -1128,7 +1127,7 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate impleme
for (Sort.Order order : query.getSort()) { for (Sort.Order order : query.getSort()) {
SortOrder sortOrder = order.getDirection().isDescending() ? SortOrder.DESC : SortOrder.ASC; SortOrder sortOrder = order.getDirection().isDescending() ? SortOrder.DESC : SortOrder.ASC;
if (FIELD_SCORE.equals(order.getProperty())) { if (ScoreSortBuilder.NAME.equals(order.getProperty())) {
ScoreSortBuilder sort = SortBuilders // ScoreSortBuilder sort = SortBuilders //
.scoreSort() // .scoreSort() //
.order(sortOrder); .order(sortOrder);

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

@ -786,26 +786,30 @@ public class ElasticsearchTemplateTests {
assertThat(sampleEntities.getContent().get(1).getMessage()).isEqualTo(sampleEntity2.getMessage()); assertThat(sampleEntities.getContent().get(1).getMessage()).isEqualTo(sampleEntity2.getMessage());
} }
@Test // DATAES-467 @Test // DATAES-467, DATAES-657
public void shouldSortResultsByScore() { public void shouldSortResultsByScore() {
// given // given
List<SampleEntity> entities = Arrays.asList( // List<SampleEntity> entities = Arrays.asList( //
SampleEntity.builder().id("1").message("abc").build(), // SampleEntity.builder().id("1").message("green").build(), //
SampleEntity.builder().id("2").message("def").build(), // SampleEntity.builder().id("2").message("yellow green").build(), //
SampleEntity.builder().id("3").message("ghi").build()); SampleEntity.builder().id("3").message("blue").build());
elasticsearchTemplate.bulkIndex(getIndexQueries(entities)); elasticsearchTemplate.bulkIndex(getIndexQueries(entities));
elasticsearchTemplate.refresh(SampleEntity.class); elasticsearchTemplate.refresh(SampleEntity.class);
SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()) SearchQuery searchQuery = new NativeSearchQueryBuilder() //
.withPageable(PageRequest.of(0, 10, Sort.by(Sort.Order.asc("_score")))).build(); .withQuery(matchQuery("message", "green")) //
.withPageable(PageRequest.of(0, 10, Sort.by(Sort.Order.asc("_score")))) //
.build();
// when // when
Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class); Page<SampleEntity> page = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class);
// then // then
assertThat(sampleEntities.getTotalElements()).isEqualTo(3); assertThat(page.getTotalElements()).isEqualTo(2);
assertThat(page.getContent().get(0).getId()).isEqualTo("2");
assertThat(page.getContent().get(1).getId()).isEqualTo("1");
} }
@Test @Test