[skywalking] branch polish-relation-fields created (now e90c7b7)

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch polish-relation-fields
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


      at e90c7b7  Remove fields of parent entity in the relation sources.

This branch includes the following new commits:

     new e90c7b7  Remove fields of parent entity in the relation sources.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[skywalking] 01/01: Remove fields of parent entity in the relation sources.

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch polish-relation-fields
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit e90c7b7e2d9527863ee753f3c4aba99addf4673d
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Feb 28 22:08:07 2021 +0800

    Remove fields of parent entity in the relation sources.
---
 .../apache/skywalking/oap/server/core/source/EndpointRelation.java   | 5 -----
 .../skywalking/oap/server/core/source/ServiceInstanceRelation.java   | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
index 09bb693..14e48b1 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/EndpointRelation.java
@@ -44,11 +44,8 @@ public class EndpointRelation extends Source {
 
     @Getter
     @Setter
-    @ScopeDefaultColumn.DefinedByField(columnName = "source_endpoint_name")
     private String endpoint;
-
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "service_id")
     private String serviceId;
     @Getter
     @Setter
@@ -61,10 +58,8 @@ public class EndpointRelation extends Source {
     private String serviceInstanceName;
     @Getter
     @Setter
-    @ScopeDefaultColumn.DefinedByField(columnName = "child_endpoint_name")
     private String childEndpoint;
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "child_service_id")
     private String childServiceId;
     @Setter
     @Getter
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java
index 9b6ee0c..d5f93fe 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/source/ServiceInstanceRelation.java
@@ -51,10 +51,8 @@ public class ServiceInstanceRelation extends Source {
     }
 
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "source_service_instance_id")
     private String sourceServiceInstanceId;
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "source_service_id")
     private String sourceServiceId;
     @Getter
     @Setter
@@ -67,10 +65,8 @@ public class ServiceInstanceRelation extends Source {
     @ScopeDefaultColumn.DefinedByField(columnName = "source_service_instance_name", requireDynamicActive = true)
     private String sourceServiceInstanceName;
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_instance_id")
     private String destServiceInstanceId;
     @Getter
-    @ScopeDefaultColumn.DefinedByField(columnName = "dest_service_id")
     private String destServiceId;
     @Setter
     private NodeType destServiceNodeType;