This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch sqldb-alarm in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 2a961df74838baf20b62c326e33b89a482dc0abe Author: Wu Sheng <[email protected]> AuthorDate: Tue Apr 30 20:22:51 2019 +0800 Fix query all scope in MySQL and H2 storage. --- .../oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 2 +- .../oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/H2AlarmQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java index 5bcf69c..51092ad 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java @@ -45,8 +45,8 @@ public class H2AlarmQueryDAO implements IAlarmQueryDAO { List<Object> parameters = new ArrayList<>(10); sql.append("from ").append(AlarmRecord.INDEX_NAME).append(" where "); sql.append(" 1=1 "); - sql.append(" and ").append(AlarmRecord.SCOPE).append(" = ?"); if (Objects.nonNull(scopeId)) { + sql.append(" and ").append(AlarmRecord.SCOPE).append(" = ?"); parameters.add(scopeId.intValue()); } if (startTB != 0 && endTB != 0) { diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java index 7647b72..0bfe110 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLAlarmQueryDAO.java @@ -45,8 +45,8 @@ public class MySQLAlarmQueryDAO implements IAlarmQueryDAO { List<Object> parameters = new ArrayList<>(10); sql.append("from ").append(AlarmRecord.INDEX_NAME).append(" where "); sql.append(" 1=1 "); - sql.append(" and ").append(AlarmRecord.SCOPE).append(" = ?"); if (Objects.nonNull(scopeId)) { + sql.append(" and ").append(AlarmRecord.SCOPE).append(" = ?"); parameters.add(scopeId.intValue()); } if (startTB != 0 && endTB != 0) {
