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

Failure to execute search request with empty top level filter 

closes #3477
This commit is contained in:
Shay Banon 2013-08-10 10:20:03 +02:00
parent be103c188b
commit 5c7d7fb399
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.index.query; package org.elasticsearch.index.query;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.util.CloseableThreadLocal; import org.apache.lucene.util.CloseableThreadLocal;
import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchException;
@ -261,7 +262,11 @@ public class IndexQueryParserService extends AbstractIndexComponent {
public ParsedFilter parseInnerFilter(XContentParser parser) throws IOException { public ParsedFilter parseInnerFilter(XContentParser parser) throws IOException {
QueryParseContext context = cache.get(); QueryParseContext context = cache.get();
context.reset(parser); context.reset(parser);
return new ParsedFilter(context.parseInnerFilter(), context.copyNamedFilters()); Filter filter = context.parseInnerFilter();
if (filter == null) {
return null;
}
return new ParsedFilter(filter, context.copyNamedFilters());
} }
@Nullable @Nullable

7
src/test/java/org/elasticsearch/test/integration/search/query/SimpleQueryTests.java
View File

@ -1231,6 +1231,13 @@ public class SimpleQueryTests extends AbstractSharedClusterTest {
assertThat(response.getHits().totalHits(), equalTo(2l)); assertThat(response.getHits().totalHits(), equalTo(2l));
} }
@Test
public void testEmptyTopLevelFilter() {
client().prepareIndex("test", "type", "1").setSource("field", "value").setRefresh(true).execute().actionGet();
SearchResponse searchResponse = client().prepareSearch().setFilter("{}").execute().actionGet();
assertNoFailures(searchResponse);
}
@Test // see #2926 @Test // see #2926
public void testMustNot() throws ElasticSearchException, IOException { public void testMustNot() throws ElasticSearchException, IOException {
client().admin().indices().prepareDelete().execute().actionGet(); client().admin().indices().prepareDelete().execute().actionGet();