From 574bb43c8703897eab769c8acc71265980204f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BD=AD=E5=8B=87=E5=8D=87=20pengys?= <8082209@qq.com> Date: Sat, 28 Apr 2018 22:05:17 +0800 Subject: [PATCH] Use LinkList to collect unique records. (#1133) * Add non-merge persistence worker for segment, segment_duration, global_trace persistence. * omitted class. * Disable _all field. * no message --- .../grpc/provider/handler/SegmentCounter.java | 34 ++++++ .../handler/TraceSegmentServiceHandler.java | 17 ++- ...onMetricAlarmListDayPersistenceWorker.java | 8 +- ...nMetricAlarmListHourPersistenceWorker.java | 8 +- ...etricAlarmListMinutePersistenceWorker.java | 8 +- ...MetricAlarmListMonthPersistenceWorker.java | 8 +- ...plicationMetricAlarmPersistenceWorker.java | 8 +- ...renceMetricAlarmListPersistenceWorker.java | 8 +- ...ReferenceMetricAlarmPersistenceWorker.java | 8 +- ...tanceMetricAlarmListPersistenceWorker.java | 8 +- .../InstanceMetricAlarmPersistenceWorker.java | 8 +- ...renceMetricAlarmListPersistenceWorker.java | 8 +- ...ReferenceMetricAlarmPersistenceWorker.java | 8 +- ...rviceMetricAlarmListPersistenceWorker.java | 8 +- .../ServiceMetricAlarmPersistenceWorker.java | 8 +- ...renceMetricAlarmListPersistenceWorker.java | 8 +- ...ReferenceMetricAlarmPersistenceWorker.java | 8 +- .../cpu/CpuDayMetricPersistenceWorker.java | 8 +- .../cpu/CpuHourMetricPersistenceWorker.java | 8 +- .../cpu/CpuMinuteMetricPersistenceWorker.java | 8 +- .../cpu/CpuMonthMetricPersistenceWorker.java | 8 +- .../gc/GCDayMetricPersistenceWorker.java | 4 +- .../gc/GCHourMetricPersistenceWorker.java | 8 +- .../gc/GCMinuteMetricPersistenceWorker.java | 8 +- .../gc/GCMonthMetricPersistenceWorker.java | 8 +- .../MemoryDayMetricPersistenceWorker.java | 8 +- .../MemoryHourMetricPersistenceWorker.java | 8 +- .../MemoryMinuteMetricPersistenceWorker.java | 8 +- .../MemoryMonthMetricPersistenceWorker.java | 8 +- .../MemoryPoolDayMetricPersistenceWorker.java | 8 +- ...MemoryPoolHourMetricPersistenceWorker.java | 8 +- ...moryPoolMinuteMetricPersistenceWorker.java | 8 +- ...emoryPoolMonthMetricPersistenceWorker.java | 8 +- ...licationComponentDayPersistenceWorker.java | 8 +- ...icationComponentHourPersistenceWorker.java | 8 +- ...ationComponentMinutePersistenceWorker.java | 8 +- ...cationComponentMonthPersistenceWorker.java | 8 +- ...pplicationMappingDayPersistenceWorker.java | 8 +- ...plicationMappingHourPersistenceWorker.java | 8 +- ...icationMappingMinutePersistenceWorker.java | 8 +- ...licationMappingMonthPersistenceWorker.java | 8 +- ...ApplicationDayMetricPersistenceWorker.java | 8 +- ...pplicationHourMetricPersistenceWorker.java | 8 +- ...licationMinuteMetricPersistenceWorker.java | 8 +- ...plicationMonthMetricPersistenceWorker.java | 8 +- ...onReferenceDayMetricPersistenceWorker.java | 8 +- ...nReferenceHourMetricPersistenceWorker.java | 8 +- ...eferenceMinuteMetricPersistenceWorker.java | 8 +- ...ReferenceMonthMetricPersistenceWorker.java | 8 +- .../global/GlobalTracePersistenceWorker.java | 10 +- ...eTimeDistributionDayPersistenceWorker.java | 8 +- ...TimeDistributionHourPersistenceWorker.java | 8 +- ...meDistributionMinutePersistenceWorker.java | 8 +- ...imeDistributionMonthPersistenceWorker.java | 8 +- .../InstHeartBeatPersistenceWorker.java | 8 +- .../InstanceMappingDayPersistenceWorker.java | 8 +- .../InstanceMappingHourPersistenceWorker.java | 8 +- ...nstanceMappingMinutePersistenceWorker.java | 8 +- ...InstanceMappingMonthPersistenceWorker.java | 8 +- .../InstanceDayMetricPersistenceWorker.java | 8 +- .../InstanceHourMetricPersistenceWorker.java | 8 +- ...InstanceMinuteMetricPersistenceWorker.java | 8 +- .../InstanceMonthMetricPersistenceWorker.java | 8 +- ...ceReferenceDayMetricPersistenceWorker.java | 8 +- ...eReferenceHourMetricPersistenceWorker.java | 8 +- ...eferenceMinuteMetricPersistenceWorker.java | 8 +- ...ReferenceMonthMetricPersistenceWorker.java | 8 +- .../SegmentDurationPersistenceWorker.java | 10 +- .../segment/SegmentDurationSpanListener.java | 19 +--- .../ServiceDayMetricPersistenceWorker.java | 8 +- .../ServiceHourMetricPersistenceWorker.java | 8 +- .../ServiceMinuteMetricPersistenceWorker.java | 8 +- .../ServiceMonthMetricPersistenceWorker.java | 8 +- ...ceReferenceDayMetricPersistenceWorker.java | 8 +- ...eReferenceHourMetricPersistenceWorker.java | 8 +- ...eferenceMinuteMetricPersistenceWorker.java | 8 +- ...ReferenceMonthMetricPersistenceWorker.java | 8 +- .../parser/provider/parser/SegmentParse.java | 29 ++--- .../parser/SegmentPersistenceWorker.java | 11 +- .../AbstractLocalAsyncWorkerProvider.java | 2 +- .../model/base/WorkerCreateListener.java | 3 +- .../worker/model/impl/AggregationWorker.java | 24 ++-- .../model/impl/MergePersistenceWorker.java | 94 ++++++++++++++++ ...va => MergePersistenceWorkerProvider.java} | 4 +- .../model/impl/NonMergePersistenceWorker.java | 64 +++++++++++ .../NonMergePersistenceWorkerProvider.java | 33 ++++++ .../worker/model/impl/PersistenceWorker.java | 103 ++++++------------ .../worker/model/impl/data/DataCache.java | 36 +----- .../model/impl/data/MergeDataCache.java | 55 ++++++++++ ...llection.java => MergeDataCollection.java} | 7 +- .../model/impl/data/NonMergeDataCache.java | 47 ++++++++ .../impl/data/NonMergeDataCollection.java | 79 ++++++++++++++ .../worker/timer/PersistenceTimer.java | 20 +++- .../apm/collector/core/cache/Window.java | 4 + .../define/ElasticSearchStorageInstaller.java | 21 ++-- .../es/define/GlobalTraceEsTableDefine.java | 2 +- .../define/SegmentDurationEsTableDefine.java | 2 +- .../es/define/SegmentEsTableDefine.java | 5 +- 98 files changed, 812 insertions(+), 495 deletions(-) create mode 100644 apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/SegmentCounter.java create mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MergePersistenceWorker.java rename apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/{PersistenceWorkerProvider.java => MergePersistenceWorkerProvider.java} (78%) create mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/NonMergePersistenceWorker.java create mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/NonMergePersistenceWorkerProvider.java create mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/MergeDataCache.java rename apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/{DataCollection.java => MergeDataCollection.java} (92%) create mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/NonMergeDataCache.java create mode 100644 apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/NonMergeDataCollection.java diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/SegmentCounter.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/SegmentCounter.java new file mode 100644 index 000000000..db933afc6 --- /dev/null +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/SegmentCounter.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.collector.agent.grpc.provider.handler; + +import java.util.concurrent.atomic.AtomicLong; + +/** + * @author peng-yongsheng + */ +public enum SegmentCounter { + INSTANCE; + + private final AtomicLong counter = new AtomicLong(0); + + public long incrementAndGet() { + return counter.incrementAndGet(); + } +} diff --git a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java index b657cf17e..4298e791c 100644 --- a/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java +++ b/apm-collector/apm-collector-agent/agent-grpc/agent-grpc-provider/src/main/java/org/apache/skywalking/apm/collector/agent/grpc/provider/handler/TraceSegmentServiceHandler.java @@ -23,11 +23,8 @@ import org.apache.skywalking.apm.collector.analysis.segment.parser.define.Analys import org.apache.skywalking.apm.collector.analysis.segment.parser.define.service.ISegmentParseService; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.server.grpc.GRPCHandler; -import org.apache.skywalking.apm.network.proto.Downstream; -import org.apache.skywalking.apm.network.proto.TraceSegmentServiceGrpc; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.skywalking.apm.network.proto.*; +import org.slf4j.*; /** * @author peng-yongsheng @@ -37,9 +34,11 @@ public class TraceSegmentServiceHandler extends TraceSegmentServiceGrpc.TraceSeg private static final Logger logger = LoggerFactory.getLogger(TraceSegmentServiceHandler.class); private final ISegmentParseService segmentParseService; + private final Boolean debug; public TraceSegmentServiceHandler(ModuleManager moduleManager) { this.segmentParseService = moduleManager.find(AnalysisSegmentParserModule.NAME).getService(ISegmentParseService.class); + this.debug = System.getProperty("debug") != null; } @Override public StreamObserver collect(StreamObserver responseObserver) { @@ -47,10 +46,18 @@ public class TraceSegmentServiceHandler extends TraceSegmentServiceGrpc.TraceSeg @Override public void onNext(UpstreamSegment segment) { logger.debug("receive segment"); segmentParseService.parse(segment, ISegmentParseService.Source.Agent); + + if (debug) { + long count = SegmentCounter.INSTANCE.incrementAndGet(); + if (count % 100000 == 0) { + logger.info("received segment count: {}", count); + } + } } @Override public void onError(Throwable throwable) { logger.error(throwable.getMessage(), throwable); + responseObserver.onCompleted(); } @Override public void onCompleted() { diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListDayPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListDayPersistenceWorker.java index 1d08b2037..f5b4e7e55 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListDayPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListDayPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.application; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ApplicationAlarmL /** * @author peng-yongsheng */ -public class ApplicationMetricAlarmListDayPersistenceWorker extends PersistenceWorker { +public class ApplicationMetricAlarmListDayPersistenceWorker extends MergePersistenceWorker { public ApplicationMetricAlarmListDayPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ApplicationMetricAlarmListDayPersistenceWorker extends PersistenceW return getModuleManager().find(StorageModule.NAME).getService(IApplicationAlarmListDayPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListHourPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListHourPersistenceWorker.java index 340844437..54af03d31 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListHourPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListHourPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.application; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ApplicationAlarmL /** * @author peng-yongsheng */ -public class ApplicationMetricAlarmListHourPersistenceWorker extends PersistenceWorker { +public class ApplicationMetricAlarmListHourPersistenceWorker extends MergePersistenceWorker { public ApplicationMetricAlarmListHourPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ApplicationMetricAlarmListHourPersistenceWorker extends Persistence return getModuleManager().find(StorageModule.NAME).getService(IApplicationAlarmListHourPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListMinutePersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListMinutePersistenceWorker.java index 114757202..7b82af346 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListMinutePersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListMinutePersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.application; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ApplicationAlarmL /** * @author peng-yongsheng */ -public class ApplicationMetricAlarmListMinutePersistenceWorker extends PersistenceWorker { +public class ApplicationMetricAlarmListMinutePersistenceWorker extends MergePersistenceWorker { public ApplicationMetricAlarmListMinutePersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ApplicationMetricAlarmListMinutePersistenceWorker extends Persisten return getModuleManager().find(StorageModule.NAME).getService(IApplicationAlarmListMinutePersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListMonthPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListMonthPersistenceWorker.java index fb8534e77..9bdacd8be 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListMonthPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmListMonthPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.application; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ApplicationAlarmL /** * @author peng-yongsheng */ -public class ApplicationMetricAlarmListMonthPersistenceWorker extends PersistenceWorker { +public class ApplicationMetricAlarmListMonthPersistenceWorker extends MergePersistenceWorker { public ApplicationMetricAlarmListMonthPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ApplicationMetricAlarmListMonthPersistenceWorker extends Persistenc return getModuleManager().find(StorageModule.NAME).getService(IApplicationAlarmListMonthPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmPersistenceWorker.java index 43be3e21f..294971986 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationMetricAlarmPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.application; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ApplicationAlarm; /** * @author peng-yongsheng */ -public class ApplicationMetricAlarmPersistenceWorker extends PersistenceWorker { +public class ApplicationMetricAlarmPersistenceWorker extends MergePersistenceWorker { public ApplicationMetricAlarmPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ApplicationMetricAlarmPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationReferenceMetricAlarmListPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationReferenceMetricAlarmListPersistenceWorker.java index fc7f38761..a13d035ca 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationReferenceMetricAlarmListPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationReferenceMetricAlarmListPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.application; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ApplicationRefere /** * @author peng-yongsheng */ -public class ApplicationReferenceMetricAlarmListPersistenceWorker extends PersistenceWorker { +public class ApplicationReferenceMetricAlarmListPersistenceWorker extends MergePersistenceWorker { public ApplicationReferenceMetricAlarmListPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ApplicationReferenceMetricAlarmListPersistenceWorker extends Persis return getModuleManager().find(StorageModule.NAME).getService(IApplicationReferenceAlarmListPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationReferenceMetricAlarmPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationReferenceMetricAlarmPersistenceWorker.java index c8f760111..875878274 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationReferenceMetricAlarmPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/application/ApplicationReferenceMetricAlarmPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.application; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ApplicationRefere /** * @author peng-yongsheng */ -public class ApplicationReferenceMetricAlarmPersistenceWorker extends PersistenceWorker { +public class ApplicationReferenceMetricAlarmPersistenceWorker extends MergePersistenceWorker { public ApplicationReferenceMetricAlarmPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ApplicationReferenceMetricAlarmPersistenceWorker extends Persistenc return getModuleManager().find(StorageModule.NAME).getService(IApplicationReferenceAlarmPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmListPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmListPersistenceWorker.java index 120d943df..921647093 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmListPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmListPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.instance; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.InstanceAlarmList /** * @author peng-yongsheng */ -public class InstanceMetricAlarmListPersistenceWorker extends PersistenceWorker { +public class InstanceMetricAlarmListPersistenceWorker extends MergePersistenceWorker { public InstanceMetricAlarmListPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class InstanceMetricAlarmListPersistenceWorker extends PersistenceWorker< return getModuleManager().find(StorageModule.NAME).getService(IInstanceAlarmListPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmPersistenceWorker.java index 6fce174ae..b97cad8e6 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceMetricAlarmPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.instance; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.InstanceAlarm; /** * @author peng-yongsheng */ -public class InstanceMetricAlarmPersistenceWorker extends PersistenceWorker { +public class InstanceMetricAlarmPersistenceWorker extends MergePersistenceWorker { public InstanceMetricAlarmPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class InstanceMetricAlarmPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmListPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmListPersistenceWorker.java index d0d9ffd45..53f84fd53 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmListPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmListPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.instance; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.InstanceReference /** * @author peng-yongsheng */ -public class InstanceReferenceMetricAlarmListPersistenceWorker extends PersistenceWorker { +public class InstanceReferenceMetricAlarmListPersistenceWorker extends MergePersistenceWorker { public InstanceReferenceMetricAlarmListPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class InstanceReferenceMetricAlarmListPersistenceWorker extends Persisten return getModuleManager().find(StorageModule.NAME).getService(IInstanceReferenceAlarmListPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmPersistenceWorker.java index 97f271d2b..f91b868e1 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/instance/InstanceReferenceMetricAlarmPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.instance; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.InstanceReference /** * @author peng-yongsheng */ -public class InstanceReferenceMetricAlarmPersistenceWorker extends PersistenceWorker { +public class InstanceReferenceMetricAlarmPersistenceWorker extends MergePersistenceWorker { public InstanceReferenceMetricAlarmPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class InstanceReferenceMetricAlarmPersistenceWorker extends PersistenceWo return getModuleManager().find(StorageModule.NAME).getService(IInstanceReferenceAlarmPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceMetricAlarmListPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceMetricAlarmListPersistenceWorker.java index e72568e6d..4d1339678 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceMetricAlarmListPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceMetricAlarmListPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.service; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ServiceAlarmList; /** * @author peng-yongsheng */ -public class ServiceMetricAlarmListPersistenceWorker extends PersistenceWorker { +public class ServiceMetricAlarmListPersistenceWorker extends MergePersistenceWorker { public ServiceMetricAlarmListPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ServiceMetricAlarmListPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceMetricAlarmPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceMetricAlarmPersistenceWorker.java index 50c75841a..ea83f68cc 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceMetricAlarmPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceMetricAlarmPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.service; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ServiceAlarm; /** * @author peng-yongsheng */ -public class ServiceMetricAlarmPersistenceWorker extends PersistenceWorker { +public class ServiceMetricAlarmPersistenceWorker extends MergePersistenceWorker { public ServiceMetricAlarmPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ServiceMetricAlarmPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmListPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmListPersistenceWorker.java index 968231321..0957f53bc 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmListPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmListPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.service; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ServiceReferenceA /** * @author peng-yongsheng */ -public class ServiceReferenceMetricAlarmListPersistenceWorker extends PersistenceWorker { +public class ServiceReferenceMetricAlarmListPersistenceWorker extends MergePersistenceWorker { public ServiceReferenceMetricAlarmListPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ServiceReferenceMetricAlarmListPersistenceWorker extends Persistenc return getModuleManager().find(StorageModule.NAME).getService(IServiceReferenceAlarmListPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmPersistenceWorker.java index ddfdaaa56..2273485a9 100644 --- a/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-alarm/alarm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/alarm/provider/worker/service/ServiceReferenceMetricAlarmPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.alarm.provider.worker.service; import org.apache.skywalking.apm.collector.analysis.alarm.define.graph.AlarmWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.alarm.ServiceReferenceA /** * @author peng-yongsheng */ -public class ServiceReferenceMetricAlarmPersistenceWorker extends PersistenceWorker { +public class ServiceReferenceMetricAlarmPersistenceWorker extends MergePersistenceWorker { public ServiceReferenceMetricAlarmPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class ServiceReferenceMetricAlarmPersistenceWorker extends PersistenceWor return getModuleManager().find(StorageModule.NAME).getService(IServiceReferenceAlarmPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuDayMetricPersistenceWorker.java index 90fbce0f0..93adefc8d 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.cpu; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.CpuMetric; /** * @author peng-yongsheng */ -public class CpuDayMetricPersistenceWorker extends PersistenceWorker { +public class CpuDayMetricPersistenceWorker extends MergePersistenceWorker { private CpuDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class CpuDayMetricPersistenceWorker extends PersistenceWorker return getModuleManager().find(StorageModule.NAME).getService(ICpuDayMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuHourMetricPersistenceWorker.java index 9f3c4fb02..5c8059de8 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.cpu; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.CpuMetric; /** * @author peng-yongsheng */ -public class CpuHourMetricPersistenceWorker extends PersistenceWorker { +public class CpuHourMetricPersistenceWorker extends MergePersistenceWorker { private CpuHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class CpuHourMetricPersistenceWorker extends PersistenceWorker return getModuleManager().find(StorageModule.NAME).getService(ICpuHourMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuMinuteMetricPersistenceWorker.java index 7642a3fa9..cb2c0cc2f 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.cpu; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.CpuMetric; /** * @author peng-yongsheng */ -public class CpuMinuteMetricPersistenceWorker extends PersistenceWorker { +public class CpuMinuteMetricPersistenceWorker extends MergePersistenceWorker { private CpuMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class CpuMinuteMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuMonthMetricPersistenceWorker.java index ff8fb9517..62f497cba 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/cpu/CpuMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.cpu; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.CpuMetric; /** * @author peng-yongsheng */ -public class CpuMonthMetricPersistenceWorker extends PersistenceWorker { +public class CpuMonthMetricPersistenceWorker extends MergePersistenceWorker { private CpuMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class CpuMonthMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCDayMetricPersistenceWorker.java index 14e62c1cb..be441fa32 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCDayMetricPersistenceWorker.java @@ -29,7 +29,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetric; /** * @author peng-yongsheng */ -public class GCDayMetricPersistenceWorker extends PersistenceWorker { +public class GCDayMetricPersistenceWorker extends MergePersistenceWorker { private GCDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -48,7 +48,7 @@ public class GCDayMetricPersistenceWorker extends PersistenceWorker { return getModuleManager().find(StorageModule.NAME).getService(IGCDayMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCHourMetricPersistenceWorker.java index 7bc731916..5ccfee3d0 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.gc; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetric; /** * @author peng-yongsheng */ -public class GCHourMetricPersistenceWorker extends PersistenceWorker { +public class GCHourMetricPersistenceWorker extends MergePersistenceWorker { private GCHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class GCHourMetricPersistenceWorker extends PersistenceWorker { return getModuleManager().find(StorageModule.NAME).getService(IGCHourMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCMinuteMetricPersistenceWorker.java index 7da8dd460..260d61047 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.gc; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetric; /** * @author peng-yongsheng */ -public class GCMinuteMetricPersistenceWorker extends PersistenceWorker { +public class GCMinuteMetricPersistenceWorker extends MergePersistenceWorker { private GCMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class GCMinuteMetricPersistenceWorker extends PersistenceWorker return getModuleManager().find(StorageModule.NAME).getService(IGCMinuteMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCMonthMetricPersistenceWorker.java index 34667f724..7887797a0 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/gc/GCMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.gc; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.GCMetric; /** * @author peng-yongsheng */ -public class GCMonthMetricPersistenceWorker extends PersistenceWorker { +public class GCMonthMetricPersistenceWorker extends MergePersistenceWorker { private GCMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class GCMonthMetricPersistenceWorker extends PersistenceWorker return getModuleManager().find(StorageModule.NAME).getService(IGCMonthMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryDayMetricPersistenceWorker.java index 4593ceb31..12031510a 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memory; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryMetric; /** * @author peng-yongsheng */ -public class MemoryDayMetricPersistenceWorker extends PersistenceWorker { +public class MemoryDayMetricPersistenceWorker extends MergePersistenceWorker { public MemoryDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class MemoryDayMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryHourMetricPersistenceWorker.java index 281de6c99..3de68c7e2 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memory; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryMetric; /** * @author peng-yongsheng */ -public class MemoryHourMetricPersistenceWorker extends PersistenceWorker { +public class MemoryHourMetricPersistenceWorker extends MergePersistenceWorker { public MemoryHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class MemoryHourMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryMinuteMetricPersistenceWorker.java index 78cb1257a..09c6b0a8b 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memory; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryMetric; /** * @author peng-yongsheng */ -public class MemoryMinuteMetricPersistenceWorker extends PersistenceWorker { +public class MemoryMinuteMetricPersistenceWorker extends MergePersistenceWorker { public MemoryMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class MemoryMinuteMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryMonthMetricPersistenceWorker.java index 861f96fac..ea74d1918 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memory/MemoryMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memory; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryMetric; /** * @author peng-yongsheng */ -public class MemoryMonthMetricPersistenceWorker extends PersistenceWorker { +public class MemoryMonthMetricPersistenceWorker extends MergePersistenceWorker { public MemoryMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -49,7 +49,7 @@ public class MemoryMonthMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolDayMetricPersistenceWorker.java index 566ba190a..3b0b8a606 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memorypool; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric; /** * @author peng-yongsheng */ -public class MemoryPoolDayMetricPersistenceWorker extends PersistenceWorker { +public class MemoryPoolDayMetricPersistenceWorker extends MergePersistenceWorker { @Override public int id() { return WorkerIdDefine.MEMORY_POOL_DAY_METRIC_PERSISTENCE_WORKER_ID; @@ -49,7 +49,7 @@ public class MemoryPoolDayMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolHourMetricPersistenceWorker.java index da860807b..7ef3cb50b 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memorypool; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric; /** * @author peng-yongsheng */ -public class MemoryPoolHourMetricPersistenceWorker extends PersistenceWorker { +public class MemoryPoolHourMetricPersistenceWorker extends MergePersistenceWorker { @Override public int id() { return WorkerIdDefine.MEMORY_POOL_HOUR_METRIC_PERSISTENCE_WORKER_ID; @@ -49,7 +49,7 @@ public class MemoryPoolHourMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolMinuteMetricPersistenceWorker.java index ac0d8a5f0..d2fab7f4c 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memorypool; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric; /** * @author peng-yongsheng */ -public class MemoryPoolMinuteMetricPersistenceWorker extends PersistenceWorker { +public class MemoryPoolMinuteMetricPersistenceWorker extends MergePersistenceWorker { @Override public int id() { return WorkerIdDefine.MEMORY_POOL_MINUTE_METRIC_PERSISTENCE_WORKER_ID; @@ -49,7 +49,7 @@ public class MemoryPoolMinuteMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolMonthMetricPersistenceWorker.java index 5435202b5..a0e5ba621 100644 --- a/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-jvm/jvm-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/jvm/provider/worker/memorypool/MemoryPoolMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.jvm.provider.worker.memorypool; import org.apache.skywalking.apm.collector.analysis.jvm.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,7 +30,7 @@ import org.apache.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric; /** * @author peng-yongsheng */ -public class MemoryPoolMonthMetricPersistenceWorker extends PersistenceWorker { +public class MemoryPoolMonthMetricPersistenceWorker extends MergePersistenceWorker { @Override public int id() { return WorkerIdDefine.MEMORY_POOL_MONTH_METRIC_PERSISTENCE_WORKER_ID; @@ -49,7 +49,7 @@ public class MemoryPoolMonthMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentDayPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentDayPersistenceWorker.java index 93b11d3e6..0311eff6b 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentDayPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentDayPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.component; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationComponentDayPersistenceWorker extends PersistenceWorker { +public class ApplicationComponentDayPersistenceWorker extends MergePersistenceWorker { private ApplicationComponentDayPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationComponentDayPersistenceWorker extends PersistenceWorker< return getModuleManager().find(StorageModule.NAME).getService(IApplicationComponentDayPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentHourPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentHourPersistenceWorker.java index 6e047701b..b050b5927 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentHourPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentHourPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.component; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationComponentHourPersistenceWorker extends PersistenceWorker { +public class ApplicationComponentHourPersistenceWorker extends MergePersistenceWorker { private ApplicationComponentHourPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationComponentHourPersistenceWorker extends PersistenceWorker return getModuleManager().find(StorageModule.NAME).getService(IApplicationComponentHourPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentMinutePersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentMinutePersistenceWorker.java index 464277565..a01b128f6 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentMinutePersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentMinutePersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.component; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationComponentMinutePersistenceWorker extends PersistenceWorker { +public class ApplicationComponentMinutePersistenceWorker extends MergePersistenceWorker { private ApplicationComponentMinutePersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationComponentMinutePersistenceWorker extends PersistenceWork return getModuleManager().find(StorageModule.NAME).getService(IApplicationComponentMinutePersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentMonthPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentMonthPersistenceWorker.java index bcd35788e..5ef244348 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentMonthPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/component/ApplicationComponentMonthPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.component; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationComponentMonthPersistenceWorker extends PersistenceWorker { +public class ApplicationComponentMonthPersistenceWorker extends MergePersistenceWorker { private ApplicationComponentMonthPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationComponentMonthPersistenceWorker extends PersistenceWorke return getModuleManager().find(StorageModule.NAME).getService(IApplicationComponentMonthPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingDayPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingDayPersistenceWorker.java index 78ad182f5..3c5478bfc 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingDayPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingDayPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.mapping; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationMappingDayPersistenceWorker extends PersistenceWorker { +public class ApplicationMappingDayPersistenceWorker extends MergePersistenceWorker { private ApplicationMappingDayPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationMappingDayPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingHourPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingHourPersistenceWorker.java index 5604959b6..fb67780c5 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingHourPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingHourPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.mapping; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationMappingHourPersistenceWorker extends PersistenceWorker { +public class ApplicationMappingHourPersistenceWorker extends MergePersistenceWorker { private ApplicationMappingHourPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationMappingHourPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingMinutePersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingMinutePersistenceWorker.java index ab4520353..ff6fa8a9d 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingMinutePersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingMinutePersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.mapping; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationMappingMinutePersistenceWorker extends PersistenceWorker { +public class ApplicationMappingMinutePersistenceWorker extends MergePersistenceWorker { private ApplicationMappingMinutePersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationMappingMinutePersistenceWorker extends PersistenceWorker return getModuleManager().find(StorageModule.NAME).getService(IApplicationMappingMinutePersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingMonthPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingMonthPersistenceWorker.java index 7e0b08463..f838e4119 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingMonthPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/mapping/ApplicationMappingMonthPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.mapping; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationMappingMonthPersistenceWorker extends PersistenceWorker { +public class ApplicationMappingMonthPersistenceWorker extends MergePersistenceWorker { private ApplicationMappingMonthPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationMappingMonthPersistenceWorker extends PersistenceWorker< return getModuleManager().find(StorageModule.NAME).getService(IApplicationMappingMonthPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationDayMetricPersistenceWorker.java index 53b25d8f0..113f5c762 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationDayMetricPersistenceWorker extends PersistenceWorker { +public class ApplicationDayMetricPersistenceWorker extends MergePersistenceWorker { private ApplicationDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationDayMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationHourMetricPersistenceWorker.java index f30186eaf..4bce92992 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationHourMetricPersistenceWorker extends PersistenceWorker { +public class ApplicationHourMetricPersistenceWorker extends MergePersistenceWorker { private ApplicationHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationHourMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationMinuteMetricPersistenceWorker.java index ed0dd9525..c834b17bc 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationMinuteMetricPersistenceWorker extends PersistenceWorker { +public class ApplicationMinuteMetricPersistenceWorker extends MergePersistenceWorker { private ApplicationMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationMinuteMetricPersistenceWorker extends PersistenceWorker< return true; } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationMonthMetricPersistenceWorker.java index 366d9887a..b20a63e31 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/metric/ApplicationMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationMonthMetricPersistenceWorker extends PersistenceWorker { +public class ApplicationMonthMetricPersistenceWorker extends MergePersistenceWorker { private ApplicationMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationMonthMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceDayMetricPersistenceWorker.java index 0a37e84c0..ea0674140 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationReferenceDayMetricPersistenceWorker extends PersistenceWorker { +public class ApplicationReferenceDayMetricPersistenceWorker extends MergePersistenceWorker { private ApplicationReferenceDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationReferenceDayMetricPersistenceWorker extends PersistenceW return getModuleManager().find(StorageModule.NAME).getService(IApplicationReferenceDayMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceHourMetricPersistenceWorker.java index 2720fe651..98d2d13b9 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationReferenceHourMetricPersistenceWorker extends PersistenceWorker { +public class ApplicationReferenceHourMetricPersistenceWorker extends MergePersistenceWorker { private ApplicationReferenceHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationReferenceHourMetricPersistenceWorker extends Persistence return getModuleManager().find(StorageModule.NAME).getService(IApplicationReferenceHourMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceMinuteMetricPersistenceWorker.java index dc086101c..1ba51f217 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationReferenceMinuteMetricPersistenceWorker extends PersistenceWorker { +public class ApplicationReferenceMinuteMetricPersistenceWorker extends MergePersistenceWorker { private ApplicationReferenceMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationReferenceMinuteMetricPersistenceWorker extends Persisten return getModuleManager().find(StorageModule.NAME).getService(IApplicationReferenceMinuteMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceMonthMetricPersistenceWorker.java index 7c5e4c92a..3fb3e3bd5 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/application/refmetric/ApplicationReferenceMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.application.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.application.Application /** * @author peng-yongsheng */ -public class ApplicationReferenceMonthMetricPersistenceWorker extends PersistenceWorker { +public class ApplicationReferenceMonthMetricPersistenceWorker extends MergePersistenceWorker { private ApplicationReferenceMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ApplicationReferenceMonthMetricPersistenceWorker extends Persistenc return getModuleManager().find(StorageModule.NAME).getService(IApplicationReferenceMonthMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTracePersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTracePersistenceWorker.java index d3c66a891..bf5b8cb48 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTracePersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/GlobalTracePersistenceWorker.java @@ -19,20 +19,18 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.global; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.*; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.apache.skywalking.apm.collector.storage.dao.IGlobalTracePersistenceDAO; -import org.apache.skywalking.apm.collector.storage.table.global.GlobalTrace; -import org.apache.skywalking.apm.collector.storage.table.global.GlobalTraceTable; +import org.apache.skywalking.apm.collector.storage.table.global.*; /** * @author peng-yongsheng */ -public class GlobalTracePersistenceWorker extends PersistenceWorker { +public class GlobalTracePersistenceWorker extends NonMergePersistenceWorker { private GlobalTracePersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +49,7 @@ public class GlobalTracePersistenceWorker extends PersistenceWorker return getModuleManager().find(StorageModule.NAME).getService(IGlobalTracePersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends NonMergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionDayPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionDayPersistenceWorker.java index 7970e9d8b..99fe25952 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionDayPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionDayPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.global.std; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.global.ResponseTimeDist /** * @author peng-yongsheng */ -public class ResponseTimeDistributionDayPersistenceWorker extends PersistenceWorker { +public class ResponseTimeDistributionDayPersistenceWorker extends MergePersistenceWorker { private ResponseTimeDistributionDayPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ResponseTimeDistributionDayPersistenceWorker extends PersistenceWor return getModuleManager().find(StorageModule.NAME).getService(IResponseTimeDistributionDayPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionHourPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionHourPersistenceWorker.java index b5662fc91..2b851fe3c 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionHourPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionHourPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.global.std; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.global.ResponseTimeDist /** * @author peng-yongsheng */ -public class ResponseTimeDistributionHourPersistenceWorker extends PersistenceWorker { +public class ResponseTimeDistributionHourPersistenceWorker extends MergePersistenceWorker { private ResponseTimeDistributionHourPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ResponseTimeDistributionHourPersistenceWorker extends PersistenceWo return getModuleManager().find(StorageModule.NAME).getService(IResponseTimeDistributionHourPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionMinutePersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionMinutePersistenceWorker.java index d5a5150b5..9907f9796 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionMinutePersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionMinutePersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.global.std; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.global.ResponseTimeDist /** * @author peng-yongsheng */ -public class ResponseTimeDistributionMinutePersistenceWorker extends PersistenceWorker { +public class ResponseTimeDistributionMinutePersistenceWorker extends MergePersistenceWorker { private ResponseTimeDistributionMinutePersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ResponseTimeDistributionMinutePersistenceWorker extends Persistence return getModuleManager().find(StorageModule.NAME).getService(IResponseTimeDistributionMinutePersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionMonthPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionMonthPersistenceWorker.java index 5624ab7c5..72cc7d10e 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionMonthPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/global/std/ResponseTimeDistributionMonthPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.global.std; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.global.ResponseTimeDist /** * @author peng-yongsheng */ -public class ResponseTimeDistributionMonthPersistenceWorker extends PersistenceWorker { +public class ResponseTimeDistributionMonthPersistenceWorker extends MergePersistenceWorker { private ResponseTimeDistributionMonthPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ResponseTimeDistributionMonthPersistenceWorker extends PersistenceW return getModuleManager().find(StorageModule.NAME).getService(IResponseTimeDistributionMonthPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/heartbeat/InstHeartBeatPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/heartbeat/InstHeartBeatPersistenceWorker.java index e7bb00be6..280004646 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/heartbeat/InstHeartBeatPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/heartbeat/InstHeartBeatPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.heartbeat; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -31,7 +31,7 @@ import org.apache.skywalking.apm.collector.storage.table.register.Instance; /** * @author peng-yongsheng */ -public class InstHeartBeatPersistenceWorker extends PersistenceWorker { +public class InstHeartBeatPersistenceWorker extends MergePersistenceWorker { private InstHeartBeatPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -50,7 +50,7 @@ public class InstHeartBeatPersistenceWorker extends PersistenceWorker return getModuleManager().find(StorageModule.NAME).getService(IInstanceHeartBeatPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingDayPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingDayPersistenceWorker.java index 94c379010..1b4bc296b 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingDayPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingDayPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.mapping; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMappin /** * @author peng-yongsheng */ -public class InstanceMappingDayPersistenceWorker extends PersistenceWorker { +public class InstanceMappingDayPersistenceWorker extends MergePersistenceWorker { private InstanceMappingDayPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceMappingDayPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingHourPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingHourPersistenceWorker.java index 026b1f727..6c9f25c25 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingHourPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingHourPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.mapping; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMappin /** * @author peng-yongsheng */ -public class InstanceMappingHourPersistenceWorker extends PersistenceWorker { +public class InstanceMappingHourPersistenceWorker extends MergePersistenceWorker { private InstanceMappingHourPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceMappingHourPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMinutePersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMinutePersistenceWorker.java index 6c0b0a743..5655e58fd 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMinutePersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMinutePersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.mapping; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMappin /** * @author peng-yongsheng */ -public class InstanceMappingMinutePersistenceWorker extends PersistenceWorker { +public class InstanceMappingMinutePersistenceWorker extends MergePersistenceWorker { private InstanceMappingMinutePersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceMappingMinutePersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMonthPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMonthPersistenceWorker.java index c017d5221..02ce3d140 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMonthPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/mapping/InstanceMappingMonthPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.mapping; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMappin /** * @author peng-yongsheng */ -public class InstanceMappingMonthPersistenceWorker extends PersistenceWorker { +public class InstanceMappingMonthPersistenceWorker extends MergePersistenceWorker { private InstanceMappingMonthPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceMappingMonthPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceDayMetricPersistenceWorker.java index bd128808d..af209f668 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric /** * @author peng-yongsheng */ -public class InstanceDayMetricPersistenceWorker extends PersistenceWorker { +public class InstanceDayMetricPersistenceWorker extends MergePersistenceWorker { private InstanceDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceDayMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceHourMetricPersistenceWorker.java index 5c01d5c0c..bdda4d6ba 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric /** * @author peng-yongsheng */ -public class InstanceHourMetricPersistenceWorker extends PersistenceWorker { +public class InstanceHourMetricPersistenceWorker extends MergePersistenceWorker { private InstanceHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceHourMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMinuteMetricPersistenceWorker.java index 5d4892d4e..3ed4e8c4d 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric /** * @author peng-yongsheng */ -public class InstanceMinuteMetricPersistenceWorker extends PersistenceWorker { +public class InstanceMinuteMetricPersistenceWorker extends MergePersistenceWorker { private InstanceMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceMinuteMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMonthMetricPersistenceWorker.java index e492b9401..09b7fd270 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/metric/InstanceMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceMetric /** * @author peng-yongsheng */ -public class InstanceMonthMetricPersistenceWorker extends PersistenceWorker { +public class InstanceMonthMetricPersistenceWorker extends MergePersistenceWorker { private InstanceMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceMonthMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceDayMetricPersistenceWorker.java index 961321d2b..882101f61 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceRefere /** * @author peng-yongsheng */ -public class InstanceReferenceDayMetricPersistenceWorker extends PersistenceWorker { +public class InstanceReferenceDayMetricPersistenceWorker extends MergePersistenceWorker { private InstanceReferenceDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceReferenceDayMetricPersistenceWorker extends PersistenceWork return true; } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceHourMetricPersistenceWorker.java index 621c59398..9303b0cb1 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceRefere /** * @author peng-yongsheng */ -public class InstanceReferenceHourMetricPersistenceWorker extends PersistenceWorker { +public class InstanceReferenceHourMetricPersistenceWorker extends MergePersistenceWorker { private InstanceReferenceHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceReferenceHourMetricPersistenceWorker extends PersistenceWor return true; } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceMinuteMetricPersistenceWorker.java index b2980ae05..5cde21c5a 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceRefere /** * @author peng-yongsheng */ -public class InstanceReferenceMinuteMetricPersistenceWorker extends PersistenceWorker { +public class InstanceReferenceMinuteMetricPersistenceWorker extends MergePersistenceWorker { private InstanceReferenceMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceReferenceMinuteMetricPersistenceWorker extends PersistenceW return true; } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceMonthMetricPersistenceWorker.java index 28d484177..e0732e97f 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/instance/refmetric/InstanceReferenceMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.instance.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.instance.InstanceRefere /** * @author peng-yongsheng */ -public class InstanceReferenceMonthMetricPersistenceWorker extends PersistenceWorker { +public class InstanceReferenceMonthMetricPersistenceWorker extends MergePersistenceWorker { private InstanceReferenceMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class InstanceReferenceMonthMetricPersistenceWorker extends PersistenceWo return true; } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationPersistenceWorker.java index ea9a51709..03299dd84 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationPersistenceWorker.java @@ -19,20 +19,18 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.segment; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.*; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; import org.apache.skywalking.apm.collector.storage.dao.ISegmentDurationPersistenceDAO; -import org.apache.skywalking.apm.collector.storage.table.segment.SegmentDuration; -import org.apache.skywalking.apm.collector.storage.table.segment.SegmentDurationTable; +import org.apache.skywalking.apm.collector.storage.table.segment.*; /** * @author peng-yongsheng */ -public class SegmentDurationPersistenceWorker extends PersistenceWorker { +public class SegmentDurationPersistenceWorker extends NonMergePersistenceWorker { private SegmentDurationPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +49,7 @@ public class SegmentDurationPersistenceWorker extends PersistenceWorker { + public static class Factory extends NonMergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java index cbaf303b8..505b7350e 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/segment/SegmentDurationSpanListener.java @@ -18,27 +18,18 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.segment; -import java.util.LinkedList; -import java.util.List; +import java.util.*; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricGraphIdDefine; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.EntrySpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.ExitSpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.FirstSpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.LocalSpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListenerFactory; +import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.*; import org.apache.skywalking.apm.collector.cache.CacheModule; import org.apache.skywalking.apm.collector.cache.service.ServiceNameCacheService; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; -import org.apache.skywalking.apm.collector.core.graph.Graph; -import org.apache.skywalking.apm.collector.core.graph.GraphManager; +import org.apache.skywalking.apm.collector.core.graph.*; import org.apache.skywalking.apm.collector.core.module.ModuleManager; -import org.apache.skywalking.apm.collector.core.util.BooleanUtils; -import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils; +import org.apache.skywalking.apm.collector.core.util.*; import org.apache.skywalking.apm.collector.storage.table.segment.SegmentDuration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.slf4j.*; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceDayMetricPersistenceWorker.java index ac81d4266..fb5323978 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.service.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.service.ServiceMetricTa /** * @author peng-yongsheng */ -public class ServiceDayMetricPersistenceWorker extends PersistenceWorker { +public class ServiceDayMetricPersistenceWorker extends MergePersistenceWorker { private ServiceDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ServiceDayMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceHourMetricPersistenceWorker.java index 902dd2c2f..2e5f5b6bc 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.service.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.service.ServiceMetricTa /** * @author peng-yongsheng */ -public class ServiceHourMetricPersistenceWorker extends PersistenceWorker { +public class ServiceHourMetricPersistenceWorker extends MergePersistenceWorker { private ServiceHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ServiceHourMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceMinuteMetricPersistenceWorker.java index 453b1df5b..afb213b65 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.service.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.service.ServiceMetricTa /** * @author peng-yongsheng */ -public class ServiceMinuteMetricPersistenceWorker extends PersistenceWorker { +public class ServiceMinuteMetricPersistenceWorker extends MergePersistenceWorker { private ServiceMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ServiceMinuteMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceMonthMetricPersistenceWorker.java index cde7d1392..414751f17 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/metric/ServiceMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.service.metric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.service.ServiceMetricTa /** * @author peng-yongsheng */ -public class ServiceMonthMetricPersistenceWorker extends PersistenceWorker { +public class ServiceMonthMetricPersistenceWorker extends MergePersistenceWorker { private ServiceMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ServiceMonthMetricPersistenceWorker extends PersistenceWorker { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceDayMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceDayMetricPersistenceWorker.java index 7cd42c21b..0b2de3146 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceDayMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceDayMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.service.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenc /** * @author peng-yongsheng */ -public class ServiceReferenceDayMetricPersistenceWorker extends PersistenceWorker { +public class ServiceReferenceDayMetricPersistenceWorker extends MergePersistenceWorker { private ServiceReferenceDayMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ServiceReferenceDayMetricPersistenceWorker extends PersistenceWorke return getModuleManager().find(StorageModule.NAME).getService(IServiceReferenceDayMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceHourMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceHourMetricPersistenceWorker.java index 17380c438..2162c1dea 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceHourMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceHourMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.service.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenc /** * @author peng-yongsheng */ -public class ServiceReferenceHourMetricPersistenceWorker extends PersistenceWorker { +public class ServiceReferenceHourMetricPersistenceWorker extends MergePersistenceWorker { private ServiceReferenceHourMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ServiceReferenceHourMetricPersistenceWorker extends PersistenceWork return getModuleManager().find(StorageModule.NAME).getService(IServiceReferenceHourMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMinuteMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMinuteMetricPersistenceWorker.java index 1739ee15c..974fee345 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMinuteMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMinuteMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.service.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenc /** * @author peng-yongsheng */ -public class ServiceReferenceMinuteMetricPersistenceWorker extends PersistenceWorker { +public class ServiceReferenceMinuteMetricPersistenceWorker extends MergePersistenceWorker { private ServiceReferenceMinuteMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ServiceReferenceMinuteMetricPersistenceWorker extends PersistenceWo return getModuleManager().find(StorageModule.NAME).getService(IServiceReferenceMinuteMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMonthMetricPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMonthMetricPersistenceWorker.java index acfa034fc..4a27ccd8e 100644 --- a/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMonthMetricPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-metric/metric-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/metric/provider/worker/service/refmetric/ServiceReferenceMonthMetricPersistenceWorker.java @@ -19,8 +19,8 @@ package org.apache.skywalking.apm.collector.analysis.metric.provider.worker.service.refmetric; import org.apache.skywalking.apm.collector.analysis.metric.define.graph.MetricWorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorker; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.MergePersistenceWorkerProvider; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; @@ -32,7 +32,7 @@ import org.apache.skywalking.apm.collector.storage.table.service.ServiceReferenc /** * @author peng-yongsheng */ -public class ServiceReferenceMonthMetricPersistenceWorker extends PersistenceWorker { +public class ServiceReferenceMonthMetricPersistenceWorker extends MergePersistenceWorker { private ServiceReferenceMonthMetricPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); @@ -51,7 +51,7 @@ public class ServiceReferenceMonthMetricPersistenceWorker extends PersistenceWor return getModuleManager().find(StorageModule.NAME).getService(IServiceReferenceMonthMetricPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { + public static class Factory extends MergePersistenceWorkerProvider { public Factory(ModuleManager moduleManager) { super(moduleManager); diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java index a7b5f2b1d..ba1a0e180 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentParse.java @@ -19,35 +19,20 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser; import com.google.protobuf.InvalidProtocolBufferException; -import java.util.LinkedList; -import java.util.List; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.ReferenceDecorator; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SegmentDecorator; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.SpanDecorator; +import java.util.*; +import org.apache.skywalking.apm.collector.analysis.segment.parser.define.decorator.*; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.graph.GraphIdDefine; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.EntrySpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.ExitSpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.FirstSpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.GlobalTraceIdsListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.LocalSpanListener; -import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.SpanListener; +import org.apache.skywalking.apm.collector.analysis.segment.parser.define.listener.*; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.service.ISegmentParseService; -import org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization.ReferenceIdExchanger; -import org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization.SegmentStandardization; -import org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization.SpanIdExchanger; +import org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser.standardization.*; import org.apache.skywalking.apm.collector.core.UnexpectedException; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; -import org.apache.skywalking.apm.collector.core.graph.Graph; -import org.apache.skywalking.apm.collector.core.graph.GraphManager; +import org.apache.skywalking.apm.collector.core.graph.*; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.core.util.TimeBucketUtils; import org.apache.skywalking.apm.collector.storage.table.segment.Segment; -import org.apache.skywalking.apm.network.proto.SpanType; -import org.apache.skywalking.apm.network.proto.TraceSegmentObject; -import org.apache.skywalking.apm.network.proto.UniqueId; -import org.apache.skywalking.apm.network.proto.UpstreamSegment; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.skywalking.apm.network.proto.*; +import org.slf4j.*; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentPersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentPersistenceWorker.java index 3ecd508fb..8803e2dc0 100644 --- a/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentPersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-segment-parser/segment-parser-provider/src/main/java/org/apache/skywalking/apm/collector/analysis/segment/parser/provider/parser/SegmentPersistenceWorker.java @@ -19,8 +19,7 @@ package org.apache.skywalking.apm.collector.analysis.segment.parser.provider.parser; import org.apache.skywalking.apm.collector.analysis.segment.parser.define.graph.WorkerIdDefine; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorkerProvider; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.*; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; @@ -30,9 +29,9 @@ import org.apache.skywalking.apm.collector.storage.table.segment.Segment; /** * @author peng-yongsheng */ -public class SegmentPersistenceWorker extends PersistenceWorker { +public class SegmentPersistenceWorker extends NonMergePersistenceWorker { - public SegmentPersistenceWorker(ModuleManager moduleManager) { + private SegmentPersistenceWorker(ModuleManager moduleManager) { super(moduleManager); } @@ -49,8 +48,8 @@ public class SegmentPersistenceWorker extends PersistenceWorker { return getModuleManager().find(StorageModule.NAME).getService(ISegmentPersistenceDAO.class); } - public static class Factory extends PersistenceWorkerProvider { - public Factory(ModuleManager moduleManager) { + public static class Factory extends NonMergePersistenceWorkerProvider { + Factory(ModuleManager moduleManager) { super(moduleManager); } diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java index 472f4d173..f2fc58022 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/AbstractLocalAsyncWorkerProvider.java @@ -39,7 +39,7 @@ public abstract class AbstractLocalAsyncWorkerProvider localAsyncWorkerRef = new LocalAsyncWorkerRef<>(localAsyncWorker); - DataCarrier dataCarrier = new DataCarrier<>(1, queueSize()); + DataCarrier dataCarrier = new DataCarrier<>(1, 8192 * 2); localAsyncWorkerRef.setQueueEventHandler(dataCarrier); dataCarrier.consume(localAsyncWorkerRef, 1); return localAsyncWorkerRef; diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerCreateListener.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerCreateListener.java index 17bea8261..87cf41289 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerCreateListener.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/base/WorkerCreateListener.java @@ -18,8 +18,7 @@ package org.apache.skywalking.apm.collector.analysis.worker.model.base; -import java.util.LinkedList; -import java.util.List; +import java.util.*; import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; /** diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java index e8c259c7b..3850ae558 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/AggregationWorker.java @@ -20,7 +20,7 @@ package org.apache.skywalking.apm.collector.analysis.worker.model.impl; import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker; import org.apache.skywalking.apm.collector.analysis.worker.model.base.WorkerException; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.DataCache; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.MergeDataCache; import org.apache.skywalking.apm.collector.core.data.StreamData; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.slf4j.Logger; @@ -33,12 +33,12 @@ public abstract class AggregationWorker dataCache; + private MergeDataCache mergeDataCache; private int messageNum; public AggregationWorker(ModuleManager moduleManager) { super(moduleManager); - this.dataCache = new DataCache<>(); + this.mergeDataCache = new MergeDataCache<>(); } @SuppressWarnings("unchecked") @@ -62,28 +62,28 @@ public abstract class AggregationWorker { + mergeDataCache.getLast().collection().forEach((String id, OUTPUT data) -> { logger.debug(data.toString()); onNext(data); }); - dataCache.finishReadingLast(); + mergeDataCache.finishReadingLast(); } private void aggregate(OUTPUT message) { - dataCache.writing(); - if (dataCache.containsKey(message.getId())) { - dataCache.get(message.getId()).mergeAndFormulaCalculateData(message); + mergeDataCache.writing(); + if (mergeDataCache.containsKey(message.getId())) { + mergeDataCache.get(message.getId()).mergeAndFormulaCalculateData(message); } else { - dataCache.put(message.getId(), message); + mergeDataCache.put(message.getId(), message); } - dataCache.finishWriting(); + mergeDataCache.finishWriting(); } } diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MergePersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MergePersistenceWorker.java new file mode 100644 index 000000000..4f4786eae --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MergePersistenceWorker.java @@ -0,0 +1,94 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.collector.analysis.worker.model.impl; + +import java.util.*; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.*; +import org.apache.skywalking.apm.collector.core.cache.Window; +import org.apache.skywalking.apm.collector.core.data.StreamData; +import org.apache.skywalking.apm.collector.core.module.ModuleManager; +import org.slf4j.*; + +import static java.util.Objects.nonNull; + +/** + * @author peng-yongsheng + */ +public abstract class MergePersistenceWorker extends PersistenceWorker> { + + private final Logger logger = LoggerFactory.getLogger(MergePersistenceWorker.class); + + private final MergeDataCache mergeDataCache; + + public MergePersistenceWorker(ModuleManager moduleManager) { + super(moduleManager); + this.mergeDataCache = new MergeDataCache<>(); + } + + @Override protected Window> getCache() { + return mergeDataCache; + } + + @Override protected List prepareBatch(MergeDataCollection collection) { + List insertBatchCollection = new LinkedList<>(); + List updateBatchCollection = new LinkedList<>(); + collection.collection().forEach((id, data) -> { + if (needMergeDBData()) { + INPUT_AND_OUTPUT dbData = persistenceDAO().get(id); + if (nonNull(dbData)) { + dbData.mergeAndFormulaCalculateData(data); + try { + updateBatchCollection.add(persistenceDAO().prepareBatchUpdate(dbData)); + onNext(dbData); + } catch (Throwable t) { + logger.error(t.getMessage(), t); + } + } else { + try { + insertBatchCollection.add(persistenceDAO().prepareBatchInsert(data)); + onNext(data); + } catch (Throwable t) { + logger.error(t.getMessage(), t); + } + } + } else { + try { + insertBatchCollection.add(persistenceDAO().prepareBatchInsert(data)); + onNext(data); + } catch (Throwable t) { + logger.error(t.getMessage(), t); + } + } + }); + + insertBatchCollection.addAll(updateBatchCollection); + return insertBatchCollection; + } + + @Override protected void cacheData(INPUT_AND_OUTPUT input) { + mergeDataCache.writing(); + if (mergeDataCache.containsKey(input.getId())) { + mergeDataCache.get(input.getId()).mergeAndFormulaCalculateData(input); + } else { + mergeDataCache.put(input.getId(), input); + } + + mergeDataCache.finishWriting(); + } +} diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorkerProvider.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MergePersistenceWorkerProvider.java similarity index 78% rename from apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorkerProvider.java rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MergePersistenceWorkerProvider.java index b9769a871..ca69bdac3 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorkerProvider.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/MergePersistenceWorkerProvider.java @@ -25,9 +25,9 @@ import org.apache.skywalking.apm.collector.core.module.ModuleManager; /** * @author peng-yongsheng */ -public abstract class PersistenceWorkerProvider> extends AbstractLocalAsyncWorkerProvider { +public abstract class MergePersistenceWorkerProvider> extends AbstractLocalAsyncWorkerProvider { - public PersistenceWorkerProvider(ModuleManager moduleManager) { + public MergePersistenceWorkerProvider(ModuleManager moduleManager) { super(moduleManager); } } diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/NonMergePersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/NonMergePersistenceWorker.java new file mode 100644 index 000000000..86e3eace4 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/NonMergePersistenceWorker.java @@ -0,0 +1,64 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.collector.analysis.worker.model.impl; + +import java.util.*; +import org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.*; +import org.apache.skywalking.apm.collector.core.cache.Window; +import org.apache.skywalking.apm.collector.core.data.StreamData; +import org.apache.skywalking.apm.collector.core.module.ModuleManager; +import org.slf4j.*; + +/** + * @author peng-yongsheng + */ +public abstract class NonMergePersistenceWorker extends PersistenceWorker> { + + private final Logger logger = LoggerFactory.getLogger(NonMergePersistenceWorker.class); + + private final NonMergeDataCache mergeDataCache; + + public NonMergePersistenceWorker(ModuleManager moduleManager) { + super(moduleManager); + this.mergeDataCache = new NonMergeDataCache<>(); + } + + @Override protected Window> getCache() { + return mergeDataCache; + } + + @Override protected void cacheData(INPUT_AND_OUTPUT input) { + mergeDataCache.writing(); + mergeDataCache.add(input); + mergeDataCache.finishWriting(); + } + + @Override protected List prepareBatch(NonMergeDataCollection collection) { + List insertBatchCollection = new LinkedList<>(); + collection.collection().forEach(data -> { + try { + insertBatchCollection.add(persistenceDAO().prepareBatchInsert(data)); + onNext(data); + } catch (Throwable t) { + logger.error(t.getMessage(), t); + } + }); + return insertBatchCollection; + } +} diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/NonMergePersistenceWorkerProvider.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/NonMergePersistenceWorkerProvider.java new file mode 100644 index 000000000..255782d5f --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/NonMergePersistenceWorkerProvider.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.collector.analysis.worker.model.impl; + +import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorkerProvider; +import org.apache.skywalking.apm.collector.core.data.StreamData; +import org.apache.skywalking.apm.collector.core.module.ModuleManager; + +/** + * @author peng-yongsheng + */ +public abstract class NonMergePersistenceWorkerProvider> extends AbstractLocalAsyncWorkerProvider { + + public NonMergePersistenceWorkerProvider(ModuleManager moduleManager) { + super(moduleManager); + } +} diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java index fa9695db4..9331b2ae9 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/PersistenceWorker.java @@ -18,72 +18,72 @@ package org.apache.skywalking.apm.collector.analysis.worker.model.impl; +import java.util.*; import org.apache.skywalking.apm.collector.analysis.worker.model.base.AbstractLocalAsyncWorker; -import org.apache.skywalking.apm.collector.analysis.worker.model.impl.data.DataCache; import org.apache.skywalking.apm.collector.core.annotations.trace.GraphComputingMetric; +import org.apache.skywalking.apm.collector.core.cache.Collection; +import org.apache.skywalking.apm.collector.core.cache.*; import org.apache.skywalking.apm.collector.core.data.StreamData; import org.apache.skywalking.apm.collector.core.module.ModuleManager; +import org.apache.skywalking.apm.collector.core.util.StringUtils; import org.apache.skywalking.apm.collector.storage.StorageModule; -import org.apache.skywalking.apm.collector.storage.base.dao.IBatchDAO; -import org.apache.skywalking.apm.collector.storage.base.dao.IPersistenceDAO; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import static java.util.Objects.nonNull; +import org.apache.skywalking.apm.collector.storage.base.dao.*; +import org.slf4j.*; /** * @author peng-yongsheng */ -public abstract class PersistenceWorker extends AbstractLocalAsyncWorker { +public abstract class PersistenceWorker extends AbstractLocalAsyncWorker { private final Logger logger = LoggerFactory.getLogger(PersistenceWorker.class); - private final DataCache dataCache; private final IBatchDAO batchDAO; + private final int blockBatchPersistenceSize; - public PersistenceWorker(ModuleManager moduleManager) { + PersistenceWorker(ModuleManager moduleManager) { super(moduleManager); - this.dataCache = new DataCache<>(); this.batchDAO = moduleManager.find(StorageModule.NAME).getService(IBatchDAO.class); + + if (StringUtils.isNotEmpty(System.getProperty("batchSize"))) { + this.blockBatchPersistenceSize = Integer.valueOf(System.getProperty("batchSize")); + } else { + this.blockBatchPersistenceSize = 500000; + } } public boolean flushAndSwitch() { boolean isSwitch; try { - if (isSwitch = dataCache.trySwitchPointer()) { - dataCache.switchPointer(); + if (isSwitch = getCache().trySwitchPointer()) { + getCache().switchPointer(); } } finally { - dataCache.trySwitchPointerFinally(); + getCache().trySwitchPointerFinally(); } return isSwitch; } @Override protected void onWork(INPUT_AND_OUTPUT input) { - if (dataCache.currentCollectionSize() >= 520000) { + if (getCache().currentCollectionSize() >= blockBatchPersistenceSize) { try { - if (dataCache.trySwitchPointer()) { - dataCache.switchPointer(); + if (getCache().trySwitchPointer()) { + getCache().switchPointer(); List collection = buildBatchCollection(); batchDAO.batchPersistence(collection); } } finally { - dataCache.trySwitchPointerFinally(); + getCache().trySwitchPointerFinally(); } } - aggregate(input); + cacheData(input); } @GraphComputingMetric(name = "/persistence/buildBatchCollection/") public final List buildBatchCollection() { List batchCollection = new LinkedList<>(); try { - while (dataCache.getLast().isWriting()) { + while (getCache().getLast().isWriting()) { try { Thread.sleep(10); } catch (InterruptedException e) { @@ -91,63 +91,22 @@ public abstract class PersistenceWorker ext } } - if (dataCache.getLast().collection() != null) { - batchCollection = prepareBatch(dataCache.getLast().collection()); + if (getCache().getLast().collection() != null) { + batchCollection = prepareBatch(getCache().getLast()); } } finally { - dataCache.finishReadingLast(); + getCache().finishReadingLast(); } return batchCollection; } - private List prepareBatch(Map dataMap) { - List insertBatchCollection = new LinkedList<>(); - List updateBatchCollection = new LinkedList<>(); - dataMap.forEach((id, data) -> { - if (needMergeDBData()) { - INPUT_AND_OUTPUT dbData = persistenceDAO().get(id); - if (nonNull(dbData)) { - dbData.mergeAndFormulaCalculateData(data); - try { - updateBatchCollection.add(persistenceDAO().prepareBatchUpdate(dbData)); - onNext(dbData); - } catch (Throwable t) { - logger.error(t.getMessage(), t); - } - } else { - try { - insertBatchCollection.add(persistenceDAO().prepareBatchInsert(data)); - onNext(data); - } catch (Throwable t) { - logger.error(t.getMessage(), t); - } - } - } else { - try { - insertBatchCollection.add(persistenceDAO().prepareBatchInsert(data)); - onNext(data); - } catch (Throwable t) { - logger.error(t.getMessage(), t); - } - } - }); + protected abstract List prepareBatch(COLLECTION collection); - insertBatchCollection.addAll(updateBatchCollection); - return insertBatchCollection; - } - - private void aggregate(INPUT_AND_OUTPUT input) { - dataCache.writing(); - if (dataCache.containsKey(input.getId())) { - dataCache.get(input.getId()).mergeAndFormulaCalculateData(input); - } else { - dataCache.put(input.getId(), input); - } - - dataCache.finishWriting(); - } + protected abstract Window getCache(); protected abstract IPersistenceDAO persistenceDAO(); protected abstract boolean needMergeDBData(); + + protected abstract void cacheData(INPUT_AND_OUTPUT input); } diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java index 7cfa06637..3e34b1da5 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCache.java @@ -18,42 +18,12 @@ package org.apache.skywalking.apm.collector.analysis.worker.model.impl.data; -import org.apache.skywalking.apm.collector.core.cache.Window; -import org.apache.skywalking.apm.collector.core.data.StreamData; - /** * @author peng-yongsheng */ -public class DataCache extends Window> { +public interface DataCache { - private DataCollection lockedDataCollection; + void writing(); - @Override public DataCollection collectionInstance() { - return new DataCollection<>(); - } - - public boolean containsKey(String id) { - return lockedDataCollection.containsKey(id); - } - - public StreamData get(String id) { - return lockedDataCollection.get(id); - } - - public void put(String id, STREAM_DATA data) { - lockedDataCollection.put(id, data); - } - - public void writing() { - lockedDataCollection = getCurrentAndWriting(); - } - - public int currentCollectionSize() { - return getCurrent().size(); - } - - public void finishWriting() { - lockedDataCollection.finishWriting(); - lockedDataCollection = null; - } + void finishWriting(); } diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/MergeDataCache.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/MergeDataCache.java new file mode 100644 index 000000000..56ce56b15 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/MergeDataCache.java @@ -0,0 +1,55 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.collector.analysis.worker.model.impl.data; + +import org.apache.skywalking.apm.collector.core.cache.Window; +import org.apache.skywalking.apm.collector.core.data.StreamData; + +/** + * @author peng-yongsheng + */ +public class MergeDataCache extends Window> implements DataCache { + + private MergeDataCollection lockedMergeDataCollection; + + @Override public MergeDataCollection collectionInstance() { + return new MergeDataCollection<>(); + } + + public boolean containsKey(String id) { + return lockedMergeDataCollection.containsKey(id); + } + + public StreamData get(String id) { + return lockedMergeDataCollection.get(id); + } + + public void put(String id, STREAM_DATA data) { + lockedMergeDataCollection.put(id, data); + } + + @Override public void writing() { + lockedMergeDataCollection = getCurrentAndWriting(); + } + + @Override public void finishWriting() { + lockedMergeDataCollection.finishWriting(); + lockedMergeDataCollection = null; + } +} diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCollection.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/MergeDataCollection.java similarity index 92% rename from apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCollection.java rename to apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/MergeDataCollection.java index c38091ada..a7e014a43 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/DataCollection.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/MergeDataCollection.java @@ -18,20 +18,19 @@ package org.apache.skywalking.apm.collector.analysis.worker.model.impl.data; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.*; import org.apache.skywalking.apm.collector.core.cache.Collection; import org.apache.skywalking.apm.collector.core.data.StreamData; /** * @author peng-yongsheng */ -public class DataCollection implements Collection> { +public class MergeDataCollection implements Collection> { private Map data; private volatile boolean writing; private volatile boolean reading; - DataCollection() { + MergeDataCollection() { this.data = new LinkedHashMap<>(); this.writing = false; this.reading = false; diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/NonMergeDataCache.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/NonMergeDataCache.java new file mode 100644 index 000000000..266efc7f0 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/NonMergeDataCache.java @@ -0,0 +1,47 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.collector.analysis.worker.model.impl.data; + +import org.apache.skywalking.apm.collector.core.cache.Window; +import org.apache.skywalking.apm.collector.core.data.StreamData; + +/** + * @author peng-yongsheng + */ +public class NonMergeDataCache extends Window> implements DataCache { + + private NonMergeDataCollection lockedMergeDataCollection; + + @Override public NonMergeDataCollection collectionInstance() { + return new NonMergeDataCollection<>(); + } + + public void add(STREAM_DATA data) { + lockedMergeDataCollection.add(data); + } + + @Override public void writing() { + lockedMergeDataCollection = getCurrentAndWriting(); + } + + @Override public void finishWriting() { + lockedMergeDataCollection.finishWriting(); + lockedMergeDataCollection = null; + } +} diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/NonMergeDataCollection.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/NonMergeDataCollection.java new file mode 100644 index 000000000..39534c5a5 --- /dev/null +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/model/impl/data/NonMergeDataCollection.java @@ -0,0 +1,79 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.collector.analysis.worker.model.impl.data; + +import java.util.*; +import org.apache.skywalking.apm.collector.core.cache.Collection; +import org.apache.skywalking.apm.collector.core.data.StreamData; + +/** + * @author peng-yongsheng + */ +public class NonMergeDataCollection implements Collection> { + + private final List data; + private volatile boolean writing; + private volatile boolean reading; + + NonMergeDataCollection() { + this.data = new LinkedList<>(); + this.writing = false; + this.reading = false; + } + + public void finishWriting() { + writing = false; + } + + @Override public void writing() { + writing = true; + } + + @Override public boolean isWriting() { + return writing; + } + + @Override public void finishReading() { + reading = false; + } + + @Override public void reading() { + reading = true; + } + + @Override public boolean isReading() { + return reading; + } + + void add(STREAM_DATA value) { + data.add(value); + } + + @Override public int size() { + return data.size(); + } + + @Override public void clear() { + data.clear(); + } + + public List collection() { + return data; + } +} diff --git a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/timer/PersistenceTimer.java b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/timer/PersistenceTimer.java index 61516c26f..7aac165fa 100644 --- a/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/timer/PersistenceTimer.java +++ b/apm-collector/apm-collector-analysis/analysis-worker-model/src/main/java/org/apache/skywalking/apm/collector/analysis/worker/timer/PersistenceTimer.java @@ -18,17 +18,14 @@ package org.apache.skywalking.apm.collector.analysis.worker.timer; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; +import java.util.*; +import java.util.concurrent.*; import org.apache.skywalking.apm.collector.analysis.worker.model.impl.PersistenceWorker; import org.apache.skywalking.apm.collector.core.module.ModuleManager; import org.apache.skywalking.apm.collector.storage.StorageModule; import org.apache.skywalking.apm.collector.storage.base.dao.IBatchDAO; import org.apache.skywalking.apm.util.RunnableWithExceptionProtection; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.slf4j.*; /** * @author peng-yongsheng @@ -40,6 +37,11 @@ public enum PersistenceTimer { private Boolean isStarted = false; private List persistenceWorkers = new LinkedList<>(); + private final Boolean debug; + + PersistenceTimer() { + this.debug = System.getProperty("debug") != null; + } public void start(ModuleManager moduleManager, List persistenceWorkers) { logger.info("persistence timer start"); @@ -61,6 +63,7 @@ public enum PersistenceTimer { @SuppressWarnings("unchecked") private void extractDataAndSave(IBatchDAO batchDAO, List persistenceWorkers) { logger.debug("Extract data and save"); + long startTime = System.currentTimeMillis(); try { List batchAllCollection = new LinkedList(); persistenceWorkers.forEach((PersistenceWorker worker) -> { @@ -78,5 +81,10 @@ public enum PersistenceTimer { } finally { logger.debug("persistence data save finish"); } + + if (debug) { + long endTime = System.currentTimeMillis(); + logger.info("batch persistence duration: {} ms", endTime - startTime); + } } } diff --git a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/cache/Window.java b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/cache/Window.java index ae007d440..5e8dd4de8 100644 --- a/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/cache/Window.java +++ b/apm-collector/apm-collector-core/src/main/java/org/apache/skywalking/apm/collector/core/cache/Window.java @@ -71,6 +71,10 @@ public abstract class Window { return pointer; } + public int currentCollectionSize() { + return getCurrent().size(); + } + public WINDOW_COLLECTION getLast() { if (pointer == windowDataA) { return windowDataB; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java index b7a21c1ee..438d6e276 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java @@ -19,22 +19,15 @@ package org.apache.skywalking.apm.collector.storage.es.base.define; import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import org.apache.skywalking.apm.collector.client.Client; import org.apache.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.apache.skywalking.apm.collector.core.data.ColumnDefine; -import org.apache.skywalking.apm.collector.core.data.TableDefine; -import org.apache.skywalking.apm.collector.storage.StorageException; -import org.apache.skywalking.apm.collector.storage.StorageInstallException; -import org.apache.skywalking.apm.collector.storage.StorageInstaller; +import org.apache.skywalking.apm.collector.core.data.*; +import org.apache.skywalking.apm.collector.storage.*; import org.elasticsearch.action.admin.indices.mapping.get.GetFieldMappingsResponse; import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.elasticsearch.common.xcontent.*; +import org.slf4j.*; /** * @author peng-yongsheng @@ -109,7 +102,6 @@ public class ElasticSearchStorageInstaller extends StorageInstaller { .put("index.number_of_shards", indexShardsNumber) .put("index.number_of_replicas", indexReplicasNumber) .put("index.refresh_interval", String.valueOf(tableDefine.refreshInterval()) + "s") - .put("analysis.analyzer.collector_analyzer.type", "stop") .build(); } @@ -117,6 +109,9 @@ public class ElasticSearchStorageInstaller extends StorageInstaller { private XContentBuilder createMappingBuilder(ElasticSearchTableDefine tableDefine) throws IOException { XContentBuilder mappingBuilder = XContentFactory.jsonBuilder() .startObject() + .startObject("_all") + .field("enabled", false) + .endObject() .startObject("properties"); for (ColumnDefine columnDefine : tableDefine.getColumnDefines()) { diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/GlobalTraceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/GlobalTraceEsTableDefine.java index 5eb469a90..2821c82c9 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/GlobalTraceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/GlobalTraceEsTableDefine.java @@ -32,7 +32,7 @@ public class GlobalTraceEsTableDefine extends ElasticSearchTableDefine { } @Override public int refreshInterval() { - return 3; + return 10; } @Override public void initialize() { diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentDurationEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentDurationEsTableDefine.java index f0bff4b8c..c6d9b2694 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentDurationEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentDurationEsTableDefine.java @@ -32,7 +32,7 @@ public class SegmentDurationEsTableDefine extends ElasticSearchTableDefine { } @Override public int refreshInterval() { - return 3; + return 10; } @Override public void initialize() { diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java index 927aea5f5..002962092 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/apache/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java @@ -18,8 +18,7 @@ package org.apache.skywalking.apm.collector.storage.es.define; -import org.apache.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; -import org.apache.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; +import org.apache.skywalking.apm.collector.storage.es.base.define.*; import org.apache.skywalking.apm.collector.storage.table.segment.SegmentTable; /** @@ -32,7 +31,7 @@ public class SegmentEsTableDefine extends ElasticSearchTableDefine { } @Override public int refreshInterval() { - return 3; + return 10; } @Override public void initialize() {