From a1f8477ea8cc43ffd048209ae591696e4b982fff Mon Sep 17 00:00:00 2001 From: youyong205 Date: Thu, 19 Mar 2015 10:16:55 +0800 Subject: [PATCH] refactor config --- .../cat/build/AlarmComponentConfigurator.java | 2 +- .../ReportServiceComponentConfigurator.java | 4 +- .../cat/build/TaskComponentConfigurator.java | 6 +- .../alert/storage/AbstractStorageAlert.java | 2 +- .../network/nettopology/NetGraphManager.java | 2 +- .../service/NetTopologyReportService.java | 2 +- .../task/NetTopologyReportBuilder.java | 2 +- .../cat/report/page/storage/Handler.java | 3 + .../storage/task/StorageReportBuilder.java | 2 +- .../{ => transform}/AllDomainMerger.java | 2 +- .../{ => transform}/AllMachineMerger.java | 2 +- .../HourlyLineChartVisitor.java | 3 +- .../{ => transform}/StorageMergeHelper.java | 2 +- .../StorageOperationFilter.java | 2 +- .../cat/system/page/router/Handler.java | 2 +- .../router}/service/RouterConfigService.java | 2 +- .../page/router/task/RouterConfigBuilder.java | 2 +- .../resources/META-INF/plexus/components.xml | 56 +++++++++---------- .../report/analyzer/RouterBuilderTest.java | 2 +- script/Cat.sql | 2 +- 20 files changed, 53 insertions(+), 49 deletions(-) rename cat-home/src/main/java/com/dianping/cat/report/page/{statistics => network}/service/NetTopologyReportService.java (97%) rename cat-home/src/main/java/com/dianping/cat/report/page/storage/{ => transform}/AllDomainMerger.java (98%) rename cat-home/src/main/java/com/dianping/cat/report/page/storage/{ => transform}/AllMachineMerger.java (97%) rename cat-home/src/main/java/com/dianping/cat/report/page/storage/{ => transform}/HourlyLineChartVisitor.java (97%) rename cat-home/src/main/java/com/dianping/cat/report/page/storage/{ => transform}/StorageMergeHelper.java (94%) rename cat-home/src/main/java/com/dianping/cat/report/page/storage/{ => transform}/StorageOperationFilter.java (98%) rename cat-home/src/main/java/com/dianping/cat/{report/page/statistics => system/page/router}/service/RouterConfigService.java (97%) diff --git a/cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java index 8d1e8e391..8dbdf3198 100644 --- a/cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/AlarmComponentConfigurator.java @@ -92,9 +92,9 @@ import com.dianping.cat.report.alert.web.WebAlert; import com.dianping.cat.report.page.app.service.AppDataService; import com.dianping.cat.report.page.dependency.graph.TopologyGraphManager; import com.dianping.cat.report.page.metric.service.BaselineService; -import com.dianping.cat.report.page.storage.StorageMergeHelper; import com.dianping.cat.report.page.storage.topology.StorageAlertInfoRTContainer; import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder; +import com.dianping.cat.report.page.storage.transform.StorageMergeHelper; import com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper; import com.dianping.cat.report.service.ModelService; import com.dianping.cat.service.ProjectService; diff --git a/cat-home/src/main/java/com/dianping/cat/build/ReportServiceComponentConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/ReportServiceComponentConfigurator.java index ae1353b9b..0d919e18b 100644 --- a/cat-home/src/main/java/com/dianping/cat/build/ReportServiceComponentConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/ReportServiceComponentConfigurator.java @@ -22,19 +22,19 @@ import com.dianping.cat.report.page.event.service.EventReportService; import com.dianping.cat.report.page.heartbeat.service.HeartbeatReportService; import com.dianping.cat.report.page.matrix.service.MatrixReportService; import com.dianping.cat.report.page.metric.service.MetricReportService; +import com.dianping.cat.report.page.network.service.NetTopologyReportService; import com.dianping.cat.report.page.problem.service.ProblemReportService; import com.dianping.cat.report.page.state.service.StateReportService; import com.dianping.cat.report.page.statistics.service.BugReportService; import com.dianping.cat.report.page.statistics.service.HeavyReportService; import com.dianping.cat.report.page.statistics.service.JarReportService; -import com.dianping.cat.report.page.statistics.service.NetTopologyReportService; -import com.dianping.cat.report.page.statistics.service.RouterConfigService; import com.dianping.cat.report.page.statistics.service.ServiceReportService; import com.dianping.cat.report.page.statistics.service.SystemReportService; import com.dianping.cat.report.page.statistics.service.UtilizationReportService; import com.dianping.cat.report.page.storage.task.StorageReportService; import com.dianping.cat.report.page.top.service.TopReportService; import com.dianping.cat.report.page.transaction.service.TransactionReportService; +import com.dianping.cat.system.page.router.service.RouterConfigService; public class ReportServiceComponentConfigurator extends AbstractResourceConfigurator { @Override diff --git a/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java b/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java index 28c6f42ef..3e1ca4a4c 100644 --- a/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java +++ b/cat-home/src/main/java/com/dianping/cat/build/TaskComponentConfigurator.java @@ -57,6 +57,7 @@ import com.dianping.cat.report.page.metric.task.DefaultBaselineCreator; import com.dianping.cat.report.page.metric.task.MetricBaselineReportBuilder; import com.dianping.cat.report.page.metric.task.MetricPointParser; import com.dianping.cat.report.page.network.nettopology.NetGraphBuilder; +import com.dianping.cat.report.page.network.service.NetTopologyReportService; import com.dianping.cat.report.page.network.task.NetTopologyReportBuilder; import com.dianping.cat.report.page.overload.task.CapacityUpdateStatusManager; import com.dianping.cat.report.page.overload.task.CapacityUpdateTask; @@ -75,8 +76,6 @@ import com.dianping.cat.report.page.state.task.StateReportBuilder; import com.dianping.cat.report.page.statistics.service.BugReportService; import com.dianping.cat.report.page.statistics.service.HeavyReportService; import com.dianping.cat.report.page.statistics.service.JarReportService; -import com.dianping.cat.report.page.statistics.service.NetTopologyReportService; -import com.dianping.cat.report.page.statistics.service.RouterConfigService; import com.dianping.cat.report.page.statistics.service.ServiceReportService; import com.dianping.cat.report.page.statistics.service.SystemReportService; import com.dianping.cat.report.page.statistics.service.UtilizationReportService; @@ -86,9 +85,9 @@ import com.dianping.cat.report.page.statistics.task.jar.JarReportBuilder; import com.dianping.cat.report.page.statistics.task.service.ServiceReportBuilder; import com.dianping.cat.report.page.statistics.task.system.SystemReportBuilder; import com.dianping.cat.report.page.statistics.task.utilization.UtilizationReportBuilder; -import com.dianping.cat.report.page.storage.StorageMergeHelper; import com.dianping.cat.report.page.storage.task.StorageReportBuilder; import com.dianping.cat.report.page.storage.task.StorageReportService; +import com.dianping.cat.report.page.storage.transform.StorageMergeHelper; import com.dianping.cat.report.page.transaction.service.TransactionReportService; import com.dianping.cat.report.page.transaction.task.TransactionGraphCreator; import com.dianping.cat.report.page.transaction.task.TransactionMerger; @@ -110,6 +109,7 @@ import com.dianping.cat.service.HostinfoService; import com.dianping.cat.service.ProjectService; import com.dianping.cat.system.config.NetGraphConfigManager; import com.dianping.cat.system.config.RouterConfigManager; +import com.dianping.cat.system.page.router.service.RouterConfigService; import com.dianping.cat.system.page.router.task.RouterConfigBuilder; public class TaskComponentConfigurator extends AbstractResourceConfigurator { diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java b/cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java index 492cbd8b9..eea87887e 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/storage/AbstractStorageAlert.java @@ -30,8 +30,8 @@ import com.dianping.cat.report.alert.DataChecker; import com.dianping.cat.report.alert.sender.AlertEntity; import com.dianping.cat.report.alert.sender.AlertManager; import com.dianping.cat.report.page.storage.StorageConstants; -import com.dianping.cat.report.page.storage.StorageMergeHelper; import com.dianping.cat.report.page.storage.topology.StorageAlertInfoBuilder; +import com.dianping.cat.report.page.storage.transform.StorageMergeHelper; import com.dianping.cat.report.service.ModelService; import com.dianping.cat.service.ModelPeriod; import com.dianping.cat.service.ModelRequest; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java b/cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java index b55746829..a02a7dcf7 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/network/nettopology/NetGraphManager.java @@ -32,7 +32,7 @@ import com.dianping.cat.home.network.entity.NetTopology; import com.dianping.cat.message.Transaction; import com.dianping.cat.report.alert.AlertInfo; import com.dianping.cat.report.alert.AlertInfo.AlertMetric; -import com.dianping.cat.report.page.statistics.service.NetTopologyReportService; +import com.dianping.cat.report.page.network.service.NetTopologyReportService; import com.dianping.cat.report.service.ModelService; import com.dianping.cat.service.ModelPeriod; import com.dianping.cat.service.ModelRequest; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/NetTopologyReportService.java b/cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java similarity index 97% rename from cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/NetTopologyReportService.java rename to cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java index 33b54dd73..35ba38ec4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/NetTopologyReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.page.statistics.service; +package com.dianping.cat.report.page.network.service; import java.util.Date; import java.util.List; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/network/task/NetTopologyReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/page/network/task/NetTopologyReportBuilder.java index f26b9914d..f05d1c3f6 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/network/task/NetTopologyReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/network/task/NetTopologyReportBuilder.java @@ -23,7 +23,7 @@ import com.dianping.cat.home.network.transform.DefaultNativeBuilder; import com.dianping.cat.report.alert.AlertInfo.AlertMetric; import com.dianping.cat.report.page.metric.service.MetricReportService; import com.dianping.cat.report.page.network.nettopology.NetGraphBuilder; -import com.dianping.cat.report.page.statistics.service.NetTopologyReportService; +import com.dianping.cat.report.page.network.service.NetTopologyReportService; import com.dianping.cat.report.task.TaskBuilder; import com.dianping.cat.system.config.NetGraphConfigManager; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java index 98faa9693..aa5f755bf 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/Handler.java @@ -33,6 +33,9 @@ import com.dianping.cat.report.graph.LineChart; import com.dianping.cat.report.page.PayloadNormalizer; import com.dianping.cat.report.page.storage.task.StorageReportService; import com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager; +import com.dianping.cat.report.page.storage.transform.HourlyLineChartVisitor; +import com.dianping.cat.report.page.storage.transform.StorageMergeHelper; +import com.dianping.cat.report.page.storage.transform.StorageOperationFilter; import com.dianping.cat.report.service.ModelService; import com.dianping.cat.service.ModelRequest; import com.dianping.cat.service.ModelResponse; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportBuilder.java index 204c6b255..d43902efc 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/task/StorageReportBuilder.java @@ -15,7 +15,7 @@ import com.dianping.cat.core.dal.DailyReport; import com.dianping.cat.core.dal.MonthlyReport; import com.dianping.cat.core.dal.WeeklyReport; import com.dianping.cat.helper.TimeHelper; -import com.dianping.cat.report.page.storage.StorageMergeHelper; +import com.dianping.cat.report.page.storage.transform.StorageMergeHelper; import com.dianping.cat.report.task.TaskBuilder; import com.dianping.cat.report.task.TaskHelper; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/AllDomainMerger.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllDomainMerger.java similarity index 98% rename from cat-home/src/main/java/com/dianping/cat/report/page/storage/AllDomainMerger.java rename to cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllDomainMerger.java index 0ee2e4abb..383541707 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/AllDomainMerger.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllDomainMerger.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.page.storage; +package com.dianping.cat.report.page.storage.transform; import com.dianping.cat.Constants; import com.dianping.cat.consumer.storage.model.entity.Domain; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/AllMachineMerger.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllMachineMerger.java similarity index 97% rename from cat-home/src/main/java/com/dianping/cat/report/page/storage/AllMachineMerger.java rename to cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllMachineMerger.java index ff739b48c..6b1a13bfe 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/AllMachineMerger.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllMachineMerger.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.page.storage; +package com.dianping.cat.report.page.storage.transform; import com.dianping.cat.Constants; import com.dianping.cat.consumer.storage.model.entity.Domain; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/HourlyLineChartVisitor.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/HourlyLineChartVisitor.java similarity index 97% rename from cat-home/src/main/java/com/dianping/cat/report/page/storage/HourlyLineChartVisitor.java rename to cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/HourlyLineChartVisitor.java index 883584e8c..196f77f3a 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/HourlyLineChartVisitor.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/HourlyLineChartVisitor.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.page.storage; +package com.dianping.cat.report.page.storage.transform; import java.util.Date; import java.util.LinkedHashMap; @@ -16,6 +16,7 @@ import com.dianping.cat.consumer.storage.model.entity.Segment; import com.dianping.cat.consumer.storage.model.transform.BaseVisitor; import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.report.graph.LineChart; +import com.dianping.cat.report.page.storage.StorageConstants; public class HourlyLineChartVisitor extends BaseVisitor { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageMergeHelper.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageMergeHelper.java similarity index 94% rename from cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageMergeHelper.java rename to cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageMergeHelper.java index ea7d3a5bf..c45f452c4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageMergeHelper.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageMergeHelper.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.page.storage; +package com.dianping.cat.report.page.storage.transform; import com.dianping.cat.Constants; import com.dianping.cat.consumer.storage.model.entity.StorageReport; diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageOperationFilter.java b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageOperationFilter.java similarity index 98% rename from cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageOperationFilter.java rename to cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageOperationFilter.java index 7357e4939..daee38517 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageOperationFilter.java +++ b/cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageOperationFilter.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.page.storage; +package com.dianping.cat.report.page.storage.transform; import java.util.Set; diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java b/cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java index 679fa042f..cad8aa81c 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/router/Handler.java @@ -17,8 +17,8 @@ import com.dianping.cat.helper.TimeHelper; import com.dianping.cat.home.router.entity.Domain; import com.dianping.cat.home.router.entity.RouterConfig; import com.dianping.cat.home.router.entity.Server; -import com.dianping.cat.report.page.statistics.service.RouterConfigService; import com.dianping.cat.system.config.RouterConfigManager; +import com.dianping.cat.system.page.router.service.RouterConfigService; public class Handler implements PageHandler { diff --git a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/RouterConfigService.java b/cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java similarity index 97% rename from cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/RouterConfigService.java rename to cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java index 486fe2f82..6d8725262 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/RouterConfigService.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java @@ -1,4 +1,4 @@ -package com.dianping.cat.report.page.statistics.service; +package com.dianping.cat.system.page.router.service; import java.util.Date; import java.util.HashMap; diff --git a/cat-home/src/main/java/com/dianping/cat/system/page/router/task/RouterConfigBuilder.java b/cat-home/src/main/java/com/dianping/cat/system/page/router/task/RouterConfigBuilder.java index abb185e4b..e8289f6b3 100644 --- a/cat-home/src/main/java/com/dianping/cat/system/page/router/task/RouterConfigBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/system/page/router/task/RouterConfigBuilder.java @@ -28,9 +28,9 @@ import com.dianping.cat.home.router.entity.Server; import com.dianping.cat.home.router.transform.DefaultNativeBuilder; import com.dianping.cat.message.Event; import com.dianping.cat.report.page.state.service.StateReportService; -import com.dianping.cat.report.page.statistics.service.RouterConfigService; import com.dianping.cat.report.task.TaskBuilder; import com.dianping.cat.system.config.RouterConfigManager; +import com.dianping.cat.system.page.router.service.RouterConfigService; public class RouterConfigBuilder implements TaskBuilder, LogEnabled { diff --git a/cat-home/src/main/resources/META-INF/plexus/components.xml b/cat-home/src/main/resources/META-INF/plexus/components.xml index c423fefcb..d3df7f38e 100755 --- a/cat-home/src/main/resources/META-INF/plexus/components.xml +++ b/cat-home/src/main/resources/META-INF/plexus/components.xml @@ -849,8 +849,8 @@ - com.dianping.cat.report.page.statistics.service.NetTopologyReportService - com.dianping.cat.report.page.statistics.service.NetTopologyReportService + com.dianping.cat.report.page.network.service.NetTopologyReportService + com.dianping.cat.report.page.network.service.NetTopologyReportService com.dianping.cat.core.dal.HourlyReportDao @@ -879,8 +879,8 @@ - com.dianping.cat.report.page.statistics.service.RouterConfigService - com.dianping.cat.report.page.statistics.service.RouterConfigService + com.dianping.cat.system.page.router.service.RouterConfigService + com.dianping.cat.system.page.router.service.RouterConfigService com.dianping.cat.core.dal.HourlyReportDao @@ -1299,7 +1299,7 @@ com.dianping.cat.report.page.state.service.StateReportService - com.dianping.cat.report.page.statistics.service.RouterConfigService + com.dianping.cat.system.page.router.service.RouterConfigService com.dianping.cat.system.config.RouterConfigManager @@ -1340,7 +1340,7 @@ com.dianping.cat.report.page.cross.service.CrossReportService - com.dianping.cat.report.page.transaction.TransactionMergeHelper + com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper com.dianping.cat.configuration.ServerConfigManager @@ -1369,7 +1369,7 @@ com.dianping.cat.report.page.network.task.NetTopologyReportBuilder - com.dianping.cat.report.page.statistics.service.NetTopologyReportService + com.dianping.cat.report.page.network.service.NetTopologyReportService com.dianping.cat.report.page.metric.service.MetricReportService @@ -1433,7 +1433,7 @@ com.dianping.cat.report.page.storage.task.StorageReportService - com.dianping.cat.report.page.storage.StorageMergeHelper + com.dianping.cat.report.page.storage.transform.StorageMergeHelper @@ -3241,7 +3241,7 @@ com.dianping.cat.report.alert.transaction.TransactionAlert - com.dianping.cat.report.page.transaction.TransactionMergeHelper + com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper com.dianping.cat.report.alert.DataChecker @@ -3263,7 +3263,7 @@ com.dianping.cat.report.alert.storage.StorageSQLAlert - com.dianping.cat.report.page.storage.StorageMergeHelper + com.dianping.cat.report.page.storage.transform.StorageMergeHelper com.dianping.cat.report.alert.DataChecker @@ -3777,7 +3777,7 @@ com.dianping.cat.report.page.transaction.service.TransactionReportService - com.dianping.cat.report.page.transaction.TransactionMergeHelper + com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper com.dianping.cat.report.page.PayloadNormalizer @@ -3848,8 +3848,8 @@ - com.dianping.cat.report.page.transaction.TransactionMergeHelper - com.dianping.cat.report.page.transaction.TransactionMergeHelper + com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper + com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper com.dianping.cat.report.page.event.Handler @@ -3868,7 +3868,7 @@ com.dianping.cat.report.page.event.service.EventReportService - com.dianping.cat.report.page.event.EventMergeHelper + com.dianping.cat.report.page.event.transform.EventMergeHelper com.dianping.cat.report.service.ModelService @@ -3935,8 +3935,8 @@ - com.dianping.cat.report.page.event.EventMergeHelper - com.dianping.cat.report.page.event.EventMergeHelper + com.dianping.cat.report.page.event.transform.EventMergeHelper + com.dianping.cat.report.page.event.transform.EventMergeHelper com.dianping.cat.report.page.heartbeat.Handler @@ -4068,10 +4068,10 @@ com.dianping.cat.report.page.dashboard.JspViewer - com.dianping.cat.report.page.transaction.TransactionMergeHelper + com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper - com.dianping.cat.report.page.event.EventMergeHelper + com.dianping.cat.report.page.event.transform.EventMergeHelper com.dianping.cat.report.service.ModelService @@ -5089,7 +5089,7 @@ com.dianping.cat.configuration.ServerConfigManager - com.dianping.cat.report.page.statistics.service.NetTopologyReportService + com.dianping.cat.report.page.network.service.NetTopologyReportService com.dianping.cat.report.page.network.nettopology.NetGraphBuilder @@ -5103,8 +5103,8 @@ - com.dianping.cat.report.page.statistics.service.NetTopologyReportService - com.dianping.cat.report.page.statistics.service.NetTopologyReportService + com.dianping.cat.report.page.network.service.NetTopologyReportService + com.dianping.cat.report.page.network.service.NetTopologyReportService com.dianping.cat.core.dal.HourlyReportDao @@ -5730,7 +5730,7 @@ m_service - com.dianping.cat.report.page.storage.StorageMergeHelper + com.dianping.cat.report.page.storage.transform.StorageMergeHelper com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager @@ -5783,8 +5783,8 @@ - com.dianping.cat.report.page.storage.StorageMergeHelper - com.dianping.cat.report.page.storage.StorageMergeHelper + com.dianping.cat.report.page.storage.transform.StorageMergeHelper + com.dianping.cat.report.page.storage.transform.StorageMergeHelper com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager @@ -5840,7 +5840,7 @@ com.dianping.cat.system.config.ActivityConfigManager - com.dianping.cat.report.page.transaction.TransactionMergeHelper + com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper com.dianping.cat.report.service.ModelService @@ -6501,7 +6501,7 @@ com.dianping.cat.system.page.router.Handler - com.dianping.cat.report.page.statistics.service.RouterConfigService + com.dianping.cat.system.page.router.service.RouterConfigService com.dianping.cat.system.config.RouterConfigManager @@ -6509,8 +6509,8 @@ - com.dianping.cat.report.page.statistics.service.RouterConfigService - com.dianping.cat.report.page.statistics.service.RouterConfigService + com.dianping.cat.system.page.router.service.RouterConfigService + com.dianping.cat.system.page.router.service.RouterConfigService com.dianping.cat.core.dal.HourlyReportDao diff --git a/cat-home/src/test/java/com/dianping/cat/report/analyzer/RouterBuilderTest.java b/cat-home/src/test/java/com/dianping/cat/report/analyzer/RouterBuilderTest.java index 5d11b9e53..4c545e847 100644 --- a/cat-home/src/test/java/com/dianping/cat/report/analyzer/RouterBuilderTest.java +++ b/cat-home/src/test/java/com/dianping/cat/report/analyzer/RouterBuilderTest.java @@ -11,8 +11,8 @@ import org.unidal.lookup.ComponentTestCase; import com.dianping.cat.Constants; import com.dianping.cat.core.dal.Task; import com.dianping.cat.home.router.entity.RouterConfig; -import com.dianping.cat.report.page.statistics.service.RouterConfigService; import com.dianping.cat.report.task.ReportFacade; +import com.dianping.cat.system.page.router.service.RouterConfigService; public class RouterBuilderTest extends ComponentTestCase { diff --git a/script/Cat.sql b/script/Cat.sql index 062160fca..5efb13882 100644 --- a/script/Cat.sql +++ b/script/Cat.sql @@ -292,7 +292,7 @@ CREATE TABLE `app_speed_data_1` ( `status` smallint NOT NULL COMMENT '数据状态', `creation_date` datetime NOT NULL COMMENT '数据插入时间', PRIMARY KEY (`id`), - UNIQUE KEY IX_condition (period,minute_order,city,operator,network,app_version,platform) + UNIQUE KEY `IX_condition` (period,minute_order,city,operator,network,app_version,platform) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='app测速数据'; CREATE TABLE `overload` ( -- GitLab