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 2018/12/15 18:21:06 UTC
[incubator-skywalking] branch nodetype updated: Format codes.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch nodetype
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/nodetype by this push:
new c366dfd Format codes.
c366dfd is described below
commit c366dfdae0d4c32aa301b0f8e822b6a8016b3c0c
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Dec 15 10:20:57 2018 -0800
Format codes.
---
.../skywalking/oap/server/core/query/MetadataQueryService.java | 5 ++---
.../apache/skywalking/oap/server/core/register/ServiceInventory.java | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java
index a9b3dd6..14c9378 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/query/MetadataQueryService.java
@@ -20,7 +20,6 @@ package org.apache.skywalking.oap.server.core.query;
import java.io.IOException;
import java.util.List;
-import org.apache.skywalking.apm.network.language.agent.SpanLayer;
import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.cache.*;
import org.apache.skywalking.oap.server.core.query.entity.*;
@@ -69,8 +68,8 @@ public class MetadataQueryService implements org.apache.skywalking.oap.server.li
clusterBrief.setNumOfService(getMetadataQueryDAO().numOfService(startTimestamp, endTimestamp));
clusterBrief.setNumOfEndpoint(getMetadataQueryDAO().numOfEndpoint(startTimestamp, endTimestamp));
clusterBrief.setNumOfDatabase(getMetadataQueryDAO().numOfConjectural(startTimestamp, endTimestamp, NodeType.Database.value()));
- clusterBrief.setNumOfCache(getMetadataQueryDAO().numOfConjectural(startTimestamp, endTimestamp, NodeType.Cache.value()));
- clusterBrief.setNumOfMQ(getMetadataQueryDAO().numOfConjectural(startTimestamp, endTimestamp, NodeType.MQ.value()));
+ clusterBrief.setNumOfCache(getMetadataQueryDAO().numOfConjectural(startTimestamp, endTimestamp, NodeType.Cache.value()));
+ clusterBrief.setNumOfMQ(getMetadataQueryDAO().numOfConjectural(startTimestamp, endTimestamp, NodeType.MQ.value()));
return clusterBrief;
}
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
index 7591994..c6cd6dd 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/register/ServiceInventory.java
@@ -54,7 +54,6 @@ public class ServiceInventory extends RegisterSource {
@Setter @Getter @Column(columnName = MAPPING_SERVICE_ID) private int mappingServiceId;
@Setter @Getter @Column(columnName = MAPPING_LAST_UPDATE_TIME) private long mappingLastUpdateTime;
-
public NodeType getServiceNodeType() {
return NodeType.get(this.nodeType);
}
@@ -67,7 +66,7 @@ public class ServiceInventory extends RegisterSource {
return BooleanUtils.TRUE + Const.ID_SPLIT + addressId;
}
- public void setServiceNodeType(NodeType nodeType){
+ public void setServiceNodeType(NodeType nodeType) {
this.nodeType = nodeType.value();
}