From e611e9019c9f4772ca794413f3c62c0388b7b9ed Mon Sep 17 00:00:00 2001 From: wankai123 Date: Wed, 14 Jan 2026 14:37:26 +0800 Subject: [PATCH 1/3] Fix `BrowserErrorLog` BanyanDB storage query order. --- docs/en/changes/changes.md | 1 + .../plugin/banyandb/stream/BanyanDBBrowserLogQueryDAO.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 187d736e8779..dadf3758208a 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -22,6 +22,7 @@ * Fix BanyanDB time range overflow in profile thread snapshot query. * `BrowserErrorLog`, OAP Server generated UUID to replace the original client side ID, because Browser scripts can't guarantee generated IDs are globally unique. * MQE: fix multiple labeled metric query and ensure no results are returned if no label value combinations match. +* Fix `BrowserErrorLog` BanyanDB storage query order. #### UI * Fix the missing icon in new native trace view. 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 3e1c5838d541..b55b7da7b10a 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 @@ -19,6 +19,7 @@ package org.apache.skywalking.oap.server.storage.plugin.banyandb.stream; import com.google.common.collect.ImmutableSet; +import org.apache.skywalking.library.banyandb.v1.client.AbstractQuery; import org.apache.skywalking.library.banyandb.v1.client.RowEntity; import org.apache.skywalking.library.banyandb.v1.client.StreamQuery; import org.apache.skywalking.library.banyandb.v1.client.StreamQueryResponse; @@ -70,7 +71,8 @@ public void apply(StreamQuery query) { if (Objects.nonNull(category)) { query.and(eq(BrowserErrorLogRecord.ERROR_CATEGORY, category.getValue())); } - + query.setOrderBy( + new AbstractQuery.OrderBy(AbstractQuery.Sort.DESC)); query.setOffset(from); query.setLimit(limit); } From d07d7e8b66d865fe41752aeb0cfca690ffab0658 Mon Sep 17 00:00:00 2001 From: Wan Kai Date: Wed, 14 Jan 2026 14:57:16 +0800 Subject: [PATCH 2/3] Update oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/stream/BanyanDBBrowserLogQueryDAO.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../plugin/banyandb/stream/BanyanDBBrowserLogQueryDAO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b55b7da7b10a..e2ccda89562d 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 @@ -72,7 +72,7 @@ public void apply(StreamQuery query) { query.and(eq(BrowserErrorLogRecord.ERROR_CATEGORY, category.getValue())); } query.setOrderBy( - new AbstractQuery.OrderBy(AbstractQuery.Sort.DESC)); + new StreamQuery.OrderBy(AbstractQuery.Sort.DESC)); query.setOffset(from); query.setLimit(limit); } From d1420682c83d818efc132e2c25ff2ea44f28051f Mon Sep 17 00:00:00 2001 From: wankai123 Date: Wed, 14 Jan 2026 15:41:06 +0800 Subject: [PATCH 3/3] fix --- .../oap/server/core/storage/query/IMetricsQueryDAO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricsQueryDAO.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricsQueryDAO.java index acb1ffa87ee2..9cf56f723a4b 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricsQueryDAO.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/query/IMetricsQueryDAO.java @@ -193,6 +193,7 @@ public static List composeLabelConditions(final List queryLabe keySets.add(keySet); } else { // If any query label has no matches, clear all keySets so that no results are returned keySets.clear(); + break; } } //intersection labels