From dbe08a1dbaf7eca81b750e77ae6973449b17bbb2 Mon Sep 17 00:00:00 2001 From: Woonduk Kang Date: Wed, 2 Oct 2013 10:26:35 +0000 Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?= =?UTF-8?q?=20=ED=96=A5=ED=9B=84=20HBaseTables=EB=8A=94=20=EB=B3=84?= =?UTF-8?q?=EB=8F=84=20=ED=8C=A8=ED=82=A4=EB=A1=9C=20=EB=B9=A0=EC=A0=B8?= =?UTF-8?q?=EC=84=9C=20hbase=EB=8B=A8=EC=9C=84=EB=A1=9C=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC=EB=90=A0=20=EC=98=88=EC=A0=95=EC=9D=B4=EB=AF=80?= =?UTF-8?q?=EB=A1=9C=20=20PinpointConstants=EB=A5=BC=20=EC=B0=B8=EC=A1=B0?= =?UTF-8?q?=20=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=ED=95=A8.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-commons/trunk@2400 84d0f5b1-2673-498c-a247-62c4ff18d310 --- .../java/com/nhn/pinpoint/common/bo/ApiMetaDataBo.java | 2 +- .../java/com/nhn/pinpoint/common/bo/SqlMetaDataBo.java | 2 +- .../java/com/nhn/pinpoint/common/util/RowKeyUtils.java | 2 +- .../java/com/nhn/pinpoint/common/util/SpanUtils.java | 9 ++++----- .../com/nhn/pinpoint/common/util/TerminalSpanUtils.java | 5 +++-- .../java/com/nhn/pinpoint/common/util/SpanUtilsTest.java | 9 +++++---- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/nhn/pinpoint/common/bo/ApiMetaDataBo.java b/src/main/java/com/nhn/pinpoint/common/bo/ApiMetaDataBo.java index b999cabfb..6d756fe8e 100644 --- a/src/main/java/com/nhn/pinpoint/common/bo/ApiMetaDataBo.java +++ b/src/main/java/com/nhn/pinpoint/common/bo/ApiMetaDataBo.java @@ -5,7 +5,7 @@ import com.nhn.pinpoint.common.util.RowKeyUtils; import com.nhn.pinpoint.common.util.TimeUtils; import org.apache.hadoop.hbase.util.Bytes; -import static com.nhn.pinpoint.common.hbase.HBaseTables.AGENT_NAME_MAX_LEN; +import static com.nhn.pinpoint.common.PinpointConstants.AGENT_NAME_MAX_LEN; import static com.nhn.pinpoint.common.util.BytesUtils.INT_BYTE_LENGTH; /** diff --git a/src/main/java/com/nhn/pinpoint/common/bo/SqlMetaDataBo.java b/src/main/java/com/nhn/pinpoint/common/bo/SqlMetaDataBo.java index c36cb470e..b61e90d18 100644 --- a/src/main/java/com/nhn/pinpoint/common/bo/SqlMetaDataBo.java +++ b/src/main/java/com/nhn/pinpoint/common/bo/SqlMetaDataBo.java @@ -5,7 +5,7 @@ import com.nhn.pinpoint.common.util.RowKeyUtils; import com.nhn.pinpoint.common.util.TimeUtils; import org.apache.hadoop.hbase.util.Bytes; -import static com.nhn.pinpoint.common.hbase.HBaseTables.AGENT_NAME_MAX_LEN; +import static com.nhn.pinpoint.common.PinpointConstants.AGENT_NAME_MAX_LEN; import static com.nhn.pinpoint.common.util.BytesUtils.INT_BYTE_LENGTH; /** diff --git a/src/main/java/com/nhn/pinpoint/common/util/RowKeyUtils.java b/src/main/java/com/nhn/pinpoint/common/util/RowKeyUtils.java index 2dfe6e677..cecc9075b 100644 --- a/src/main/java/com/nhn/pinpoint/common/util/RowKeyUtils.java +++ b/src/main/java/com/nhn/pinpoint/common/util/RowKeyUtils.java @@ -1,6 +1,6 @@ package com.nhn.pinpoint.common.util; -import static com.nhn.pinpoint.common.hbase.HBaseTables.AGENT_NAME_MAX_LEN; +import static com.nhn.pinpoint.common.PinpointConstants.AGENT_NAME_MAX_LEN; import static com.nhn.pinpoint.common.util.BytesUtils.INT_BYTE_LENGTH; import static com.nhn.pinpoint.common.util.BytesUtils.LONG_BYTE_LENGTH; diff --git a/src/main/java/com/nhn/pinpoint/common/util/SpanUtils.java b/src/main/java/com/nhn/pinpoint/common/util/SpanUtils.java index d0d2dc27c..c45043d15 100644 --- a/src/main/java/com/nhn/pinpoint/common/util/SpanUtils.java +++ b/src/main/java/com/nhn/pinpoint/common/util/SpanUtils.java @@ -1,8 +1,7 @@ package com.nhn.pinpoint.common.util; -import static com.nhn.pinpoint.common.hbase.HBaseTables.AGENT_NAME_MAX_LEN; +import static com.nhn.pinpoint.common.PinpointConstants.AGENT_NAME_MAX_LEN; -import com.nhn.pinpoint.common.hbase.HBaseTables; import com.nhn.pinpoint.thrift.dto.Span; import com.nhn.pinpoint.thrift.dto.SpanChunk; import com.nhn.pinpoint.thrift.dto.SpanEvent; @@ -36,7 +35,7 @@ public class SpanUtils { if (span == null) { throw new NullPointerException("span must not be null"); } - return BytesUtils.stringLongLongToBytes(span.getTraceAgentId(), HBaseTables.AGENT_NAME_MAX_LEN, span.getTraceAgentStartTime(), span.getTraceTransactionSequence()); + return BytesUtils.stringLongLongToBytes(span.getTraceAgentId(), AGENT_NAME_MAX_LEN, span.getTraceAgentStartTime(), span.getTraceTransactionSequence()); } @@ -44,13 +43,13 @@ public class SpanUtils { if (spanEvent == null) { throw new NullPointerException("spanEvent must not be null"); } - return BytesUtils.stringLongLongToBytes(spanEvent.getTraceAgentId(), HBaseTables.AGENT_NAME_MAX_LEN, spanEvent.getTraceAgentStartTime(), spanEvent.getTraceTransactionSequence()); + return BytesUtils.stringLongLongToBytes(spanEvent.getTraceAgentId(), AGENT_NAME_MAX_LEN, spanEvent.getTraceAgentStartTime(), spanEvent.getTraceTransactionSequence()); } public static byte[] getTransactionId(SpanChunk spanChunk) { if (spanChunk == null) { throw new NullPointerException("spanChunk must not be null"); } - return BytesUtils.stringLongLongToBytes(spanChunk.getTraceAgentId(), HBaseTables.AGENT_NAME_MAX_LEN, spanChunk.getTraceAgentStartTime(), spanChunk.getTraceTransactionSequence()); + return BytesUtils.stringLongLongToBytes(spanChunk.getTraceAgentId(), AGENT_NAME_MAX_LEN, spanChunk.getTraceAgentStartTime(), spanChunk.getTraceTransactionSequence()); } } diff --git a/src/main/java/com/nhn/pinpoint/common/util/TerminalSpanUtils.java b/src/main/java/com/nhn/pinpoint/common/util/TerminalSpanUtils.java index 83106f276..1d89ea7d6 100644 --- a/src/main/java/com/nhn/pinpoint/common/util/TerminalSpanUtils.java +++ b/src/main/java/com/nhn/pinpoint/common/util/TerminalSpanUtils.java @@ -1,5 +1,6 @@ package com.nhn.pinpoint.common.util; +import com.nhn.pinpoint.common.PinpointConstants; import org.apache.hadoop.hbase.util.Bytes; import com.nhn.pinpoint.common.Histogram; @@ -83,9 +84,9 @@ public class TerminalSpanUtils { byte[] slot = Bytes.toBytes(time); byte[] applicationnameBytes = Bytes.toBytes(applicationName); - byte[] buf = new byte[HBaseTables.APPLICATION_NAME_MAX_LEN + 8]; + byte[] buf = new byte[PinpointConstants.APPLICATION_NAME_MAX_LEN + 8]; System.arraycopy(applicationnameBytes, 0, buf, 0, applicationnameBytes.length); - System.arraycopy(slot, 0, buf, HBaseTables.APPLICATION_NAME_MAX_LEN, 8); + System.arraycopy(slot, 0, buf, PinpointConstants.APPLICATION_NAME_MAX_LEN, 8); return buf; } diff --git a/src/test/java/com/nhn/pinpoint/common/util/SpanUtilsTest.java b/src/test/java/com/nhn/pinpoint/common/util/SpanUtilsTest.java index eb1397a74..be376591a 100644 --- a/src/test/java/com/nhn/pinpoint/common/util/SpanUtilsTest.java +++ b/src/test/java/com/nhn/pinpoint/common/util/SpanUtilsTest.java @@ -1,5 +1,6 @@ package com.nhn.pinpoint.common.util; +import com.nhn.pinpoint.common.PinpointConstants; import com.nhn.pinpoint.thrift.dto.Span; import com.nhn.pinpoint.common.hbase.HBaseTables; @@ -28,7 +29,7 @@ public class SpanUtilsTest { @Test public void testGetTraceIndexRowKey2() throws Exception { String agentId = ""; - for (int i = 0; i < HBaseTables.AGENT_NAME_MAX_LEN; i++) { + for (int i = 0; i < PinpointConstants.AGENT_NAME_MAX_LEN; i++) { agentId += "1"; } @@ -39,7 +40,7 @@ public class SpanUtilsTest { @Test public void testGetTraceIndexRowKey3() throws Exception { String agentId = ""; - for (int i = 0; i < HBaseTables.AGENT_NAME_MAX_LEN + 1; i++) { + for (int i = 0; i < PinpointConstants.AGENT_NAME_MAX_LEN + 1; i++) { agentId += "1"; } @@ -58,10 +59,10 @@ public class SpanUtilsTest { byte[] traceIndexRowKey = SpanUtils.getAgentIdTraceIndexRowKey(span.getAgentId(), span.getStartTime()); - String agentId = Bytes.toString(traceIndexRowKey, 0, HBaseTables.AGENT_NAME_MAX_LEN).trim(); + String agentId = Bytes.toString(traceIndexRowKey, 0, PinpointConstants.AGENT_NAME_MAX_LEN).trim(); Assert.assertEquals(agentId0, agentId); - long time = TimeUtils.recoveryCurrentTimeMillis(Bytes.toLong(traceIndexRowKey, HBaseTables.AGENT_NAME_MAX_LEN)); + long time = TimeUtils.recoveryCurrentTimeMillis(Bytes.toLong(traceIndexRowKey, PinpointConstants.AGENT_NAME_MAX_LEN)); Assert.assertEquals(time, l1); } }