refactor config

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;

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

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 {

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;

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;

cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/NetTopologyReportService.java → cat-home/src/main/java/com/dianping/cat/report/page/network/service/NetTopologyReportService.java

-package com.dianping.cat.report.page.statistics.service;
+package com.dianping.cat.report.page.network.service;
 
 import java.util.Date;
 import java.util.List;

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;
 

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;

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;
 

cat-home/src/main/java/com/dianping/cat/report/page/storage/AllDomainMerger.java → cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllDomainMerger.java

-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;

cat-home/src/main/java/com/dianping/cat/report/page/storage/AllMachineMerger.java → cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/AllMachineMerger.java

-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;

cat-home/src/main/java/com/dianping/cat/report/page/storage/HourlyLineChartVisitor.java → cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/HourlyLineChartVisitor.java

-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 {
 

cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageMergeHelper.java → cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageMergeHelper.java

-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;

cat-home/src/main/java/com/dianping/cat/report/page/storage/StorageOperationFilter.java → cat-home/src/main/java/com/dianping/cat/report/page/storage/transform/StorageOperationFilter.java

-package com.dianping.cat.report.page.storage;
+package com.dianping.cat.report.page.storage.transform;
 
 import java.util.Set;
 

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<Context> {
 

cat-home/src/main/java/com/dianping/cat/report/page/statistics/service/RouterConfigService.java → cat-home/src/main/java/com/dianping/cat/system/page/router/service/RouterConfigService.java

-package com.dianping.cat.report.page.statistics.service;
+package com.dianping.cat.system.page.router.service;
 
 import java.util.Date;
 import java.util.HashMap;

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 {
 

cat-home/src/main/resources/META-INF/plexus/components.xml

@@ -849,8 +849,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.statistics.service.NetTopologyReportService</role>
-			<implementation>com.dianping.cat.report.page.statistics.service.NetTopologyReportService</implementation>
+			<role>com.dianping.cat.report.page.network.service.NetTopologyReportService</role>
+			<implementation>com.dianping.cat.report.page.network.service.NetTopologyReportService</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportDao</role>
@@ -879,8 +879,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.statistics.service.RouterConfigService</role>
-			<implementation>com.dianping.cat.report.page.statistics.service.RouterConfigService</implementation>
+			<role>com.dianping.cat.system.page.router.service.RouterConfigService</role>
+			<implementation>com.dianping.cat.system.page.router.service.RouterConfigService</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportDao</role>
@@ -1299,7 +1299,7 @@
 					<role>com.dianping.cat.report.page.state.service.StateReportService</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.statistics.service.RouterConfigService</role>
+					<role>com.dianping.cat.system.page.router.service.RouterConfigService</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.system.config.RouterConfigManager</role>
@@ -1340,7 +1340,7 @@
 					<role>com.dianping.cat.report.page.cross.service.CrossReportService</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.transaction.TransactionMergeHelper</role>
+					<role>com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.configuration.ServerConfigManager</role>
@@ -1369,7 +1369,7 @@
 			<implementation>com.dianping.cat.report.page.network.task.NetTopologyReportBuilder</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.report.page.statistics.service.NetTopologyReportService</role>
+					<role>com.dianping.cat.report.page.network.service.NetTopologyReportService</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.metric.service.MetricReportService</role>
@@ -1433,7 +1433,7 @@
 					<role>com.dianping.cat.report.page.storage.task.StorageReportService</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.storage.StorageMergeHelper</role>
+					<role>com.dianping.cat.report.page.storage.transform.StorageMergeHelper</role>
 				</requirement>
 			</requirements>
 		</component>
@@ -3241,7 +3241,7 @@
 			<implementation>com.dianping.cat.report.alert.transaction.TransactionAlert</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.report.page.transaction.TransactionMergeHelper</role>
+					<role>com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.DataChecker</role>
@@ -3263,7 +3263,7 @@
 			<implementation>com.dianping.cat.report.alert.storage.StorageSQLAlert</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.report.page.storage.StorageMergeHelper</role>
+					<role>com.dianping.cat.report.page.storage.transform.StorageMergeHelper</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.alert.DataChecker</role>
@@ -3777,7 +3777,7 @@
 					<role>com.dianping.cat.report.page.transaction.service.TransactionReportService</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.transaction.TransactionMergeHelper</role>
+					<role>com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.PayloadNormalizer</role>
@@ -3848,8 +3848,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.transaction.TransactionMergeHelper</role>
-			<implementation>com.dianping.cat.report.page.transaction.TransactionMergeHelper</implementation>
+			<role>com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper</role>
+			<implementation>com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.report.page.event.Handler</role>
@@ -3868,7 +3868,7 @@
 					<role>com.dianping.cat.report.page.event.service.EventReportService</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.event.EventMergeHelper</role>
+					<role>com.dianping.cat.report.page.event.transform.EventMergeHelper</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.service.ModelService</role>
@@ -3935,8 +3935,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.event.EventMergeHelper</role>
-			<implementation>com.dianping.cat.report.page.event.EventMergeHelper</implementation>
+			<role>com.dianping.cat.report.page.event.transform.EventMergeHelper</role>
+			<implementation>com.dianping.cat.report.page.event.transform.EventMergeHelper</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.report.page.heartbeat.Handler</role>
@@ -4068,10 +4068,10 @@
 					<role>com.dianping.cat.report.page.dashboard.JspViewer</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.transaction.TransactionMergeHelper</role>
+					<role>com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.event.EventMergeHelper</role>
+					<role>com.dianping.cat.report.page.event.transform.EventMergeHelper</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.service.ModelService</role>
@@ -5089,7 +5089,7 @@
 					<role>com.dianping.cat.configuration.ServerConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.statistics.service.NetTopologyReportService</role>
+					<role>com.dianping.cat.report.page.network.service.NetTopologyReportService</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.network.nettopology.NetGraphBuilder</role>
@@ -5103,8 +5103,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.statistics.service.NetTopologyReportService</role>
-			<implementation>com.dianping.cat.report.page.statistics.service.NetTopologyReportService</implementation>
+			<role>com.dianping.cat.report.page.network.service.NetTopologyReportService</role>
+			<implementation>com.dianping.cat.report.page.network.service.NetTopologyReportService</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportDao</role>
@@ -5730,7 +5730,7 @@
 					<field-name>m_service</field-name>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.storage.StorageMergeHelper</role>
+					<role>com.dianping.cat.report.page.storage.transform.StorageMergeHelper</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager</role>
@@ -5783,8 +5783,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.storage.StorageMergeHelper</role>
-			<implementation>com.dianping.cat.report.page.storage.StorageMergeHelper</implementation>
+			<role>com.dianping.cat.report.page.storage.transform.StorageMergeHelper</role>
+			<implementation>com.dianping.cat.report.page.storage.transform.StorageMergeHelper</implementation>
 		</component>
 		<component>
 			<role>com.dianping.cat.report.page.storage.topology.StorageAlertInfoManager</role>
@@ -5840,7 +5840,7 @@
 					<role>com.dianping.cat.system.config.ActivityConfigManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.report.page.transaction.TransactionMergeHelper</role>
+					<role>com.dianping.cat.report.page.transaction.transform.TransactionMergeHelper</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.report.service.ModelService</role>
@@ -6501,7 +6501,7 @@
 			<implementation>com.dianping.cat.system.page.router.Handler</implementation>
 			<requirements>
 				<requirement>
-					<role>com.dianping.cat.report.page.statistics.service.RouterConfigService</role>
+					<role>com.dianping.cat.system.page.router.service.RouterConfigService</role>
 				</requirement>
 				<requirement>
 					<role>com.dianping.cat.system.config.RouterConfigManager</role>
@@ -6509,8 +6509,8 @@
 			</requirements>
 		</component>
 		<component>
-			<role>com.dianping.cat.report.page.statistics.service.RouterConfigService</role>
-			<implementation>com.dianping.cat.report.page.statistics.service.RouterConfigService</implementation>
+			<role>com.dianping.cat.system.page.router.service.RouterConfigService</role>
+			<implementation>com.dianping.cat.system.page.router.service.RouterConfigService</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.core.dal.HourlyReportDao</role>

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 {
 

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` (