diff --git a/cat-core/src/main/java/com/dianping/cat/service/DefaultReportManager.java b/cat-core/src/main/java/com/dianping/cat/service/DefaultReportManager.java index ff3fe9ebe442f13120550b17ced6fa08ebfc7dbb..e9e9d87b688922934fc55b8712e3a79a9785c061 100644 --- a/cat-core/src/main/java/com/dianping/cat/service/DefaultReportManager.java +++ b/cat-core/src/main/java/com/dianping/cat/service/DefaultReportManager.java @@ -234,7 +234,6 @@ public class DefaultReportManager implements ReportManager, LogEnabled { r.setPeriod(period); r.setIp(ip); r.setType(1); - r.setContent(""); m_reportDao.insert(r); diff --git a/cat-core/src/main/resources/META-INF/dal/jdbc/report-codegen.xml b/cat-core/src/main/resources/META-INF/dal/jdbc/report-codegen.xml index cd718268d64675aaef3c0e808d3047c9d06ad298..b70210e326ed3bf0b38c7c34de52c41804562175 100644 --- a/cat-core/src/main/resources/META-INF/dal/jdbc/report-codegen.xml +++ b/cat-core/src/main/resources/META-INF/dal/jdbc/report-codegen.xml @@ -50,7 +50,6 @@ - @@ -176,7 +175,6 @@ - @@ -262,7 +260,6 @@ - @@ -388,7 +385,6 @@ - diff --git a/cat-core/src/main/resources/META-INF/dal/jdbc/report-dal.xml b/cat-core/src/main/resources/META-INF/dal/jdbc/report-dal.xml index 5dc6bf4ad8714f3e4e4ed5cffe6d709f39c4331e..77ebce9d4e63bdb5a8609b0199520b30c90d9f03 100644 --- a/cat-core/src/main/resources/META-INF/dal/jdbc/report-dal.xml +++ b/cat-core/src/main/resources/META-INF/dal/jdbc/report-dal.xml @@ -189,9 +189,6 @@ - - - diff --git a/cat-home/src/main/java/com/dianping/cat/report/alert/exception/AlertReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/alert/exception/AlertReportBuilder.java index 830503298e541208e303681c567a5de846aa0c24..7a719a8293415f01e8ea916b9f98f8af3faaa7d3 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/alert/exception/AlertReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/alert/exception/AlertReportBuilder.java @@ -39,7 +39,6 @@ public class AlertReportBuilder implements TaskBuilder { AlertReport alertReport = queryHourlyReportsByDuration(name, domain, period, TaskHelper.tomorrowZero(period)); DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -64,7 +63,6 @@ public class AlertReportBuilder implements TaskBuilder { visitor.visitTopReport(topReport); HourlyReport report = new HourlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -82,7 +80,6 @@ public class AlertReportBuilder implements TaskBuilder { AlertReport alertReport = queryDailyReportsByDuration(domain, period, TaskHelper.nextMonthStart(period)); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -101,7 +98,6 @@ public class AlertReportBuilder implements TaskBuilder { + TimeHelper.ONE_WEEK)); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/DefaultReportServiceManager.java b/cat-home/src/main/java/com/dianping/cat/report/service/DefaultReportServiceManager.java index bdf805c647338deb905c786fd4493553d9863ab1..d1d0c00017a4473bf001c5877da7a8d6299a67e2 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/DefaultReportServiceManager.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/DefaultReportServiceManager.java @@ -101,7 +101,6 @@ public class DefaultReportServiceManager extends ContainerHolder implements Repo @Override public boolean insertDailyReport(DailyReport report, byte[] content) { try { - report.setContent(""); m_dailyReportDao.insert(report); int id = report.getId(); @@ -120,7 +119,6 @@ public class DefaultReportServiceManager extends ContainerHolder implements Repo @Override public boolean insertHourlyReport(HourlyReport report, byte[] content) { try { - report.setContent(""); m_hourlyReportDao.insert(report); int id = report.getId(); diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/AlertReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/AlertReportService.java index a84785fd7055358a11019b37dfcddb7c0742153a..dfd5b5201fe55ad4c4b29affdb3247e89721954a 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/AlertReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/AlertReportService.java @@ -52,17 +52,11 @@ public class AlertReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); - - if (xml != null && xml.length() > 0) { - AlertReport reportModel = com.dianping.cat.home.alert.report.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - AlertReport reportModel = queryFromDailyBinary(report.getId(), domain); - reportModel.accept(merger); - } + AlertReport reportModel = queryFromDailyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -131,18 +125,12 @@ public class AlertReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) { - AlertReport reportModel = com.dianping.cat.home.alert.report.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - AlertReport reportModel = queryFromHourlyBinary(report.getId(), domain); - reportModel.accept(merger); - } + AlertReport reportModel = queryFromHourlyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -153,7 +141,7 @@ public class AlertReportService extends AbstractReportService { alertReport.setStartTime(start); alertReport.setEndTime(new Date(end.getTime() - 1)); - + return alertReport; } @@ -162,15 +150,10 @@ public class AlertReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, Constants.REPORT_ALERT, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - if (content != null && content.length() > 0) { - return com.dianping.cat.home.alert.report.transform.DefaultSaxParser.parse(content); - } else { - return queryFromMonthlyBinary(entity.getId(), domain); - } + return queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -182,15 +165,10 @@ public class AlertReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, Constants.REPORT_ALERT, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - if (content != null && content.length() > 0) { - return com.dianping.cat.home.alert.report.transform.DefaultSaxParser.parse(content); - } else { - return queryFromWeeklyBinary(entity.getId(), domain); - } + return queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/BugReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/BugReportService.java index 99d8388e9333ace5b686af74428152d38a7ea140..9143ddf6e242d909d8aa9e81fd995c94660fb558 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/BugReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/BugReportService.java @@ -52,17 +52,11 @@ public class BugReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); - - if (xml != null && xml.length() > 0) { - BugReport reportModel = com.dianping.cat.home.bug.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - BugReport reportModel = queryFromDailyBinary(report.getId(), domain); - reportModel.accept(merger); - } + + BugReport reportModel = queryFromDailyBinary(report.getId(), domain); + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -131,18 +125,12 @@ public class BugReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) { - BugReport reportModel = com.dianping.cat.home.bug.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - BugReport reportModel = queryFromHourlyBinary(report.getId(), domain); - reportModel.accept(merger); - } + BugReport reportModel = queryFromHourlyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -162,15 +150,9 @@ public class BugReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, Constants.REPORT_BUG, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - return com.dianping.cat.home.bug.transform.DefaultSaxParser.parse(content); - } else { - return queryFromMonthlyBinary(entity.getId(), domain); - } + return queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -182,15 +164,10 @@ public class BugReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, Constants.REPORT_BUG, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - if (content != null && content.length() > 0) { - return com.dianping.cat.home.bug.transform.DefaultSaxParser.parse(content); - } else { - return queryFromWeeklyBinary(entity.getId(), domain); - } + return queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/CrossReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/CrossReportService.java index ac65ffc4c5a5b1de9fc815af5bbf7c87dd8fcd8d..0179ef92243135fdf0c8478e49d3689034fc7d52 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/CrossReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/CrossReportService.java @@ -53,18 +53,11 @@ public class CrossReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); + CrossReport reportModel = queryFromDailyBinary(report.getId(), domain); - if (xml != null && xml.length() > 0) { - CrossReport reportModel = com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - CrossReport reportModel = queryFromDailyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -133,20 +126,12 @@ public class CrossReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) {// for old xml storage - CrossReport reportModel = com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else {// for new binary storage, binary is same to report id - CrossReport reportModel = queryFromHourlyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + CrossReport reportModel = queryFromHourlyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -168,15 +153,9 @@ public class CrossReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, CrossAnalyzer.ID, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - return com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser.parse(content); - } else { - return queryFromMonthlyBinary(entity.getId(), domain); - } + return queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -188,15 +167,10 @@ public class CrossReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, CrossAnalyzer.ID, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - return com.dianping.cat.consumer.cross.model.transform.DefaultSaxParser.parse(content); - } else { - return queryFromWeeklyBinary(entity.getId(), domain); - } + + return queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/DependencyReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/DependencyReportService.java index 3b3441bc220476f9b62866db18dbb32b8738c335..4ec74befc8cf44654c82f3ea389785ad1a7c9551 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/DependencyReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/DependencyReportService.java @@ -62,19 +62,11 @@ public class DependencyReportService extends AbstractReportService 0) { - DependencyReport reportModel = com.dianping.cat.consumer.dependency.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else { - DependencyReport reportModel = queryFromHourlyBinary(report.getId(), domain); - reportModel.accept(merger); - } + DependencyReport reportModel = queryFromHourlyBinary(report.getId(), domain); + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/EventReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/EventReportService.java index 9796ba01edefd4010be7518e81016da743f4ea0e..09f7f4c21c2e7b1c397991709a64a73bc00b91b5 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/EventReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/EventReportService.java @@ -59,16 +59,9 @@ public class EventReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); + EventReport reportModel = queryFromDailyBinary(report.getId(), domain); - if (xml != null && xml.length() > 0) { - EventReport reportModel = com.dianping.cat.consumer.event.model.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - EventReport reportModel = queryFromDailyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + reportModel.accept(merger); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -139,18 +132,10 @@ public class EventReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) {// for old xml storage - EventReport reportModel = com.dianping.cat.consumer.event.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else {// for new binary storage, binary is same to report id - EventReport reportModel = queryFromHourlyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + EventReport reportModel = queryFromHourlyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -176,13 +161,8 @@ public class EventReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, EventAnalyzer.ID, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - eventReport = com.dianping.cat.consumer.event.model.transform.DefaultSaxParser.parse(content); - } else { - eventReport = queryFromMonthlyBinary(entity.getId(), domain); - } + + eventReport = queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -198,13 +178,8 @@ public class EventReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, EventAnalyzer.ID, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - if (content != null && content.length() > 0) { - eventReport = com.dianping.cat.consumer.event.model.transform.DefaultSaxParser.parse(content); - } else { - eventReport = queryFromWeeklyBinary(entity.getId(), domain); - } + eventReport = queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/HeartbeatReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/HeartbeatReportService.java index bbaad6bd28a2a61d158fce93701fbad12611ee0e..2af34de3fe13f90701ea1d7bde55f63d2a58d733 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/HeartbeatReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/HeartbeatReportService.java @@ -16,7 +16,6 @@ import com.dianping.cat.consumer.heartbeat.model.entity.HeartbeatReport; import com.dianping.cat.consumer.heartbeat.model.entity.Period; import com.dianping.cat.consumer.heartbeat.model.transform.BaseVisitor; import com.dianping.cat.consumer.heartbeat.model.transform.DefaultNativeParser; -import com.dianping.cat.consumer.heartbeat.model.transform.DefaultSaxParser; import com.dianping.cat.core.dal.DailyReport; import com.dianping.cat.core.dal.DailyReportEntity; import com.dianping.cat.core.dal.HourlyReport; @@ -50,17 +49,9 @@ public class HeartbeatReportService extends AbstractReportService 0) { - HeartbeatReport reportModel = DefaultSaxParser.parse(xml); - - reportModel.accept(merger); - } else { - HeartbeatReport reportModel = queryFromDailyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + reportModel.accept(merger); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -74,7 +65,7 @@ public class HeartbeatReportService extends AbstractReportService domains = queryAllDomainNames(start, end, HeartbeatAnalyzer.ID); heartbeatReport.getDomainNames().addAll(domains); - + new HeartbeatConvertor().visitHeartbeatReport(heartbeatReport); return heartbeatReport; } @@ -116,17 +107,9 @@ public class HeartbeatReportService extends AbstractReportService 0) { - HeartbeatReport reportModel = com.dianping.cat.consumer.heartbeat.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else { - HeartbeatReport reportModel = queryFromHourlyBinary(report.getId(), domain); - reportModel.accept(merger); - } + HeartbeatReport reportModel = queryFromHourlyBinary(report.getId(), domain); + reportModel.accept(merger); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/HeavyReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/HeavyReportService.java index 8f35cf83ab27fe5c25e86b6e6f45769228716701..a47e7c1037ec4b272a0c18885580aef1321f2773 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/HeavyReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/HeavyReportService.java @@ -52,17 +52,11 @@ public class HeavyReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); - - if (xml != null && xml.length() > 0) { - HeavyReport reportModel = com.dianping.cat.home.heavy.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - HeavyReport reportModel = queryFromDailyBinary(report.getId(), domain); - reportModel.accept(merger); - } + HeavyReport reportModel = queryFromDailyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -131,18 +125,11 @@ public class HeavyReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) { - HeavyReport reportModel = com.dianping.cat.home.heavy.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - HeavyReport reportModel = queryFromHourlyBinary(report.getId(), domain); - reportModel.accept(merger); - } + HeavyReport reportModel = queryFromHourlyBinary(report.getId(), domain); + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -162,15 +149,9 @@ public class HeavyReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, Constants.REPORT_HEAVY, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - return com.dianping.cat.home.heavy.transform.DefaultSaxParser.parse(content); - } else { - return queryFromMonthlyBinary(entity.getId(), domain); - } + return queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -182,15 +163,9 @@ public class HeavyReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, Constants.REPORT_HEAVY, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - return com.dianping.cat.home.heavy.transform.DefaultSaxParser.parse(content); - } else { - return queryFromWeeklyBinary(entity.getId(), domain); - } + return queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/MatrixReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/MatrixReportService.java index 32d04fed5116e701d5aca75c69e6aac3ace76099..6f476ac6f35d1883d6a0b1a9e6efe99e8795bf38 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/MatrixReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/MatrixReportService.java @@ -53,18 +53,11 @@ public class MatrixReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); + MatrixReport reportModel = queryFromDailyBinary(report.getId(), domain); - if (xml != null && xml.length() > 0) { - MatrixReport reportModel = com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - MatrixReport reportModel = queryFromDailyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -133,20 +126,12 @@ public class MatrixReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) {// for old xml storage - MatrixReport reportModel = com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else {// for new binary storage, binary is same to report id - MatrixReport reportModel = queryFromHourlyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + MatrixReport reportModel = queryFromHourlyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -168,15 +153,9 @@ public class MatrixReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, MatrixAnalyzer.ID, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - return com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser.parse(content); - } else { - return queryFromMonthlyBinary(entity.getId(), domain); - } + return queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -188,15 +167,9 @@ public class MatrixReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, MatrixAnalyzer.ID, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - return com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser.parse(content); - } else { - return queryFromWeeklyBinary(entity.getId(), domain); - } + return queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/NetTopologyReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/NetTopologyReportService.java index 33dca49d259091db9d156e8ed9b0e553435be345..4bad4ce493429cf03cba1f0d42f542f28874e4ac 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/NetTopologyReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/NetTopologyReportService.java @@ -28,7 +28,7 @@ public class NetTopologyReportService extends AbstractReportService public NetGraphSet queryDailyReport(String domain, Date start, Date end) { throw new RuntimeException("net topology report don't support daily report"); } - + private NetGraphSet queryFromHourlyBinary(int id) throws DalException { HourlyReportContent content = m_hourlyReportContentDao.findByPK(id, HourlyReportContentEntity.READSET_FULL); @@ -43,7 +43,7 @@ public class NetTopologyReportService extends AbstractReportService public NetGraphSet queryHourlyReport(String domain, Date start, Date end) { long startTime = start.getTime(); String name = Constants.REPORT_NET_TOPOLOGY; - NetGraphSet netGraphSet = null; + NetGraphSet netGraphs = null; List reports = null; try { @@ -54,24 +54,14 @@ public class NetTopologyReportService extends AbstractReportService } if (reports != null && reports.size() > 0) { - String xml = reports.get(0).getContent(); - - if (xml != null && xml.length() > 0) { - try { - netGraphSet = com.dianping.cat.home.network.transform.DefaultSaxParser.parse(xml); - } catch (Exception e) { - Cat.logError(e); - } - } else { - try { - netGraphSet = queryFromHourlyBinary(reports.get(0).getId()); - } catch (DalException e) { - Cat.logError(e); - } + try { + netGraphs = queryFromHourlyBinary(reports.get(0).getId()); + } catch (DalException e) { + Cat.logError(e); } } - return netGraphSet; + return netGraphs; } @Override diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/ProblemReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/ProblemReportService.java index 466ff3c5e1fc7a2b3737fef76a7f8a8f72133076..f4811d5680c7227f8104e152158b271074290ce7 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/ProblemReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/ProblemReportService.java @@ -54,17 +54,9 @@ public class ProblemReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); + ProblemReport reportModel = queryFromDailyBinary(report.getId(), domain); - if (xml != null && xml.length() > 0) { - ProblemReport reportModel = com.dianping.cat.consumer.problem.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else { - ProblemReport reportModel = queryFromDailyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + reportModel.accept(merger); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -137,18 +129,10 @@ public class ProblemReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) {// for old xml storage - ProblemReport reportModel = com.dianping.cat.consumer.problem.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else {// for new binary storage, binary is same to report id - ProblemReport reportModel = queryFromHourlyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + ProblemReport reportModel = queryFromHourlyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -177,13 +161,8 @@ public class ProblemReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, ProblemAnalyzer.ID, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - if (content != null && content.length() > 0) { - problemReport = com.dianping.cat.consumer.problem.model.transform.DefaultSaxParser.parse(content); - } else { - problemReport = queryFromMonthlyBinary(entity.getId(), domain); - } + problemReport = queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -202,14 +181,8 @@ public class ProblemReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, ProblemAnalyzer.ID, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - problemReport = com.dianping.cat.consumer.problem.model.transform.DefaultSaxParser.parse(content); - } else { - problemReport = queryFromWeeklyBinary(entity.getId(), domain); - } + problemReport = queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/ServiceReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/ServiceReportService.java index 20f6d69fd2579f2eb5f41492519c38104c38bbf7..953741488b40b69f7cfbdfdbb840955b892f234f 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/ServiceReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/ServiceReportService.java @@ -52,17 +52,11 @@ public class ServiceReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); - - if (xml != null && xml.length() > 0) { - ServiceReport reportModel = com.dianping.cat.home.service.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - ServiceReport reportModel = queryFromDailyBinary(report.getId(), domain); - reportModel.accept(merger); - } + ServiceReport reportModel = queryFromDailyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -131,18 +125,11 @@ public class ServiceReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) { - ServiceReport reportModel = com.dianping.cat.home.service.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - ServiceReport reportModel = queryFromHourlyBinary(report.getId(), domain); - reportModel.accept(merger); - } + ServiceReport reportModel = queryFromHourlyBinary(report.getId(), domain); + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -162,15 +149,9 @@ public class ServiceReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, Constants.REPORT_SERVICE, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - - if (content != null && content.length() > 0) { - return com.dianping.cat.home.service.transform.DefaultSaxParser.parse(content); - } else { - return queryFromMonthlyBinary(entity.getId(), domain); - } + return queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -182,15 +163,10 @@ public class ServiceReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, Constants.REPORT_SERVICE, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - if (content != null && content.length() > 0) { - return com.dianping.cat.home.service.transform.DefaultSaxParser.parse(content); - } else { - return queryFromWeeklyBinary(entity.getId(), domain); - } + return queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/StateReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/StateReportService.java index d070ea7c9d60f49562784dcb094b00e33293e5ab..3f538c76c7e311a36550951ce5ca931feae6cebb 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/StateReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/StateReportService.java @@ -52,18 +52,11 @@ public class StateReportService extends AbstractReportService { try { DailyReport report = m_dailyReportDao.findByDomainNamePeriod(domain, name, new Date(startTime), DailyReportEntity.READSET_FULL); - String xml = report.getContent(); + StateReport reportModel = queryFromDailyBinary(report.getId(), domain); - if (xml != null && xml.length() > 0) { - StateReport reportModel = com.dianping.cat.consumer.state.model.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - StateReport reportModel = queryFromDailyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -132,20 +125,12 @@ public class StateReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) {// for old xml storage - StateReport reportModel = com.dianping.cat.consumer.state.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else {// for new binary storage, binary is same to report id - StateReport reportModel = queryFromHourlyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + StateReport reportModel = queryFromHourlyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -164,15 +149,10 @@ public class StateReportService extends AbstractReportService { try { MonthlyReport entity = m_monthlyReportDao.findReportByDomainNamePeriod(start, domain, StateAnalyzer.ID, MonthlyReportEntity.READSET_FULL); - String content = entity.getContent(); - if (content != null && content.length() > 0) { - return com.dianping.cat.consumer.state.model.transform.DefaultSaxParser.parse(content); - } else { - return queryFromMonthlyBinary(entity.getId(), domain); - } + return queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -184,15 +164,10 @@ public class StateReportService extends AbstractReportService { try { WeeklyReport entity = m_weeklyReportDao.findReportByDomainNamePeriod(start, domain, StateAnalyzer.ID, WeeklyReportEntity.READSET_FULL); - String content = entity.getContent(); - if (content != null && content.length() > 0) { - return com.dianping.cat.consumer.state.model.transform.DefaultSaxParser.parse(content); - } else { - return queryFromWeeklyBinary(entity.getId(), domain); - } + return queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/TopReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/TopReportService.java index c79b4475f43219a735c6af18d52f6f87ea9b1c0f..6ec95ea8bac6e9a980a22c4c646d0ffceae1adc0 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/TopReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/TopReportService.java @@ -61,18 +61,11 @@ public class TopReportService extends AbstractReportService { } if (reports != null) { for (HourlyReport report : reports) { - String xml = report.getContent(); - try { - if (xml != null && xml.length() > 0) { - TopReport reportModel = com.dianping.cat.consumer.top.model.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - TopReport reportModel = queryFromHourlyBinary(report.getId(), domain); - reportModel.accept(merger); - } + TopReport reportModel = queryFromHourlyBinary(report.getId(), domain); + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/TransactionReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/TransactionReportService.java index 9d8c1bd706a09d21a797398b75f7eb1a592532f4..e9c0d95138cd35a5fdc7ee7690d1de86c5fd7ce2 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/TransactionReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/TransactionReportService.java @@ -59,17 +59,9 @@ public class TransactionReportService extends AbstractReportService 0) { - TransactionReport reportModel = com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else { - TransactionReport reportModel = queryFromDailyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + reportModel.accept(merger); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -140,18 +132,10 @@ public class TransactionReportService extends AbstractReportService 0) {// for old xml storage - TransactionReport reportModel = com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else {// for new binary storage, binary is same to report id - TransactionReport reportModel = queryFromHourlyBinary(report.getId(), domain); - - reportModel.accept(merger); - } + TransactionReport reportModel = queryFromHourlyBinary(report.getId(), domain); + + reportModel.accept(merger); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -177,13 +161,7 @@ public class TransactionReportService extends AbstractReportService 0) { - transactionReport = com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser.parse(content); - } else { - transactionReport = queryFromMonthlyBinary(entity.getId(), domain); - } + transactionReport = queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { @@ -199,13 +177,7 @@ public class TransactionReportService extends AbstractReportService 0) { - transactionReport = com.dianping.cat.consumer.transaction.model.transform.DefaultSaxParser.parse(content); - } else { - transactionReport = queryFromWeeklyBinary(entity.getId(), domain); - } + transactionReport = queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { // ignore } catch (Exception e) { diff --git a/cat-home/src/main/java/com/dianping/cat/report/service/impl/UtilizationReportService.java b/cat-home/src/main/java/com/dianping/cat/report/service/impl/UtilizationReportService.java index a31fac4e89d94173e8a0b9ba714f449110437d2b..7c97ced60e0a6fb323b7d8567ad6c0adccc80825 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/service/impl/UtilizationReportService.java +++ b/cat-home/src/main/java/com/dianping/cat/report/service/impl/UtilizationReportService.java @@ -52,17 +52,10 @@ public class UtilizationReportService extends AbstractReportService 0) { - UtilizationReport reportModel = com.dianping.cat.home.utilization.transform.DefaultSaxParser.parse(xml); - reportModel.accept(merger); - } else { - UtilizationReport reportModel = queryFromDailyBinary(report.getId(), domain); - reportModel.accept(merger); - } + UtilizationReport reportModel = queryFromDailyBinary(report.getId(), domain); + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -131,19 +124,11 @@ public class UtilizationReportService extends AbstractReportService 0) { - UtilizationReport reportModel = com.dianping.cat.home.utilization.transform.DefaultSaxParser - .parse(xml); - reportModel.accept(merger); - } else { - UtilizationReport reportModel = queryFromHourlyBinary(report.getId(), domain); - reportModel.accept(merger); - } + UtilizationReport reportModel = queryFromHourlyBinary(report.getId(), domain); + reportModel.accept(merger); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -163,15 +148,9 @@ public class UtilizationReportService extends AbstractReportService 0) { - return com.dianping.cat.home.utilization.transform.DefaultSaxParser.parse(content); - } else { - return queryFromMonthlyBinary(entity.getId(), domain); - } + return queryFromMonthlyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } @@ -183,15 +162,9 @@ public class UtilizationReportService extends AbstractReportService 0) { - return com.dianping.cat.home.utilization.transform.DefaultSaxParser.parse(content); - } else { - return queryFromWeeklyBinary(entity.getId(), domain); - } + return queryFromWeeklyBinary(entity.getId(), domain); } catch (DalNotFoundException e) { - //ignore + // ignore } catch (Exception e) { Cat.logError(e); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/bug/BugReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/bug/BugReportBuilder.java index 1e85b445feabc1e350aac875b108397ec65e7bf5..ac68e5e810085139677f4c7782830a52ff501c97 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/bug/BugReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/bug/BugReportBuilder.java @@ -48,7 +48,6 @@ public class BugReportBuilder implements TaskBuilder { } DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -80,7 +79,6 @@ public class BugReportBuilder implements TaskBuilder { } HourlyReport report = new HourlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -101,7 +99,6 @@ public class BugReportBuilder implements TaskBuilder { } MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -122,7 +119,6 @@ public class BugReportBuilder implements TaskBuilder { } WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/cached/CachedReportTask.java b/cat-home/src/main/java/com/dianping/cat/report/task/cached/CachedReportTask.java index f00cc63d35f317eb361ea87e4847b48532012590..6fc942a4732c546511756285afabc00505dd865f 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/cached/CachedReportTask.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/cached/CachedReportTask.java @@ -54,7 +54,6 @@ public class CachedReportTask implements Task { private MonthlyReport buildMonthlyReport(String domain, Date period, String name) { MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -67,7 +66,6 @@ public class CachedReportTask implements Task { private WeeklyReport buildWeeklyReport(String domain, Date period, String name) { WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/cross/CrossReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/cross/CrossReportBuilder.java index ddb5430e2244501c0a8af9429fbb5a4ce512130c..bc766ffd824a46923737f8a2d759999bc3d64d21 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/cross/CrossReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/cross/CrossReportBuilder.java @@ -31,7 +31,6 @@ public class CrossReportBuilder implements TaskBuilder { CrossReport crossReport = queryHourlyReportsByDuration(name, domain, period, TaskHelper.tomorrowZero(period)); DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -52,7 +51,6 @@ public class CrossReportBuilder implements TaskBuilder { CrossReport crossReport = queryDailyReportsByDuration(domain, period, TaskHelper.nextMonthStart(period)); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -69,7 +67,6 @@ public class CrossReportBuilder implements TaskBuilder { + TimeHelper.ONE_WEEK)); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/event/EventReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/event/EventReportBuilder.java index a6386b9c53d6b1ea83563878828d4a0d43c50587..970ea856fdc18fce59970c28fe2a4aafc5fa0d77 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/event/EventReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/event/EventReportBuilder.java @@ -54,7 +54,6 @@ public class EventReportBuilder implements TaskBuilder { DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -119,7 +118,6 @@ public class EventReportBuilder implements TaskBuilder { EventReport eventReport = queryDailyReportsByDuration(domain, period, end); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -143,7 +141,6 @@ public class EventReportBuilder implements TaskBuilder { EventReport eventReport = queryDailyReportsByDuration(domain, period, end); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/heartbeat/HeartbeatReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/heartbeat/HeartbeatReportBuilder.java index 0704869b59405a296cf9b3f881da2d27bdbbc6d5..e127bd5ec0c4cf25f38535f636717fcd38ba0cfb 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/heartbeat/HeartbeatReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/heartbeat/HeartbeatReportBuilder.java @@ -37,7 +37,6 @@ public class HeartbeatReportBuilder implements TaskBuilder { report.setCreationDate(new Date()); report.setDomain(domain); - report.setContent(""); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); report.setName(name); report.setPeriod(period); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/heavy/HeavyReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/heavy/HeavyReportBuilder.java index 9a3ad6d1b711dc34d0f29830ad93795a1498ca28..1bc8f0c7b671ef95d8f58ea6895987f5a27efd7d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/heavy/HeavyReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/heavy/HeavyReportBuilder.java @@ -37,7 +37,6 @@ public class HeavyReportBuilder implements TaskBuilder { HeavyReport heavyReport = queryHourlyReportsByDuration(name, domain, period, TaskHelper.tomorrowZero(period)); DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -67,7 +66,6 @@ public class HeavyReportBuilder implements TaskBuilder { HourlyReport report = new HourlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -83,7 +81,6 @@ public class HeavyReportBuilder implements TaskBuilder { HeavyReport heavyReport = queryDailyReportsByDuration(domain, period, TaskHelper.nextMonthStart(period)); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -100,7 +97,6 @@ public class HeavyReportBuilder implements TaskBuilder { + TimeHelper.ONE_WEEK)); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/highload/HighLoadReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/highload/HighLoadReportBuilder.java index a1fa0b45579da56b387a9573baf325787da6ac8e..0e9fb6804e1ae17e30307c7dd7d3588eba00c7c4 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/highload/HighLoadReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/highload/HighLoadReportBuilder.java @@ -52,7 +52,6 @@ public class HighLoadReportBuilder implements TaskBuilder { HighloadReport report = generateHighloadReport(period); DailyReport dailyReport = new DailyReport(); - dailyReport.setContent(""); dailyReport.setIp(""); dailyReport.setDomain(""); dailyReport.setCreationDate(new Date()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/jar/JarReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/jar/JarReportBuilder.java index 215b3ee06e1ca5d0b872f8c407b6fe31ff66931c..8104a97f4b1e89ff90c3054358d34782bd934df0 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/jar/JarReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/jar/JarReportBuilder.java @@ -64,7 +64,6 @@ public class JarReportBuilder implements TaskBuilder { HourlyReport report = new HourlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/matrix/MatrixReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/matrix/MatrixReportBuilder.java index 302516bc4e02f92dd0f026db9bee5bc8023ed495..41d763161a27ea5bfc5267132bca3170273efe94 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/matrix/MatrixReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/matrix/MatrixReportBuilder.java @@ -32,7 +32,6 @@ public class MatrixReportBuilder implements TaskBuilder { MatrixReport matrixReport = queryHourlyReportByDuration(name, domain, period, TaskHelper.tomorrowZero(period)); DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -53,7 +52,6 @@ public class MatrixReportBuilder implements TaskBuilder { MatrixReport matrixReport = queryDailyReportsByDuration(domain, period, TaskHelper.nextMonthStart(period)); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -70,7 +68,6 @@ public class MatrixReportBuilder implements TaskBuilder { + TimeHelper.ONE_WEEK)); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/network/NetTopologyReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/network/NetTopologyReportBuilder.java index 4d6f7a8e17b931b2614f3df59a81f526f923a9de..6cc377295ca92f0d616f2ed168ae978d7233ef7e 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/network/NetTopologyReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/network/NetTopologyReportBuilder.java @@ -75,7 +75,6 @@ public class NetTopologyReportBuilder implements TaskBuilder { hourlyReport.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); hourlyReport.setDomain(domain); hourlyReport.setPeriod(period); - hourlyReport.setContent(""); byte[] content = DefaultNativeBuilder.build(netGraphSet); return m_reportService.insertHourlyReport(hourlyReport, content); } diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/problem/ProblemReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/problem/ProblemReportBuilder.java index 1993e43ba7b8e7203cf59ce75bffeb071fcf4586..d1b1416a522130929229d7cb65d8a0e3d622a0f3 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/problem/ProblemReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/problem/ProblemReportBuilder.java @@ -56,7 +56,6 @@ public class ProblemReportBuilder implements TaskBuilder { DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -105,7 +104,6 @@ public class ProblemReportBuilder implements TaskBuilder { MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -137,7 +135,6 @@ public class ProblemReportBuilder implements TaskBuilder { + TimeHelper.ONE_WEEK)); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/router/RouterConfigBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/router/RouterConfigBuilder.java index f970cada2e592c732c78274b6a854118d22986fd..6fabec1187abf3e2a15baa30fb03fbb0eec1e19c 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/router/RouterConfigBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/router/RouterConfigBuilder.java @@ -83,7 +83,6 @@ public class RouterConfigBuilder implements TaskBuilder, LogEnabled { routerConfig.setEndTime(new Date(end.getTime() + TimeHelper.ONE_DAY)); DailyReport dailyReport = new DailyReport(); - dailyReport.setContent(""); dailyReport.setCreationDate(new Date()); dailyReport.setDomain(domain); dailyReport.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/service/ServiceReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/service/ServiceReportBuilder.java index 848b180e3c843df5d2a0f5aab919460640adb38e..5f0880e44cc0b82ed8ac223fbe9a0daeb5076949 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/service/ServiceReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/service/ServiceReportBuilder.java @@ -45,7 +45,6 @@ public class ServiceReportBuilder implements TaskBuilder { ServiceReport serviceReport = queryHourlyReportsByDuration(name, domain, period, TaskHelper.tomorrowZero(period)); DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -81,7 +80,6 @@ public class ServiceReportBuilder implements TaskBuilder { } HourlyReport report = new HourlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -97,7 +95,6 @@ public class ServiceReportBuilder implements TaskBuilder { ServiceReport serviceReport = queryDailyReportsByDuration(domain, period, TaskHelper.nextMonthStart(period)); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -114,7 +111,6 @@ public class ServiceReportBuilder implements TaskBuilder { + TimeHelper.ONE_WEEK)); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/state/StateReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/state/StateReportBuilder.java index 7482464eaa28da3c71fac031e93a2a5845b663ac..1ccfb41407ee06db75ff49cd70690e10c363e9a6 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/state/StateReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/state/StateReportBuilder.java @@ -46,7 +46,6 @@ public class StateReportBuilder implements TaskBuilder { StateReport stateReport = queryHourlyReportsByDuration(name, domain, period, TaskHelper.tomorrowZero(period)); DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -72,7 +71,6 @@ public class StateReportBuilder implements TaskBuilder { StateReport stateReport = queryDailyReportsByDuration(domain, period, TaskHelper.nextMonthStart(period)); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -91,7 +89,6 @@ public class StateReportBuilder implements TaskBuilder { StateReport stateReport = queryDailyReportsByDuration(domain, start, end); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/system/SystemReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/system/SystemReportBuilder.java index eea73723b91884a7c123615298cf2cc912c036b4..277be910d0c516caf1e2d686ce203938d351580a 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/system/SystemReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/system/SystemReportBuilder.java @@ -39,7 +39,6 @@ public class SystemReportBuilder implements TaskBuilder { SystemReport report = buildSystemReport(period); DailyReport dailyReport = new DailyReport(); - dailyReport.setContent(""); dailyReport.setIp(""); dailyReport.setDomain(Constants.CAT); dailyReport.setCreationDate(new Date()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/transaction/TransactionReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/transaction/TransactionReportBuilder.java index 1968fe3aa60fd5ac61a34d1002c068826df4794a..73c8b90e01af3786c118b22a38467d5fe7eab158 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/transaction/TransactionReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/transaction/TransactionReportBuilder.java @@ -61,7 +61,6 @@ public class TransactionReportBuilder implements TaskBuilder, LogEnabled { report.setCreationDate(new Date()); report.setDomain(domain); - report.setContent(""); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); report.setName(name); report.setPeriod(period); @@ -125,7 +124,6 @@ public class TransactionReportBuilder implements TaskBuilder, LogEnabled { TransactionReport transactionReport = queryDailyReportsByDuration(domain, period, end); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -149,7 +147,6 @@ public class TransactionReportBuilder implements TaskBuilder, LogEnabled { TransactionReport transactionReport = queryDailyReportsByDuration(domain, period, end); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/utilization/UtilizationReportBuilder.java b/cat-home/src/main/java/com/dianping/cat/report/task/utilization/UtilizationReportBuilder.java index 296ddb8c0479870c0516f92a2faee476b4af930b..2b10ab2a46b154b294afdbc520073657a1d1882d 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/utilization/UtilizationReportBuilder.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/utilization/UtilizationReportBuilder.java @@ -49,7 +49,6 @@ public class UtilizationReportBuilder implements TaskBuilder { TaskHelper.tomorrowZero(period)); DailyReport report = new DailyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -124,7 +123,6 @@ public class UtilizationReportBuilder implements TaskBuilder { HourlyReport report = new HourlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -142,7 +140,6 @@ public class UtilizationReportBuilder implements TaskBuilder { TaskHelper.nextMonthStart(period)); MonthlyReport report = new MonthlyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); @@ -160,7 +157,6 @@ public class UtilizationReportBuilder implements TaskBuilder { + TimeHelper.ONE_WEEK)); WeeklyReport report = new WeeklyReport(); - report.setContent(""); report.setCreationDate(new Date()); report.setDomain(domain); report.setIp(NetworkInterfaceManager.INSTANCE.getLocalHostAddress()); diff --git a/script/Cat.sql b/script/Cat.sql index f413a2cedb788af01aa473f06bca166e947e7b23..062160fca72275f48bf5e30d19ebc34efd8cc8e0 100644 --- a/script/Cat.sql +++ b/script/Cat.sql @@ -19,7 +19,6 @@ CREATE TABLE `dailyreport` ( `domain` varchar(50) NOT NULL COMMENT '报表处理的Domain信息', `period` datetime NOT NULL COMMENT '报表时间段', `type` tinyint(4) NOT NULL COMMENT '报表数据格式, 1/xml, 2/json, 默认1', - `content` mediumtext NOT NULL COMMENT '报表内容', `creation_date` datetime NOT NULL COMMENT '报表创建时间', PRIMARY KEY (`id`), UNIQUE KEY `period` (`period`,`domain`,`name`) @@ -32,7 +31,6 @@ CREATE TABLE `weeklyreport` ( `domain` varchar(50) NOT NULL COMMENT '报表处理的Domain信息', `period` datetime NOT NULL COMMENT '报表时间段', `type` tinyint(4) NOT NULL COMMENT '报表数据格式, 1/xml, 2/json, 默认1', - `content` mediumtext NOT NULL COMMENT '报表内容', `creation_date` datetime NOT NULL COMMENT '报表创建时间', PRIMARY KEY (`id`), UNIQUE KEY `period` (`period`,`domain`,`name`) @@ -45,7 +43,6 @@ CREATE TABLE `monthreport` ( `domain` varchar(50) NOT NULL COMMENT '报表处理的Domain信息', `period` datetime NOT NULL COMMENT '报表时间段', `type` tinyint(4) NOT NULL COMMENT '报表数据格式, 1/xml, 2/json, 默认1', - `content` mediumtext NOT NULL COMMENT '报表内容', `creation_date` datetime NOT NULL COMMENT '报表创建时间', PRIMARY KEY (`id`), UNIQUE KEY `period` (`period`,`domain`,`name`) @@ -83,7 +80,6 @@ CREATE TABLE `report` ( `ip` varchar(50) DEFAULT NULL COMMENT '报表来自于哪台机器', `domain` varchar(50) NOT NULL COMMENT '报表项目', `period` timestamp NOT NULL COMMENT '报表时间段', - `content` longtext NULL, `creation_date` timestamp NOT NULL COMMENT '报表创建时间', PRIMARY KEY (`id`), KEY `IX_Domain_Name_Period` (`domain`,`name`,`period`),