From 24393f3b8dc2e3fcced224cd867fade60bf702f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Wed, 1 May 2019 00:39:29 +0800 Subject: [PATCH] Fix query all scope in MySQL and H2 storage. (#2568) --- .../oap/server/storage/plugin/jdbc/h2/dao/H2AlarmQueryDAO.java | 2 +- .../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 5bcf69cec..51092ad64 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 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 7647b72a1..0bfe110d0 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 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) {