From 4fc5cc331811f783e390364d389d1ded3eb0d62d Mon Sep 17 00:00:00 2001
From: lican <295198088@qq.com>
Date: Fri, 4 May 2018 15:31:56 +0800
Subject: [PATCH] fix_average_duration_zero (#1164)

---
 .../collector/analysis/worker/model/impl/AggregationWorker.java | 1 +
 .../apache/skywalking/apm/collector/core/data/AbstractData.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java
index 3850ae5585..93498f847f 100644
--- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java
+++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java
@@ -82,6 +82,7 @@ public abstract class AggregationWorker<INPUT extends StreamData, OUTPUT extends
         if (mergeDataCache.containsKey(message.getId())) {
             mergeDataCache.get(message.getId()).mergeAndFormulaCalculateData(message);
         } else {
+            message.calculateFormula();
             mergeDataCache.put(message.getId(), message);
         }
         mergeDataCache.finishWriting();
diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/AbstractData.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/AbstractData.java
index 01418ab926..6634743893 100644
--- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/AbstractData.java
+++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/data/AbstractData.java
@@ -156,7 +156,7 @@ public abstract class AbstractData {
     }
 
     @SuppressWarnings("unchecked")
-    private void calculateFormula() {
+    public void calculateFormula() {
         for (int i = 0; i < stringColumns.length; i++) {
             if (nonNull(stringColumns[i].getFormulaOperation())) {
                 String stringData = (String)stringColumns[i].getFormulaOperation().operate(this);
-- 
GitLab