You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/05/13 03:54:19 UTC
[skywalking] branch new-topo updated: Change topology line id.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch new-topo
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/new-topo by this push:
new a26a486 Change topology line id.
a26a486 is described below
commit a26a4861aad7a2b470b2d2898acc1d84150a01d4
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Mon May 13 11:54:11 2019 +0800
Change topology line id.
---
.../org/apache/skywalking/oap/server/core/query/entity/Call.java | 6 ++++++
.../storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java | 2 +-
.../oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Call.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Call.java
index 1b42582..0a51858 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Call.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/entity/Call.java
@@ -20,6 +20,7 @@ package org.apache.skywalking.oap.server.core.query.entity;
import java.util.*;
import lombok.*;
+import org.apache.skywalking.oap.server.core.Const;
import org.apache.skywalking.oap.server.core.source.DetectPoint;
/**
@@ -81,10 +82,15 @@ public class Call {
@Setter
@Getter
public static class CallDetail {
+ @Setter(AccessLevel.PRIVATE)
private String id;
private Integer source;
private Integer target;
private DetectPoint detectPoint;
private Integer componentId;
+
+ public void generateID() {
+ id = source + Const.ID_SPLIT + target;
+ }
}
}
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
index b3ef528..ab3444d 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/query/TopologyQueryEsDAO.java
@@ -148,11 +148,11 @@ public class TopologyQueryEsDAO extends EsDAO implements ITopologyQueryDAO {
ServiceRelationDefineUtil.RelationDefine relationDefine = ServiceRelationDefineUtil.splitEntityId(entityId);
Call.CallDetail call = new Call.CallDetail();
- call.setId(entityId);
call.setSource(relationDefine.getSource());
call.setTarget(relationDefine.getDest());
call.setComponentId(relationDefine.getComponentId());
call.setDetectPoint(detectPoint);
+ call.generateID();
calls.add(call);
}
return calls;
diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java
index 45d45a0..2b40d61 100644
--- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java
@@ -147,7 +147,7 @@ public class H2TopologyQueryDAO implements ITopologyQueryDAO {
} else {
call.setDetectPoint(DetectPoint.SERVER);
}
- call.setId(entityId);
+ call.generateID();
calls.add(call);
}
}