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 4ca431188809d1b0f0bd3ff559ae8077eb064414..5fc868842e7e03f9641394c7ed77c2dc7f13bdfe 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 chainIdPuts = new ArrayList(); for (Map.Entry> 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 chainInfoPuts = new ArrayList(); for (Map.Entry 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 e9e159c22ce977b46fee70ec3ed98ac3fd9ed3be..f9850896609aafb48b45221239abe80e4c167155 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"; } }