From 07fa03d6420f386ce36bc1681ac5368e344b11be Mon Sep 17 00:00:00 2001 From: wusheng Date: Fri, 26 Feb 2016 11:07:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=A4=A7=E9=87=8F=E7=B1=BB?= =?UTF-8?q?=E7=9A=84=E5=8C=85=E5=90=8D=EF=BC=8C=E5=AE=9A=E4=B9=89=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=80=A7=E7=9A=84=E5=8C=85=E7=9B=AE=E5=BD=95=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skywalking/analysis/AnalysisServerDriver.java | 3 ++- .../categorize2chain/Categorize2ChainMapper.java | 5 +++-- .../categorize2chain/Categorize2ChainReducer.java | 4 +++- .../analysis/categorize2chain/DBCallChainInfoDao.java | 3 ++- .../analysis/categorize2chain/SpanEntry.java | 2 +- .../{ => entity}/CategorizedChainInfo.java | 6 +++--- .../categorize2chain/{ => entity}/ChainDetail.java | 7 ++++--- .../ChainNodeSpecificTimeWindowSummary.java | 4 ++-- .../ChainNodeSpecificTimeWindowSummaryValue.java | 4 ++-- .../{ => entity}/ChainRelationship.java | 4 ++-- .../{ => entity}/ChainSpecificTimeWindowSummary.java | 5 +++-- .../{ => entity}/ChainSummaryWithoutRelationship.java | 8 +++++--- .../{ => entity}/UncategorizeChainInfo.java | 6 +++--- .../categorize2chain/filter/SpanNodeProcessFilter.java | 4 ++-- .../filter/impl/AppendBusinessKeyFilter.java | 4 ++-- .../categorize2chain/filter/impl/CopyAttrFilter.java | 4 ++-- .../filter/impl/ProcessCostTimeFilter.java | 4 ++-- .../filter/impl/ReplaceAddressFilter.java | 4 ++-- .../filter/impl/TokenGenerateFilter.java | 4 ++-- .../categorize2chain/{model => po}/ChainInfo.java | 2 +- .../categorize2chain/{model => po}/ChainNode.java | 2 +- .../analysis/categorize2chain/util/HBaseUtil.java | 10 ++++++++-- .../{ => util}/SubLevelSpanCostCounter.java | 2 +- .../analysis/chain2summary/Chain2SummaryMapper.java | 2 ++ .../analysis/chain2summary/Chain2SummaryReducer.java | 2 ++ .../skywalking/analysis/chain2summary/Summary.java | 3 +++ .../{model => entity}/ChainNodeSpecificDaySummary.java | 6 +++--- .../ChainNodeSpecificHourSummary.java | 6 +++--- .../{model => entity}/ChainNodeSpecificMinSummary.java | 6 +++--- .../ChainNodeSpecificMonthSummary.java | 6 +++--- .../{model => entity}/ChainSpecificDaySummary.java | 7 ++++--- .../{model => entity}/ChainSpecificHourSummary.java | 7 ++++--- .../{model => entity}/ChainSpecificMinSummary.java | 7 ++++--- .../{model => entity}/ChainSpecificMonthSummary.java | 7 ++++--- .../{ => entity}/ChainSummaryWithRelationship.java | 7 ++----- .../{ => po}/ChainSpecificTimeSummary.java | 5 +++-- .../analysis/mapper/CallChainMapperTest.java | 4 ++-- 37 files changed, 100 insertions(+), 76 deletions(-) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => entity}/CategorizedChainInfo.java (91%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => entity}/ChainDetail.java (84%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => entity}/ChainNodeSpecificTimeWindowSummary.java (94%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => entity}/ChainNodeSpecificTimeWindowSummaryValue.java (90%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => entity}/ChainRelationship.java (97%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => entity}/ChainSpecificTimeWindowSummary.java (94%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => entity}/ChainSummaryWithoutRelationship.java (90%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => entity}/UncategorizeChainInfo.java (88%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{model => po}/ChainInfo.java (98%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{model => po}/ChainNode.java (97%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/{ => util}/SubLevelSpanCostCounter.java (87%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{model => entity}/ChainNodeSpecificDaySummary.java (87%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{model => entity}/ChainNodeSpecificHourSummary.java (87%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{model => entity}/ChainNodeSpecificMinSummary.java (85%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{model => entity}/ChainNodeSpecificMonthSummary.java (87%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{model => entity}/ChainSpecificDaySummary.java (87%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{model => entity}/ChainSpecificHourSummary.java (87%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{model => entity}/ChainSpecificMinSummary.java (87%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{model => entity}/ChainSpecificMonthSummary.java (86%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{ => entity}/ChainSummaryWithRelationship.java (91%) rename skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/{ => po}/ChainSpecificTimeSummary.java (96%) diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java index ca7723184..c21773ead 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/AnalysisServerDriver.java @@ -6,6 +6,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.client.Scan; @@ -21,7 +22,7 @@ import org.slf4j.LoggerFactory; import com.ai.cloud.skywalking.analysis.categorize2chain.Categorize2ChainMapper; import com.ai.cloud.skywalking.analysis.categorize2chain.Categorize2ChainReducer; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; import com.ai.cloud.skywalking.analysis.config.Config; import com.ai.cloud.skywalking.analysis.config.ConfigInitializer; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/Categorize2ChainMapper.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/Categorize2ChainMapper.java index a752fb298..f80d3a1d2 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/Categorize2ChainMapper.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/Categorize2ChainMapper.java @@ -19,9 +19,10 @@ import org.slf4j.LoggerFactory; import com.ai.cloud.skywalking.analysis.categorize2chain.filter.SpanNodeProcessChain; import com.ai.cloud.skywalking.analysis.categorize2chain.filter.SpanNodeProcessFilter; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.ai.cloud.skywalking.analysis.categorize2chain.util.HBaseUtil; +import com.ai.cloud.skywalking.analysis.categorize2chain.util.SubLevelSpanCostCounter; import com.ai.cloud.skywalking.analysis.config.ConfigInitializer; import com.ai.cloud.skywalking.protocol.Span; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/Categorize2ChainReducer.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/Categorize2ChainReducer.java index f52af2e7f..1623ca84a 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/Categorize2ChainReducer.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/Categorize2ChainReducer.java @@ -9,7 +9,9 @@ import org.apache.hadoop.mapreduce.Reducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainRelationship; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainSummaryWithoutRelationship; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; import com.ai.cloud.skywalking.analysis.categorize2chain.util.HBaseUtil; import com.ai.cloud.skywalking.analysis.config.ConfigInitializer; 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 d0cd5510d..9a587c7a3 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 @@ -1,6 +1,7 @@ package com.ai.cloud.skywalking.analysis.categorize2chain; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainDetail; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.ai.cloud.skywalking.analysis.config.Config; import org.slf4j.Logger; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/SpanEntry.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/SpanEntry.java index fa3636dcb..3df7b4758 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/SpanEntry.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/SpanEntry.java @@ -1,6 +1,6 @@ package com.ai.cloud.skywalking.analysis.categorize2chain; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.ai.cloud.skywalking.protocol.CallType; import com.ai.cloud.skywalking.protocol.Span; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/CategorizedChainInfo.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/CategorizedChainInfo.java similarity index 91% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/CategorizedChainInfo.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/CategorizedChainInfo.java index 50b7b7246..48f7ac12f 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/CategorizedChainInfo.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/CategorizedChainInfo.java @@ -1,7 +1,7 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainDetail.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainDetail.java similarity index 84% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainDetail.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainDetail.java index e94d5509b..34beb6dfe 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainDetail.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainDetail.java @@ -1,7 +1,8 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.DBCallChainInfoDao; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.ai.cloud.skywalking.analysis.config.Config; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; import com.google.gson.Gson; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainNodeSpecificTimeWindowSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainNodeSpecificTimeWindowSummary.java similarity index 94% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainNodeSpecificTimeWindowSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainNodeSpecificTimeWindowSummary.java index f67b71ea9..05e81815a 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainNodeSpecificTimeWindowSummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainNodeSpecificTimeWindowSummary.java @@ -1,9 +1,9 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.entity; import java.util.HashMap; import java.util.Map; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainNodeSpecificTimeWindowSummaryValue.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainNodeSpecificTimeWindowSummaryValue.java similarity index 90% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainNodeSpecificTimeWindowSummaryValue.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainNodeSpecificTimeWindowSummaryValue.java index b3e91788f..0d69053df 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainNodeSpecificTimeWindowSummaryValue.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainNodeSpecificTimeWindowSummaryValue.java @@ -1,6 +1,6 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; public class ChainNodeSpecificTimeWindowSummaryValue { private long totalCall; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainRelationship.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainRelationship.java similarity index 97% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainRelationship.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainRelationship.java index b4478f162..e7e88516e 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainRelationship.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainRelationship.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.entity; import java.io.IOException; import java.sql.SQLException; @@ -14,7 +14,7 @@ import org.apache.hadoop.hbase.client.Put; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; import com.ai.cloud.skywalking.analysis.categorize2chain.util.HBaseUtil; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; import com.google.gson.GsonBuilder; 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/entity/ChainSpecificTimeWindowSummary.java similarity index 94% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSpecificTimeWindowSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainSpecificTimeWindowSummary.java index aeaeb780f..5c552ec00 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/entity/ChainSpecificTimeWindowSummary.java @@ -1,8 +1,9 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.ai.cloud.skywalking.analysis.categorize2chain.util.HBaseUtil; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; + import org.apache.hadoop.hbase.client.Put; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSummaryWithoutRelationship.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainSummaryWithoutRelationship.java similarity index 90% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSummaryWithoutRelationship.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainSummaryWithoutRelationship.java index 2c43f2e0c..f047946b1 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/ChainSummaryWithoutRelationship.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/ChainSummaryWithoutRelationship.java @@ -1,8 +1,10 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.DBCallChainInfoDao; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.ai.cloud.skywalking.analysis.categorize2chain.util.HBaseUtil; + import org.apache.hadoop.hbase.client.Put; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/UncategorizeChainInfo.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/UncategorizeChainInfo.java similarity index 88% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/UncategorizeChainInfo.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/UncategorizeChainInfo.java index f938a8e2e..1890b8c0b 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/UncategorizeChainInfo.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/entity/UncategorizeChainInfo.java @@ -1,7 +1,7 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; import com.google.gson.GsonBuilder; import com.google.gson.annotations.Expose; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/SpanNodeProcessFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/SpanNodeProcessFilter.java index 03782b8de..eb8b54409 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/SpanNodeProcessFilter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/SpanNodeProcessFilter.java @@ -1,8 +1,8 @@ package com.ai.cloud.skywalking.analysis.categorize2chain.filter; -import com.ai.cloud.skywalking.analysis.categorize2chain.SubLevelSpanCostCounter; import com.ai.cloud.skywalking.analysis.categorize2chain.SpanEntry; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.util.SubLevelSpanCostCounter; public abstract class SpanNodeProcessFilter { diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/AppendBusinessKeyFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/AppendBusinessKeyFilter.java index cb136f175..4becf8e06 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/AppendBusinessKeyFilter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/AppendBusinessKeyFilter.java @@ -1,9 +1,9 @@ package com.ai.cloud.skywalking.analysis.categorize2chain.filter.impl; -import com.ai.cloud.skywalking.analysis.categorize2chain.SubLevelSpanCostCounter; import com.ai.cloud.skywalking.analysis.categorize2chain.SpanEntry; import com.ai.cloud.skywalking.analysis.categorize2chain.filter.SpanNodeProcessFilter; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.util.SubLevelSpanCostCounter; public class AppendBusinessKeyFilter extends SpanNodeProcessFilter { diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/CopyAttrFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/CopyAttrFilter.java index e577a2ab0..92a615216 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/CopyAttrFilter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/CopyAttrFilter.java @@ -1,9 +1,9 @@ package com.ai.cloud.skywalking.analysis.categorize2chain.filter.impl; -import com.ai.cloud.skywalking.analysis.categorize2chain.SubLevelSpanCostCounter; import com.ai.cloud.skywalking.analysis.categorize2chain.SpanEntry; import com.ai.cloud.skywalking.analysis.categorize2chain.filter.SpanNodeProcessFilter; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.util.SubLevelSpanCostCounter; public class CopyAttrFilter extends SpanNodeProcessFilter { diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/ProcessCostTimeFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/ProcessCostTimeFilter.java index 5b188e7de..95dd78ce0 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/ProcessCostTimeFilter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/ProcessCostTimeFilter.java @@ -1,9 +1,9 @@ package com.ai.cloud.skywalking.analysis.categorize2chain.filter.impl; -import com.ai.cloud.skywalking.analysis.categorize2chain.SubLevelSpanCostCounter; import com.ai.cloud.skywalking.analysis.categorize2chain.SpanEntry; import com.ai.cloud.skywalking.analysis.categorize2chain.filter.SpanNodeProcessFilter; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.util.SubLevelSpanCostCounter; public class ProcessCostTimeFilter extends SpanNodeProcessFilter { @Override diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/ReplaceAddressFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/ReplaceAddressFilter.java index 87e47d43c..9c12fafc7 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/ReplaceAddressFilter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/ReplaceAddressFilter.java @@ -1,9 +1,9 @@ package com.ai.cloud.skywalking.analysis.categorize2chain.filter.impl; -import com.ai.cloud.skywalking.analysis.categorize2chain.SubLevelSpanCostCounter; import com.ai.cloud.skywalking.analysis.categorize2chain.SpanEntry; import com.ai.cloud.skywalking.analysis.categorize2chain.filter.SpanNodeProcessFilter; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.util.SubLevelSpanCostCounter; public class ReplaceAddressFilter extends SpanNodeProcessFilter { diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/TokenGenerateFilter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/TokenGenerateFilter.java index b008ce993..ac8c6aa0f 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/TokenGenerateFilter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/filter/impl/TokenGenerateFilter.java @@ -1,9 +1,9 @@ package com.ai.cloud.skywalking.analysis.categorize2chain.filter.impl; -import com.ai.cloud.skywalking.analysis.categorize2chain.SubLevelSpanCostCounter; import com.ai.cloud.skywalking.analysis.categorize2chain.SpanEntry; import com.ai.cloud.skywalking.analysis.categorize2chain.filter.SpanNodeProcessFilter; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainNode; +import com.ai.cloud.skywalking.analysis.categorize2chain.util.SubLevelSpanCostCounter; import com.ai.cloud.skywalking.analysis.categorize2chain.util.TokenGenerator; public class TokenGenerateFilter extends SpanNodeProcessFilter { diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/model/ChainInfo.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/po/ChainInfo.java similarity index 98% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/model/ChainInfo.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/po/ChainInfo.java index f4be27097..ae8d0252a 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/model/ChainInfo.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/po/ChainInfo.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain.model; +package com.ai.cloud.skywalking.analysis.categorize2chain.po; import com.ai.cloud.skywalking.analysis.categorize2chain.util.TokenGenerator; import com.google.gson.Gson; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/model/ChainNode.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/po/ChainNode.java similarity index 97% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/model/ChainNode.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/po/ChainNode.java index 8664ad037..5349bd986 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/model/ChainNode.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/po/ChainNode.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain.model; +package com.ai.cloud.skywalking.analysis.categorize2chain.po; import com.google.gson.GsonBuilder; import com.google.gson.annotations.Expose; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/util/HBaseUtil.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/util/HBaseUtil.java index 47544b93e..2156fb1ba 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/util/HBaseUtil.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/util/HBaseUtil.java @@ -1,13 +1,19 @@ package com.ai.cloud.skywalking.analysis.categorize2chain.util; import com.ai.cloud.skywalking.analysis.categorize2chain.*; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.CategorizedChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainRelationship; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.UncategorizeChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; import com.ai.cloud.skywalking.analysis.chain2summary.ChainRelationship4Search; -import com.ai.cloud.skywalking.analysis.chain2summary.model.*; +import com.ai.cloud.skywalking.analysis.chain2summary.entity.*; import com.ai.cloud.skywalking.analysis.config.Config; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.*; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/SubLevelSpanCostCounter.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/util/SubLevelSpanCostCounter.java similarity index 87% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/SubLevelSpanCostCounter.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/util/SubLevelSpanCostCounter.java index 76d612876..90f08ae5a 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/SubLevelSpanCostCounter.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/categorize2chain/util/SubLevelSpanCostCounter.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.analysis.categorize2chain; +package com.ai.cloud.skywalking.analysis.categorize2chain.util; import java.util.HashMap; import java.util.Map; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Chain2SummaryMapper.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Chain2SummaryMapper.java index ab6ed26a1..0bafb3576 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Chain2SummaryMapper.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Chain2SummaryMapper.java @@ -1,6 +1,8 @@ package com.ai.cloud.skywalking.analysis.chain2summary; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; import com.ai.cloud.skywalking.analysis.config.ConfigInitializer; + import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Chain2SummaryReducer.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Chain2SummaryReducer.java index 6d1045ff9..c463b2c2d 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Chain2SummaryReducer.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Chain2SummaryReducer.java @@ -1,6 +1,8 @@ package com.ai.cloud.skywalking.analysis.chain2summary; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; import com.ai.cloud.skywalking.analysis.config.ConfigInitializer; + import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.Text; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Summary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Summary.java index b335e1197..df029aacf 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Summary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/Summary.java @@ -4,6 +4,9 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import com.ai.cloud.skywalking.analysis.chain2summary.entity.ChainSummaryWithRelationship; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; + public class Summary { private Map summaryWithRelationshipMap; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificDaySummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificDaySummary.java similarity index 87% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificDaySummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificDaySummary.java index 58d6d447b..dafbbf633 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificDaySummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificDaySummary.java @@ -1,7 +1,7 @@ -package com.ai.cloud.skywalking.analysis.chain2summary.model; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummaryValue; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummaryValue; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificHourSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificHourSummary.java similarity index 87% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificHourSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificHourSummary.java index 77ad858c6..50f3406c2 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificHourSummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificHourSummary.java @@ -1,7 +1,7 @@ -package com.ai.cloud.skywalking.analysis.chain2summary.model; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummaryValue; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummaryValue; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificMinSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificMinSummary.java similarity index 85% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificMinSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificMinSummary.java index 4f56567c9..b56c40cee 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificMinSummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificMinSummary.java @@ -1,7 +1,7 @@ -package com.ai.cloud.skywalking.analysis.chain2summary.model; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummaryValue; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummaryValue; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificMonthSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificMonthSummary.java similarity index 87% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificMonthSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificMonthSummary.java index 4b9aae253..d39bc6d42 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainNodeSpecificMonthSummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainNodeSpecificMonthSummary.java @@ -1,7 +1,7 @@ -package com.ai.cloud.skywalking.analysis.chain2summary.model; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummaryValue; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummaryValue; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificDaySummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificDaySummary.java similarity index 87% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificDaySummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificDaySummary.java index 51a8ce024..852c590b0 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificDaySummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificDaySummary.java @@ -1,8 +1,9 @@ -package com.ai.cloud.skywalking.analysis.chain2summary.model; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; -import com.ai.cloud.skywalking.analysis.chain2summary.ChainSpecificTimeSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; + import org.apache.hadoop.hbase.client.Put; import java.util.HashMap; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificHourSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificHourSummary.java similarity index 87% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificHourSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificHourSummary.java index e38a763e0..b8b1da14f 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificHourSummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificHourSummary.java @@ -1,8 +1,9 @@ -package com.ai.cloud.skywalking.analysis.chain2summary.model; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; -import com.ai.cloud.skywalking.analysis.chain2summary.ChainSpecificTimeSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; + import org.apache.hadoop.hbase.client.Put; import java.util.HashMap; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificMinSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificMinSummary.java similarity index 87% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificMinSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificMinSummary.java index a1a336894..3d32566f4 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificMinSummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificMinSummary.java @@ -1,8 +1,9 @@ -package com.ai.cloud.skywalking.analysis.chain2summary.model; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; -import com.ai.cloud.skywalking.analysis.chain2summary.ChainSpecificTimeSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; + import org.apache.hadoop.hbase.client.Put; import java.util.HashMap; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificMonthSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificMonthSummary.java similarity index 86% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificMonthSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificMonthSummary.java index 8105de114..478a82396 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/model/ChainSpecificMonthSummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSpecificMonthSummary.java @@ -1,8 +1,9 @@ -package com.ai.cloud.skywalking.analysis.chain2summary.model; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; -import com.ai.cloud.skywalking.analysis.chain2summary.ChainSpecificTimeSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; + import org.apache.hadoop.hbase.client.Put; import java.util.Map; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/ChainSummaryWithRelationship.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSummaryWithRelationship.java similarity index 91% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/ChainSummaryWithRelationship.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSummaryWithRelationship.java index 45f8023af..ffaafb298 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/ChainSummaryWithRelationship.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/entity/ChainSummaryWithRelationship.java @@ -1,10 +1,7 @@ -package com.ai.cloud.skywalking.analysis.chain2summary; +package com.ai.cloud.skywalking.analysis.chain2summary.entity; import com.ai.cloud.skywalking.analysis.categorize2chain.util.HBaseUtil; -import com.ai.cloud.skywalking.analysis.chain2summary.model.ChainSpecificDaySummary; -import com.ai.cloud.skywalking.analysis.chain2summary.model.ChainSpecificHourSummary; -import com.ai.cloud.skywalking.analysis.chain2summary.model.ChainSpecificMinSummary; -import com.ai.cloud.skywalking.analysis.chain2summary.model.ChainSpecificMonthSummary; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; import java.io.IOException; import java.util.HashMap; diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/ChainSpecificTimeSummary.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/po/ChainSpecificTimeSummary.java similarity index 96% rename from skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/ChainSpecificTimeSummary.java rename to skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/po/ChainSpecificTimeSummary.java index 3a46c3be0..ef9922d23 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/ChainSpecificTimeSummary.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chain2summary/po/ChainSpecificTimeSummary.java @@ -1,10 +1,11 @@ -package com.ai.cloud.skywalking.analysis.chain2summary; +package com.ai.cloud.skywalking.analysis.chain2summary.po; -import com.ai.cloud.skywalking.analysis.categorize2chain.ChainNodeSpecificTimeWindowSummary; +import com.ai.cloud.skywalking.analysis.categorize2chain.entity.ChainNodeSpecificTimeWindowSummary; import com.google.gson.Gson; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.google.gson.reflect.TypeToken; + import org.apache.hadoop.io.Writable; import java.io.DataInput; diff --git a/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java b/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java index 3e431654d..0fd798ae7 100644 --- a/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java +++ b/skywalking-analysis/src/test/java/com/ai/cloud/skywalking/analysis/mapper/CallChainMapperTest.java @@ -3,9 +3,9 @@ package com.ai.cloud.skywalking.analysis.mapper; import com.ai.cloud.skywalking.analysis.categorize2chain.Categorize2ChainMapper; import com.ai.cloud.skywalking.analysis.categorize2chain.Categorize2ChainReducer; -import com.ai.cloud.skywalking.analysis.categorize2chain.model.ChainInfo; +import com.ai.cloud.skywalking.analysis.categorize2chain.po.ChainInfo; import com.ai.cloud.skywalking.analysis.chain2summary.Chain2SummaryReducer; -import com.ai.cloud.skywalking.analysis.chain2summary.ChainSpecificTimeSummary; +import com.ai.cloud.skywalking.analysis.chain2summary.po.ChainSpecificTimeSummary; import com.ai.cloud.skywalking.analysis.config.ConfigInitializer; import com.ai.cloud.skywalking.analysis.config.HBaseTableMetaData; import com.ai.cloud.skywalking.protocol.Span;