honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow max_children only in top level nested sort (#46731) 

This commit restricts the usage of max_children to the top level nested sort since it is ignored on the other levels.
This commit is contained in:
Eray 2019-09-23 19:46:39 +03:00 committed by jimczi
parent a815f8b930
commit 199fff8a55
4 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
View File

@ -409,16 +409,15 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> {
throw new QueryShardException(context,
"max_children is only supported on last level of nested sort");
}
// new nested sorts takes priority
validateMaxChildrenExistOnlyInTopLevelNestedSort(context, nestedSort);
nested = resolveNested(context, nestedSort);
} else {
nested = resolveNested(context, nestedPath, nestedFilter);
}
}
IndexFieldData<?> fieldData = context.getForField(fieldType);
if (fieldData instanceof IndexNumericFieldData == false
&& (sortMode == SortMode.SUM || sortMode == SortMode.AVG || sortMode == SortMode.MEDIAN)) {
&& (sortMode == SortMode.SUM || sortMode == SortMode.AVG || sortMode == SortMode.MEDIAN)) {
throw new QueryShardException(context, "we only support AVG, MEDIAN and SUM on number based fields");
}
final SortField field;
@ -437,6 +436,18 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> {
}
}
/**
* 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");
}
}
}
@Override
public boolean equals(Object other) {
if (this == other) {

2
server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java
View File

@ -66,6 +66,7 @@ import java.util.Locale;
import java.util.Objects;
import static org.elasticsearch.index.query.AbstractQueryBuilder.parseInnerQueryBuilder;
import static org.elasticsearch.search.sort.FieldSortBuilder.validateMaxChildrenExistOnlyInTopLevelNestedSort;
import static org.elasticsearch.search.sort.NestedSortBuilder.NESTED_FIELD;
/**
@ -630,6 +631,7 @@ public class GeoDistanceSortBuilder extends SortBuilder<GeoDistanceSortBuilder>
"max_children is only supported on last level of nested sort");
}
// new nested sorts takes priority
validateMaxChildrenExistOnlyInTopLevelNestedSort(context, nestedSort);
nested = resolveNested(context, nestedSort);
} else {
nested = resolveNested(context, nestedPath, nestedFilter);

2
server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
View File

@ -60,6 +60,7 @@ import java.util.Locale;
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;
/**
@ -325,6 +326,7 @@ public class ScriptSortBuilder extends SortBuilder<ScriptSortBuilder> {
"max_children is only supported on last level of nested sort");
}
// new nested sorts takes priority
validateMaxChildrenExistOnlyInTopLevelNestedSort(context, nestedSort);
nested = resolveNested(context, nestedSort);
} else {
nested = resolveNested(context, nestedPath, nestedFilter);

30
server/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java
View File

@ -1421,6 +1421,20 @@ public class FieldSortIT extends ESIntegTestCase {
.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()
@ -1471,6 +1485,22 @@ public class FieldSortIT extends ESIntegTestCase {
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())