Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bool query: parser should return match_all in case there are no clauses
This also fixes has_parent filters with a nested empty bool filter (see test SimpleChildQuerySearchTests#test6722, the test should actually expect either 0 results when searching for has_parent "test" or one result when search for has_parent "foo") closes #7240 closes #7347
- Loading branch information
Showing
9 changed files
with
193 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
src/test/java/org/elasticsearch/index/query/bool-query-with-empty-clauses-for-parsing.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| { | ||
| "filtered": { | ||
| "filter": { | ||
| "has_parent": { | ||
| "type": "foo", | ||
| "query": { | ||
| "bool": { | ||
| "must": [], | ||
| "must_not": [], | ||
| "should": [] | ||
| } | ||
| } | ||
| }, | ||
| "query": [] | ||
| } | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/test/java/org/elasticsearch/index/query/fquery-with-empty-bool-query.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "fquery": { | ||
| "query": { | ||
| "filtered": { | ||
| "query": { | ||
| "bool": {} | ||
| }, | ||
| "filter": { | ||
| "term": { | ||
| "text": "apache" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
56 changes: 56 additions & 0 deletions
56
src/test/java/org/elasticsearch/search/aggregations/bucket/DedicatedAggregationTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.search.aggregations.bucket; | ||
|
|
||
| import org.elasticsearch.action.search.SearchResponse; | ||
| import org.elasticsearch.search.aggregations.bucket.filter.Filter; | ||
| import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; | ||
| import org.elasticsearch.test.ElasticsearchIntegrationTest; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.elasticsearch.common.io.Streams.copyToStringFromClasspath; | ||
| import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; | ||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse; | ||
| import static org.hamcrest.CoreMatchers.equalTo; | ||
| import static org.hamcrest.CoreMatchers.instanceOf; | ||
|
|
||
|
|
||
| public class DedicatedAggregationTests extends ElasticsearchIntegrationTest { | ||
|
|
||
| // https://github.com/elasticsearch/elasticsearch/issues/7240 | ||
| @Test | ||
| public void testEmptyBoolIsMatchAll() throws IOException { | ||
| String query = copyToStringFromClasspath("/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json"); | ||
| createIndex("testidx"); | ||
| index("testidx", "apache", "1", "field", "text"); | ||
| index("testidx", "nginx", "2", "field", "text"); | ||
| refresh(); | ||
| ensureGreen("testidx"); | ||
| SearchResponse searchResponse = client().prepareSearch("testidx").setQuery(matchAllQuery()).get(); | ||
| assertThat(searchResponse.getHits().getTotalHits(), equalTo(2l)); | ||
| searchResponse = client().prepareSearch("testidx").setSource(query).get(); | ||
| assertSearchResponse(searchResponse); | ||
| assertThat(searchResponse.getAggregations().getAsMap().get("issue7240"), instanceOf(Filter.class)); | ||
| Filter filterAgg = (Filter) searchResponse.getAggregations().getAsMap().get("issue7240"); | ||
| assertThat(filterAgg.getAggregations().getAsMap().get("terms"), instanceOf(StringTerms.class)); | ||
| assertThat(((StringTerms) filterAgg.getAggregations().getAsMap().get("terms")).getBuckets().get(0).getDocCount(), equalTo(1l)); | ||
| } | ||
| } |
33 changes: 33 additions & 0 deletions
33
src/test/java/org/elasticsearch/search/aggregations/bucket/agg-filter-with-empty-bool.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| { | ||
| "aggs": { | ||
| "issue7240": { | ||
| "aggs": { | ||
| "terms": { | ||
| "terms": { | ||
| "field": "field" | ||
| } | ||
| } | ||
| }, | ||
| "filter": { | ||
| "fquery": { | ||
| "query": { | ||
| "filtered": { | ||
| "query": { | ||
| "bool": {} | ||
| }, | ||
| "filter": { | ||
| "fquery": { | ||
| "query": { | ||
| "query_string": { | ||
| "query": "_type:apache" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
src/test/java/org/elasticsearch/search/child/bool-query-with-empty-clauses.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "query": { | ||
| "filtered": { | ||
| "filter": { | ||
| "has_parent": { | ||
| "type": "foo", | ||
| "query": { | ||
| "bool": { | ||
| "must": [], | ||
| "must_not": [], | ||
| "should": [] | ||
| } | ||
| } | ||
| }, | ||
| "query": [] | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters