Merge pull request #12635 from SergVro/1.7

Add a check if FieldMappers exists
elastic · Sep 8, 2015 · e65c384 · e65c384
2 parents 63f4af5 + 049bc82
commit e65c384
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/index/query/ExistsFilterParser.java b/src/main/java/org/elasticsearch/index/query/ExistsFilterParser.java
@@ -84,7 +84,7 @@ public Filter parse(QueryParseContext parseContext) throws IOException, QueryPar
 
     public static Filter newFilter(QueryParseContext parseContext, String fieldPattern, String filterName) {
         final FieldMappers fieldNamesMappers = parseContext.mapperService().indexName(FieldNamesFieldMapper.NAME);
-        final FieldNamesFieldMapper fieldNamesMapper = (FieldNamesFieldMapper)fieldNamesMappers.mapper();
+        final FieldNamesFieldMapper fieldNamesMapper = fieldNamesMappers == null ? null : (FieldNamesFieldMapper)fieldNamesMappers.mapper();
 
         MapperService.SmartNameObjectMapper smartNameObjectMapper = parseContext.smartObjectMapper(fieldPattern);
         if (smartNameObjectMapper != null && smartNameObjectMapper.hasMapper()) {

diff --git a/src/main/java/org/elasticsearch/index/query/MissingFilterParser.java b/src/main/java/org/elasticsearch/index/query/MissingFilterParser.java
@@ -98,7 +98,7 @@ public static Filter newFilter(QueryParseContext parseContext, String fieldPatte
         }
 
         final FieldMappers fieldNamesMappers = parseContext.mapperService().fullName(FieldNamesFieldMapper.NAME);
-        final FieldNamesFieldMapper fieldNamesMapper = (FieldNamesFieldMapper)fieldNamesMappers.mapper();
+        final FieldNamesFieldMapper fieldNamesMapper = fieldNamesMappers == null ? null : (FieldNamesFieldMapper)fieldNamesMappers.mapper();
         MapperService.SmartNameObjectMapper smartNameObjectMapper = parseContext.smartObjectMapper(fieldPattern);
         if (smartNameObjectMapper != null && smartNameObjectMapper.hasMapper()) {
             // automatic make the object mapper pattern

diff --git a/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java b/src/test/java/org/elasticsearch/search/query/ExistsMissingTests.java
@@ -39,6 +39,23 @@
 
 public class ExistsMissingTests extends ElasticsearchIntegrationTest {
 
+    public void testExistsFilterOnEmptyIndex() throws Exception {
+        createIndex("test");
+        ensureYellow("test");
+
+        SearchResponse resp = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).setPostFilter(FilterBuilders.existsFilter("foo")).execute().actionGet();
+        assertSearchResponse(resp);
+    }
+
+    public void testMissingFilterOnEmptyIndex() throws Exception {
+        createIndex("test");
+        ensureYellow("test");
+
+        SearchResponse resp = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery()).setPostFilter(FilterBuilders.missingFilter("foo")).execute().actionGet();
+        assertSearchResponse(resp);
+    }
+
+
     public void testExistsMissing() throws Exception {
 
         XContentBuilder mapping = XContentBuilder.builder(JsonXContent.jsonXContent)