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/05/14 03:36:43 UTC

[skywalking] branch master updated: Fix the wrong sortN condition (#4784)

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 c5f0591  Fix the wrong sortN condition (#4784)
c5f0591 is described below

commit c5f0591e06feffa981bd15ba0ccdd06e27c807fd
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu May 14 11:36:32 2020 +0800

    Fix the wrong sortN condition (#4784)
---
 .../apache/skywalking/oap/server/core/query/input/TopNCondition.java    | 2 +-
 .../query-graphql-plugin/src/main/resources/query-protocol              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TopNCondition.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TopNCondition.java
index 6964184..25d1d78 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TopNCondition.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/input/TopNCondition.java
@@ -43,7 +43,7 @@ public class TopNCondition {
      * Normal service is the service having installed agent or metrics reported directly. Unnormal service is
      * conjectural service, usually detected by the agent.
      */
-    private boolean isNormal;
+    private boolean normal;
     /**
      * Indicate the metrics entity scope. Because this is a top list, don't need to set the Entity like the
      * MetricsCondition. Only accept scope = {@link Scope#Service} {@link Scope#ServiceInstance} and {@link
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
index 9d5bb7c..459f78b 160000
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
@@ -1 +1 @@
-Subproject commit 9d5bb7c97a5b653babe157e0360fee6bdf30c045
+Subproject commit 459f78b95168a4d17acae03e892b17bc78f8f4e5