Skip to content

Make 0 as invalid value for min_children in has_child query #41347

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 7 commits into from
Apr 25, 2019
Merged

Make 0 as invalid value for min_children in has_child query #41347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
adefce1
squashing multiple commits
codebird Apr 18, 2019
cc7dc07
fixing #32949 updated DEFAULT_MIN_CHILDREN to be 1, this way in case …
codebird Apr 18, 2019
4d84b50
Merge branch 'master' into fixing#32949
Apr 23, 2019
8e41565
Merge branch 'master' into fixing#32949
Apr 23, 2019
f5edd09
Fix ChildQuerySearchIT
Apr 23, 2019
2cbda76
Merge branch 'master' into fixing#32949
Apr 24, 2019
0ff02ba
Merge branch 'master' into fixing#32949
Apr 25, 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
10 changes: 5 additions & 5 deletions modules/parent-join/src/main/java/org/elasticsearch/join/query/HasChildQueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil
/**
* The default minimum number of children that are required to match for the parent to be considered a match.
*/
public static final int DEFAULT_MIN_CHILDREN = 0;
public static final int DEFAULT_MIN_CHILDREN = 1;

/**
* The default value for ignore_unmapped.
Expand Down Expand Up @@ -133,11 +133,11 @@ protected void doWriteTo(StreamOutput out) throws IOException {
* the maximum number of children that are required to match for the parent to be considered a match.
*/
public HasChildQueryBuilder minMaxChildren(int minChildren, int maxChildren) {
if (minChildren < 0) {
throw new IllegalArgumentException("[" + NAME + "] requires non-negative 'min_children' field");
if (minChildren <= 0) {
throw new IllegalArgumentException("[" + NAME + "] requires positive 'min_children' field");
}
if (maxChildren < 0) {
throw new IllegalArgumentException("[" + NAME + "] requires non-negative 'max_children' field");
if (maxChildren <= 0) {
throw new IllegalArgumentException("[" + NAME + "] requires positive 'max_children' field");
}
if (maxChildren < minChildren) {
throw new IllegalArgumentException("[" + NAME + "] 'max_children' is less than 'min_children'");
Expand Down
64 changes: 12 additions & 52 deletions modules/parent-join/src/test/java/org/elasticsearch/join/query/ChildQuerySearchIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1396,16 +1396,6 @@ public void testMinMaxChildren() throws Exception {
SearchResponse response;

// Score mode = NONE
response = minMaxQuery(ScoreMode.None, 0, null);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[0].getScore(), equalTo(1f));
assertThat(response.getHits().getHits()[1].getId(), equalTo("3"));
assertThat(response.getHits().getHits()[1].getScore(), equalTo(1f));
assertThat(response.getHits().getHits()[2].getId(), equalTo("4"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.None, 1, null);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
Expand Down Expand Up @@ -1434,7 +1424,7 @@ public void testMinMaxChildren() throws Exception {

assertThat(response.getHits().getTotalHits().value, equalTo(0L));

response = minMaxQuery(ScoreMode.None, 0, 4);
response = minMaxQuery(ScoreMode.None, 1, 4);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("2"));
Expand All @@ -1444,7 +1434,7 @@ public void testMinMaxChildren() throws Exception {
assertThat(response.getHits().getHits()[2].getId(), equalTo("4"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.None, 0, 3);
response = minMaxQuery(ScoreMode.None, 1, 3);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("2"));
Expand All @@ -1454,7 +1444,7 @@ public void testMinMaxChildren() throws Exception {
assertThat(response.getHits().getHits()[2].getId(), equalTo("4"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.None, 0, 2);
response = minMaxQuery(ScoreMode.None, 1, 2);

assertThat(response.getHits().getTotalHits().value, equalTo(2L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("2"));
Expand All @@ -1472,16 +1462,6 @@ public void testMinMaxChildren() throws Exception {
assertThat(e.getMessage(), equalTo("[has_child] 'max_children' is less than 'min_children'"));

// Score mode = SUM
response = minMaxQuery(ScoreMode.Total, 0, null);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
assertThat(response.getHits().getHits()[0].getScore(), equalTo(6f));
assertThat(response.getHits().getHits()[1].getId(), equalTo("3"));
assertThat(response.getHits().getHits()[1].getScore(), equalTo(3f));
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Total, 1, null);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
Expand Down Expand Up @@ -1510,7 +1490,7 @@ public void testMinMaxChildren() throws Exception {

assertThat(response.getHits().getTotalHits().value, equalTo(0L));

response = minMaxQuery(ScoreMode.Total, 0, 4);
response = minMaxQuery(ScoreMode.Total, 1, 4);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
Expand All @@ -1520,7 +1500,7 @@ public void testMinMaxChildren() throws Exception {
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Total, 0, 3);
response = minMaxQuery(ScoreMode.Total, 1, 3);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
Expand All @@ -1530,7 +1510,7 @@ public void testMinMaxChildren() throws Exception {
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Total, 0, 2);
response = minMaxQuery(ScoreMode.Total, 1, 2);

assertThat(response.getHits().getTotalHits().value, equalTo(2L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("3"));
Expand All @@ -1548,16 +1528,6 @@ public void testMinMaxChildren() throws Exception {
assertThat(e.getMessage(), equalTo("[has_child] 'max_children' is less than 'min_children'"));

// Score mode = MAX
response = minMaxQuery(ScoreMode.Max, 0, null);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
assertThat(response.getHits().getHits()[0].getScore(), equalTo(3f));
assertThat(response.getHits().getHits()[1].getId(), equalTo("3"));
assertThat(response.getHits().getHits()[1].getScore(), equalTo(2f));
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Max, 1, null);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
Expand Down Expand Up @@ -1586,7 +1556,7 @@ public void testMinMaxChildren() throws Exception {

assertThat(response.getHits().getTotalHits().value, equalTo(0L));

response = minMaxQuery(ScoreMode.Max, 0, 4);
response = minMaxQuery(ScoreMode.Max, 1, 4);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
Expand All @@ -1596,7 +1566,7 @@ public void testMinMaxChildren() throws Exception {
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Max, 0, 3);
response = minMaxQuery(ScoreMode.Max, 1, 3);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
Expand All @@ -1606,7 +1576,7 @@ public void testMinMaxChildren() throws Exception {
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Max, 0, 2);
response = minMaxQuery(ScoreMode.Max, 1, 2);

assertThat(response.getHits().getTotalHits().value, equalTo(2L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("3"));
Expand All @@ -1624,16 +1594,6 @@ public void testMinMaxChildren() throws Exception {
assertThat(e.getMessage(), equalTo("[has_child] 'max_children' is less than 'min_children'"));

// Score mode = AVG
response = minMaxQuery(ScoreMode.Avg, 0, null);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
assertThat(response.getHits().getHits()[0].getScore(), equalTo(2f));
assertThat(response.getHits().getHits()[1].getId(), equalTo("3"));
assertThat(response.getHits().getHits()[1].getScore(), equalTo(1.5f));
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Avg, 1, null);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
Expand Down Expand Up @@ -1662,7 +1622,7 @@ public void testMinMaxChildren() throws Exception {

assertThat(response.getHits().getTotalHits().value, equalTo(0L));

response = minMaxQuery(ScoreMode.Avg, 0, 4);
response = minMaxQuery(ScoreMode.Avg, 1, 4);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
Expand All @@ -1672,7 +1632,7 @@ public void testMinMaxChildren() throws Exception {
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Avg, 0, 3);
response = minMaxQuery(ScoreMode.Avg, 1, 3);

assertThat(response.getHits().getTotalHits().value, equalTo(3L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("4"));
Expand All @@ -1682,7 +1642,7 @@ public void testMinMaxChildren() throws Exception {
assertThat(response.getHits().getHits()[2].getId(), equalTo("2"));
assertThat(response.getHits().getHits()[2].getScore(), equalTo(1f));

response = minMaxQuery(ScoreMode.Avg, 0, 2);
response = minMaxQuery(ScoreMode.Avg, 1, 2);

assertThat(response.getHits().getTotalHits().value, equalTo(2L));
assertThat(response.getHits().getHits()[0].getId(), equalTo("3"));
Expand Down
6 changes: 3 additions & 3 deletions ...les/parent-join/src/test/java/org/elasticsearch/join/query/HasChildQueryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ protected void initializeAdditionalMappings(MapperService mapperService) throws
*/
@Override
protected HasChildQueryBuilder doCreateTestQueryBuilder() {
int min = randomIntBetween(0, Integer.MAX_VALUE / 2);
int min = randomIntBetween(1, Integer.MAX_VALUE / 2);
int max = randomIntBetween(min, Integer.MAX_VALUE);

QueryBuilder innerQueryBuilder = new MatchAllQueryBuilder();
Expand Down Expand Up @@ -215,10 +215,10 @@ public void testIllegalValues() {
int positiveValue = randomIntBetween(0, Integer.MAX_VALUE);
HasChildQueryBuilder foo = hasChildQuery("foo", query, ScoreMode.None); // all good
e = expectThrows(IllegalArgumentException.class, () -> foo.minMaxChildren(randomIntBetween(Integer.MIN_VALUE, -1), positiveValue));
assertEquals("[has_child] requires non-negative 'min_children' field", e.getMessage());
assertEquals("[has_child] requires positive 'min_children' field", e.getMessage());

e = expectThrows(IllegalArgumentException.class, () -> foo.minMaxChildren(positiveValue, randomIntBetween(Integer.MIN_VALUE, -1)));
assertEquals("[has_child] requires non-negative 'max_children' field", e.getMessage());
assertEquals("[has_child] requires positive 'max_children' field", e.getMessage());

e = expectThrows(IllegalArgumentException.class, () -> foo.minMaxChildren(positiveValue, positiveValue - 10));
assertEquals("[has_child] 'max_children' is less than 'min_children'", e.getMessage());
Expand Down