From 42b788f10f15edf043ac3220b8d887bd4d311fc2 Mon Sep 17 00:00:00 2001
From: wusheng <wu.sheng@foxmail.com>
Date: Tue, 8 Mar 2016 14:53:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=B0=91=E9=87=8F=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...SpecificTimeCallTreeMergedChainIdContainer.java | 14 +++++++++++++-
 .../analysis/config/HBaseTableMetaData.java        |  4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/po/SpecificTimeCallTreeMergedChainIdContainer.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/po/SpecificTimeCallTreeMergedChainIdContainer.java
index 4ca431188..5fc868842 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/po/SpecificTimeCallTreeMergedChainIdContainer.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/po/SpecificTimeCallTreeMergedChainIdContainer.java
@@ -49,18 +49,30 @@ public class SpecificTimeCallTreeMergedChainIdContainer {
         batchSaveMergedChainId();
     }
 
+    /**
+     * 保存被合并的cid信息列表
+     * 
+     * @throws IOException
+     * @throws InterruptedException
+     */
     private void batchSaveMergedChainId() throws IOException, InterruptedException {
         List<Put> chainIdPuts = new ArrayList<Put>();
         for (Map.Entry<String, List<String>> entry : hasBeenMergedChainIds.entrySet()) {
             Put chainIdPut = new Put(entry.getKey().getBytes());
             chainIdPut.addColumn(HBaseTableMetaData.TABLE_CALL_CHAIN_TREE_ID_AND_CID_MAPPING.COLUMN_FAMILY_NAME.getBytes()
-                    , "HAS_BEEN_MERGED_CHAIN_ID".getBytes(), new Gson().toJson(entry.getValue()).getBytes());
+                    , HBaseTableMetaData.TABLE_CALL_CHAIN_TREE_ID_AND_CID_MAPPING.COLUMN_NAME.getBytes(), new Gson().toJson(entry.getValue()).getBytes());
             chainIdPuts.add(chainIdPut);
         }
 
         HBaseUtil.batchSaveHasBeenMergedCID(chainIdPuts);
     }
 
+    /**
+     * 保存已经合并的调用链信息，包含调用链明细
+     * 
+     * @throws IOException
+     * @throws InterruptedException
+     */
     private void batchSaveCurrentHasBeenMergedChainInfo() throws IOException, InterruptedException {
         List<Put> chainInfoPuts = new ArrayList<Put>();
         for (Map.Entry<String, ChainInfo> entry : combineChains.entrySet()) {
diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/HBaseTableMetaData.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/HBaseTableMetaData.java
index e9e159c22..f98508966 100644
--- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/HBaseTableMetaData.java
+++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/config/HBaseTableMetaData.java
@@ -41,6 +41,8 @@ public class HBaseTableMetaData {
     public final static class TABLE_CALL_CHAIN_TREE_ID_AND_CID_MAPPING {
         public static final String TABLE_NAME = "sw-treeId-cid-mapping";
 
-        public static final String COLUMN_FAMILY_NAME = "sw-treeId-cid-mapping";
+        public static final String COLUMN_FAMILY_NAME = "cids";
+        
+        public static final String COLUMN_NAME = "been_merged_cid";
     }
 }
-- 
GitLab