Skip to content

Add searchAfter interfaces to NativeSearchQueryBuilder #2106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
* @author Peter-Josef Meisch
* @author Peer Mueller
* @author vdisk
* @author owen.qq
*/
public class NativeSearchQueryBuilder {

Expand Down Expand Up @@ -80,6 +81,7 @@ public class NativeSearchQueryBuilder {
@Nullable private Duration timeout;
private final List<RescorerQuery> rescorerQueries = new ArrayList<>();
@Nullable private SuggestBuilder suggestBuilder;
@Nullable private List<Object> searchAfter;

public NativeSearchQueryBuilder withQuery(QueryBuilder queryBuilder) {
this.queryBuilder = queryBuilder;
Expand Down Expand Up @@ -342,6 +344,15 @@ public NativeSearchQueryBuilder withSuggestBuilder(SuggestBuilder suggestBuilder
return this;
}

public NativeSearchQueryBuilder withSearchAfter(List<Object> searchAfter) {
if (searchAfter != null && searchAfter.isEmpty()) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since SearchAfterBuilder not allow empty collections (it throws illegalArgument exception)
i add this conditions for ignore empty collections

return this;
}

this.searchAfter = searchAfter;
return this;
}

public NativeSearchQuery build() {

NativeSearchQuery nativeSearchQuery = new NativeSearchQuery( //
Expand Down Expand Up @@ -431,6 +442,11 @@ public NativeSearchQuery build() {
if (suggestBuilder != null) {
nativeSearchQuery.setSuggestBuilder(suggestBuilder);
}

if (searchAfter != null) {
nativeSearchQuery.setSearchAfter(searchAfter);
}

return nativeSearchQuery;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package org.springframework.data.elasticsearch.core.query;

import static org.assertj.core.api.Assertions.assertThat;

import java.util.List;

import org.junit.jupiter.api.Test;

import com.google.common.collect.Lists;

/**
* @author owen.qq
*/
public class NativeSearchQueryBuilderTests {

@Test // #2105
void shouldContainEffectiveSearchAfterValue() {
Long lastSortValue = 1L;
List<Object> searchAfter = Lists.newArrayList(lastSortValue);

NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
nativeSearchQueryBuilder.withSearchAfter(searchAfter);
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();

assertThat(nativeSearchQuery.getSearchAfter()).isNotNull();
}

@Test // #2105
void shouldIgnoreNullableSearchAfterValue() {
List<Object> emptySearchValueByFirstSearch = null;
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
nativeSearchQueryBuilder.withSearchAfter(emptySearchValueByFirstSearch);
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();

assertThat(nativeSearchQuery.getSearchAfter()).isNull();
}

@Test // #2105
void shouldIgnoreEmptySearchAfterValue() {
List<Object> emptySearchValueByFirstSearch = Lists.newArrayList();
NativeSearchQueryBuilder nativeSearchQueryBuilder = new NativeSearchQueryBuilder();
nativeSearchQueryBuilder.withSearchAfter(emptySearchValueByFirstSearch);
NativeSearchQuery nativeSearchQuery = nativeSearchQueryBuilder.build();

assertThat(nativeSearchQuery.getSearchAfter()).isNull();
}
}