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
commit 9054d8b43bb816796a869e2eba63730c1af40200 Author: Megrez Lu <[email protected]> AuthorDate: Wed May 4 23:23:27 2022 +0800 fix process query conditon --- .../plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java | 2 +- .../banyandb/stream/BanyanDBBrowserLogQueryDAO.java | 4 +++- .../plugin/banyandb/stream/BanyanDBTraceQueryDAO.java | 15 ++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java index 2756d56e59..960800fb2e 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetadataQueryDAO.java @@ -218,7 +218,7 @@ public class BanyanDBMetadataQueryDAO extends AbstractBanyanDBDAO implements IMe query.and(eq(ProcessTraffic.INSTANCE_ID, instanceId)); } if (StringUtil.isNotEmpty(agentId)) { - query.and(eq(ProcessTraffic.AGENT_ID, instanceId)); + query.and(eq(ProcessTraffic.AGENT_ID, agentId)); } if (lastPingStartTimeBucket > 0) { query.and(gte(ProcessTraffic.LAST_PING_TIME_BUCKET, lastPingStartTimeBucket)); diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBrowserLogQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBrowserLogQueryDAO.java index 7db8561463..3061fc6a61 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBrowserLogQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBrowserLogQueryDAO.java @@ -58,7 +58,9 @@ public class BanyanDBBrowserLogQueryDAO extends AbstractBanyanDBDAO implements I BrowserErrorLogRecord.ERROR_CATEGORY, BrowserErrorLogRecord.DATA_BINARY), tsRange, new QueryBuilder<StreamQuery>() { @Override public void apply(StreamQuery query) { - query.and(eq(BrowserErrorLogRecord.SERVICE_ID, serviceId)); + if (StringUtil.isNotEmpty(serviceId)) { + query.and(eq(BrowserErrorLogRecord.SERVICE_ID, serviceId)); + } if (StringUtil.isNotEmpty(serviceVersionId)) { query.and(eq(BrowserErrorLogRecord.SERVICE_VERSION_ID, serviceVersionId)); diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBTraceQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBTraceQueryDAO.java index c0b121450c..c236c939cd 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBTraceQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBTraceQueryDAO.java @@ -18,7 +18,7 @@ package org.apache.skywalking.oap.server.storage.plugin.banyandb.stream; -import com.google.common.base.Strings; + import com.google.common.collect.ImmutableSet; import org.apache.skywalking.banyandb.v1.client.RowEntity; import org.apache.skywalking.banyandb.v1.client.StreamQuery; @@ -36,6 +36,7 @@ import org.apache.skywalking.oap.server.core.query.type.TraceState; import org.apache.skywalking.oap.server.core.storage.query.ITraceQueryDAO; import org.apache.skywalking.oap.server.library.util.BooleanUtils; import org.apache.skywalking.oap.server.library.util.CollectionUtils; +import org.apache.skywalking.oap.server.library.util.StringUtil; import org.apache.skywalking.oap.server.storage.plugin.banyandb.BanyanDBConverter; import org.apache.skywalking.oap.server.storage.plugin.banyandb.BanyanDBStorageClient; @@ -64,15 +65,15 @@ public class BanyanDBTraceQueryDAO extends AbstractBanyanDBDAO implements ITrace query.and(lte(SegmentRecord.LATENCY, maxDuration)); } - if (!Strings.isNullOrEmpty(serviceId)) { + if (StringUtil.isNotEmpty(serviceId)) { query.and(eq(SegmentRecord.SERVICE_ID, serviceId)); } - if (!Strings.isNullOrEmpty(serviceInstanceId)) { + if (StringUtil.isNotEmpty(serviceInstanceId)) { query.and(eq(SegmentRecord.SERVICE_INSTANCE_ID, serviceInstanceId)); } - if (!Strings.isNullOrEmpty(endpointId)) { + if (StringUtil.isNotEmpty(endpointId)) { query.and(eq(SegmentRecord.ENDPOINT_ID, endpointId)); } @@ -123,7 +124,11 @@ public class BanyanDBTraceQueryDAO extends AbstractBanyanDBDAO implements ITrace tsRange, q); TraceBrief traceBrief = new TraceBrief(); - traceBrief.setTotal(resp.getElements().size()); + traceBrief.setTotal(resp.size()); + + if (resp.size() == 0) { + return traceBrief; + } for (final RowEntity row : resp.getElements()) { BasicTrace basicTrace = new BasicTrace();
