From b21e576a301df9d6967279c9f307b60aa47f73d4 Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Wed, 29 May 2024 23:52:13 +0800 Subject: [PATCH] Fix Wrong Interval in BanyanDB Installation Process (#12264) --- docs/en/changes/changes.md | 1 + .../oap/server/storage/plugin/banyandb/MetadataRegistry.java | 2 +- .../plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 8a5b3e1366..598983cee9 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -8,6 +8,7 @@ * Fix LAL test query api. * Add component libraries of `Derby`/`Sybase`/`SQLite`/`DB2`/`OceanBase` jdbc driver. +* Fix setting the wrong interval to day level measure schema in BanyanDB installation process. #### UI diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java index 2525fc6c3c..bc3dc3de83 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/MetadataRegistry.java @@ -278,7 +278,7 @@ public enum MetadataRegistry { case Minute: return Duration.ofMinutes(1); case Day: - return Duration.ofDays(1); + return Duration.ofHours(24); default: throw new UnsupportedOperationException("unsupported downSampling interval"); } diff --git a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java index 5d98f933f1..d64f674038 100644 --- a/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-banyandb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/banyandb/measure/BanyanDBMetricsQueryDAO.java @@ -227,8 +227,9 @@ public class BanyanDBMetricsQueryDAO extends AbstractBanyanDBDAO implements IMet }); for (final DataPoint dp : resp.getDataPoints()) { long timeBucket = TimeBucket.getTimeBucket(dp.getTimestamp(), schema.getMetadata().getDownSampling()); - if (map.putIfAbsent(timeBucket, dp) != null) { - log.warn("duplicated data point at " + timeBucket); + DataPoint preDp = map.putIfAbsent(timeBucket, dp); + if (preDp != null) { + log.warn("{}:{} returns duplicated data point at {}, pre:{}, current:{}", entityID, schema.getMetadata(), timeBucket, preDp.getFields(), dp.getFields()); } }