Skip to content

max_children exist only in top level nested sort #46731

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.

Sign up for GitHub

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
Sep 23, 2019
Merged

max_children exist only in top level nested sort #46731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e886fd3
max_children exist only in top level nested sort
erayarslan Sep 15, 2019
61370d0
integration test style changed: try/catch -> expectThrows
erayarslan Sep 18, 2019
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
17 changes: 13 additions & 4 deletions server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,7 @@ public SortFieldAndFormat build(QueryShardContext context) throws IOException {
Nested nested = null;
if (isUnmapped == false) {
if (nestedSort != null) {
if (nestedSort.getNestedSort() != null && nestedSort.getMaxChildren() != Integer.MAX_VALUE) {
throw new QueryShardException(context,
"max_children is only supported on last level of nested sort");
}
validateMaxChildrenExistOnlyInTopLevelNestedSort(context, nestedSort);
nested = resolveNested(context, nestedSort);
} else {
validateMissingNestedPath(context, fieldName);
Expand All @@ -362,6 +359,18 @@ public SortFieldAndFormat build(QueryShardContext context) throws IOException {
return new SortFieldAndFormat(field, fieldType.docValueFormat(null, null));
}

/**
* Throws an exception if max children is not located at top level nested sort.
*/
static void validateMaxChildrenExistOnlyInTopLevelNestedSort(QueryShardContext context, NestedSortBuilder nestedSort) {
for (NestedSortBuilder child = nestedSort.getNestedSort(); child != null; child = child.getNestedSort()) {
if (child.getMaxChildren() != Integer.MAX_VALUE) {
throw new QueryShardException(context,
"max_children is only supported on top level of nested sort");
}
}
}

/**
* Throws an exception if the provided <code>field</code> requires a nested context.
*/
Expand Down
7 changes: 2 additions & 5 deletions server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryRewriteContext;
import org.elasticsearch.index.query.QueryShardContext;
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.search.DocValueFormat;
import org.elasticsearch.search.MultiValueMode;

Expand All @@ -64,6 +63,7 @@
import java.util.Objects;

import static org.elasticsearch.search.sort.FieldSortBuilder.validateMissingNestedPath;
import static org.elasticsearch.search.sort.FieldSortBuilder.validateMaxChildrenExistOnlyInTopLevelNestedSort;
import static org.elasticsearch.search.sort.NestedSortBuilder.NESTED_FIELD;

/**
Expand Down Expand Up @@ -536,10 +536,7 @@ public SortFieldAndFormat build(QueryShardContext context) throws IOException {

Nested nested = null;
if (nestedSort != null) {
if (nestedSort.getNestedSort() != null && nestedSort.getMaxChildren() != Integer.MAX_VALUE) {
throw new QueryShardException(context,
"max_children is only supported on last level of nested sort");
}
validateMaxChildrenExistOnlyInTopLevelNestedSort(context, nestedSort);
nested = resolveNested(context, nestedSort);
} else {
validateMissingNestedPath(context, fieldName);
Expand Down
6 changes: 2 additions & 4 deletions server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import java.util.Objects;

import static org.elasticsearch.common.xcontent.ConstructingObjectParser.constructorArg;
import static org.elasticsearch.search.sort.FieldSortBuilder.validateMaxChildrenExistOnlyInTopLevelNestedSort;
import static org.elasticsearch.search.sort.NestedSortBuilder.NESTED_FIELD;

/**
Expand Down Expand Up @@ -242,10 +243,7 @@ public SortFieldAndFormat build(QueryShardContext context) throws IOException {

Nested nested = null;
if (nestedSort != null) {
if (nestedSort.getNestedSort() != null && nestedSort.getMaxChildren() != Integer.MAX_VALUE) {
throw new QueryShardException(context,
"max_children is only supported on last level of nested sort");
}
validateMaxChildrenExistOnlyInTopLevelNestedSort(context, nestedSort);
nested = resolveNested(context, nestedSort);
}

Expand Down
30 changes: 30 additions & 0 deletions server/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1421,6 +1421,20 @@ public void testNestedSort() throws IOException, InterruptedException, Execution
.endObject()
.endObject()
.endObject()
.startObject("bar")
.field("type", "nested")
.startObject("properties")
.startObject("foo")
.field("type", "text")
.field("fielddata", true)
.startObject("fields")
.startObject("sub")
.field("type", "keyword")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
Expand Down Expand Up @@ -1473,6 +1487,22 @@ public void testNestedSort() throws IOException, InterruptedException, Execution
assertThat(hits[0].getSortValues()[0], is("bar"));
assertThat(hits[1].getSortValues()[0], is("abc"));

{
SearchPhaseExecutionException exc = expectThrows(SearchPhaseExecutionException.class,
() -> client().prepareSearch()
.setQuery(matchAllQuery())
.addSort(SortBuilders
.fieldSort("nested.bar.foo")
.setNestedSort(new NestedSortBuilder("nested")
.setNestedSort(new NestedSortBuilder("nested.bar")
.setMaxChildren(1)))
.order(SortOrder.DESC))
.get()
);
assertThat(exc.toString(),
containsString("max_children is only supported on top level of nested sort"));
}

// We sort on nested sub field
searchResponse = client().prepareSearch()
.setQuery(matchAllQuery())
Expand Down