modify the statistic

cat-consumer/src/main/java/com/dianping/cat/consumer/state/StateAnalyzer.java

@@ -50,16 +50,22 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
 		long end = m_startTime + minute * 60;
 		int size = 0;
 		double maxTps = 0;
-
-		if (end > System.currentTimeMillis()) {
-			end = System.currentTimeMillis();
+		long current = System.currentTimeMillis();
+		
+		if (end > current) {
+			end = current;
 		}
 		for (; start < end; start += minute) {
 			Statistic state = m_serverStateManager.findState(start);
+
+			if (state == null) {
+				continue;
+			}
+
 			Message temp = machine.findOrCreateMessage(start);
 			long messageTotal = state.getMessageTotal();
 			long messageTotalLoss = state.getMessageTotalLoss();
-			double messageSize = state.getMessageSize();
+			long messageSize = state.getMessageSize();
 
 			temp.setTotal(messageTotal).setTotalLoss(messageTotalLoss).setSize(messageSize);
 			machine.setTotal(messageTotal + machine.getTotal());

cat-core/src/main/java/com/dianping/cat/statistic/ServerStatistic.java

@@ -2,6 +2,7 @@ package com.dianping.cat.statistic;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class ServerStatistic {
@@ -27,17 +28,17 @@ public class ServerStatistic {
 
 		private long m_messageTotalLoss;
 
-		private double m_messageSize;
+		private long m_messageSize;
 
 		private long m_messageDump;
 
 		private long m_messageDumpLoss;
 
-		private Map<String, AtomicLong> m_messageTotals = new ConcurrentHashMap<String, AtomicLong>(256);
+		private ConcurrentMap<String, AtomicLong> m_messageTotals = new ConcurrentHashMap<String, AtomicLong>(256);
 
-		private Map<String, AtomicLong> m_messageTotalLosses = new ConcurrentHashMap<String, AtomicLong>(256);
+		private ConcurrentMap<String, AtomicLong> m_messageTotalLosses = new ConcurrentHashMap<String, AtomicLong>(256);
 
-		private Map<String, AtomicLong> m_messageSizes = new ConcurrentHashMap<String, AtomicLong>(256);
+		private ConcurrentMap<String, AtomicLong> m_messageSizes = new ConcurrentHashMap<String, AtomicLong>(256);
 
 		private double m_processDelaySum;
 
@@ -104,7 +105,7 @@ public class ServerStatistic {
 
 		public void addMessageTotalLoss(String domain, long messageTotalLoss) {
 			m_messageTotalLoss += messageTotalLoss;
-			
+
 			AtomicLong value = m_messageTotalLosses.get(domain);
 			if (value != null) {
 				value.addAndGet(messageTotalLoss);
@@ -153,7 +154,7 @@ public class ServerStatistic {
 			return m_messageDumpLoss;
 		}
 
-		public double getMessageSize() {
+		public long getMessageSize() {
 			return m_messageSize;
 		}
 

cat-core/src/main/java/com/dianping/cat/statistic/ServerStatisticManager.java

@@ -10,10 +10,6 @@ public class ServerStatisticManager {
 
 	private volatile long m_currentMunite = -1;
 
-	public void addBlockTotal(long total) {
-		getCurrentStatistic().addBlockTotal(total);
-	}
-
 	public void addBlockLoss(long total) {
 		getCurrentStatistic().addBlockLoss(total);
 	}
@@ -22,18 +18,14 @@ public class ServerStatisticManager {
 		getCurrentStatistic().addBlockTime(total);
 	}
 
-	public void addPigeonTimeError(long total) {
-		getCurrentStatistic().addPigeonTimeError(total);
+	public void addBlockTotal(long total) {
+		getCurrentStatistic().addBlockTotal(total);
 	}
 
 	public void addMessageDump(long total) {
 		getCurrentStatistic().addMessageDump(total);
 	}
 
-	public void addNetworkTimeError(long total) {
-		getCurrentStatistic().addNetworkTimeError(total);
-	}
-
 	public void addMessageDumpLoss(long total) {
 		getCurrentStatistic().addMessageDumpLoss(total);
 	}
@@ -42,20 +34,28 @@ public class ServerStatisticManager {
 		getCurrentStatistic().addMessageSize(domain, size);
 	}
 
+	public void addMessageTotal(long total) {
+		getCurrentStatistic().addMessageTotal(total);
+	}
+
 	public void addMessageTotal(String domain, long total) {
 		getCurrentStatistic().addMessageTotal(domain, total);
 	}
 
-	public void addMessageTotal(long total) {
-		getCurrentStatistic().addMessageTotal(total);
+	public void addMessageTotalLoss(long total) {
+		getCurrentStatistic().addMessageTotalLoss(total);
 	}
 
 	public void addMessageTotalLoss(String domain, long total) {
 		getCurrentStatistic().addMessageTotalLoss(domain, total);
 	}
 
-	public void addMessageTotalLoss(long total) {
-		getCurrentStatistic().addMessageTotalLoss(total);
+	public void addNetworkTimeError(long total) {
+		getCurrentStatistic().addNetworkTimeError(total);
+	}
+
+	public void addPigeonTimeError(long total) {
+		getCurrentStatistic().addPigeonTimeError(total);
 	}
 
 	public void addProcessDelay(double delay) {

cat-core/src/main/java/com/dianping/cat/storage/dump/LocalMessageBucketManager.java

@@ -360,7 +360,7 @@ public class LocalMessageBucketManager extends ContainerHolder implements Messag
 		}
 	}
 
-	class BlockDumper implements Task {
+	private class BlockDumper implements Task {
 		private int m_errors;
 
 		@Override
@@ -404,7 +404,7 @@ public class LocalMessageBucketManager extends ContainerHolder implements Messag
 		}
 	}
 
-	class MessageGzip implements Task {
+	private class MessageGzip implements Task {
 
 		private int m_index;
 
@@ -417,10 +417,6 @@ public class LocalMessageBucketManager extends ContainerHolder implements Messag
 			m_index = index;
 		}
 
-		public int getIndex() {
-			return m_index;
-		}
-
 		@Override
 		public String getName() {
 			return "Message-Gzip-" + m_index;