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 2020/11/04 11:39:29 UTC

[skywalking] branch master updated: Fix storage-influxdb-plugin serviceCode query (#5792)

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 3a2706d  Fix storage-influxdb-plugin serviceCode query (#5792)
3a2706d is described below

commit 3a2706d104e42220dd64ecbb2b03fad052285f94
Author: gerry <yu...@163.com>
AuthorDate: Wed Nov 4 19:39:06 2020 +0800

    Fix storage-influxdb-plugin serviceCode query (#5792)
    
    * Fix storage-influxdb-plugin serviceCode query
    
    * Update CHANGES.md
    
    Add the changelog for the PR as I have time.
    
    Co-authored-by: yuanguohua <yu...@fin-shine.com>
    Co-authored-by: 吴晟 Wu Sheng <wu...@foxmail.com>
---
 CHANGES.md                                                              | 1 +
 .../oap/server/storage/plugin/influxdb/query/MetadataQuery.java         | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 15e23b6..9d53966 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -27,6 +27,7 @@ Release Notes.
 * Fix the excessive timeout period set by the kubernetes-client.
 * Fix deadlock problem when using elasticsearch-client-7.0.0.
 * Fix storage-jdbc isExists not set dbname.
+* Fix `searchService` bug in the InfluxDB storage implementation.
 
 #### UI
 
diff --git a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java
index 1ff91a1..ea9a636 100644
--- a/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java
+++ b/oap-server/server-storage-plugin/storage-influxdb-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/influxdb/query/MetadataQuery.java
@@ -137,7 +137,7 @@ public class MetadataQuery implements IMetadataQueryDAO {
         WhereQueryImpl<SelectQueryImpl> query = select(ID_COLUMN, NAME)
             .from(client.getDatabase(), ServiceTraffic.INDEX_NAME)
             .where(eq(InfluxConstants.TagName.NODE_TYPE, String.valueOf(NodeType.Normal.value())));
-        query.and(eq(ServiceTraffic.NODE_TYPE, serviceCode));
+        query.and(eq(ServiceTraffic.NAME, serviceCode));
         return buildServices(query).get(0);
     }