From 66bd78cfc068ea7fa4cbd4273b41c9a103bac632 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Sun, 24 Jan 2016 16:59:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=B8=80=E6=89=B9=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D=EF=BC=8C=E6=98=8E=E7=A1=AE=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChainSpecificTimeWindowSummary.java       |  2 +-
 .../categorize2chain/ChainSummary.java        | 20 +++++++++----------
 .../categorize2chain/DBCallChainInfoDao.java  |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSpecificTimeWindowSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSpecificTimeWindowSummary.java
index b1b296d31..426ca1853 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSpecificTimeWindowSummary.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSpecificTimeWindowSummary.java
@@ -39,7 +39,7 @@ public class ChainSpecificTimeWindowSummary {
         chainNodeSummaryResultMap.put(chainNodeSummaryResult.getTraceLevelId(), chainNodeSummaryResult);
     }
 
-    public void summaryResult(ChainNode node) {
+    public void summaryNodeValue(ChainNode node) {
         String tlid = node.getTraceLevelId();
         ChainNodeSpecificTimeWindowSummary chainNodeSummaryResult = chainNodeSummaryResultMap.get(tlid);
         if (chainNodeSummaryResult == null) {
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSummary.java
index be6804648..900eb6c3d 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSummary.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSummary.java
@@ -14,24 +14,22 @@ import java.util.Date;
 
 public class ChainSummary {
 
-    private Map<String, ChainSpecificTimeWindowSummary> summaryResultMap;
+    private Map<String, ChainSpecificTimeWindowSummary> loadedChainSpecificTimeWindowSummary;
     private Map<String, Timestamp> updateChainInfo;
 
     public ChainSummary() {
-        summaryResultMap = new HashMap<String, ChainSpecificTimeWindowSummary>();
+        loadedChainSpecificTimeWindowSummary = new HashMap<String, ChainSpecificTimeWindowSummary>();
         updateChainInfo = new HashMap<String, Timestamp>();
     }
 
     public void summary(ChainInfo chainInfo) {
         for (ChainNode node : chainInfo.getNodes()) {
             String csk = generateChainSummaryKey(chainInfo.getCID(), node.getStartDate());
-            ChainSpecificTimeWindowSummary chainSummaryResult = summaryResultMap.get(csk);
-            if (chainSummaryResult == null) {
-                chainSummaryResult = ChainSpecificTimeWindowSummary.load(csk);
-                summaryResultMap.put(csk, chainSummaryResult);
+            if (loadedChainSpecificTimeWindowSummary.containsKey(csk)) {
+                loadedChainSpecificTimeWindowSummary.put(csk, ChainSpecificTimeWindowSummary.load(csk));
             }
 
-            summaryResultMap.get(csk).summaryResult(node);
+            loadedChainSpecificTimeWindowSummary.get(csk).summaryNodeValue(node);
         }
 
         updateChainInfo.put(chainInfo.getCID(), new Timestamp(System.currentTimeMillis()));
@@ -44,16 +42,16 @@ public class ChainSummary {
 
     public void save() throws IOException, InterruptedException, SQLException {
         batchSaveChainSpecificTimeWindowSummary();
-        batchUpdateChainDetail();
+        updateChainLastActiveTime();
     }
 
-    private void batchUpdateChainDetail() throws SQLException {
-        DBCallChainInfoDao.updateChainDetail(updateChainInfo);
+    private void updateChainLastActiveTime() throws SQLException {
+        DBCallChainInfoDao.updateChainLastActiveTime(updateChainInfo);
     }
 
     private void batchSaveChainSpecificTimeWindowSummary() throws IOException, InterruptedException {
         List<Put> puts = new ArrayList<Put>();
-        for (Map.Entry<String, ChainSpecificTimeWindowSummary> entry : summaryResultMap.entrySet()) {
+        for (Map.Entry<String, ChainSpecificTimeWindowSummary> entry : loadedChainSpecificTimeWindowSummary.entrySet()) {
             Put put = new Put(entry.getKey().getBytes());
             entry.getValue().save(put);
             puts.add(put);
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/DBCallChainInfoDao.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/DBCallChainInfoDao.java
index 6e109667a..760829068 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/DBCallChainInfoDao.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/DBCallChainInfoDao.java
@@ -61,7 +61,7 @@ public class DBCallChainInfoDao {
 		connection.commit();
 	}
 
-	public synchronized static void updateChainDetail(Map<String, Timestamp> updateChainInfo)
+	public synchronized static void updateChainLastActiveTime(Map<String, Timestamp> updateChainInfo)
 			throws SQLException {
 		PreparedStatement preparedStatement = null;
 		try {