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

Polish for retaining the sort order when using text search sort by score.

Browse Source 
Closes gh-3896.
This commit is contained in:
John Blum
2021-12-07 17:33:39 -08:00
parent 132834b1e6
commit 113106037a
2 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java
View File

@@ -175,32 +175,44 @@ public class TextQuery extends Query {
public Document getSortObject() {
if (this.sortByScore) {
if (sortByScoreIndex == 0) {
Document sort = new Document();
sort.put(getScoreFieldName(), META_TEXT_SCORE);
sort.putAll(super.getSortObject());
return sort;
}
return fitInSortByScoreAtPosition(super.getSortObject());
int sortByScoreIndex = this.sortByScoreIndex;
return sortByScoreIndex != 0
? sortByScoreAtPosition(super.getSortObject(), sortByScoreIndex)
: sortByScoreAtPositionZero();
}
return super.getSortObject();
}
private Document fitInSortByScoreAtPosition(Document source) {
private Document sortByScoreAtPositionZero() {
Document sort = new Document();
sort.put(getScoreFieldName(), META_TEXT_SCORE);
sort.putAll(super.getSortObject());
return sort;
}
private Document sortByScoreAtPosition(Document source, int sortByScoreIndex) {
Document target = new Document();
int i = 0;
int index = 0;
for (Entry<String, Object> entry : source.entrySet()) {
if (i == sortByScoreIndex) {
if (index == sortByScoreIndex) {
target.put(getScoreFieldName(), META_TEXT_SCORE);
}
target.put(entry.getKey(), entry.getValue());
i++;
index++;
}
if (i == sortByScoreIndex) {
if (index == sortByScoreIndex) {
target.put(getScoreFieldName(), META_TEXT_SCORE);
}
return target;
}

10
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryUnitTests.java
View File

@@ -15,9 +15,7 @@
*/
package org.springframework.data.mongodb.core.query;
import static org.springframework.data.mongodb.test.util.Assertions.*;
import java.util.Map.Entry;
import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
import org.junit.jupiter.api.Test;
import org.springframework.data.domain.Sort;
@@ -103,20 +101,20 @@ public class TextQueryUnitTests {
query.sortByScore();
query.with(Sort.by(Direction.DESC, "two"));
assertThat(query.getSortObject().entrySet().stream().map(Entry::getKey)).containsExactly("one", "score", "two");
assertThat(query.getSortObject().keySet().stream()).containsExactly("one", "score", "two");
query = new TextQuery(QUERY);
query.with(Sort.by(Direction.DESC, "one"));
query.sortByScore();
assertThat(query.getSortObject().entrySet().stream().map(Entry::getKey)).containsExactly("one", "score");
assertThat(query.getSortObject().keySet().stream()).containsExactly("one", "score");
query = new TextQuery(QUERY);
query.sortByScore();
query.with(Sort.by(Direction.DESC, "one"));
query.with(Sort.by(Direction.DESC, "two"));
assertThat(query.getSortObject().entrySet().stream().map(Entry::getKey)).containsExactly("score", "one", "two");
assertThat(query.getSortObject().keySet().stream()).containsExactly("score", "one", "two");
}
}