[incubator-skywalking-oal-tool] branch master updated: Sync real cpm skeleton.

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-oal-tool.git


The following commit(s) were added to refs/heads/master by this push:
     new b868f03  Sync real cpm skeleton.
b868f03 is described below

commit b868f0341e862c3b8a0686b25f340adacf5284df
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Sep 16 23:07:23 2018 +0800

    Sync real cpm skeleton.
---
 .../oap/server/core/analysis/indicator/CPMIndicator.java       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/CPMIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/CPMIndicator.java
index 8893c87..7d0660b 100644
--- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/CPMIndicator.java
+++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/CPMIndicator.java
@@ -32,18 +32,24 @@ import org.apache.skywalking.oap.server.core.storage.annotation.Column;
 public abstract class CPMIndicator extends Indicator {
 
     protected static final String VALUE = "value";
+    protected static final String TOTAL = "total";
 
     @Getter @Setter @Column(columnName = VALUE) private long value;
+    @Getter @Setter @Column(columnName = TOTAL) private long total;
 
     @Entrance
     public final void combine(@ConstOne long count) {
-        this.value += count;
+        this.total += count;
     }
 
     @Override public final void combine(Indicator indicator) {
+        CPMIndicator countIndicator = (CPMIndicator)indicator;
+        combine(countIndicator.total);
     }
 
     @Override public void calculate() {
+
     }
 
-}
\ No newline at end of file
+}
+