You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/08/20 03:39:43 UTC
[GitHub] wu-sheng closed pull request #4: Fixed the dispatcher check style
error.
wu-sheng closed pull request #4: Fixed the dispatcher check style error.
URL: https://github.com/apache/incubator-skywalking-oal-tool/pull/4
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java
index 036f1f5..7fc0d95 100644
--- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java
+++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/DoubleAvgIndicator.java
@@ -18,12 +18,8 @@
package org.apache.skywalking.oap.server.core.analysis.indicator;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.ConstOne;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom;
+import lombok.*;
+import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
/**
@@ -50,4 +46,8 @@ public final void combine(@SourceFrom double summation, @ConstOne int count) {
DoubleAvgIndicator longAvgIndicator = (DoubleAvgIndicator)indicator;
combine(longAvgIndicator.summation, longAvgIndicator.count);
}
+
+ @Override public final void calculate() {
+ this.value = this.summation / this.count;
+ }
}
diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
index b5ba1b8..34b387d 100644
--- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
+++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/Indicator.java
@@ -18,9 +18,7 @@
package org.apache.skywalking.oap.server.core.analysis.indicator;
-import java.util.Map;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
/**
@@ -36,9 +34,5 @@
public abstract void combine(Indicator indicator);
- public abstract String name();
-
- public abstract Map<String, Object> toMap();
-
- public abstract Indicator newOne(Map<String, Object> dbMap);
+ public abstract void calculate();
}
diff --git a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java
index f98e068..05c56e1 100644
--- a/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java
+++ b/oal-parser/src/main/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicator.java
@@ -18,12 +18,8 @@
package org.apache.skywalking.oap.server.core.analysis.indicator;
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.ConstOne;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.Entrance;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorOperator;
-import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.SourceFrom;
+import lombok.*;
+import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.*;
import org.apache.skywalking.oap.server.core.storage.annotation.Column;
/**
@@ -50,4 +46,8 @@ public final void combine(@SourceFrom long summation, @ConstOne int count) {
LongAvgIndicator longAvgIndicator = (LongAvgIndicator)indicator;
combine(longAvgIndicator.summation, longAvgIndicator.count);
}
+
+ @Override public final void calculate() {
+ this.value = this.summation / this.count;
+ }
}
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
index 48ef241..92d0ae8 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMGCDispatcherTemplate.ftl
@@ -39,7 +39,7 @@ public class ServiceInstanceJVMGCDispatcher implements SourceDispatcher<ServiceI
<#list serviceInstanceJVMGCIndicators as indicator>
private void do${indicator.metricName}(ServiceInstanceJVMGC source) {
- ${indicator.metricName}Indicator indicator = new ${indicator.metricName}Indicator();
+ ${indicator.metricName}Indicator indicator = new ${indicator.metricName}Indicator();
indicator.setTimeBucket(source.getTimeBucket());
<#list indicator.fieldsFromSource as field>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
index 60a6680..dc63468 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryDispatcherTemplate.ftl
@@ -39,7 +39,7 @@ public class ServiceInstanceJVMMemoryDispatcher implements SourceDispatcher<Serv
<#list serviceInstanceJVMMemoryIndicators as indicator>
private void do${indicator.metricName}(ServiceInstanceJVMMemory source) {
- ${indicator.metricName}Indicator indicator = new ${indicator.metricName}Indicator();
+ ${indicator.metricName}Indicator indicator = new ${indicator.metricName}Indicator();
indicator.setTimeBucket(source.getTimeBucket());
<#list indicator.fieldsFromSource as field>
diff --git a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
index ce71046..a6f5d3b 100644
--- a/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
+++ b/oal-parser/src/main/resources/code-templates/ServiceInstanceJVMMemoryPoolDispatcherTemplate.ftl
@@ -39,7 +39,7 @@ public class ServiceInstanceJVMMemoryPoolDispatcher implements SourceDispatcher<
<#list serviceInstanceJVMMemoryPoolIndicators as indicator>
private void do${indicator.metricName}(ServiceInstanceJVMMemoryPool source) {
- ${indicator.metricName}Indicator indicator = new ${indicator.metricName}Indicator();
+ ${indicator.metricName}Indicator indicator = new ${indicator.metricName}Indicator();
indicator.setTimeBucket(source.getTimeBucket());
<#list indicator.fieldsFromSource as field>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services