From 15d00ca08d7af571d931e2855154cf5e42743f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Tue, 9 Oct 2018 12:48:19 +0800 Subject: [PATCH] Fix wrong column name. (#1734) --- .../ServiceRelationClientCallSlaIndicator.java | 6 +++--- .../servicerelation/ServiceRelationClientCpmIndicator.java | 6 +++--- .../ServiceRelationClientRespTimeIndicator.java | 6 +++--- .../ServiceRelationServerCallSlaIndicator.java | 6 +++--- .../servicerelation/ServiceRelationServerCpmIndicator.java | 6 +++--- .../ServiceRelationServerRespTimeIndicator.java | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java index c8a6c76ae..eb02c71f8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCallSlaIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_client_call_sla", builder = ServiceRelationClientCallSlaIndicator.Builder.class) public class ServiceRelationClientCallSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -152,7 +152,7 @@ public class ServiceRelationClientCallSlaIndicator extends PercentIndicator impl @Override public Map data2Map(ServiceRelationClientCallSlaIndicator storageData) { Map map = new HashMap<>(); - map.put("source_service_id", storageData.getEntityId()); + map.put("entity_id", storageData.getEntityId()); map.put("total", storageData.getTotal()); map.put("percentage", storageData.getPercentage()); map.put("match", storageData.getMatch()); @@ -162,7 +162,7 @@ public class ServiceRelationClientCallSlaIndicator extends PercentIndicator impl @Override public ServiceRelationClientCallSlaIndicator map2Data(Map dbMap) { ServiceRelationClientCallSlaIndicator indicator = new ServiceRelationClientCallSlaIndicator(); - indicator.setEntityId((String)dbMap.get("source_service_id")); + indicator.setEntityId((String)dbMap.get("entity_id")); indicator.setTotal(((Number)dbMap.get("total")).longValue()); indicator.setPercentage(((Number)dbMap.get("percentage")).intValue()); indicator.setMatch(((Number)dbMap.get("match")).longValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java index a5a076324..2c5b18da8 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientCpmIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_client_cpm", builder = ServiceRelationClientCpmIndicator.Builder.class) public class ServiceRelationClientCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -147,7 +147,7 @@ public class ServiceRelationClientCpmIndicator extends CPMIndicator implements A @Override public Map data2Map(ServiceRelationClientCpmIndicator storageData) { Map map = new HashMap<>(); - map.put("source_service_id", storageData.getEntityId()); + map.put("entity_id", storageData.getEntityId()); map.put("value", storageData.getValue()); map.put("total", storageData.getTotal()); map.put("time_bucket", storageData.getTimeBucket()); @@ -156,7 +156,7 @@ public class ServiceRelationClientCpmIndicator extends CPMIndicator implements A @Override public ServiceRelationClientCpmIndicator map2Data(Map dbMap) { ServiceRelationClientCpmIndicator indicator = new ServiceRelationClientCpmIndicator(); - indicator.setEntityId((String)dbMap.get("source_service_id")); + indicator.setEntityId((String)dbMap.get("entity_id")); indicator.setValue(((Number)dbMap.get("value")).longValue()); indicator.setTotal(((Number)dbMap.get("total")).longValue()); indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java index 90593a690..a01878a1c 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationClientRespTimeIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_client_resp_time", builder = ServiceRelationClientRespTimeIndicator.Builder.class) public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -152,7 +152,7 @@ public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator imp @Override public Map data2Map(ServiceRelationClientRespTimeIndicator storageData) { Map map = new HashMap<>(); - map.put("source_service_id", storageData.getEntityId()); + map.put("entity_id", storageData.getEntityId()); map.put("summation", storageData.getSummation()); map.put("count", storageData.getCount()); map.put("value", storageData.getValue()); @@ -162,7 +162,7 @@ public class ServiceRelationClientRespTimeIndicator extends LongAvgIndicator imp @Override public ServiceRelationClientRespTimeIndicator map2Data(Map dbMap) { ServiceRelationClientRespTimeIndicator indicator = new ServiceRelationClientRespTimeIndicator(); - indicator.setEntityId((String)dbMap.get("source_service_id")); + indicator.setEntityId((String)dbMap.get("entity_id")); indicator.setSummation(((Number)dbMap.get("summation")).longValue()); indicator.setCount(((Number)dbMap.get("count")).intValue()); indicator.setValue(((Number)dbMap.get("value")).longValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java index d11e6ca43..72228e0fd 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCallSlaIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_server_call_sla", builder = ServiceRelationServerCallSlaIndicator.Builder.class) public class ServiceRelationServerCallSlaIndicator extends PercentIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -152,7 +152,7 @@ public class ServiceRelationServerCallSlaIndicator extends PercentIndicator impl @Override public Map data2Map(ServiceRelationServerCallSlaIndicator storageData) { Map map = new HashMap<>(); - map.put("source_service_id", storageData.getEntityId()); + map.put("entity_id", storageData.getEntityId()); map.put("total", storageData.getTotal()); map.put("percentage", storageData.getPercentage()); map.put("match", storageData.getMatch()); @@ -162,7 +162,7 @@ public class ServiceRelationServerCallSlaIndicator extends PercentIndicator impl @Override public ServiceRelationServerCallSlaIndicator map2Data(Map dbMap) { ServiceRelationServerCallSlaIndicator indicator = new ServiceRelationServerCallSlaIndicator(); - indicator.setEntityId((String)dbMap.get("source_service_id")); + indicator.setEntityId((String)dbMap.get("entity_id")); indicator.setTotal(((Number)dbMap.get("total")).longValue()); indicator.setPercentage(((Number)dbMap.get("percentage")).intValue()); indicator.setMatch(((Number)dbMap.get("match")).longValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java index 9d713da74..0541f6334 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerCpmIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_server_cpm", builder = ServiceRelationServerCpmIndicator.Builder.class) public class ServiceRelationServerCpmIndicator extends CPMIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -147,7 +147,7 @@ public class ServiceRelationServerCpmIndicator extends CPMIndicator implements A @Override public Map data2Map(ServiceRelationServerCpmIndicator storageData) { Map map = new HashMap<>(); - map.put("source_service_id", storageData.getEntityId()); + map.put("entity_id", storageData.getEntityId()); map.put("value", storageData.getValue()); map.put("total", storageData.getTotal()); map.put("time_bucket", storageData.getTimeBucket()); @@ -156,7 +156,7 @@ public class ServiceRelationServerCpmIndicator extends CPMIndicator implements A @Override public ServiceRelationServerCpmIndicator map2Data(Map dbMap) { ServiceRelationServerCpmIndicator indicator = new ServiceRelationServerCpmIndicator(); - indicator.setEntityId((String)dbMap.get("source_service_id")); + indicator.setEntityId((String)dbMap.get("entity_id")); indicator.setValue(((Number)dbMap.get("value")).longValue()); indicator.setTotal(((Number)dbMap.get("total")).longValue()); indicator.setTimeBucket(((Number)dbMap.get("time_bucket")).longValue()); diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java index 2a23c7660..ec33ced97 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/generated/servicerelation/ServiceRelationServerRespTimeIndicator.java @@ -41,7 +41,7 @@ import org.apache.skywalking.oap.server.core.source.Scope; @StorageEntity(name = "service_relation_server_resp_time", builder = ServiceRelationServerRespTimeIndicator.Builder.class) public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator implements AlarmSupported { - @Setter @Getter @Column(columnName = "source_service_id") @IDColumn private java.lang.String entityId; + @Setter @Getter @Column(columnName = "entity_id") @IDColumn private java.lang.String entityId; @Override public String id() { String splitJointId = String.valueOf(getTimeBucket()); @@ -152,7 +152,7 @@ public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator imp @Override public Map data2Map(ServiceRelationServerRespTimeIndicator storageData) { Map map = new HashMap<>(); - map.put("source_service_id", storageData.getEntityId()); + map.put("entity_id", storageData.getEntityId()); map.put("summation", storageData.getSummation()); map.put("count", storageData.getCount()); map.put("value", storageData.getValue()); @@ -162,7 +162,7 @@ public class ServiceRelationServerRespTimeIndicator extends LongAvgIndicator imp @Override public ServiceRelationServerRespTimeIndicator map2Data(Map dbMap) { ServiceRelationServerRespTimeIndicator indicator = new ServiceRelationServerRespTimeIndicator(); - indicator.setEntityId((String)dbMap.get("source_service_id")); + indicator.setEntityId((String)dbMap.get("entity_id")); indicator.setSummation(((Number)dbMap.get("summation")).longValue()); indicator.setCount(((Number)dbMap.get("count")).intValue()); indicator.setValue(((Number)dbMap.get("value")).longValue()); -- GitLab