kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修改部分变量名和少量逻辑

This commit is contained in:
wusheng 2016-01-22 17:57:29 +08:00
parent 9af11e7ba6
commit 9df0577982
7 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/model/ChainInfo.java
View File

@ -10,7 +10,7 @@ import java.util.ArrayList;
import java.util.List;
public class ChainInfo implements Writable {
private String chainToken;
private String cid;
private ChainStatus chainStatus = ChainStatus.NORMAL;
private List<ChainNode> nodes;
private String userId = null;
@ -28,7 +28,7 @@ public class ChainInfo implements Writable {
@Override
public void write(DataOutput out) throws IOException {
out.write(chainToken.getBytes());
out.write(cid.getBytes());
out.writeChar(chainStatus.getValue());
out.write(userId.getBytes());
@ -46,7 +46,7 @@ public class ChainInfo implements Writable {
@Override
public void readFields(DataInput in) throws IOException {
chainToken = in.readLine();
cid = in.readLine();
chainStatus = ChainStatus.convert(in.readChar());
userId = in.readLine();
@ -66,8 +66,8 @@ public class ChainInfo implements Writable {
}
}
public String getChainToken() {
return chainToken;
public String getCID() {
return cid;
}
public String getEntranceNodeToken() {
@ -83,7 +83,7 @@ public class ChainInfo implements Writable {
for (ChainNode node : nodes) {
chainTokenDesc.append(node.getParentLevelId() + "." + node.getLevelId() + "-" + node.getNodeToken() + ";");
}
this.chainToken = TokenGenerator.generate(chainTokenDesc.toString()) + "-";
this.cid = TokenGenerator.generate(chainTokenDesc.toString()) + "-";
}
public ChainStatus getChainStatus() {
@ -145,8 +145,8 @@ public class ChainInfo implements Writable {
}
}
public void setChainToken(String chainToken) {
this.chainToken = chainToken;
public void setCID(String cid) {
this.cid = cid;
}
public long getStartDate() {

24
skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/reduce/CategorizedChainInfo.java
View File

@ -12,13 +12,13 @@ import java.util.List;
import java.util.regex.Pattern;
public class CategorizedChainInfo {
private String chainToken;
private String chainStr;
private String cid;
private String chainFullToken;
private List<String> children_Token;
public CategorizedChainInfo(ChainInfo chainInfo) {
chainToken = chainInfo.getChainToken();
cid = chainInfo.getCID();
StringBuilder stringBuilder = new StringBuilder();
boolean flag = false;
@ -26,38 +26,38 @@ public class CategorizedChainInfo {
if (flag) {
stringBuilder.append(";");
}
stringBuilder.append((chainNode.getTraceLevelId() + "-" + chainNode.getNodeToken()));
stringBuilder.append(chainNode.getNodeToken());
flag = true;
}
chainStr = stringBuilder.toString();
chainFullToken = stringBuilder.toString();
children_Token = new ArrayList<String>();
}
public CategorizedChainInfo(String value) {
JsonObject jsonObject = (JsonObject) new JsonParser().parse(value);
chainToken = jsonObject.get("chainToken").getAsString();
chainStr = jsonObject.get("chainStr").getAsString();
cid = jsonObject.get("chainToken").getAsString();
chainFullToken = jsonObject.get("chainFullToken").getAsString();
children_Token = new Gson().fromJson(jsonObject.get("children_Token"),
new TypeToken<List<String>>() {
}.getType());
}
public String getChainStr() {
return chainStr;
public String getChainFullToken() {
return chainFullToken;
}
public boolean isContained(UncategorizeChainInfo uncategorizeChainInfo) {
Pattern pattern = Pattern.compile(uncategorizeChainInfo.getNodeRegEx());
return pattern.matcher(getChainStr()).find();
return pattern.matcher(this.chainFullToken).find();
}
public boolean isAlreadyContained(UncategorizeChainInfo uncategorizeChainInfo) {
return children_Token.contains(uncategorizeChainInfo.getChainToken());
return children_Token.contains(uncategorizeChainInfo.getCID());
}
public void add(UncategorizeChainInfo uncategorizeChainInfo) {
children_Token.add(uncategorizeChainInfo.getChainToken());
children_Token.add(uncategorizeChainInfo.getCID());
}
@Override

2
skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/reduce/ChainDetail.java
View File

@ -18,7 +18,7 @@ public class ChainDetail {
private String userId;
public ChainDetail(ChainInfo chainInfo) {
chainToken = chainInfo.getChainToken();
chainToken = chainInfo.getCID();
for (ChainNode chainNode : chainInfo.getNodes()) {
chainNodeMap.put(chainNode.getTraceLevelId(), chainNode);
}

12
skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/reduce/ChainRelate.java
View File

@ -45,7 +45,7 @@ public class ChainRelate {
isContained = true;
} else if (entry.getValue().isContained(child)) {
entry.getValue().add(child);
chainDetailMap.put(child.getChainToken(), new ChainDetail(child.getChainInfo()));
chainDetailMap.put(child.getCID(), new ChainDetail(child.getChainInfo()));
isContained = true;
}
}
@ -54,20 +54,20 @@ public class ChainRelate {
uncategorizeChainInfoList.add(child);
if (!uncategorizeChainInfoList.contains(child)) {
chainDetailMap.put(child.getChainToken(), new ChainDetail(child.getChainInfo()));
chainDetailMap.put(child.getCID(), new ChainDetail(child.getChainInfo()));
}
}
}
private CategorizedChainInfo addCategorizedChain(ChainInfo chainInfo) {
if (!categorizedChainInfoMap.containsKey(chainInfo.getChainToken())) {
categorizedChainInfoMap.put(chainInfo.getChainToken(),
if (!categorizedChainInfoMap.containsKey(chainInfo.getCID())) {
categorizedChainInfoMap.put(chainInfo.getCID(),
new CategorizedChainInfo(chainInfo));
chainDetailMap.put(chainInfo.getChainToken(), new ChainDetail(chainInfo));
chainDetailMap.put(chainInfo.getCID(), new ChainDetail(chainInfo));
}
return categorizedChainInfoMap.get(chainInfo.getChainToken());
return categorizedChainInfoMap.get(chainInfo.getCID());
}
public void addRelate(ChainInfo chainInfo) {

4
skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/reduce/Summary.java
View File

@ -24,7 +24,7 @@ public class Summary {
public void summary(ChainInfo chainInfo) {
for (ChainNode node : chainInfo.getNodes()) {
String csk = generateChainSummaryKey(chainInfo.getChainToken(), node.getStartDate());
String csk = generateChainSummaryKey(chainInfo.getCID(), node.getStartDate());
ChainSpecificTimeWindowSummary chainSummaryResult = summaryResultMap.get(csk);
if (chainSummaryResult == null) {
chainSummaryResult = ChainSpecificTimeWindowSummary.load(csk);
@ -34,7 +34,7 @@ public class Summary {
summaryResultMap.get(csk).summaryResult(node);
}
updateChainInfo.put(chainInfo.getChainToken(), new Timestamp(System.currentTimeMillis()));
updateChainInfo.put(chainInfo.getCID(), new Timestamp(System.currentTimeMillis()));
}
private String generateChainSummaryKey(String chainToken, long startDate) {

8
skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/reduce/UncategorizeChainInfo.java
View File

@ -7,7 +7,7 @@ import com.google.gson.annotations.Expose;
public class UncategorizeChainInfo {
@Expose
private String chainToken;
private String cid;
@Expose
private String nodeRegEx;
@ -17,7 +17,7 @@ public class UncategorizeChainInfo {
}
public UncategorizeChainInfo(ChainInfo chainInfo) {
this.chainToken = chainInfo.getChainToken();
this.cid = chainInfo.getCID();
StringBuilder stringBuilder = new StringBuilder();
boolean flag = false;
for (ChainNode node : chainInfo.getNodes()) {
@ -33,8 +33,8 @@ public class UncategorizeChainInfo {
this.chainInfo = chainInfo;
}
public String getChainToken() {
return chainToken;
public String getCID() {
return cid;
}
public String getNodeRegEx() {

2
skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/util/HBaseUtil.java
View File

@ -35,7 +35,7 @@ public class HBaseUtil {
put.addColumn(Bytes.toBytes(Config.HBase.TRACE_INFO_COLUMN_FAMILY),
Bytes.toBytes(Config.TraceInfo.TRACE_INFO_COLUMN_CID),
Bytes.toBytes(chainInfo.getChainToken()));
Bytes.toBytes(chainInfo.getCID()));
try {
table.put(put);
if (logger.isDebugEnabled()) {