[skywalking] branch banyandb-integration-stream updated: add alarm query and polish profile task query

[lujiajing]

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

lujiajing pushed a commit to branch banyandb-integration-stream
in repository https://gitbox.apache.org/repos/asf/skywalking.git


The following commit(s) were added to refs/heads/banyandb-integration-stream by 
this push:
     new 75595215f1 add alarm query and polish profile task query
75595215f1 is described below

commit 75595215f1d4921027ebe8a98e727e6686f70889
Author: Megrez Lu <lujiajing1...@gmail.com>
AuthorDate: Wed May 4 13:09:07 2022 +0800

    add alarm query and polish profile task query
---
 .../storage/plugin/banyandb/stream/BanyanDBAlarmQueryDAO.java | 11 +++++++++--
 .../banyandb/stream/BanyanDBProfileTaskLogQueryDAO.java       |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBAlarmQueryDAO.java
 
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBAlarmQueryDAO.java
index 42a219b96f..4fb9f88b84 100644
--- 
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBAlarmQueryDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBAlarmQueryDAO.java
@@ -33,7 +33,6 @@ import 
org.apache.skywalking.oap.server.core.storage.query.IAlarmQueryDAO;
 import org.apache.skywalking.oap.server.library.util.CollectionUtils;
 import 
org.apache.skywalking.oap.server.storage.plugin.banyandb.BanyanDBConverter;
 import 
org.apache.skywalking.oap.server.storage.plugin.banyandb.BanyanDBStorageClient;
-import 
org.apache.skywalking.oap.server.storage.plugin.banyandb.MetadataRegistry;
 
 import java.io.IOException;
 import java.util.List;
@@ -56,7 +55,15 @@ public class BanyanDBAlarmQueryDAO extends 
AbstractBanyanDBDAO implements IAlarm
         }
 
         StreamQueryResponse resp = query(AlarmRecord.INDEX_NAME,
-                ImmutableSet.of(AlarmRecord.SCOPE, AlarmRecord.START_TIME, 
AlarmRecord.ID0, AlarmRecord.ID1, AlarmRecord.ALARM_MESSAGE, 
AlarmRecord.TAGS_RAW_DATA),
+                ImmutableSet.of(AlarmRecord.SCOPE,
+                        AlarmRecord.NAME,
+                        AlarmRecord.ID0,
+                        AlarmRecord.ID1,
+                        AlarmRecord.ALARM_MESSAGE,
+                        AlarmRecord.START_TIME,
+                        AlarmRecord.TIME_BUCKET,
+                        AlarmRecord.RULE_NAME,
+                        AlarmRecord.TAGS_RAW_DATA),
                 tsRange,
                 new QueryBuilder<StreamQuery>() {
                     @Override
diff --git 
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBProfileTaskLogQueryDAO.java
 
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBProfileTaskLogQueryDAO.java
index 55a5bbddf2..776404b777 100644
--- 
a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBProfileTaskLogQueryDAO.java
+++ 
b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBProfileTaskLogQueryDAO.java
@@ -29,6 +29,7 @@ import 
org.apache.skywalking.oap.server.core.storage.profiling.trace.IProfileTas
 import 
org.apache.skywalking.oap.server.storage.plugin.banyandb.BanyanDBStorageClient;
 
 import java.io.IOException;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -57,6 +58,10 @@ public class BanyanDBProfileTaskLogQueryDAO extends 
AbstractBanyanDBDAO implemen
                     }
                 });
 
+        if (resp.size() == 0) {
+            return Collections.emptyList();
+        }
+
         final LinkedList<ProfileTaskLog> tasks = new LinkedList<>();
         for (final RowEntity rowEntity : resp.getElements()) {
             tasks.add(buildProfileTaskLog(rowEntity));