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/01/20 09:37:41 UTC
[incubator-skywalking] branch GA-release updated: Fix #2186
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch GA-release
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/GA-release by this push:
new 1268c94 Fix #2186
1268c94 is described below
commit 1268c9457cb8cad19a2fc37b94492d703934d481
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Jan 20 17:37:30 2019 +0800
Fix #2186
---
CHANGES.md | 4 ++++
.../oap/server/storage/plugin/jdbc/h2/dao/H2TopologyQueryDAO.java | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 3b41909..9dad155 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,6 +23,10 @@ Release Notes.
- Add test case for span limit mechanism.
- Add telemetry module and prometheus implementation, with grafana setting.
- A refactor for register API in storage module.
+- Fix H2 and MySQL endpoint dependency map miss upstream side.
+- Optimize the inventory register and refactor the implementation.
+- Speed up the trace buffer read.
+- Fix and removed unnecessary inventory register operations.
#### UI
- Add new trace view.
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 f1d73cc..4b527ec 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
@@ -72,7 +72,9 @@ public class H2TopologyQueryDAO implements ITopologyQueryDAO {
int destEndpointId) throws IOException {
String tableName = DownSamplingModelNameBuilder.build(step, EndpointRelationServerSideIndicator.INDEX_NAME);
- return loadEndpointFromSide(tableName, startTB, endTB, EndpointRelationServerSideIndicator.SOURCE_ENDPOINT_ID, EndpointRelationServerSideIndicator.DEST_ENDPOINT_ID, destEndpointId, false);
+ List<Call> calls = loadEndpointFromSide(tableName, startTB, endTB, EndpointRelationServerSideIndicator.SOURCE_ENDPOINT_ID, EndpointRelationServerSideIndicator.DEST_ENDPOINT_ID, destEndpointId, false);
+ calls.addAll(loadEndpointFromSide(tableName, startTB, endTB, EndpointRelationServerSideIndicator.SOURCE_ENDPOINT_ID, EndpointRelationServerSideIndicator.DEST_ENDPOINT_ID, destEndpointId, true));
+ return calls;
}
private List<Call> loadServiceCalls(String tableName, long startTB, long endTB, String sourceCName,