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

[Query] QueryParser can return null from a query 

This causes a NPE since XContentStructure checks if the query is null
and takes this as the condition to parse from the byte source which is
actually null in that case.

Closes #6722
This commit is contained in:
Simon Willnauer 2014-07-04 10:52:06 +02:00
parent a3d5cdcda8
commit c6623877c9
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/elasticsearch/index/query/support/XContentStructure.java
View File

@ -127,13 +127,14 @@ public abstract class XContentStructure {
*/ */
public static class InnerQuery extends XContentStructure { public static class InnerQuery extends XContentStructure {
private Query query = null; private Query query = null;
private boolean queryParsed = false;
public InnerQuery(QueryParseContext parseContext1, @Nullable String... types) throws IOException { public InnerQuery(QueryParseContext parseContext1, @Nullable String... types) throws IOException {
super(parseContext1); super(parseContext1);
if (types != null) { if (types != null) {
String[] origTypes = QueryParseContext.setTypesWithPrevious(types); String[] origTypes = QueryParseContext.setTypesWithPrevious(types);
try { try {
query = parseContext1.parseInnerQuery(); query = parseContext1.parseInnerQuery();
queryParsed = true;
} finally { } finally {
QueryParseContext.setTypes(origTypes); QueryParseContext.setTypes(origTypes);
} }
@ -150,7 +151,7 @@ public abstract class XContentStructure {
*/ */
@Override @Override
public Query asQuery(String... types) throws IOException { public Query asQuery(String... types) throws IOException {
if (this.query == null) { if (!queryParsed) { // query can be null
this.query = super.asQuery(types); this.query = super.asQuery(types);
} }
return this.query; return this.query;
@ -164,6 +165,8 @@ public abstract class XContentStructure {
*/ */
public static class InnerFilter extends XContentStructure { public static class InnerFilter extends XContentStructure {
private Query query = null; private Query query = null;
private boolean queryParsed = false;
public InnerFilter(QueryParseContext parseContext1, @Nullable String... types) throws IOException { public InnerFilter(QueryParseContext parseContext1, @Nullable String... types) throws IOException {
super(parseContext1); super(parseContext1);
@ -172,6 +175,7 @@ public abstract class XContentStructure {
try { try {
Filter innerFilter = parseContext1.parseInnerFilter(); Filter innerFilter = parseContext1.parseInnerFilter();
query = new XConstantScoreQuery(innerFilter); query = new XConstantScoreQuery(innerFilter);
queryParsed = true;
} finally { } finally {
QueryParseContext.setTypes(origTypes); QueryParseContext.setTypes(origTypes);
} }
@ -190,7 +194,7 @@ public abstract class XContentStructure {
*/ */
@Override @Override
public Query asFilter(String... types) throws IOException { public Query asFilter(String... types) throws IOException {
if (this.query == null) { if (!queryParsed) { // query can be null
this.query = super.asFilter(types); this.query = super.asFilter(types);
} }
return this.query; return this.query;

18
src/test/java/org/elasticsearch/search/child/SimpleChildQuerySearchTests.java
View File

@ -125,6 +125,24 @@ public class SimpleChildQuerySearchTests extends ElasticsearchIntegrationTest {
assertThat(searchResponse.getHits().getAt(0).id(), equalTo("gc1")); assertThat(searchResponse.getHits().getAt(0).id(), equalTo("gc1"));
} }
@Test
// see #6722
public void test6722() throws ElasticsearchException, IOException {
assertAcked(prepareCreate("test")
.addMapping("foo")
.addMapping("test", "_parent", "type=foo"));
ensureGreen();
// index simple data
client().prepareIndex("test", "foo", "1").setSource("foo", 1).get();
client().prepareIndex("test", "test").setSource("foo", 1).setParent("1").get();
refresh();
SearchResponse searchResponse = client().prepareSearch("test").setSource("{\"query\":{\"filtered\":{\"filter\":{\"has_parent\":{\"type\":\"test\",\"query\":{\"bool\":{\"must\":[],\"must_not\":[],\"should\":[]}}},\"query\":[]}}}}").get();
assertNoFailures(searchResponse);
assertThat(searchResponse.getHits().totalHits(), equalTo(2l));
}
@Test @Test
// see #2744 // see #2744
public void test2744() throws ElasticsearchException, IOException { public void test2744() throws ElasticsearchException, IOException {