kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add IDColumn Annotation. (#1667)

This commit is contained in:
吴晟 Wu Sheng 2018-09-12 21:09:08 +08:00 committed by 彭勇升 pengys
parent 973ad9e35d
commit 87449d016c
15 changed files with 68 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointAvgIndicator.java
View File

@ -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());

6
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpoint/EndpointPercentIndicator.java
View File

@ -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());

12
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/endpointrelation/EndpointRelationAvgIndicator.java
View File

@ -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());

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceAvgIndicator.java
View File

@ -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());

2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/service/ServiceCallsSumIndicator.java
View File

@ -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());

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstance/ServiceInstanceRespTimeIndicator.java
View File

@ -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());

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmcpu/InstanceJvmCpuIndicator.java
View File

@ -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());

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmgc/InstanceJvmYoungGcTimeIndicator.java
View File

@ -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());

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemory/InstanceJvmMemoryMaxIndicator.java
View File

@ -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());

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancejvmmemorypool/InstanceJvmMemoryPoolMaxIndicator.java
View File

@ -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());

8
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/serviceinstancerelation/ServiceInstanceRelationAvgIndicator.java
View File

@ -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());

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationAvgIndicator.java
View File

@ -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());

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallsSumIndicator.java
View File

@ -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());

4
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallsSumIndicator.java
View File

@ -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());

34
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/IDColumn.java Normal file
View File

@ -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 {
}