[incubator-skywalking] branch master updated: Fix H2 and MySQL endpoint dependency map miss upstream side and add changelogs (#2187)

[wusheng]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d315522  Fix H2 and MySQL endpoint dependency map miss upstream side 
and add changelogs (#2187)
d315522 is described below

commit d3155220c3ad3b1484997e03ff8b5383962e29a4
Author: 吴晟 Wu Sheng <wu.sh...@foxmail.com>
AuthorDate: Sun Jan 20 18:14:18 2019 +0800

    Fix H2 and MySQL endpoint dependency map miss upstream side and add 
changelogs (#2187)
    
    * fix no language attr value in mesh (#2182)
    
    * Fixed the inventory register lock invalid bug. (#2184)
    
    * #2183
    
    Merge commit into master.
    
    * Make the h2 register lock same as mysql.
    
    * 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,