diff --git a/cat-consumer/pom.xml b/cat-consumer/pom.xml index 1e95e2e0498132ace37bc6b75988e1a7d98c62f0..414d97a95bd9b7561476003234b3294ab607b1c4 100644 --- a/cat-consumer/pom.xml +++ b/cat-consumer/pom.xml @@ -4,7 +4,7 @@ com.dianping.cat parent - 0.3.0 + 0.3.1 4.0.0 cat-consumer diff --git a/cat-core/pom.xml b/cat-core/pom.xml index 80a5bf9456e6d30ef499fd69278892a28e44a27f..5238cb4220922865f76475e204a5d53545e24698 100644 --- a/cat-core/pom.xml +++ b/cat-core/pom.xml @@ -4,7 +4,7 @@ com.dianping.cat parent - 0.3.0 + 0.3.1 4.0.0 cat-core diff --git a/cat-hadoop/pom.xml b/cat-hadoop/pom.xml index 3a2cff8b03f1b12fc2bd7e9d90780bf6fd07b228..984912e5875684abe51dcf726f20f08aea7d7085 100644 --- a/cat-hadoop/pom.xml +++ b/cat-hadoop/pom.xml @@ -4,7 +4,7 @@ com.dianping.cat parent - 0.3.0 + 0.3.1 4.0.0 cat-hadoop diff --git a/cat-home/pom.xml b/cat-home/pom.xml index a7e278310205721b7ddac2d6d748ad9c668d9b53..cf2d5db2bcfa0bcb270053fcd236339ebee46020 100755 --- a/cat-home/pom.xml +++ b/cat-home/pom.xml @@ -4,7 +4,7 @@ com.dianping.cat parent - 0.3.0 + 0.3.1 4.0.0 cat-home diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/EventMerger.java b/cat-home/src/main/java/com/dianping/cat/report/task/EventMerger.java index 7ac235599a977c7e92a956f8b776651100a56d09..628b86989a52095cf37096e25d199f28751b8e3f 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/EventMerger.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/EventMerger.java @@ -22,7 +22,7 @@ public class EventMerger implements ReportMerger { @Override public EventReport merge(String reportDomain, List reports) { EventReport eventReport; - EventReportMerger merger = new EventReportMerger(new EventReport(reportDomain)); + EventReportMerger merger = new HistoryEventReportMerger(new EventReport(reportDomain)); for (Report report : reports) { String xml = report.getContent(); @@ -45,7 +45,7 @@ public class EventMerger implements ReportMerger { @Override public String mergeAll(String reportDomain, List reports) { EventReport eventReport = merge(reportDomain, reports); - EventReportMerger merger = new EventReportMerger(new EventReport(reportDomain)); + EventReportMerger merger = new HistoryEventReportMerger(new EventReport(reportDomain)); EventReport eventReport2 = merge(reportDomain, reports); com.dianping.cat.consumer.event.model.entity.Machine allMachines = merger.mergesForAllMachine(eventReport2); eventReport.addMachine(allMachines); diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/HistoryEventReportMerger.java b/cat-home/src/main/java/com/dianping/cat/report/task/HistoryEventReportMerger.java new file mode 100644 index 0000000000000000000000000000000000000000..869fb7ba48914ee73d207668c4af894a179daabf --- /dev/null +++ b/cat-home/src/main/java/com/dianping/cat/report/task/HistoryEventReportMerger.java @@ -0,0 +1,22 @@ +package com.dianping.cat.report.task; + +import com.dianping.cat.consumer.event.model.entity.EventReport; +import com.dianping.cat.consumer.event.model.entity.Range; +import com.dianping.cat.report.page.model.event.EventReportMerger; + +public class HistoryEventReportMerger extends EventReportMerger{ + + public HistoryEventReportMerger(EventReport eventReport) { + super(eventReport); + } + + @Override + public void visitRange(Range range) { + //super.visitRange(range); + } + + @Override + protected void visitRangeChildren(Range old, Range range) { + //super.visitRangeChildren(old, range); + } +} diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/HistoryTransactionReportMerger.java b/cat-home/src/main/java/com/dianping/cat/report/task/HistoryTransactionReportMerger.java new file mode 100755 index 0000000000000000000000000000000000000000..bb98c26cebff1f130e6d5db3fbb928457a4c5ce3 --- /dev/null +++ b/cat-home/src/main/java/com/dianping/cat/report/task/HistoryTransactionReportMerger.java @@ -0,0 +1,30 @@ +package com.dianping.cat.report.task; + +import com.dianping.cat.consumer.transaction.model.entity.AllDuration; +import com.dianping.cat.consumer.transaction.model.entity.Duration; +import com.dianping.cat.consumer.transaction.model.entity.Range; +import com.dianping.cat.consumer.transaction.model.entity.TransactionReport; +import com.dianping.cat.report.page.model.transaction.TransactionReportMerger; + +public class HistoryTransactionReportMerger extends TransactionReportMerger { + + public HistoryTransactionReportMerger(TransactionReport transactionReport) { + super(transactionReport); + } + + @Override + public void visitAllDuration(AllDuration allDuration) { + //super.visitAllDuration(allDuration); + } + + @Override + public void visitDuration(Duration duration) { + //super.visitDuration(duration); + } + + @Override + public void visitRange(Range range) { + // super.visitRange(range); + } + +} diff --git a/cat-home/src/main/java/com/dianping/cat/report/task/TransactionMerger.java b/cat-home/src/main/java/com/dianping/cat/report/task/TransactionMerger.java index 3fe410e0547fb03c97bbbd655d2727f3f6881d97..899b195bca949bcc26215b3d16168459ab561a46 100644 --- a/cat-home/src/main/java/com/dianping/cat/report/task/TransactionMerger.java +++ b/cat-home/src/main/java/com/dianping/cat/report/task/TransactionMerger.java @@ -21,7 +21,7 @@ public class TransactionMerger implements ReportMerger { public String mergeAll(String reportDomain, List reports) { TransactionReport transactionReport = merge(reportDomain, reports); - TransactionReportMerger merger = new TransactionReportMerger(new TransactionReport(reportDomain)); + TransactionReportMerger merger = new HistoryTransactionReportMerger(new TransactionReport(reportDomain)); TransactionReport transactionReport2 = merge(reportDomain, reports); com.dianping.cat.consumer.transaction.model.entity.Machine allMachines = merger.mergesForAllMachine(transactionReport2); transactionReport.addMachine(allMachines); @@ -32,7 +32,7 @@ public class TransactionMerger implements ReportMerger { public TransactionReport merge(String reportDomain, List reports) { TransactionReport transactionReport; - TransactionReportMerger merger = new TransactionReportMerger(new TransactionReport(reportDomain)); + TransactionReportMerger merger = new HistoryTransactionReportMerger(new TransactionReport(reportDomain)); for (Report report : reports) { String xml = report.getContent(); diff --git a/cat-job/pom.xml b/cat-job/pom.xml index bd51ebdf8021d67adc26fac14c3280db395f19be..9914734e97728e4831a2425a6a322711323052ae 100644 --- a/cat-job/pom.xml +++ b/cat-job/pom.xml @@ -4,7 +4,7 @@ com.dianping.cat parent - 0.3.0 + 0.3.1 4.0.0 cat-job diff --git a/pom.xml b/pom.xml index 5c253a3a96b7a78376a1a90d5add63e34a0ad9b7..abb0f352f82aa01726a29d1d9de501b353b4b719 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.dianping.cat parent - 0.3.0 + 0.3.1 CAT pom