You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/09/12 07:56:29 UTC
[incubator-skywalking] branch timebucket updated: Support time
bucket transfer.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch timebucket
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/timebucket by this push:
new cc162a3 Support time bucket transfer.
cc162a3 is described below
commit cc162a360ce991c814cbd87ee3de36cca79853ce
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed Sep 12 15:56:18 2018 +0800
Support time bucket transfer.
---
.../core/alarm/provider/RunningRuleTest.java | 12 ++++++++
.../servicerelation/ServiceRelationDispatcher.java | 1 -
.../manual/service/ServiceComponentIndicator.java | 27 ++++++++++++++++
.../manual/service/ServiceMappingIndicator.java | 36 ++++++++++++++++++++--
.../core/analysis/indicator/IndicatorTest.java | 12 ++++++++
.../analysis/indicator/LongAvgIndicatorTest.java | 12 ++++++++
.../analysis/indicator/PercentIndicatorTest.java | 12 ++++++++
.../core/analysis/indicator/PxxIndicatorTest.java | 12 ++++++++
.../core/analysis/indicator/SumIndicatorTest.java | 12 ++++++++
.../indicator/ThermodynamicIndicatorTest.java | 12 ++++++++
10 files changed, 144 insertions(+), 4 deletions(-)
diff --git a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
index 24b13cf..538d097 100644
--- a/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
+++ b/oap-server/server-alarm-plugin/src/test/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRuleTest.java
@@ -240,6 +240,18 @@ public class RunningRuleTest {
}
+ @Override public Indicator toHour() {
+ return null;
+ }
+
+ @Override public Indicator toDay() {
+ return null;
+ }
+
+ @Override public Indicator toMonth() {
+ return null;
+ }
+
@Override public int getValue() {
return value;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java
index cce5f07..008bde7 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationDispatcher.java
@@ -21,7 +21,6 @@ package org.apache.skywalking.oap.server.core.analysis.generated.servicerelation
import org.apache.skywalking.oap.server.core.analysis.SourceDispatcher;
import org.apache.skywalking.oap.server.core.analysis.worker.IndicatorProcess;
import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
-import org.apache.skywalking.oap.server.core.analysis.indicator.expression.*;
import org.apache.skywalking.oap.server.core.source.*;
/**
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceComponentIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceComponentIndicator.java
index 406943c..f4d405b 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceComponentIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceComponentIndicator.java
@@ -98,6 +98,33 @@ public class ServiceComponentIndicator extends Indicator {
@Override public void calculate() {
}
+ @Override public Indicator toHour() {
+ ServiceComponentIndicator indicator = new ServiceComponentIndicator();
+ indicator.setTimeBucket(toTimeBucketInHour());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setComponentId(this.getComponentId());
+
+ return indicator;
+ }
+
+ @Override public Indicator toDay() {
+ ServiceComponentIndicator indicator = new ServiceComponentIndicator();
+ indicator.setTimeBucket(toTimeBucketInDay());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setComponentId(this.getComponentId());
+
+ return indicator;
+ }
+
+ @Override public Indicator toMonth() {
+ ServiceComponentIndicator indicator = new ServiceComponentIndicator();
+ indicator.setTimeBucket(toTimeBucketInMonth());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setComponentId(this.getComponentId());
+
+ return indicator;
+ }
+
@Override public final void combine(Indicator indicator) {
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceMappingIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceMappingIndicator.java
index 808fcae..f435918 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceMappingIndicator.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/service/ServiceMappingIndicator.java
@@ -18,15 +18,18 @@
package org.apache.skywalking.oap.server.core.analysis.manual.service;
-import java.util.*;
-import lombok.*;
+import java.util.HashMap;
+import java.util.Map;
+import lombok.Getter;
+import lombok.Setter;
import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.analysis.indicator.Indicator;
import org.apache.skywalking.oap.server.core.analysis.indicator.annotation.IndicatorType;
import org.apache.skywalking.oap.server.core.remote.annotation.StreamData;
import org.apache.skywalking.oap.server.core.remote.grpc.proto.RemoteData;
import org.apache.skywalking.oap.server.core.storage.StorageBuilder;
-import org.apache.skywalking.oap.server.core.storage.annotation.*;
+import org.apache.skywalking.oap.server.core.storage.annotation.Column;
+import org.apache.skywalking.oap.server.core.storage.annotation.StorageEntity;
/**
* @author peng-yongsheng
@@ -98,6 +101,33 @@ public class ServiceMappingIndicator extends Indicator {
@Override public void calculate() {
}
+ @Override public Indicator toHour() {
+ ServiceMappingIndicator indicator = new ServiceMappingIndicator();
+ indicator.setTimeBucket(toTimeBucketInHour());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setMappingServiceId(this.getMappingServiceId());
+
+ return indicator;
+ }
+
+ @Override public Indicator toDay() {
+ ServiceMappingIndicator indicator = new ServiceMappingIndicator();
+ indicator.setTimeBucket(toTimeBucketInDay());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setMappingServiceId(this.getMappingServiceId());
+
+ return indicator;
+ }
+
+ @Override public Indicator toMonth() {
+ ServiceMappingIndicator indicator = new ServiceMappingIndicator();
+ indicator.setTimeBucket(toTimeBucketInMonth());
+ indicator.setServiceId(this.getServiceId());
+ indicator.setMappingServiceId(this.getMappingServiceId());
+
+ return indicator;
+ }
+
@Override public final void combine(Indicator indicator) {
}
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/IndicatorTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/IndicatorTest.java
index 88541a3..ddeeb7d 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/IndicatorTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/IndicatorTest.java
@@ -94,6 +94,18 @@ public class IndicatorTest {
}
+ @Override public Indicator toHour() {
+ return null;
+ }
+
+ @Override public Indicator toDay() {
+ return null;
+ }
+
+ @Override public Indicator toMonth() {
+ return null;
+ }
+
@Override public void deserialize(RemoteData remoteData) {
}
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicatorTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicatorTest.java
index bcb12fd..5e4fe2e 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicatorTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/LongAvgIndicatorTest.java
@@ -58,6 +58,18 @@ public class LongAvgIndicatorTest {
return null;
}
+ @Override public Indicator toHour() {
+ return null;
+ }
+
+ @Override public Indicator toDay() {
+ return null;
+ }
+
+ @Override public Indicator toMonth() {
+ return null;
+ }
+
@Override public void deserialize(RemoteData remoteData) {
}
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicatorTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicatorTest.java
index 6ed96a9..7a301d9 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicatorTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PercentIndicatorTest.java
@@ -73,6 +73,18 @@ public class PercentIndicatorTest {
return null;
}
+ @Override public Indicator toHour() {
+ return null;
+ }
+
+ @Override public Indicator toDay() {
+ return null;
+ }
+
+ @Override public Indicator toMonth() {
+ return null;
+ }
+
@Override public void deserialize(RemoteData remoteData) {
}
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicatorTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicatorTest.java
index 5644c52..f75b08a 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicatorTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/PxxIndicatorTest.java
@@ -103,6 +103,18 @@ public class PxxIndicatorTest {
return null;
}
+ @Override public Indicator toHour() {
+ return null;
+ }
+
+ @Override public Indicator toDay() {
+ return null;
+ }
+
+ @Override public Indicator toMonth() {
+ return null;
+ }
+
@Override public void deserialize(RemoteData remoteData) {
}
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicatorTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicatorTest.java
index dc03c05..1a557cd 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicatorTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/SumIndicatorTest.java
@@ -62,6 +62,18 @@ public class SumIndicatorTest {
return null;
}
+ @Override public Indicator toHour() {
+ return null;
+ }
+
+ @Override public Indicator toDay() {
+ return null;
+ }
+
+ @Override public Indicator toMonth() {
+ return null;
+ }
+
@Override public void deserialize(RemoteData remoteData) {
}
diff --git a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicatorTest.java b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicatorTest.java
index 3383b6b..84df33e 100644
--- a/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicatorTest.java
+++ b/oap-server/server-core/src/test/java/org/apache/skywalking/oap/server/core/analysis/indicator/ThermodynamicIndicatorTest.java
@@ -98,6 +98,18 @@ public class ThermodynamicIndicatorTest {
return null;
}
+ @Override public Indicator toHour() {
+ return null;
+ }
+
+ @Override public Indicator toDay() {
+ return null;
+ }
+
+ @Override public Indicator toMonth() {
+ return null;
+ }
+
@Override public void deserialize(RemoteData remoteData) {
}