Fix wrong column name. (#1734)

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<String, Object> data2Map(ServiceRelationClientCallSlaIndicator storageData) {
             Map<String, Object> 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<String, Object> 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());

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<String, Object> data2Map(ServiceRelationClientCpmIndicator storageData) {
             Map<String, Object> 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<String, Object> 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());

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<String, Object> data2Map(ServiceRelationClientRespTimeIndicator storageData) {
             Map<String, Object> 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<String, Object> 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());

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<String, Object> data2Map(ServiceRelationServerCallSlaIndicator storageData) {
             Map<String, Object> 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<String, Object> 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());

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<String, Object> data2Map(ServiceRelationServerCpmIndicator storageData) {
             Map<String, Object> 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<String, Object> 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());

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<String, Object> data2Map(ServiceRelationServerRespTimeIndicator storageData) {
             Map<String, Object> 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<String, Object> 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());