Fix #153: Due to synchronisation issues sometimes aggregations got overridden.

Author: Florian Lautenschlager

chronix-server-plugin-management/src/main/java/de/qaware/chronix/server/functions/FunctionCtx.java

@@ -79,7 +79,7 @@ public void add(ChronixTransformation transformation, String joinKey) {
         functionCtxEntries.get(joinKey).add(transformation);
     }
 
-    private void addEntryIfNotExist(String joinKey) {
+    private synchronized void addEntryIfNotExist(String joinKey) {
         if (!functionCtxEntries.containsKey(joinKey)) {
             functionCtxEntries.put(joinKey, new FunctionCtxEntry(maxAmountOfTransformations, maxAmountOfAggregations, maxAmountOfAnalyses));
         }

chronix-server-plugin-management/src/main/java/de/qaware/chronix/server/functions/FunctionCtxEntry.java

@@ -72,7 +72,7 @@ public int size() {
         return analysisSize + transformationSize + aggregationSize;
     }
 
-    public void add(ChronixAggregation aggregation, double value) {
+    public synchronized void add(ChronixAggregation aggregation, double value) {
 
         if (aggregationSize < aggregations.length) {
             aggregations[aggregationSize] = aggregation;

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

@@ -364,7 +364,7 @@ class ChronixClientTestIT extends Specification {
 
     }
 
-    @Unroll
+
     def "Raw query with compression activated"() {
         when:
         def connection = (solrBaseUrl + "select?indent=on&q=*:*&wt=json").toURL().openConnection()
@@ -375,6 +375,43 @@ class ChronixClientTestIT extends Specification {
         result.length != 0
     }
 
+    def "Test all aggregations are executed 50 times (ticket #153)"() {
+        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) {
+            List<MetricTimeSeries> timeSeriesList = chronix.stream(solr, query).collect(Collectors.toList())
+            iteration = iteration - 1;
+
+            for (MetricTimeSeries timeSeries in timeSeriesList) {
+                def avg = timeSeries.attribute("0_function_avg")
+                if (avg == null) {
+                    avg = timeSeries.attribute("1_function_avg")
+                }
+                def max = timeSeries.attribute("1_function_max")
+                if (max == null) {
+                    max = timeSeries.attribute("0_function_max")
+                }
+
+                if (max == null || avg == null) {
+                    test = false
+                    success = false
+                }
+            }
+        }
+
+
+        then:
+        success
+
+    }
+
     def testAttributes(MetricTimeSeries series) {
         series.attribute("myIntField") as Set<Integer> == [5] as Set<Integer>
         series.attribute("myLongField") as Set<Long> == [8L] as Set<Long>