From 9042ce6fe225a5c68fd00185e7dec9dff14b9eee Mon Sep 17 00:00:00 2001 From: Jared Tan Date: Wed, 4 Nov 2020 11:37:54 +0800 Subject: [PATCH] fix storage-jdbc isExists not set dbname (#5786) * fix null catalog * update CHANGES.md --- CHANGES.md | 1 + .../server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index b446b0cee2..15e23b67f1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -26,6 +26,7 @@ Release Notes. * Improve the queryable tags generation. Remove the duplicated tags to reduce the storage payload. * Fix the excessive timeout period set by the kubernetes-client. * Fix deadlock problem when using elasticsearch-client-7.0.0. +* Fix storage-jdbc isExists not set dbname. #### UI diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java index 62f615f53f..978098b8e9 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java @@ -58,7 +58,7 @@ public class MySQLTableInstaller extends H2TableInstaller { TableMetaInfo.addModel(model); JDBCHikariCPClient h2Client = (JDBCHikariCPClient) client; try (Connection conn = h2Client.getConnection()) { - try (ResultSet rset = conn.getMetaData().getTables(null, null, model.getName(), null)) { + try (ResultSet rset = conn.getMetaData().getTables(conn.getCatalog(), null, model.getName(), null)) { if (rset.next()) { return true; } -- GitLab