diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java index af4d71e0f..11eb359c1 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/graph/TraceStreamGraph.java @@ -48,9 +48,9 @@ import org.skywalking.apm.collector.remote.RemoteModule; import org.skywalking.apm.collector.remote.service.RemoteSenderService; import org.skywalking.apm.collector.storage.table.global.GlobalTrace; import org.skywalking.apm.collector.storage.table.instance.InstanceMetric; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponent; -import org.skywalking.apm.collector.storage.table.node.ApplicationMapping; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponent; +import org.skywalking.apm.collector.storage.table.application.ApplicationMapping; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; import org.skywalking.apm.collector.storage.table.segment.Segment; import org.skywalking.apm.collector.storage.table.segment.SegmentCost; import org.skywalking.apm.collector.storage.table.service.ServiceEntry; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java index 639950f9d..48a734b62 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/AgentStreamRemoteDataRegister.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agent.stream.worker; import org.skywalking.apm.collector.remote.service.RemoteDataRegisterService; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponent; -import org.skywalking.apm.collector.storage.table.node.ApplicationMapping; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponent; +import org.skywalking.apm.collector.storage.table.application.ApplicationMapping; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; import org.skywalking.apm.collector.storage.table.register.Application; import org.skywalking.apm.collector.storage.table.register.Instance; import org.skywalking.apm.collector.storage.table.register.ServiceName; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java index d0f806911..0d2a7fcae 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentAggregationWorker.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.agent.stream.worker.trace.application; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponent; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponent; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentPersistenceWorker.java index e5031fec9..8d543d5a6 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentPersistenceWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentPersistenceWorker.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.StorageModule; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IApplicationComponentPersistenceDAO; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponent; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponent; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java index fa1145bf1..334ede507 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentRemoteWorker.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agent.stream.worker.trace.application; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.remote.service.RemoteSenderService; import org.skywalking.apm.collector.remote.service.Selector; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponent; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponent; import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.base.WorkerException; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentSpanListener.java index c2e4e23b4..392fd8dad 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentSpanListener.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationComponentSpanListener.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.core.graph.Graph; import org.skywalking.apm.collector.core.graph.GraphManager; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponent; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java index 52e251391..02c8e7d0d 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingAggregationWorker.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.agent.stream.worker.trace.application; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; -import org.skywalking.apm.collector.storage.table.node.ApplicationMapping; +import org.skywalking.apm.collector.storage.table.application.ApplicationMapping; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingPersistenceWorker.java index c72343b94..3ff8e11d6 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingPersistenceWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingPersistenceWorker.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.StorageModule; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IApplicationMappingPersistenceDAO; -import org.skywalking.apm.collector.storage.table.node.ApplicationMapping; +import org.skywalking.apm.collector.storage.table.application.ApplicationMapping; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java index 35f8e1368..bb6a6cca8 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingRemoteWorker.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agent.stream.worker.trace.application; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.remote.service.RemoteSenderService; import org.skywalking.apm.collector.remote.service.Selector; -import org.skywalking.apm.collector.storage.table.node.ApplicationMapping; +import org.skywalking.apm.collector.storage.table.application.ApplicationMapping; import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.base.WorkerException; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingSpanListener.java index 560de72c7..8b49b4fba 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingSpanListener.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMappingSpanListener.java @@ -29,7 +29,7 @@ import org.skywalking.apm.collector.core.graph.Graph; import org.skywalking.apm.collector.core.graph.GraphManager; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.table.node.ApplicationMapping; +import org.skywalking.apm.collector.storage.table.application.ApplicationMapping; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricAggregationWorker.java index ff3270336..208008917 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricAggregationWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationMetricAggregationWorker.java @@ -22,7 +22,7 @@ import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.table.application.ApplicationMetric; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricAggregationWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricAggregationWorker.java index 43918c184..c87c56116 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricAggregationWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricAggregationWorker.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.agent.stream.worker.trace.application; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.queue.service.QueueCreatorService; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.AggregationWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricPersistenceWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricPersistenceWorker.java index 0b4a63f78..6d8e1085e 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricPersistenceWorker.java @@ -23,7 +23,7 @@ import org.skywalking.apm.collector.queue.service.QueueCreatorService; import org.skywalking.apm.collector.storage.StorageModule; import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricPersistenceDAO; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricRemoteWorker.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricRemoteWorker.java index e0288f03b..ea32603d5 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricRemoteWorker.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricRemoteWorker.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agent.stream.worker.trace.application; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.remote.service.RemoteSenderService; import org.skywalking.apm.collector.remote.service.Selector; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.base.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.base.WorkerException; diff --git a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricSpanListener.java b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricSpanListener.java index c66902fa9..b03ad83d7 100644 --- a/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricSpanListener.java +++ b/apm-collector/apm-collector-agent-stream/collector-agent-stream-provider/src/main/java/org/skywalking/apm/collector/agent/stream/worker/trace/application/ApplicationReferenceMetricSpanListener.java @@ -34,7 +34,7 @@ import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.core.util.CollectionUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageModule.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageModule.java index d19f9f70a..ec9043b5c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageModule.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageModule.java @@ -41,11 +41,11 @@ import org.skywalking.apm.collector.storage.dao.IMemoryMetricUIDAO; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationComponentPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationComponentUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationMappingPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationMappingUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeReferenceUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricUIDAO; import org.skywalking.apm.collector.storage.dao.ISegmentCostPersistenceDAO; import org.skywalking.apm.collector.storage.dao.ISegmentCostUIDAO; import org.skywalking.apm.collector.storage.dao.ISegmentPersistenceDAO; @@ -121,9 +121,9 @@ public class StorageModule extends Module { classes.add(IGlobalTraceUIDAO.class); classes.add(IInstPerformanceUIDAO.class); - classes.add(INodeComponentUIDAO.class); - classes.add(INodeMappingUIDAO.class); - classes.add(INodeReferenceUIDAO.class); + classes.add(IApplicationComponentUIDAO.class); + classes.add(IApplicationMappingUIDAO.class); + classes.add(IApplicationReferenceMetricUIDAO.class); classes.add(ISegmentCostUIDAO.class); classes.add(ISegmentUIDAO.class); classes.add(IServiceEntryUIDAO.class); diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeMappingUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationComponentUIDAO.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeMappingUIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationComponentUIDAO.java index 06aee5af1..e8f421ea8 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeMappingUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationComponentUIDAO.java @@ -24,6 +24,6 @@ import org.skywalking.apm.collector.storage.base.dao.DAO; /** * @author peng-yongsheng */ -public interface INodeMappingUIDAO extends DAO { +public interface IApplicationComponentUIDAO extends DAO { JsonArray load(long startTime, long endTime); } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeComponentUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationMappingUIDAO.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeComponentUIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationMappingUIDAO.java index f83a519ec..daa79bad6 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeComponentUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationMappingUIDAO.java @@ -24,6 +24,6 @@ import org.skywalking.apm.collector.storage.base.dao.DAO; /** * @author peng-yongsheng */ -public interface INodeComponentUIDAO extends DAO { +public interface IApplicationMappingUIDAO extends DAO { JsonArray load(long startTime, long endTime); } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeReferenceUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationReferenceMetricUIDAO.java similarity index 93% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeReferenceUIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationReferenceMetricUIDAO.java index eb8dfca2f..2e374bdbf 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/INodeReferenceUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IApplicationReferenceMetricUIDAO.java @@ -24,6 +24,6 @@ import org.skywalking.apm.collector.storage.base.dao.DAO; /** * @author peng-yongsheng */ -public interface INodeReferenceUIDAO extends DAO { +public interface IApplicationReferenceMetricUIDAO extends DAO { JsonArray load(long startTime, long endTime); } diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationComponent.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationComponent.java similarity index 97% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationComponent.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationComponent.java index 8abc29acc..9cdede8d0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationComponent.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationComponent.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.table.node; +package org.skywalking.apm.collector.storage.table.application; import org.skywalking.apm.collector.core.data.Column; import org.skywalking.apm.collector.core.data.Data; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationComponentTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationComponentTable.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationComponentTable.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationComponentTable.java index 22f380073..1318c560c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationComponentTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationComponentTable.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.table.node; +package org.skywalking.apm.collector.storage.table.application; import org.skywalking.apm.collector.core.data.CommonTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationMapping.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMapping.java similarity index 97% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationMapping.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMapping.java index ebfc4f3b3..979db8f75 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationMapping.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMapping.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.table.node; +package org.skywalking.apm.collector.storage.table.application; import org.skywalking.apm.collector.core.data.Column; import org.skywalking.apm.collector.core.data.Data; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationMappingTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMappingTable.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationMappingTable.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMappingTable.java index f396e8b39..86eb92c32 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/ApplicationMappingTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationMappingTable.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.table.node; +package org.skywalking.apm.collector.storage.table.application; import org.skywalking.apm.collector.core.data.CommonTable; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/ApplicationReferenceMetric.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationReferenceMetric.java similarity index 76% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/ApplicationReferenceMetric.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationReferenceMetric.java index 0e5335dd3..0c3a8ab62 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/ApplicationReferenceMetric.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationReferenceMetric.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.table.noderef; +package org.skywalking.apm.collector.storage.table.application; import org.skywalking.apm.collector.core.data.Column; import org.skywalking.apm.collector.core.data.Data; @@ -29,22 +29,22 @@ import org.skywalking.apm.collector.core.data.operator.NonOperation; public class ApplicationReferenceMetric extends Data { private static final Column[] STRING_COLUMNS = { - new Column(NodeReferenceTable.COLUMN_ID, new NonOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_ID, new NonOperation()), }; private static final Column[] LONG_COLUMNS = { - new Column(NodeReferenceTable.COLUMN_TIME_BUCKET, new NonOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET, new NonOperation()), }; private static final Column[] DOUBLE_COLUMNS = {}; private static final Column[] INTEGER_COLUMNS = { - new Column(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, new NonOperation()), - new Column(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, new NonOperation()), - new Column(NodeReferenceTable.COLUMN_S1_LTE, new AddOperation()), - new Column(NodeReferenceTable.COLUMN_S3_LTE, new AddOperation()), - new Column(NodeReferenceTable.COLUMN_S5_LTE, new AddOperation()), - new Column(NodeReferenceTable.COLUMN_S5_GT, new AddOperation()), - new Column(NodeReferenceTable.COLUMN_SUMMARY, new AddOperation()), - new Column(NodeReferenceTable.COLUMN_ERROR, new AddOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, new NonOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID, new NonOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_S1_LTE, new AddOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_S3_LTE, new AddOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_S5_LTE, new AddOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_S5_GT, new AddOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_SUMMARY, new AddOperation()), + new Column(ApplicationReferenceMetricTable.COLUMN_ERROR, new AddOperation()), }; private static final Column[] BOOLEAN_COLUMNS = {}; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationReferenceMetricTable.java similarity index 87% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationReferenceMetricTable.java index aa5e31c5e..a9a9ad1fe 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/application/ApplicationReferenceMetricTable.java @@ -16,15 +16,15 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.table.noderef; +package org.skywalking.apm.collector.storage.table.application; import org.skywalking.apm.collector.core.data.CommonTable; /** * @author peng-yongsheng */ -public class NodeReferenceTable extends CommonTable { - public static final String TABLE = "node_reference"; +public class ApplicationReferenceMetricTable extends CommonTable { + public static final String TABLE = "application_reference"; public static final String COLUMN_FRONT_APPLICATION_ID = "front_application_id"; public static final String COLUMN_BEHIND_APPLICATION_ID = "behind_application_id"; public static final String COLUMN_S1_LTE = "s1_lte"; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java index b97246243..15123d036 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java @@ -50,11 +50,11 @@ import org.skywalking.apm.collector.storage.dao.IMemoryMetricUIDAO; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationComponentPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationComponentUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationMappingPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationMappingUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeReferenceUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricUIDAO; import org.skywalking.apm.collector.storage.dao.ISegmentCostPersistenceDAO; import org.skywalking.apm.collector.storage.dao.ISegmentCostUIDAO; import org.skywalking.apm.collector.storage.dao.ISegmentPersistenceDAO; @@ -86,11 +86,11 @@ import org.skywalking.apm.collector.storage.es.dao.MemoryMetricEsUIDAO; import org.skywalking.apm.collector.storage.es.dao.MemoryPoolMetricEsPersistenceDAO; import org.skywalking.apm.collector.storage.es.dao.MemoryPoolMetricEsUIDAO; import org.skywalking.apm.collector.storage.es.dao.ApplicationComponentEsPersistenceDAO; -import org.skywalking.apm.collector.storage.es.dao.NodeComponentEsUIDAO; +import org.skywalking.apm.collector.storage.es.dao.ApplicationComponentEsUIDAO; import org.skywalking.apm.collector.storage.es.dao.ApplicationMappingEsPersistenceDAO; -import org.skywalking.apm.collector.storage.es.dao.NodeMappingEsUIDAO; -import org.skywalking.apm.collector.storage.es.dao.ApplicationReferenceEsMetricPersistenceDAO; -import org.skywalking.apm.collector.storage.es.dao.NodeReferenceEsUIDAO; +import org.skywalking.apm.collector.storage.es.dao.ApplicationMappingEsUIDAO; +import org.skywalking.apm.collector.storage.es.dao.ApplicationReferenceMetricEsPersistenceDAO; +import org.skywalking.apm.collector.storage.es.dao.ApplicationReferenceMetricEsUIDAO; import org.skywalking.apm.collector.storage.es.dao.SegmentCostEsPersistenceDAO; import org.skywalking.apm.collector.storage.es.dao.SegmentCostEsUIDAO; import org.skywalking.apm.collector.storage.es.dao.SegmentEsPersistenceDAO; @@ -197,7 +197,7 @@ public class StorageModuleEsProvider extends ModuleProvider { this.registerServiceImplementation(IInstanceMetricPersistenceDAO.class, new InstanceMetricEsPersistenceDAO(elasticSearchClient)); this.registerServiceImplementation(IApplicationComponentPersistenceDAO.class, new ApplicationComponentEsPersistenceDAO(elasticSearchClient)); this.registerServiceImplementation(IApplicationMappingPersistenceDAO.class, new ApplicationMappingEsPersistenceDAO(elasticSearchClient)); - this.registerServiceImplementation(IApplicationReferenceMetricPersistenceDAO.class, new ApplicationReferenceEsMetricPersistenceDAO(elasticSearchClient)); + this.registerServiceImplementation(IApplicationReferenceMetricPersistenceDAO.class, new ApplicationReferenceMetricEsPersistenceDAO(elasticSearchClient)); this.registerServiceImplementation(ISegmentCostPersistenceDAO.class, new SegmentCostEsPersistenceDAO(elasticSearchClient)); this.registerServiceImplementation(ISegmentPersistenceDAO.class, new SegmentEsPersistenceDAO(elasticSearchClient)); this.registerServiceImplementation(IServiceEntryPersistenceDAO.class, new ServiceEntryEsPersistenceDAO(elasticSearchClient)); @@ -216,9 +216,9 @@ public class StorageModuleEsProvider extends ModuleProvider { this.registerServiceImplementation(IGlobalTraceUIDAO.class, new GlobalTraceEsUIDAO(elasticSearchClient)); this.registerServiceImplementation(IInstPerformanceUIDAO.class, new InstPerformanceEsUIDAO(elasticSearchClient)); - this.registerServiceImplementation(INodeComponentUIDAO.class, new NodeComponentEsUIDAO(elasticSearchClient)); - this.registerServiceImplementation(INodeMappingUIDAO.class, new NodeMappingEsUIDAO(elasticSearchClient)); - this.registerServiceImplementation(INodeReferenceUIDAO.class, new NodeReferenceEsUIDAO(elasticSearchClient)); + this.registerServiceImplementation(IApplicationComponentUIDAO.class, new ApplicationComponentEsUIDAO(elasticSearchClient)); + this.registerServiceImplementation(IApplicationMappingUIDAO.class, new ApplicationMappingEsUIDAO(elasticSearchClient)); + this.registerServiceImplementation(IApplicationReferenceMetricUIDAO.class, new ApplicationReferenceMetricEsUIDAO(elasticSearchClient)); this.registerServiceImplementation(ISegmentCostUIDAO.class, new SegmentCostEsUIDAO(elasticSearchClient)); this.registerServiceImplementation(ISegmentUIDAO.class, new SegmentEsUIDAO(elasticSearchClient)); this.registerServiceImplementation(IServiceEntryUIDAO.class, new ServiceEntryEsUIDAO(elasticSearchClient)); diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationComponentEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationComponentEsPersistenceDAO.java index 706b2ec30..27146cee2 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationComponentEsPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationComponentEsPersistenceDAO.java @@ -29,8 +29,8 @@ import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.storage.dao.IApplicationComponentPersistenceDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponent; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponentTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponent; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponentTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationComponentEsUIDAO.java similarity index 92% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationComponentEsUIDAO.java index bc8b31767..7ee35c300 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationComponentEsUIDAO.java @@ -27,20 +27,20 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationComponentUIDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponentTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponentTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng */ -public class NodeComponentEsUIDAO extends EsDAO implements INodeComponentUIDAO { +public class ApplicationComponentEsUIDAO extends EsDAO implements IApplicationComponentUIDAO { private final Logger logger = LoggerFactory.getLogger(ApplicationComponentEsPersistenceDAO.class); - public NodeComponentEsUIDAO(ElasticSearchClient client) { + public ApplicationComponentEsUIDAO(ElasticSearchClient client) { super(client); } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMappingEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMappingEsPersistenceDAO.java index 4c7547034..7f72c67bd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMappingEsPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMappingEsPersistenceDAO.java @@ -29,8 +29,8 @@ import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.storage.dao.IApplicationMappingPersistenceDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; -import org.skywalking.apm.collector.storage.table.node.ApplicationMapping; -import org.skywalking.apm.collector.storage.table.node.ApplicationMappingTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationMapping; +import org.skywalking.apm.collector.storage.table.application.ApplicationMappingTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMappingEsUIDAO.java similarity index 89% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMappingEsUIDAO.java index af6934f6e..b525aea15 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeMappingEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationMappingEsUIDAO.java @@ -27,20 +27,20 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationMappingUIDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; -import org.skywalking.apm.collector.storage.table.node.ApplicationMappingTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationMappingTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng */ -public class NodeMappingEsUIDAO extends EsDAO implements INodeMappingUIDAO { +public class ApplicationMappingEsUIDAO extends EsDAO implements IApplicationMappingUIDAO { - private final Logger logger = LoggerFactory.getLogger(NodeMappingEsUIDAO.class); + private final Logger logger = LoggerFactory.getLogger(ApplicationMappingEsUIDAO.class); - public NodeMappingEsUIDAO(ElasticSearchClient client) { + public ApplicationMappingEsUIDAO(ElasticSearchClient client) { super(client); } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceEsMetricPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceMetricEsPersistenceDAO.java similarity index 51% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceEsMetricPersistenceDAO.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceMetricEsPersistenceDAO.java index b1e1a5328..e7c107f5c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceEsMetricPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceMetricEsPersistenceDAO.java @@ -29,36 +29,36 @@ import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricPersistenceDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; -import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetricTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng */ -public class ApplicationReferenceEsMetricPersistenceDAO extends EsDAO implements IApplicationReferenceMetricPersistenceDAO { +public class ApplicationReferenceMetricEsPersistenceDAO extends EsDAO implements IApplicationReferenceMetricPersistenceDAO { - private final Logger logger = LoggerFactory.getLogger(ApplicationReferenceEsMetricPersistenceDAO.class); + private final Logger logger = LoggerFactory.getLogger(ApplicationReferenceMetricEsPersistenceDAO.class); - public ApplicationReferenceEsMetricPersistenceDAO(ElasticSearchClient client) { + public ApplicationReferenceMetricEsPersistenceDAO(ElasticSearchClient client) { super(client); } @Override public ApplicationReferenceMetric get(String id) { - GetResponse getResponse = getClient().prepareGet(NodeReferenceTable.TABLE, id).get(); + GetResponse getResponse = getClient().prepareGet(ApplicationReferenceMetricTable.TABLE, id).get(); if (getResponse.isExists()) { ApplicationReferenceMetric applicationReferenceMetric = new ApplicationReferenceMetric(id); Map source = getResponse.getSource(); - applicationReferenceMetric.setFrontApplicationId(((Number)source.get(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID)).intValue()); - applicationReferenceMetric.setBehindApplicationId(((Number)source.get(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID)).intValue()); - applicationReferenceMetric.setS1Lte(((Number)source.get(NodeReferenceTable.COLUMN_S1_LTE)).intValue()); - applicationReferenceMetric.setS3Lte(((Number)source.get(NodeReferenceTable.COLUMN_S3_LTE)).intValue()); - applicationReferenceMetric.setS5Lte(((Number)source.get(NodeReferenceTable.COLUMN_S5_LTE)).intValue()); - applicationReferenceMetric.setS5Gt(((Number)source.get(NodeReferenceTable.COLUMN_S5_GT)).intValue()); - applicationReferenceMetric.setSummary(((Number)source.get(NodeReferenceTable.COLUMN_SUMMARY)).intValue()); - applicationReferenceMetric.setError(((Number)source.get(NodeReferenceTable.COLUMN_ERROR)).intValue()); - applicationReferenceMetric.setTimeBucket(((Number)source.get(NodeReferenceTable.COLUMN_TIME_BUCKET)).longValue()); + applicationReferenceMetric.setFrontApplicationId(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID)).intValue()); + applicationReferenceMetric.setBehindApplicationId(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID)).intValue()); + applicationReferenceMetric.setS1Lte(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_S1_LTE)).intValue()); + applicationReferenceMetric.setS3Lte(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_S3_LTE)).intValue()); + applicationReferenceMetric.setS5Lte(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_S5_LTE)).intValue()); + applicationReferenceMetric.setS5Gt(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_S5_GT)).intValue()); + applicationReferenceMetric.setSummary(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_SUMMARY)).intValue()); + applicationReferenceMetric.setError(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_ERROR)).intValue()); + applicationReferenceMetric.setTimeBucket(((Number)source.get(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET)).longValue()); return applicationReferenceMetric; } else { return null; @@ -67,43 +67,43 @@ public class ApplicationReferenceEsMetricPersistenceDAO extends EsDAO implements @Override public IndexRequestBuilder prepareBatchInsert(ApplicationReferenceMetric data) { Map source = new HashMap<>(); - source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId()); - source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId()); - source.put(NodeReferenceTable.COLUMN_S1_LTE, data.getS1Lte()); - source.put(NodeReferenceTable.COLUMN_S3_LTE, data.getS3Lte()); - source.put(NodeReferenceTable.COLUMN_S5_LTE, data.getS5Lte()); - source.put(NodeReferenceTable.COLUMN_S5_GT, data.getS5Gt()); - source.put(NodeReferenceTable.COLUMN_SUMMARY, data.getSummary()); - source.put(NodeReferenceTable.COLUMN_ERROR, data.getError()); - source.put(NodeReferenceTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); + source.put(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId()); + source.put(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId()); + source.put(ApplicationReferenceMetricTable.COLUMN_S1_LTE, data.getS1Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S3_LTE, data.getS3Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S5_LTE, data.getS5Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S5_GT, data.getS5Gt()); + source.put(ApplicationReferenceMetricTable.COLUMN_SUMMARY, data.getSummary()); + source.put(ApplicationReferenceMetricTable.COLUMN_ERROR, data.getError()); + source.put(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); - return getClient().prepareIndex(NodeReferenceTable.TABLE, data.getId()).setSource(source); + return getClient().prepareIndex(ApplicationReferenceMetricTable.TABLE, data.getId()).setSource(source); } @Override public UpdateRequestBuilder prepareBatchUpdate(ApplicationReferenceMetric data) { Map source = new HashMap<>(); - source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId()); - source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId()); - source.put(NodeReferenceTable.COLUMN_S1_LTE, data.getS1Lte()); - source.put(NodeReferenceTable.COLUMN_S3_LTE, data.getS3Lte()); - source.put(NodeReferenceTable.COLUMN_S5_LTE, data.getS5Lte()); - source.put(NodeReferenceTable.COLUMN_S5_GT, data.getS5Gt()); - source.put(NodeReferenceTable.COLUMN_SUMMARY, data.getSummary()); - source.put(NodeReferenceTable.COLUMN_ERROR, data.getError()); - source.put(NodeReferenceTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); + source.put(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId()); + source.put(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId()); + source.put(ApplicationReferenceMetricTable.COLUMN_S1_LTE, data.getS1Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S3_LTE, data.getS3Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S5_LTE, data.getS5Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S5_GT, data.getS5Gt()); + source.put(ApplicationReferenceMetricTable.COLUMN_SUMMARY, data.getSummary()); + source.put(ApplicationReferenceMetricTable.COLUMN_ERROR, data.getError()); + source.put(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); - return getClient().prepareUpdate(NodeReferenceTable.TABLE, data.getId()).setDoc(source); + return getClient().prepareUpdate(ApplicationReferenceMetricTable.TABLE, data.getId()).setDoc(source); } @Override public void deleteHistory(Long startTimestamp, Long endTimestamp) { long startTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(startTimestamp); long endTimeBucket = TimeBucketUtils.INSTANCE.getMinuteTimeBucket(endTimestamp); BulkByScrollResponse response = getClient().prepareDelete() - .filter(QueryBuilders.rangeQuery(NodeReferenceTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket)) - .source(NodeReferenceTable.TABLE) + .filter(QueryBuilders.rangeQuery(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET).gte(startTimeBucket).lte(endTimeBucket)) + .source(ApplicationReferenceMetricTable.TABLE) .get(); long deleted = response.getDeleted(); - logger.info("Delete {} rows history from {} index.", deleted, NodeReferenceTable.TABLE); + logger.info("Delete {} rows history from {} index.", deleted, ApplicationReferenceMetricTable.TABLE); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsUIDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceMetricEsUIDAO.java similarity index 56% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsUIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceMetricEsUIDAO.java index dba339467..d29f68ddd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsUIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ApplicationReferenceMetricEsUIDAO.java @@ -30,69 +30,69 @@ import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilde import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.core.util.ColumnNameUtils; -import org.skywalking.apm.collector.storage.dao.INodeReferenceUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricUIDAO; import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; -import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetricTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng */ -public class NodeReferenceEsUIDAO extends EsDAO implements INodeReferenceUIDAO { +public class ApplicationReferenceMetricEsUIDAO extends EsDAO implements IApplicationReferenceMetricUIDAO { - private final Logger logger = LoggerFactory.getLogger(NodeReferenceEsUIDAO.class); + private final Logger logger = LoggerFactory.getLogger(ApplicationReferenceMetricEsUIDAO.class); - public NodeReferenceEsUIDAO(ElasticSearchClient client) { + public ApplicationReferenceMetricEsUIDAO(ElasticSearchClient client) { super(client); } @Override public JsonArray load(long startTime, long endTime) { - SearchRequestBuilder searchRequestBuilder = getClient().prepareSearch(NodeReferenceTable.TABLE); - searchRequestBuilder.setTypes(NodeReferenceTable.TABLE_TYPE); + SearchRequestBuilder searchRequestBuilder = getClient().prepareSearch(ApplicationReferenceMetricTable.TABLE); + searchRequestBuilder.setTypes(ApplicationReferenceMetricTable.TABLE_TYPE); searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); - searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeReferenceTable.COLUMN_TIME_BUCKET).gte(startTime).lte(endTime)); + searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET).gte(startTime).lte(endTime)); searchRequestBuilder.setSize(0); - TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID).field(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID).size(100); - aggregationBuilder.subAggregation(AggregationBuilders.terms(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID).field(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID).size(100) - .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S1_LTE).field(NodeReferenceTable.COLUMN_S1_LTE)) - .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S3_LTE).field(NodeReferenceTable.COLUMN_S3_LTE)) - .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S5_LTE).field(NodeReferenceTable.COLUMN_S5_LTE)) - .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_S5_GT).field(NodeReferenceTable.COLUMN_S5_GT)) - .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_SUMMARY).field(NodeReferenceTable.COLUMN_SUMMARY)) - .subAggregation(AggregationBuilders.sum(NodeReferenceTable.COLUMN_ERROR).field(NodeReferenceTable.COLUMN_ERROR))); + TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID).field(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID).size(100); + aggregationBuilder.subAggregation(AggregationBuilders.terms(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID).field(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID).size(100) + .subAggregation(AggregationBuilders.sum(ApplicationReferenceMetricTable.COLUMN_S1_LTE).field(ApplicationReferenceMetricTable.COLUMN_S1_LTE)) + .subAggregation(AggregationBuilders.sum(ApplicationReferenceMetricTable.COLUMN_S3_LTE).field(ApplicationReferenceMetricTable.COLUMN_S3_LTE)) + .subAggregation(AggregationBuilders.sum(ApplicationReferenceMetricTable.COLUMN_S5_LTE).field(ApplicationReferenceMetricTable.COLUMN_S5_LTE)) + .subAggregation(AggregationBuilders.sum(ApplicationReferenceMetricTable.COLUMN_S5_GT).field(ApplicationReferenceMetricTable.COLUMN_S5_GT)) + .subAggregation(AggregationBuilders.sum(ApplicationReferenceMetricTable.COLUMN_SUMMARY).field(ApplicationReferenceMetricTable.COLUMN_SUMMARY)) + .subAggregation(AggregationBuilders.sum(ApplicationReferenceMetricTable.COLUMN_ERROR).field(ApplicationReferenceMetricTable.COLUMN_ERROR))); searchRequestBuilder.addAggregation(aggregationBuilder); SearchResponse searchResponse = searchRequestBuilder.execute().actionGet(); JsonArray nodeRefResSumArray = new JsonArray(); - Terms frontApplicationIdTerms = searchResponse.getAggregations().get(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID); + Terms frontApplicationIdTerms = searchResponse.getAggregations().get(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID); for (Terms.Bucket frontApplicationIdBucket : frontApplicationIdTerms.getBuckets()) { int frontApplicationId = frontApplicationIdBucket.getKeyAsNumber().intValue(); - Terms behindApplicationIdTerms = frontApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID); + Terms behindApplicationIdTerms = frontApplicationIdBucket.getAggregations().get(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID); for (Terms.Bucket behindApplicationIdBucket : behindApplicationIdTerms.getBuckets()) { int behindApplicationId = behindApplicationIdBucket.getKeyAsNumber().intValue(); if (behindApplicationId != 0) { - Sum s1LTE = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_S1_LTE); - Sum s3LTE = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_S3_LTE); - Sum s5LTE = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_S5_LTE); - Sum s5GT = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_S5_GT); - Sum summary = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_SUMMARY); - Sum error = behindApplicationIdBucket.getAggregations().get(NodeReferenceTable.COLUMN_ERROR); + Sum s1LTE = behindApplicationIdBucket.getAggregations().get(ApplicationReferenceMetricTable.COLUMN_S1_LTE); + Sum s3LTE = behindApplicationIdBucket.getAggregations().get(ApplicationReferenceMetricTable.COLUMN_S3_LTE); + Sum s5LTE = behindApplicationIdBucket.getAggregations().get(ApplicationReferenceMetricTable.COLUMN_S5_LTE); + Sum s5GT = behindApplicationIdBucket.getAggregations().get(ApplicationReferenceMetricTable.COLUMN_S5_GT); + Sum summary = behindApplicationIdBucket.getAggregations().get(ApplicationReferenceMetricTable.COLUMN_SUMMARY); + Sum error = behindApplicationIdBucket.getAggregations().get(ApplicationReferenceMetricTable.COLUMN_ERROR); logger.debug("frontApplicationId: {}, behindApplicationId: {}, s1LTE: {}, s3LTE: {}, s5LTE: {}, s5GT: {}, error: {}, summary: {}", frontApplicationId, behindApplicationId, s1LTE.getValue(), s3LTE.getValue(), s5LTE.getValue(), s5GT.getValue(), error.getValue(), summary.getValue()); JsonObject nodeRefResSumObj = new JsonObject(); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID), frontApplicationId); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID), behindApplicationId); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S1_LTE), s1LTE.getValue()); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S3_LTE), s3LTE.getValue()); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S5_LTE), s5LTE.getValue()); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S5_GT), s5GT.getValue()); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_ERROR), error.getValue()); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_SUMMARY), summary.getValue()); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID), frontApplicationId); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID), behindApplicationId); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_S1_LTE), s1LTE.getValue()); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_S3_LTE), s3LTE.getValue()); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_S5_LTE), s5LTE.getValue()); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_S5_GT), s5GT.getValue()); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_ERROR), error.getValue()); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_SUMMARY), summary.getValue()); nodeRefResSumArray.add(nodeRefResSumObj); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java index 47e9496d0..3323a5b47 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.storage.es.define; import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponentTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponentTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java index c1a69c683..a56a54f51 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.storage.es.define; import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; -import org.skywalking.apm.collector.storage.table.node.ApplicationMappingTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationMappingTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java index 9e87b653a..019589a57 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.storage.es.define; import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; -import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetricTable; /** * @author peng-yongsheng @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; public class NodeReferenceEsTableDefine extends ElasticSearchTableDefine { public NodeReferenceEsTableDefine() { - super(NodeReferenceTable.TABLE); + super(ApplicationReferenceMetricTable.TABLE); } @Override public int refreshInterval() { @@ -36,14 +36,14 @@ public class NodeReferenceEsTableDefine extends ElasticSearchTableDefine { } @Override public void initialize() { - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_S1_LTE, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_S3_LTE, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_S5_LTE, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_S5_GT, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_SUMMARY, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_ERROR, ElasticSearchColumnDefine.Type.Integer.name())); - addColumn(new ElasticSearchColumnDefine(NodeReferenceTable.COLUMN_TIME_BUCKET, ElasticSearchColumnDefine.Type.Long.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, ElasticSearchColumnDefine.Type.Integer.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID, ElasticSearchColumnDefine.Type.Integer.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_S1_LTE, ElasticSearchColumnDefine.Type.Integer.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_S3_LTE, ElasticSearchColumnDefine.Type.Integer.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_S5_LTE, ElasticSearchColumnDefine.Type.Integer.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_S5_GT, ElasticSearchColumnDefine.Type.Integer.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_SUMMARY, ElasticSearchColumnDefine.Type.Integer.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_ERROR, ElasticSearchColumnDefine.Type.Integer.name())); + addColumn(new ElasticSearchColumnDefine(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET, ElasticSearchColumnDefine.Type.Long.name())); } } diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java index 12e6dfd4f..036d71c4e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java @@ -45,11 +45,11 @@ import org.skywalking.apm.collector.storage.dao.IMemoryMetricUIDAO; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricPersistenceDAO; import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationComponentPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationComponentUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationMappingPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationMappingUIDAO; import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricPersistenceDAO; -import org.skywalking.apm.collector.storage.dao.INodeReferenceUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricUIDAO; import org.skywalking.apm.collector.storage.dao.ISegmentCostPersistenceDAO; import org.skywalking.apm.collector.storage.dao.ISegmentCostUIDAO; import org.skywalking.apm.collector.storage.dao.ISegmentPersistenceDAO; @@ -81,11 +81,11 @@ import org.skywalking.apm.collector.storage.h2.dao.MemoryMetricH2UIDAO; import org.skywalking.apm.collector.storage.h2.dao.MemoryPoolMetricH2PersistenceDAO; import org.skywalking.apm.collector.storage.h2.dao.MemoryPoolMetricH2UIDAO; import org.skywalking.apm.collector.storage.h2.dao.ApplicationComponentH2PersistenceDAO; -import org.skywalking.apm.collector.storage.h2.dao.NodeComponentH2UIDAO; +import org.skywalking.apm.collector.storage.h2.dao.ApplicationComponentH2UIDAO; import org.skywalking.apm.collector.storage.h2.dao.ApplicationMappingH2PersistenceDAO; -import org.skywalking.apm.collector.storage.h2.dao.NodeMappingH2UIDAO; -import org.skywalking.apm.collector.storage.h2.dao.ApplicationReferenceH2MetricPersistenceDAO; -import org.skywalking.apm.collector.storage.h2.dao.NodeReferenceH2UIDAO; +import org.skywalking.apm.collector.storage.h2.dao.ApplicationMappingH2UIDAO; +import org.skywalking.apm.collector.storage.h2.dao.ApplicationReferenceMetricH2PersistenceDAO; +import org.skywalking.apm.collector.storage.h2.dao.ApplicationReferenceMetricH2UIDAO; import org.skywalking.apm.collector.storage.h2.dao.SegmentCostH2PersistenceDAO; import org.skywalking.apm.collector.storage.h2.dao.SegmentCostH2UIDAO; import org.skywalking.apm.collector.storage.h2.dao.SegmentH2PersistenceDAO; @@ -174,7 +174,7 @@ public class StorageModuleH2Provider extends ModuleProvider { this.registerServiceImplementation(IInstanceMetricPersistenceDAO.class, new InstanceMetricH2PersistenceDAO(h2Client)); this.registerServiceImplementation(IApplicationComponentPersistenceDAO.class, new ApplicationComponentH2PersistenceDAO(h2Client)); this.registerServiceImplementation(IApplicationMappingPersistenceDAO.class, new ApplicationMappingH2PersistenceDAO(h2Client)); - this.registerServiceImplementation(IApplicationReferenceMetricPersistenceDAO.class, new ApplicationReferenceH2MetricPersistenceDAO(h2Client)); + this.registerServiceImplementation(IApplicationReferenceMetricPersistenceDAO.class, new ApplicationReferenceMetricH2PersistenceDAO(h2Client)); this.registerServiceImplementation(ISegmentCostPersistenceDAO.class, new SegmentCostH2PersistenceDAO(h2Client)); this.registerServiceImplementation(ISegmentPersistenceDAO.class, new SegmentH2PersistenceDAO(h2Client)); this.registerServiceImplementation(IServiceEntryPersistenceDAO.class, new ServiceEntryH2PersistenceDAO(h2Client)); @@ -193,9 +193,9 @@ public class StorageModuleH2Provider extends ModuleProvider { this.registerServiceImplementation(IGlobalTraceUIDAO.class, new GlobalTraceH2UIDAO(h2Client)); this.registerServiceImplementation(IInstPerformanceUIDAO.class, new InstPerformanceH2UIDAO(h2Client)); - this.registerServiceImplementation(INodeComponentUIDAO.class, new NodeComponentH2UIDAO(h2Client)); - this.registerServiceImplementation(INodeMappingUIDAO.class, new NodeMappingH2UIDAO(h2Client)); - this.registerServiceImplementation(INodeReferenceUIDAO.class, new NodeReferenceH2UIDAO(h2Client)); + this.registerServiceImplementation(IApplicationComponentUIDAO.class, new ApplicationComponentH2UIDAO(h2Client)); + this.registerServiceImplementation(IApplicationMappingUIDAO.class, new ApplicationMappingH2UIDAO(h2Client)); + this.registerServiceImplementation(IApplicationReferenceMetricUIDAO.class, new ApplicationReferenceMetricH2UIDAO(h2Client)); this.registerServiceImplementation(ISegmentCostUIDAO.class, new SegmentCostH2UIDAO(h2Client)); this.registerServiceImplementation(ISegmentUIDAO.class, new SegmentH2UIDAO(h2Client)); this.registerServiceImplementation(IServiceEntryUIDAO.class, new ServiceEntryH2UIDAO(h2Client)); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationComponentH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationComponentH2PersistenceDAO.java index 7c78192e5..a0a16e94c 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationComponentH2PersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationComponentH2PersistenceDAO.java @@ -30,8 +30,8 @@ import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; import org.skywalking.apm.collector.storage.dao.IApplicationComponentPersistenceDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponent; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponentTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponent; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponentTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationComponentH2UIDAO.java similarity index 87% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2UIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationComponentH2UIDAO.java index 6b4016ac7..7b67ae500 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationComponentH2UIDAO.java @@ -25,21 +25,21 @@ import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; -import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationComponentUIDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponentTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponentTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng, clevertension */ -public class NodeComponentH2UIDAO extends H2DAO implements INodeComponentUIDAO { +public class ApplicationComponentH2UIDAO extends H2DAO implements IApplicationComponentUIDAO { - private final Logger logger = LoggerFactory.getLogger(NodeComponentH2UIDAO.class); + private final Logger logger = LoggerFactory.getLogger(ApplicationComponentH2UIDAO.class); private static final String AGGREGATE_COMPONENT_SQL = "select {0}, {1} from {2} where {3} >= ? and {3} <= ? group by {0}, {1} limit 100"; - public NodeComponentH2UIDAO(H2Client client) { + public ApplicationComponentH2UIDAO(H2Client client) { super(client); } diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMappingH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMappingH2PersistenceDAO.java index c48e80e09..70eaa9541 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMappingH2PersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMappingH2PersistenceDAO.java @@ -30,8 +30,8 @@ import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; import org.skywalking.apm.collector.storage.dao.IApplicationMappingPersistenceDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; -import org.skywalking.apm.collector.storage.table.node.ApplicationMapping; -import org.skywalking.apm.collector.storage.table.node.ApplicationMappingTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationMapping; +import org.skywalking.apm.collector.storage.table.application.ApplicationMappingTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMappingH2UIDAO.java similarity index 87% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2UIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMappingH2UIDAO.java index ce0f8be4f..8f63b12de 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeMappingH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationMappingH2UIDAO.java @@ -25,21 +25,21 @@ import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; -import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationMappingUIDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; -import org.skywalking.apm.collector.storage.table.node.ApplicationMappingTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationMappingTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng, clevertension */ -public class NodeMappingH2UIDAO extends H2DAO implements INodeMappingUIDAO { +public class ApplicationMappingH2UIDAO extends H2DAO implements IApplicationMappingUIDAO { - private final Logger logger = LoggerFactory.getLogger(NodeMappingH2UIDAO.class); + private final Logger logger = LoggerFactory.getLogger(ApplicationMappingH2UIDAO.class); private static final String NODE_MAPPING_SQL = "select {0}, {1} from {2} where {3} >= ? and {3} <= ? group by {0}, {1} limit 100"; - public NodeMappingH2UIDAO(H2Client client) { + public ApplicationMappingH2UIDAO(H2Client client) { super(client); } diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceH2MetricPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceMetricH2PersistenceDAO.java similarity index 50% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceH2MetricPersistenceDAO.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceMetricH2PersistenceDAO.java index 1f3fad7ff..342c518f3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceH2MetricPersistenceDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceMetricH2PersistenceDAO.java @@ -30,39 +30,39 @@ import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricPersistenceDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; -import org.skywalking.apm.collector.storage.table.noderef.ApplicationReferenceMetric; -import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetric; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetricTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng, clevertension */ -public class ApplicationReferenceH2MetricPersistenceDAO extends H2DAO implements IApplicationReferenceMetricPersistenceDAO { +public class ApplicationReferenceMetricH2PersistenceDAO extends H2DAO implements IApplicationReferenceMetricPersistenceDAO { - private final Logger logger = LoggerFactory.getLogger(ApplicationReferenceH2MetricPersistenceDAO.class); + private final Logger logger = LoggerFactory.getLogger(ApplicationReferenceMetricH2PersistenceDAO.class); private static final String GET_SQL = "select * from {0} where {1} = ?"; - public ApplicationReferenceH2MetricPersistenceDAO(H2Client client) { + public ApplicationReferenceMetricH2PersistenceDAO(H2Client client) { super(client); } @Override public ApplicationReferenceMetric get(String id) { H2Client client = getClient(); - String sql = SqlBuilder.buildSql(GET_SQL, NodeReferenceTable.TABLE, NodeReferenceTable.COLUMN_ID); + String sql = SqlBuilder.buildSql(GET_SQL, ApplicationReferenceMetricTable.TABLE, ApplicationReferenceMetricTable.COLUMN_ID); Object[] params = new Object[] {id}; try (ResultSet rs = client.executeQuery(sql, params)) { if (rs.next()) { ApplicationReferenceMetric applicationReferenceMetric = new ApplicationReferenceMetric(id); - applicationReferenceMetric.setFrontApplicationId(rs.getInt(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID)); - applicationReferenceMetric.setBehindApplicationId(rs.getInt(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID)); - applicationReferenceMetric.setS1Lte(rs.getInt(NodeReferenceTable.COLUMN_S1_LTE)); - applicationReferenceMetric.setS3Lte(rs.getInt(NodeReferenceTable.COLUMN_S3_LTE)); - applicationReferenceMetric.setS5Lte(rs.getInt(NodeReferenceTable.COLUMN_S5_LTE)); - applicationReferenceMetric.setS5Gt(rs.getInt(NodeReferenceTable.COLUMN_S5_GT)); - applicationReferenceMetric.setSummary(rs.getInt(NodeReferenceTable.COLUMN_SUMMARY)); - applicationReferenceMetric.setError(rs.getInt(NodeReferenceTable.COLUMN_ERROR)); - applicationReferenceMetric.setTimeBucket(rs.getLong(NodeReferenceTable.COLUMN_TIME_BUCKET)); + applicationReferenceMetric.setFrontApplicationId(rs.getInt(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID)); + applicationReferenceMetric.setBehindApplicationId(rs.getInt(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID)); + applicationReferenceMetric.setS1Lte(rs.getInt(ApplicationReferenceMetricTable.COLUMN_S1_LTE)); + applicationReferenceMetric.setS3Lte(rs.getInt(ApplicationReferenceMetricTable.COLUMN_S3_LTE)); + applicationReferenceMetric.setS5Lte(rs.getInt(ApplicationReferenceMetricTable.COLUMN_S5_LTE)); + applicationReferenceMetric.setS5Gt(rs.getInt(ApplicationReferenceMetricTable.COLUMN_S5_GT)); + applicationReferenceMetric.setSummary(rs.getInt(ApplicationReferenceMetricTable.COLUMN_SUMMARY)); + applicationReferenceMetric.setError(rs.getInt(ApplicationReferenceMetricTable.COLUMN_ERROR)); + applicationReferenceMetric.setTimeBucket(rs.getLong(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET)); return applicationReferenceMetric; } } catch (SQLException | H2ClientException e) { @@ -74,17 +74,17 @@ public class ApplicationReferenceH2MetricPersistenceDAO extends H2DAO implements @Override public H2SqlEntity prepareBatchInsert(ApplicationReferenceMetric data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); - source.put(NodeReferenceTable.COLUMN_ID, data.getId()); - source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId()); - source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId()); - source.put(NodeReferenceTable.COLUMN_S1_LTE, data.getS1Lte()); - source.put(NodeReferenceTable.COLUMN_S3_LTE, data.getS3Lte()); - source.put(NodeReferenceTable.COLUMN_S5_LTE, data.getS5Lte()); - source.put(NodeReferenceTable.COLUMN_S5_GT, data.getS5Gt()); - source.put(NodeReferenceTable.COLUMN_SUMMARY, data.getSummary()); - source.put(NodeReferenceTable.COLUMN_ERROR, data.getError()); - source.put(NodeReferenceTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); - String sql = SqlBuilder.buildBatchInsertSql(NodeReferenceTable.TABLE, source.keySet()); + source.put(ApplicationReferenceMetricTable.COLUMN_ID, data.getId()); + source.put(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId()); + source.put(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId()); + source.put(ApplicationReferenceMetricTable.COLUMN_S1_LTE, data.getS1Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S3_LTE, data.getS3Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S5_LTE, data.getS5Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S5_GT, data.getS5Gt()); + source.put(ApplicationReferenceMetricTable.COLUMN_SUMMARY, data.getSummary()); + source.put(ApplicationReferenceMetricTable.COLUMN_ERROR, data.getError()); + source.put(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); + String sql = SqlBuilder.buildBatchInsertSql(ApplicationReferenceMetricTable.TABLE, source.keySet()); entity.setSql(sql); entity.setParams(source.values().toArray(new Object[0])); @@ -94,16 +94,16 @@ public class ApplicationReferenceH2MetricPersistenceDAO extends H2DAO implements @Override public H2SqlEntity prepareBatchUpdate(ApplicationReferenceMetric data) { Map source = new HashMap<>(); H2SqlEntity entity = new H2SqlEntity(); - source.put(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId()); - source.put(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId()); - source.put(NodeReferenceTable.COLUMN_S1_LTE, data.getS1Lte()); - source.put(NodeReferenceTable.COLUMN_S3_LTE, data.getS3Lte()); - source.put(NodeReferenceTable.COLUMN_S5_LTE, data.getS5Lte()); - source.put(NodeReferenceTable.COLUMN_S5_GT, data.getS5Gt()); - source.put(NodeReferenceTable.COLUMN_SUMMARY, data.getSummary()); - source.put(NodeReferenceTable.COLUMN_ERROR, data.getError()); - source.put(NodeReferenceTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); - String sql = SqlBuilder.buildBatchUpdateSql(NodeReferenceTable.TABLE, source.keySet(), NodeReferenceTable.COLUMN_ID); + source.put(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, data.getFrontApplicationId()); + source.put(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID, data.getBehindApplicationId()); + source.put(ApplicationReferenceMetricTable.COLUMN_S1_LTE, data.getS1Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S3_LTE, data.getS3Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S5_LTE, data.getS5Lte()); + source.put(ApplicationReferenceMetricTable.COLUMN_S5_GT, data.getS5Gt()); + source.put(ApplicationReferenceMetricTable.COLUMN_SUMMARY, data.getSummary()); + source.put(ApplicationReferenceMetricTable.COLUMN_ERROR, data.getError()); + source.put(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET, data.getTimeBucket()); + String sql = SqlBuilder.buildBatchUpdateSql(ApplicationReferenceMetricTable.TABLE, source.keySet(), ApplicationReferenceMetricTable.COLUMN_ID); entity.setSql(sql); List values = new ArrayList<>(source.values()); values.add(data.getId()); diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2UIDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceMetricH2UIDAO.java similarity index 55% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2UIDAO.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceMetricH2UIDAO.java index 98b8ddf56..dbe7f9427 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2UIDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ApplicationReferenceMetricH2UIDAO.java @@ -26,48 +26,48 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.storage.base.sql.SqlBuilder; -import org.skywalking.apm.collector.storage.dao.INodeReferenceUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricUIDAO; import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; -import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetricTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** * @author peng-yongsheng, clevertension */ -public class NodeReferenceH2UIDAO extends H2DAO implements INodeReferenceUIDAO { +public class ApplicationReferenceMetricH2UIDAO extends H2DAO implements IApplicationReferenceMetricUIDAO { - private final Logger logger = LoggerFactory.getLogger(NodeReferenceH2UIDAO.class); + private final Logger logger = LoggerFactory.getLogger(ApplicationReferenceMetricH2UIDAO.class); private static final String NODE_REFERENCE_SQL = "select {8}, {9}, sum({0}) as {0}, sum({1}) as {1}, sum({2}) as {2}, " + "sum({3}) as {3}, sum({4}) as {4}, sum({5}) as {5} from {6} where {7} >= ? and {7} <= ? group by {8}, {9} limit 100"; - public NodeReferenceH2UIDAO(H2Client client) { + public ApplicationReferenceMetricH2UIDAO(H2Client client) { super(client); } @Override public JsonArray load(long startTime, long endTime) { H2Client client = getClient(); JsonArray nodeRefResSumArray = new JsonArray(); - String sql = SqlBuilder.buildSql(NODE_REFERENCE_SQL, NodeReferenceTable.COLUMN_S1_LTE, - NodeReferenceTable.COLUMN_S3_LTE, NodeReferenceTable.COLUMN_S5_LTE, - NodeReferenceTable.COLUMN_S5_GT, NodeReferenceTable.COLUMN_SUMMARY, - NodeReferenceTable.COLUMN_ERROR, NodeReferenceTable.TABLE, NodeReferenceTable.COLUMN_TIME_BUCKET, - NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID); + String sql = SqlBuilder.buildSql(NODE_REFERENCE_SQL, ApplicationReferenceMetricTable.COLUMN_S1_LTE, + ApplicationReferenceMetricTable.COLUMN_S3_LTE, ApplicationReferenceMetricTable.COLUMN_S5_LTE, + ApplicationReferenceMetricTable.COLUMN_S5_GT, ApplicationReferenceMetricTable.COLUMN_SUMMARY, + ApplicationReferenceMetricTable.COLUMN_ERROR, ApplicationReferenceMetricTable.TABLE, ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET, + ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID); Object[] params = new Object[] {startTime, endTime}; try (ResultSet rs = client.executeQuery(sql, params)) { while (rs.next()) { - int frontApplicationId = rs.getInt(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID); - int behindApplicationId = rs.getInt(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID); + int frontApplicationId = rs.getInt(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID); + int behindApplicationId = rs.getInt(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID); JsonObject nodeRefResSumObj = new JsonObject(); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID), frontApplicationId); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID), behindApplicationId); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S1_LTE), rs.getDouble(NodeReferenceTable.COLUMN_S1_LTE)); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S3_LTE), rs.getDouble(NodeReferenceTable.COLUMN_S3_LTE)); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S5_LTE), rs.getDouble(NodeReferenceTable.COLUMN_S5_LTE)); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_S5_GT), rs.getDouble(NodeReferenceTable.COLUMN_S5_GT)); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_ERROR), rs.getDouble(NodeReferenceTable.COLUMN_ERROR)); - nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_SUMMARY), rs.getDouble(NodeReferenceTable.COLUMN_SUMMARY)); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID), frontApplicationId); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID), behindApplicationId); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_S1_LTE), rs.getDouble(ApplicationReferenceMetricTable.COLUMN_S1_LTE)); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_S3_LTE), rs.getDouble(ApplicationReferenceMetricTable.COLUMN_S3_LTE)); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_S5_LTE), rs.getDouble(ApplicationReferenceMetricTable.COLUMN_S5_LTE)); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_S5_GT), rs.getDouble(ApplicationReferenceMetricTable.COLUMN_S5_GT)); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_ERROR), rs.getDouble(ApplicationReferenceMetricTable.COLUMN_ERROR)); + nodeRefResSumObj.addProperty(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_SUMMARY), rs.getDouble(ApplicationReferenceMetricTable.COLUMN_SUMMARY)); nodeRefResSumArray.add(nodeRefResSumObj); } } catch (SQLException | H2ClientException e) { diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java index a326eed4e..1c50caafd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.storage.h2.define; import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponentTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponentTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java index 1b68474d1..06feef8b3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.storage.h2.define; import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; -import org.skywalking.apm.collector.storage.table.node.ApplicationMappingTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationMappingTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeReferenceH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeReferenceH2TableDefine.java index 8f407c5ad..15f6b5204 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeReferenceH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeReferenceH2TableDefine.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.storage.h2.define; import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; -import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetricTable; /** * @author peng-yongsheng @@ -28,19 +28,19 @@ import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; public class NodeReferenceH2TableDefine extends H2TableDefine { public NodeReferenceH2TableDefine() { - super(NodeReferenceTable.TABLE); + super(ApplicationReferenceMetricTable.TABLE); } @Override public void initialize() { - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_S1_LTE, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_S3_LTE, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_S5_LTE, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_S5_GT, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_SUMMARY, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_ERROR, H2ColumnDefine.Type.Int.name())); - addColumn(new H2ColumnDefine(NodeReferenceTable.COLUMN_TIME_BUCKET, H2ColumnDefine.Type.Bigint.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID, H2ColumnDefine.Type.Int.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID, H2ColumnDefine.Type.Int.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_S1_LTE, H2ColumnDefine.Type.Int.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_S3_LTE, H2ColumnDefine.Type.Int.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_S5_LTE, H2ColumnDefine.Type.Int.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_S5_GT, H2ColumnDefine.Type.Int.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_SUMMARY, H2ColumnDefine.Type.Int.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_ERROR, H2ColumnDefine.Type.Int.name())); + addColumn(new H2ColumnDefine(ApplicationReferenceMetricTable.COLUMN_TIME_BUCKET, H2ColumnDefine.Type.Bigint.name())); } } diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java index 91d33d203..c7e647729 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java @@ -28,9 +28,9 @@ import org.skywalking.apm.collector.cache.service.ApplicationCacheService; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.table.node.ApplicationComponentTable; -import org.skywalking.apm.collector.storage.table.node.ApplicationMappingTable; -import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationComponentTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationMappingTable; +import org.skywalking.apm.collector.storage.table.application.ApplicationReferenceMetricTable; import org.skywalking.apm.network.trace.component.ComponentsDefine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +70,7 @@ public class TraceDagDataBuilder { JsonObject lineJsonObj = new JsonObject(); lineJsonObj.addProperty("from", findOrCreateNode(front)); lineJsonObj.addProperty("to", findOrCreateNode(behind)); - lineJsonObj.addProperty("resSum", nodeRefJsonObj.get(NodeReferenceTable.COLUMN_SUMMARY).getAsInt()); + lineJsonObj.addProperty("resSum", nodeRefJsonObj.get(ApplicationReferenceMetricTable.COLUMN_SUMMARY).getAsInt()); lineArray.add(lineJsonObj); logger.debug("line: {}", lineJsonObj); @@ -135,8 +135,8 @@ public class TraceDagDataBuilder { for (int i = 0; i < nodeReference.size(); i++) { JsonObject nodeRefJsonObj = nodeReference.get(i).getAsJsonObject(); - int frontApplicationId = nodeRefJsonObj.get(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_FRONT_APPLICATION_ID)).getAsInt(); - int behindApplicationId = nodeRefJsonObj.get(ColumnNameUtils.INSTANCE.rename(NodeReferenceTable.COLUMN_BEHIND_APPLICATION_ID)).getAsInt(); + int frontApplicationId = nodeRefJsonObj.get(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_FRONT_APPLICATION_ID)).getAsInt(); + int behindApplicationId = nodeRefJsonObj.get(ColumnNameUtils.INSTANCE.rename(ApplicationReferenceMetricTable.COLUMN_BEHIND_APPLICATION_ID)).getAsInt(); String front = applicationCacheService.get(frontApplicationId); String behind = applicationCacheService.get(behindApplicationId); diff --git a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java index 0a2839cf0..1cfcb746a 100644 --- a/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java +++ b/apm-collector/apm-collector-ui/collector-ui-jetty-provider/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java @@ -22,9 +22,9 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import org.skywalking.apm.collector.core.module.ModuleManager; import org.skywalking.apm.collector.storage.StorageModule; -import org.skywalking.apm.collector.storage.dao.INodeComponentUIDAO; -import org.skywalking.apm.collector.storage.dao.INodeMappingUIDAO; -import org.skywalking.apm.collector.storage.dao.INodeReferenceUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationComponentUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationMappingUIDAO; +import org.skywalking.apm.collector.storage.dao.IApplicationReferenceMetricUIDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,16 +35,16 @@ public class TraceDagService { private final Logger logger = LoggerFactory.getLogger(TraceDagService.class); - private final INodeComponentUIDAO nodeComponentDAO; - private final INodeMappingUIDAO nodeMappingDAO; - private final INodeReferenceUIDAO nodeRefSumDAO; + private final IApplicationComponentUIDAO nodeComponentDAO; + private final IApplicationMappingUIDAO nodeMappingDAO; + private final IApplicationReferenceMetricUIDAO nodeRefSumDAO; private final ModuleManager moduleManager; public TraceDagService(ModuleManager moduleManager) { this.moduleManager = moduleManager; - this.nodeComponentDAO = moduleManager.find(StorageModule.NAME).getService(INodeComponentUIDAO.class); - this.nodeMappingDAO = moduleManager.find(StorageModule.NAME).getService(INodeMappingUIDAO.class); - this.nodeRefSumDAO = moduleManager.find(StorageModule.NAME).getService(INodeReferenceUIDAO.class); + this.nodeComponentDAO = moduleManager.find(StorageModule.NAME).getService(IApplicationComponentUIDAO.class); + this.nodeMappingDAO = moduleManager.find(StorageModule.NAME).getService(IApplicationMappingUIDAO.class); + this.nodeRefSumDAO = moduleManager.find(StorageModule.NAME).getService(IApplicationReferenceMetricUIDAO.class); } public JsonObject load(long startTime, long endTime) {