Fix #155: Due to synchronisation issues sometimes time series got lost.

Author: Florian Lautenschlager

chronix-server-query-handler/src/main/java/de/qaware/chronix/solr/query/analysis/AnalysisHandler.java

@@ -270,7 +270,7 @@ public List<SolrDocument> analyze(SolrQueryRequest req, CQLCFResult functions, M
         //loop over the types
         for (ChronixType type : collectedDocs.keySet()) {
 
-            List<ChronixTimeSeries> timeSeriesList = new ArrayList<>(collectedDocs.get(type).size());
+            List<ChronixTimeSeries> timeSeriesList = Collections.synchronizedList(new ArrayList<>(collectedDocs.get(type).size()));
 
             //do this in parallel as it contains deserialization
             collectedDocs.get(type).entrySet().parallelStream().forEach(docs -> {

chronix-server-test-integration/src/intTest/groovy/de/qaware/chronix/solr/ChronixClientTestIT.groovy

@@ -375,17 +375,16 @@ class ChronixClientTestIT extends Specification {
         result.length != 0
     }
 
-    def "Test all aggregations are executed 50 times (ticket #153)"() {
+    def "Test all aggregations are executed 50 times (ticket #153,#155)"() {
         given:
         def query = new SolrQuery("*:*")
         query.setParam(ChronixQueryParams.CHRONIX_FUNCTION, "metric{avg;max}")
         query.addField("-data")
 
-        def test = true
         def success = true
         def iteration = 50
         when:
-        while (test && iteration > 0) {
+        while (success && iteration > 0) {
             List<MetricTimeSeries> timeSeriesList = chronix.stream(solr, query).collect(Collectors.toList())
             iteration = iteration - 1;
 
@@ -400,10 +399,14 @@ class ChronixClientTestIT extends Specification {
                 }
 
                 if (max == null || avg == null) {
-                    test = false
                     success = false
                 }
             }
+
+            //ensure we got 26 every time
+            if (timeSeriesList.size() != 26i) {
+                success = false
+            }
         }