diff --git a/src/main/java/com/nhn/hippo/web/service/FlowChartServiceImpl.java b/src/main/java/com/nhn/hippo/web/service/FlowChartServiceImpl.java index 20a33874e..2c2578c23 100755 --- a/src/main/java/com/nhn/hippo/web/service/FlowChartServiceImpl.java +++ b/src/main/java/com/nhn/hippo/web/service/FlowChartServiceImpl.java @@ -12,7 +12,6 @@ import java.util.Set; 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.stereotype.Service; import org.springframework.util.StopWatch; @@ -31,10 +30,6 @@ import com.nhn.hippo.web.vo.scatter.Dot; import com.profiler.common.ServiceType; import com.profiler.common.bo.SpanBo; import com.profiler.common.bo.SubSpanBo; -import com.profiler.common.hbase.HBaseClient; -import com.profiler.common.hbase.HBaseQuery; -import com.profiler.common.hbase.HBaseQuery.HbaseColumn; -import com.profiler.common.hbase.HBaseTables; /** * @author netspider @@ -44,10 +39,6 @@ public class FlowChartServiceImpl implements FlowChartService { private Logger logger = LoggerFactory.getLogger(this.getClass()); - @Autowired - @Qualifier("hbaseClient") - HBaseClient client; - @Autowired private TraceDao traceDao; @@ -327,20 +318,20 @@ public class FlowChartServiceImpl implements FlowChartService { @Deprecated @Override public String[] selectAgentIds(String[] hosts) { - List column = new ArrayList(); - column.add(new HbaseColumn("Agents", "AgentID")); - - HBaseQuery query = new HBaseQuery(HBaseTables.APPLICATION_INDEX, null, null, column); - Iterator> iterator = client.getHBaseData(query); - - if (logger.isDebugEnabled()) { - while (iterator.hasNext()) { - logger.debug("selectedAgentId={}", iterator.next()); - } - logger.debug("!!!==============WARNING==============!!!"); - logger.debug("!!! selectAgentIds IS NOT IMPLEMENTED !!!"); - logger.debug("!!!===================================!!!"); - } +// List column = new ArrayList(); +// column.add(new HbaseColumn("Agents", "AgentID")); +// +// HBaseQuery query = new HBaseQuery(HBaseTables.APPLICATION_INDEX, null, null, column); +// Iterator> iterator = client.getHBaseData(query); +// +// if (logger.isDebugEnabled()) { +// while (iterator.hasNext()) { +// logger.debug("selectedAgentId={}", iterator.next()); +// } +// logger.debug("!!!==============WARNING==============!!!"); +// logger.debug("!!! selectAgentIds IS NOT IMPLEMENTED !!!"); +// logger.debug("!!!===================================!!!"); +// } return hosts; } diff --git a/src/main/resources/hbase-applicationContext.xml b/src/main/resources/hbase-applicationContext.xml index 974d4650a..c0bd37648 100644 --- a/src/main/resources/hbase-applicationContext.xml +++ b/src/main/resources/hbase-applicationContext.xml @@ -24,10 +24,6 @@ - - - - diff --git a/src/test/java/com/nhn/hippo/web/service/FlowChartServiceImplTest.java b/src/test/java/com/nhn/hippo/web/service/FlowChartServiceImplTest.java deleted file mode 100644 index 160c5faa2..000000000 --- a/src/test/java/com/nhn/hippo/web/service/FlowChartServiceImplTest.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.nhn.hippo.web.service; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map.Entry; -import java.util.NavigableMap; - -import junit.framework.Assert; - -import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.util.Bytes; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -import com.profiler.common.hbase.HBaseClient; - -@Ignore -public class FlowChartServiceImplTest { - - private static final String TABLE_NAME = "ttt"; - - private static HBaseClient client; - - @BeforeClass - public static void init() { - client = new HBaseClient("localhost", "2181", 2); - Assert.assertNotNull(client); - } - - @AfterClass - public static void destroy() { - client.close(); - } - - @Test - public void hbase() { - List gets = new ArrayList(1); - gets.add(new Get("row1".getBytes())); - - Result[] results = client.get(TABLE_NAME, gets); - - for (Result r : results) { - NavigableMap>> map = r.getMap(); - - for (Entry>> entry : map.entrySet()) { - byte[] family = entry.getKey(); - System.out.println("family=" + Bytes.toString(family)); - - NavigableMap> values = entry.getValue(); - - for (Entry> value : values.entrySet()) { - byte[] colname = value.getKey(); - System.out.println("colname=" + Bytes.toString(colname)); - - NavigableMap valueSeries = value.getValue(); - - for (Entry v : valueSeries.entrySet()) { - byte[] vv = v.getValue(); - System.out.println("value=" + Bytes.toString(vv)); - } - } - } - } - } -}