[skywalking] branch master updated: Fix an old query compatible bug. (#4714)

[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 f486459  Fix an old query compatible bug. (#4714)
f486459 is described below

commit f4864597c2753150acd26d484ca565dfeb27eb95
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Apr 26 10:58:36 2020 +0800

    Fix an old query compatible bug. (#4714)
---
 .../apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java
index d889d3a..3de9dee 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/AggregationQuery.java
@@ -78,6 +78,7 @@ public class AggregationQuery implements GraphQLQueryResolver {
         condition.setScope(Scope.ServiceInstance);
         final IDManager.ServiceID.ServiceIDDefinition serviceIDDefinition = IDManager.ServiceID.analysisId(serviceId);
         condition.setParentService(serviceIDDefinition.getName());
+        condition.setNormal(true);
         condition.setOrder(order);
         condition.setTopN(topN);
         List<TopNEntity> list = new ArrayList<>();
@@ -110,6 +111,7 @@ public class AggregationQuery implements GraphQLQueryResolver {
         condition.setScope(Scope.Endpoint);
         final IDManager.ServiceID.ServiceIDDefinition serviceIDDefinition = IDManager.ServiceID.analysisId(serviceId);
         condition.setParentService(serviceIDDefinition.getName());
+        condition.setNormal(true);
         condition.setOrder(order);
         condition.setTopN(topN);
         List<TopNEntity> list = new ArrayList<>();