You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2019/04/30 16:39:36 UTC
[skywalking] branch master updated: Fix query all scope in MySQL
and H2 storage. (#2568)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 24393f3 Fix query all scope in MySQL and H2 storage. (#2568)
24393f3 is described below
commit 24393f3b8dc2e3fcced224cd867fade60bf702f2
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Wed May 1 00:39:29 2019 +0800
Fix query all scope in MySQL and H2 storage. (#2568)
---
.../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) {