You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/09/04 11:02:35 UTC
[incubator-skywalking] branch master updated: Fixed the startup
failure cause by query protocol. (#1623)
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/incubator-skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 73679fc Fixed the startup failure cause by query protocol. (#1623)
73679fc is described below
commit 73679fc0f01ce22f6cd0c3df2254269533b43e7e
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Tue Sep 4 19:02:32 2018 +0800
Fixed the startup failure cause by query protocol. (#1623)
---
.../skywalking/oap/query/graphql/resolver/AggregationQuery.java | 8 +++-----
.../java/org/apache/skywalking/oap/query/graphql/type/Call.java | 2 --
.../apache/skywalking/oap/query/graphql/type/ClusterBrief.java | 2 +-
.../query-graphql-plugin/src/main/resources/query-protocol | 2 +-
skywalking-ui | 2 +-
5 files changed, 6 insertions(+), 10 deletions(-)
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 15b666a..90fab3e 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
@@ -19,13 +19,11 @@
package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver;
-import java.util.Collections;
-import java.util.List;
-import org.apache.skywalking.oap.query.graphql.type.TopNCondition;
-import org.apache.skywalking.oap.query.graphql.type.TopNEntity;
+import java.util.*;
+import org.apache.skywalking.oap.query.graphql.type.*;
public class AggregationQuery implements GraphQLQueryResolver {
- public List<TopNEntity> getTopN(final TopNCondition condition) {
+ public List<TopNEntity> getTopN(final TopNCondition condition, final Duration duration) {
return Collections.emptyList();
}
}
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java
index 774dbc1..7a97df8 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/Call.java
@@ -21,8 +21,6 @@ package org.apache.skywalking.oap.query.graphql.type;
public class Call {
private String source;
private String target;
- private boolean isAlert;
private String callType;
private long cpm;
- private long avgResponseTime;
}
diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ClusterBrief.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ClusterBrief.java
index 61ff49c..b5d20a6 100644
--- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ClusterBrief.java
+++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/type/ClusterBrief.java
@@ -20,7 +20,7 @@ package org.apache.skywalking.oap.query.graphql.type;
public class ClusterBrief {
private int numOfService;
- private int numOfServiceInstance;
+ private int numOfEndpoint;
private int numOfDatabase;
private int numOfCache;
private int numOfMQ;
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 ebbeb72..1492514 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 ebbeb721d95bba8ee63bc2e706e877ee3a56433e
+Subproject commit 149251420c887552df93d5c76f67ccdd47cb71ce
diff --git a/skywalking-ui b/skywalking-ui
index f9c6029..ad3ee45 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit f9c602936ab4f386576bf16f203efac61962e424
+Subproject commit ad3ee45dbadfae35d77238bdd7a1df593158f109