From 66e00a06ba4664f31916a49f9de844ffbb737652 Mon Sep 17 00:00:00 2001
From: Woonduk Kang <wd.kang@navercorp.com>
Date: Tue, 5 Nov 2013 05:30:34 +0000
Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?=
 =?UTF-8?q?=20=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20?=
 =?UTF-8?q?class=EC=82=AD=EC=A0=9C.?=
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-web/trunk@2769 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 .../web/dao/hbase/HbaseTraceIndexDao.java     | 83 -------------------
 .../nhn/pinpoint/web/vo/TraceIdWithTime.java  | 42 ----------
 2 files changed, 125 deletions(-)
 delete mode 100644 src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceIndexDao.java
 delete mode 100644 src/main/java/com/nhn/pinpoint/web/vo/TraceIdWithTime.java

diff --git a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceIndexDao.java b/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceIndexDao.java
deleted file mode 100644
index e58294208..000000000
--- a/src/main/java/com/nhn/pinpoint/web/dao/hbase/HbaseTraceIndexDao.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.nhn.pinpoint.web.dao.hbase;
-
-import java.util.List;
-
-import com.sematext.hbase.wd.AbstractRowKeyDistributor;
-import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.hadoop.hbase.RowMapper;
-import org.springframework.stereotype.Repository;
-
-import com.nhn.pinpoint.web.dao.TraceIndexDao;
-import com.nhn.pinpoint.web.vo.TransactionId;
-import com.nhn.pinpoint.common.hbase.HBaseTables;
-import com.nhn.pinpoint.common.hbase.HbaseOperations2;
-import com.nhn.pinpoint.common.util.SpanUtils;
-
-/**
- * @author emeroad
- */
-@Repository
-@Deprecated
-public class HbaseTraceIndexDao implements TraceIndexDao {
-
-	private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-	@Autowired
-	private HbaseOperations2 hbaseOperations2;
-
-	@Autowired
-	@Qualifier("transactionIdMapper")
-	private RowMapper<List<TransactionId>> traceIndexMapper;
-
-    @Autowired
-    @Qualifier("traceIdRowKeyDistributor")
-    private AbstractRowKeyDistributor traceIdRowKeyDistributor;
-
-	// cache size를 지정해야 되는거 같음.??
-	private int scanCacheSize = 512;
-
-	public void setScanCacheSize(int scanCacheSize) {
-		this.scanCacheSize = scanCacheSize;
-	}
-
-	@Override
-	public List<List<TransactionId>> scanTraceIndex(String agent, long start, long end) {
-		Scan scan = createScan(agent, start, end);
-		return hbaseOperations2.find(HBaseTables.TRACE_INDEX, scan, traceIdRowKeyDistributor, traceIndexMapper);
-	}
-
-//	@Override
-//	public List<List<List<TransactionId>>> multiScanTraceIndex(String[] agents, long start, long end) {
-//		final List<Scan> multiScan = new ArrayList<Scan>(agents.length);
-//		for (String agent : agents) {
-//			Scan scan = createScan(agent, start, end);
-//			multiScan.add(scan);
-//		}
-//		return hbaseOperations2.find(HBaseTables.TRACE_INDEX, multiScan, traceIndexMapper);
-//	}
-
-	private Scan createScan(String agent, long start, long end) {
-		Scan scan = new Scan();
-		scan.setCaching(this.scanCacheSize);
-
-		byte[] bAgent = Bytes.toBytes(agent);
-		byte[] traceIndexStartKey = SpanUtils.getTraceIndexRowKey(bAgent, start);
-		byte[] traceIndexEndKey = SpanUtils.getTraceIndexRowKey(bAgent, end);
-		
-		// timestamp가 reverse되었기 때문에 start, end를 바꿔서 조회.
-		scan.setStartRow(traceIndexEndKey);
-		scan.setStopRow(traceIndexStartKey);
-		
-		scan.addFamily(HBaseTables.TRACE_INDEX_CF_TRACE);
-		scan.setId("traceIndexScan");
-
-		// json으로 변화해서 로그를 찍어서. 최초 변환 속도가 느림.
-		logger.debug("create scan:{}", scan);
-		return scan;
-	}
-}
diff --git a/src/main/java/com/nhn/pinpoint/web/vo/TraceIdWithTime.java b/src/main/java/com/nhn/pinpoint/web/vo/TraceIdWithTime.java
deleted file mode 100644
index 0d10aceca..000000000
--- a/src/main/java/com/nhn/pinpoint/web/vo/TraceIdWithTime.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.nhn.pinpoint.web.vo;
-
-public class TraceIdWithTime extends TransactionId {
-
-	private final long acceptedTime;
-
-	public TraceIdWithTime(byte[] buffer, int offset, long acceptedTime) {
-		super(buffer, offset);
-		this.acceptedTime = acceptedTime;
-	}
-
-	public long getAcceptedTime() {
-		return acceptedTime;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = super.hashCode();
-		result = prime * result + (int) (acceptedTime ^ (acceptedTime >>> 32));
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!super.equals(obj))
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		TraceIdWithTime other = (TraceIdWithTime) obj;
-		if (acceptedTime != other.acceptedTime)
-			return false;
-		return true;
-	}
-
-	@Override
-	public String toString() {
-		return "TraceIdWithTime [acceptedTime=" + acceptedTime + ", transactionId=" + transactionSequence + "]";
-	}
-}