From 137fb6488847fc295ca25db48c8a52ca5ad643eb Mon Sep 17 00:00:00 2001 From: weixiang1862 <652048614@qq.com> Date: Thu, 29 Jun 2023 18:58:00 +0800 Subject: [PATCH] Fix instance query in JDBC implementation.(#11023) (#11024) Co-authored-by: weixiang1862 --- docs/en/changes/changes.md | 3 ++- .../plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 6f611aff32..25e55ee762 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -27,10 +27,11 @@ * Packages with name `recevier` are renamed to `receiver`. * `BanyanDBMetricsDAO` handles `storeIDTag` in `multiGet` for `BanyanDBModelExtension`. * Fix endpoint grouping-related logic and enhance the performance of PatternTree retrieval. -* Fix metric session cache saving after batch insert when using `mysql-connector-java` +* Fix metric session cache saving after batch insert when using `mysql-connector-java`. * Support dynamic UI menu query. * Add comment for `docker/.env` to explain the usage. * Fix wrong environment variable name `SW_OTEL_RECEIVER_ENABLED_OTEL_RULES` to right `SW_OTEL_RECEIVER_ENABLED_OTEL_METRICS_RULES`. +* Fix instance query in JDBC implementation. #### UI diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java index 0647e586b4..5ddee52ed3 100644 --- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java +++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/common/dao/JDBCMetadataQueryDAO.java @@ -156,12 +156,7 @@ public class JDBCMetadataQueryDAO implements IMetadataQueryDAO { final var minuteTimeBucket = TimeBucket.getMinuteTimeBucket(duration.getStartTimestamp()); - final var tables = tableHelper.getTablesForRead( - InstanceTraffic.INDEX_NAME, - duration.getStartTimeBucket(), - duration.getEndTimeBucket() - ); - + final var tables = tableHelper.getTablesWithinTTL(InstanceTraffic.INDEX_NAME); for (String table : tables) { final var sqlAndParameters = buildSQLForListInstances(serviceId, minuteTimeBucket, table); results.addAll(