You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/09/05 05:56:12 UTC
[skywalking] branch master updated: Fix
`H2MetadataQueryDAO.searchService` doesn't support auto grouping. [issue
#7653] (#7654)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new de59bf7 Fix `H2MetadataQueryDAO.searchService` doesn't support auto grouping. [issue #7653] (#7654)
de59bf7 is described below
commit de59bf7aebc20110c21c0e39e9b987e4aec91911
Author: 刘威 <51...@users.noreply.github.com>
AuthorDate: Sun Sep 5 13:56:00 2021 +0800
Fix `H2MetadataQueryDAO.searchService` doesn't support auto grouping. [issue #7653] (#7654)
---
CHANGES.md | 1 +
.../oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGES.md b/CHANGES.md
index 9838eb4..f63527f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -54,6 +54,7 @@ Release Notes.
* Support mTLS for gRPC channel.
* Add yaml file suffix limit when reading ui templates.
* Support consul grouped dynamic configurations.
+* Fix `H2MetadataQueryDAO.searchService` doesn't support auto grouping.
#### UI
diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
index 87c2d91..9c25e6a 100644
--- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
+++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2MetadataQueryDAO.java
@@ -163,6 +163,7 @@ public class H2MetadataQueryDAO implements IMetadataQueryDAO {
Service service = new Service();
service.setId(resultSet.getString(H2TableInstaller.ID_COLUMN));
service.setName(resultSet.getString(ServiceTraffic.NAME));
+ service.setGroup(resultSet.getString(ServiceTraffic.GROUP));
return service;
}
}