From bdead134cd6b4adc8d5a827b3563018ea569436f Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Tue, 17 Nov 2015 16:50:09 +0800 Subject: [PATCH] =?UTF-8?q?Trim=E6=8E=A5=E5=8F=97=E5=88=B0=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reciever/model/BuriedPointEntry.java | 14 +++++++------- .../reciever/storage/chain/SaveToHBaseChain.java | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/model/BuriedPointEntry.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/model/BuriedPointEntry.java index 26072d72a..d25e7e068 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/model/BuriedPointEntry.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/model/BuriedPointEntry.java @@ -77,18 +77,18 @@ public class BuriedPointEntry { public static BuriedPointEntry convert(String str) { BuriedPointEntry result = new BuriedPointEntry(); String[] fieldValues = str.split("-"); - result.traceId = fieldValues[0]; - result.parentLevel = fieldValues[1]; + result.traceId = fieldValues[0].trim(); + result.parentLevel = fieldValues[1].trim(); result.levelId = Integer.valueOf(fieldValues[2]); - result.viewPointId = fieldValues[3]; + result.viewPointId = fieldValues[3].trim(); result.startDate = new Date(Long.valueOf(fieldValues[4])); result.cost = Long.parseLong(fieldValues[5]); - result.address = fieldValues[6]; - result.exceptionStack = fieldValues[7]; + result.address = fieldValues[6].trim(); + result.exceptionStack = fieldValues[7].trim(); result.spanType = fieldValues[8].charAt(0); result.isReceiver = Boolean.getBoolean(fieldValues[9]); - result.businessKey = fieldValues[10].replace('^', '-'); - result.processNo = fieldValues[11]; + result.businessKey = fieldValues[10].replace('^', '-').trim(); + result.processNo = fieldValues[11].trim(); return result; } diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java index 9801651d1..ce1e53f2a 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/storage/chain/SaveToHBaseChain.java @@ -7,16 +7,15 @@ import com.ai.cloud.skywalking.reciever.storage.ChainException; import com.ai.cloud.skywalking.reciever.storage.IStorageChain; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.*; import org.apache.hadoop.hbase.util.Bytes; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; public class SaveToHBaseChain implements IStorageChain { private static Logger logger = LogManager.getLogger(SaveToHBaseChain.class);