[skywalking] branch master updated: fix influx query error #6056 (#6057)

[wu...@apache.org]

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 8899930  fix influx query error #6056 (#6057)
8899930 is described below

commit 88999300829567202933ba991c9ae69d9f3310b8
Author: songzhe <so...@sina.com>
AuthorDate: Tue Dec 22 20:25:36 2020 +0800

    fix influx query error #6056 (#6057)
    
    * fix influx query error
    * use InfluxConstants.NAME
---
 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 d69dc51..bbb9659 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -35,6 +35,7 @@ Release Notes.
 * Fix H2 in-memory database table missing issues
 * Add component ID for Python pyramid plugin server.
 * Add component ID for NodeJS Axios plugin.
+* Fix searchService method error in storage-influxdb-plugin.
 
 #### UI
 * Fix un-removed tags in trace query.
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 2da548e..6499646 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
@@ -125,7 +125,7 @@ public class MetadataQuery implements IMetadataQueryDAO {
         final WhereQueryImpl<SelectQueryImpl> whereQuery = select(ID_COLUMN, NAME, ServiceTraffic.GROUP)
             .from(client.getDatabase(), ServiceTraffic.INDEX_NAME)
             .where(eq(TagName.NODE_TYPE, String.valueOf(NodeType.Normal.value())));
-        whereQuery.and(eq(ServiceTraffic.NAME, serviceCode));
+        whereQuery.and(eq(InfluxConstants.NAME, serviceCode));
         return buildServices(whereQuery).get(0);
     }