Use query filters rather than post filters.

Author: Luc Boutier

elasticsearch-annotations/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
     </parent>
 
     <artifactId>elasticsearch-annotations</artifactId>

elasticsearch-mapping/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.6.1-SNAPSHOT</version>
+        <version>1.6.1</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>

elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/QueryHelper.java

@@ -386,22 +386,26 @@ public SearchRequestBuilder generate(QueryBuilderAdapter queryBuilderAdapter) {
             SearchRequestBuilder searchRequestBuilder = esClient.getClient().prepareSearch(this.indices);
             searchRequestBuilder.setSearchType(SearchType.QUERY_THEN_FETCH);
             QueryBuilder query = queryBuilder;
+            if (functionScore != null) {
+                query = QueryBuilders.functionScoreQuery(query, ScoreFunctionBuilders.scriptFunction(functionScore));
+            }
             if (queryBuilderAdapter != null) {
                 query = queryBuilderAdapter.adapt(queryBuilder);
             }
-            if (functionScore == null) {
-                searchRequestBuilder.setQuery(query);
-            } else {
-                searchRequestBuilder.setQuery(QueryBuilders.functionScoreQuery(query, ScoreFunctionBuilders.scriptFunction(functionScore)));
-            }
-            searchRequestBuilder.setTypes(getTypes());
+            // create a filtered query with filters and add aggregations
             if (classes != null && classes.length > 0) {
+                QueryBuilder newQB = null;
                 addFetchContext(searchRequestBuilder);
                 Set<String> aggIds = Sets.newHashSet();
                 for (Class<?> clazz : classes) {
-                    addFilters(searchRequestBuilder, customFilter, clazz, aggIds);
+                    newQB = addFilters(query, searchRequestBuilder, customFilter, clazz, aggIds);
+                }
+                if (newQB != null) {
+                    query = newQB;
                 }
             }
+            searchRequestBuilder.setQuery(query);
+            searchRequestBuilder.setTypes(getTypes());
             if (fieldSort != null) {
                 FieldSortBuilder sortBuilder = SortBuilders.fieldSort(fieldSort);
                 if (fieldSortDesc) {
@@ -475,9 +479,10 @@ private void addFetchContext(SearchRequestBuilder searchRequestBuilder) {
             searchRequestBuilder.setFetchSource(inc, exc);
         }
 
-        private void addFilters(SearchRequestBuilder searchRequestBuilder, FilterBuilder customFilter, Class<?> clazz, Set<String> aggIds) {
+        private QueryBuilder addFilters(QueryBuilder query, SearchRequestBuilder searchRequestBuilder, FilterBuilder customFilter, Class<?> clazz,
+                Set<String> aggIds) {
             if (clazz == null) {
-                return;
+                return query;
             }
             final List<FilterBuilder> esFilters = buildFilters(clazz.getName());
             if (customFilter != null) {
@@ -486,15 +491,18 @@ private void addFilters(SearchRequestBuilder searchRequestBuilder, FilterBuilder
             FilterBuilder filter = null;
             if (esFilters.size() > 0) {
                 filter = getAndFilter(esFilters);
-                searchRequestBuilder.setPostFilter(filter);
+                if (filter != null) {
+                    query = QueryBuilders.filteredQuery(query, filter);
+                }
             }
             if (facets) {
                 if (filters == null) {
-                    addAggregations(new HashMap<String, String[]>(), clazz.getName(), searchRequestBuilder, aggIds);
+                    addAggregations(new HashMap(), clazz.getName(), searchRequestBuilder, aggIds);
                 } else {
                     addAggregations(filters, clazz.getName(), searchRequestBuilder, aggIds);
                 }
             }
+            return query;
         }
 
         private void addAggregations(Map<String, String[]> filters, String className, SearchRequestBuilder searchRequestBuilder, Set<String> aggIds) {

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.alien4cloud</groupId>
     <artifactId>elasticsearch-mapping-parent</artifactId>
-    <version>1.6.1-SNAPSHOT</version>
+    <version>1.6.1</version>
     <packaging>pom</packaging>
 
     <name>Elastic search mapping parent</name>