[ALIEN-3000] Concurrency problem in faceted search

Author: SebastienLaurent

elasticsearch-annotations/pom.xml

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

elasticsearch-mapping/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.alien4cloud</groupId>
         <artifactId>elasticsearch-mapping-parent</artifactId>
-        <version>1.7.6</version>
+        <version>1.7.7</version>
     </parent>
 
     <artifactId>elasticsearch-mapping</artifactId>

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

@@ -3,6 +3,8 @@
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.Resource;
 
@@ -583,19 +585,17 @@ private void addAggregations(Map<String, String[]> filters, String className, Se
          */
         private List<AggregationBuilder> buildAggregations(String className, Set<String> filters,List<IFacetBuilderHelper> externalHelpers) {
             final List<AggregationBuilder> aggregationBuilders = new ArrayList<AggregationBuilder>();
-            List<IFacetBuilderHelper> facetBuilderHelpers = mappingBuilder.getFacets(className);
 
-            // Add external Helpers
-            facetBuilderHelpers.addAll(externalHelpers);
+            List<IFacetBuilderHelper> facetBuilderHelpers = Stream.concat(
+                    mappingBuilder.getFacets(className).stream(),
+                    externalHelpers.stream()
+                ).collect(Collectors.toList());
 
             if (facetBuilderHelpers == null || facetBuilderHelpers.size() < 1) {
                 return aggregationBuilders;
             }
 
-            // FIXME: concurrent modifications here, to instruct
-            IFacetBuilderHelper[] IFacetBuilderHelpers = new IFacetBuilderHelper[facetBuilderHelpers.size()];
-            facetBuilderHelpers.toArray(IFacetBuilderHelpers);
-            for (IFacetBuilderHelper facetBuilderHelper : IFacetBuilderHelpers) {
+            for (IFacetBuilderHelper facetBuilderHelper : facetBuilderHelpers) {
                 if (filters == null || !filters.contains(facetBuilderHelper.getEsFieldName())) {
                     aggregationBuilders.addAll(facetBuilderHelper.buildFacets());
                 }

pom.xml

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