This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 87449d0 Add IDColumn Annotation. (#1667)
87449d0 is described below
commit 87449d016cb260a9bcee74d915140e238cac76ca
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Wed Sep 12 21:09:08 2018 +0800
Add IDColumn Annotation. (#1667)
---
.../generated/endpoint/EndpointAvgIndicator.java | 6 ++--
.../endpoint/EndpointPercentIndicator.java | 6 ++--
.../EndpointRelationAvgIndicator.java | 12 ++++----
.../generated/service/ServiceAvgIndicator.java | 2 +-
.../service/ServiceCallsSumIndicator.java | 2 +-
.../ServiceInstanceRespTimeIndicator.java | 4 +--
.../InstanceJvmCpuIndicator.java | 4 +--
.../InstanceJvmYoungGcTimeIndicator.java | 4 +--
.../InstanceJvmMemoryMaxIndicator.java | 4 +--
.../InstanceJvmMemoryPoolMaxIndicator.java | 4 +--
.../ServiceInstanceRelationAvgIndicator.java | 8 ++---
.../ServiceRelationAvgIndicator.java | 4 +--
.../ServiceRelationClientCallsSumIndicator.java | 4 +--
.../ServiceRelationServerCallsSumIndicator.java | 4 +--
.../server/core/storage/annotation/IDColumn.java | 34 ++++++++++++++++++++++
15 files changed, 68 insertions(+), 34 deletions(-)
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
index e1eb230..dcbf8bf 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
@@ -41,9 +41,9 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_avg", builder =
EndpointAvgIndicator.Builder.class)
public class EndpointAvgIndicator extends LongAvgIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
- @Setter @Getter @Column(columnName = "service_id") private int serviceId;
- @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
+ @Setter @Getter @Column(columnName = "service_id") private int serviceId;
+ @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointPercentIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointPercentIndicator.java
index de0e36b..88d300b 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointPercentIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointPercentIndicator.java
@@ -41,9 +41,9 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpoint_percent", builder =
EndpointPercentIndicator.Builder.class)
public class EndpointPercentIndicator extends PercentIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
- @Setter @Getter @Column(columnName = "service_id") private int serviceId;
- @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
+ @Setter @Getter @Column(columnName = "service_id") private int serviceId;
+ @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationAvgIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationAvgIndicator.java
index 305739c..b9f1488 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationAvgIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationAvgIndicator.java
@@ -41,12 +41,12 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "endpointrelation_avg", builder =
EndpointRelationAvgIndicator.Builder.class)
public class EndpointRelationAvgIndicator extends LongAvgIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "endpoint_id") private int endpointId;
- @Setter @Getter @Column(columnName = "child_endpoint_id") private int
childEndpointId;
- @Setter @Getter @Column(columnName = "service_id") private int serviceId;
- @Setter @Getter @Column(columnName = "child_service_id") private int
childServiceId;
- @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
- @Setter @Getter @Column(columnName = "child_service_instance_id") private
int childServiceInstanceId;
+ @Setter @Getter @Column(columnName = "endpoint_id") @IDColumn private int
endpointId;
+ @Setter @Getter @Column(columnName = "child_endpoint_id") @IDColumn
private int childEndpointId;
+ @Setter @Getter @Column(columnName = "service_id") private int serviceId;
+ @Setter @Getter @Column(columnName = "child_service_id") private int
childServiceId;
+ @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
+ @Setter @Getter @Column(columnName = "child_service_instance_id") private
int childServiceInstanceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java
index 775f176..83db747 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_avg", builder =
ServiceAvgIndicator.Builder.class)
public class ServiceAvgIndicator extends LongAvgIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java
index fa0c58d..ab12b11 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java
@@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_calls_sum", builder =
ServiceCallsSumIndicator.Builder.class)
public class ServiceCallsSumIndicator extends SumIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
index 099ff36..03671ab 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
@@ -41,8 +41,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "serviceinstance_resptime", builder =
ServiceInstanceRespTimeIndicator.Builder.class)
public class ServiceInstanceRespTimeIndicator extends LongAvgIndicator
implements AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
- @Setter @Getter @Column(columnName = "service_id") private int serviceId;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
+ @Setter @Getter @Column(columnName = "service_id") private int serviceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
index ab53fc9..a099cc2 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
@@ -41,8 +41,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_cpu", builder =
InstanceJvmCpuIndicator.Builder.class)
public class InstanceJvmCpuIndicator extends DoubleAvgIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
- @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
+ @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
index a9e3b63..d7418c5 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
@@ -41,8 +41,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_young_gc_time", builder =
InstanceJvmYoungGcTimeIndicator.Builder.class)
public class InstanceJvmYoungGcTimeIndicator extends LongAvgIndicator
implements AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
- @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
+ @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java
index 8da59b0..c084c88 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java
@@ -41,8 +41,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_memory_max", builder =
InstanceJvmMemoryMaxIndicator.Builder.class)
public class InstanceJvmMemoryMaxIndicator extends LongAvgIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
- @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
+ @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java
index 30e0e26..6297859 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java
@@ -41,8 +41,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "instance_jvm_memory_pool_max", builder =
InstanceJvmMemoryPoolMaxIndicator.Builder.class)
public class InstanceJvmMemoryPoolMaxIndicator extends LongAvgIndicator
implements AlarmSupported {
- @Setter @Getter @Column(columnName = "id") private int id;
- @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
+ @Setter @Getter @Column(columnName = "id") @IDColumn private int id;
+ @Setter @Getter @Column(columnName = "service_instance_id") private int
serviceInstanceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java
index f36e1c4..4fab05b 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java
@@ -41,10 +41,10 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "serviceinstancerelation_avg", builder =
ServiceInstanceRelationAvgIndicator.Builder.class)
public class ServiceInstanceRelationAvgIndicator extends LongAvgIndicator
implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") private int
sourceServiceId;
- @Setter @Getter @Column(columnName = "dest_service_id") private int
destServiceId;
- @Setter @Getter @Column(columnName = "source_service_instance_id") private
int sourceServiceInstanceId;
- @Setter @Getter @Column(columnName = "dest_service_instance_id") private
int destServiceInstanceId;
+ @Setter @Getter @Column(columnName = "source_service_id") private int
sourceServiceId;
+ @Setter @Getter @Column(columnName = "dest_service_id") private int
destServiceId;
+ @Setter @Getter @Column(columnName = "source_service_instance_id")
@IDColumn private int sourceServiceInstanceId;
+ @Setter @Getter @Column(columnName = "dest_service_instance_id") @IDColumn
private int destServiceInstanceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationAvgIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationAvgIndicator.java
index 3b6b5a3..4110f2e 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationAvgIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationAvgIndicator.java
@@ -41,8 +41,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "servicerelation_avg", builder =
ServiceRelationAvgIndicator.Builder.class)
public class ServiceRelationAvgIndicator extends LongAvgIndicator implements
AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") private int
sourceServiceId;
- @Setter @Getter @Column(columnName = "dest_service_id") private int
destServiceId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn
private int sourceServiceId;
+ @Setter @Getter @Column(columnName = "dest_service_id") @IDColumn private
int destServiceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallsSumIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallsSumIndicator.java
index 0fa0c21..84cbad1 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallsSumIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallsSumIndicator.java
@@ -41,8 +41,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_relation_client_calls_sum", builder =
ServiceRelationClientCallsSumIndicator.Builder.class)
public class ServiceRelationClientCallsSumIndicator extends SumIndicator
implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") private int
sourceServiceId;
- @Setter @Getter @Column(columnName = "dest_service_id") private int
destServiceId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn
private int sourceServiceId;
+ @Setter @Getter @Column(columnName = "dest_service_id") @IDColumn private
int destServiceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallsSumIndicator.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallsSumIndicator.java
index a15c43e..713c972 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallsSumIndicator.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallsSumIndicator.java
@@ -41,8 +41,8 @@ import org.apache.skywalking.oap.server.core.source.Scope;
@StorageEntity(name = "service_relation_server_calls_sum", builder =
ServiceRelationServerCallsSumIndicator.Builder.class)
public class ServiceRelationServerCallsSumIndicator extends SumIndicator
implements AlarmSupported {
- @Setter @Getter @Column(columnName = "source_service_id") private int
sourceServiceId;
- @Setter @Getter @Column(columnName = "dest_service_id") private int
destServiceId;
+ @Setter @Getter @Column(columnName = "source_service_id") @IDColumn
private int sourceServiceId;
+ @Setter @Getter @Column(columnName = "dest_service_id") @IDColumn private
int destServiceId;
@Override public String id() {
String splitJointId = String.valueOf(getTimeBucket());
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/IDColumn.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/IDColumn.java
new file mode 100644
index 0000000..ba70be6
--- /dev/null
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/IDColumn.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.skywalking.oap.server.core.storage.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * IDColumn is the plus annotation for {@link Column}, declares this column is
ID for the entity, besides time(bucket).
+ *
+ * @author wusheng
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IDColumn {
+}
