[pinpoint-apm#12434] Cleanup

Author: emeroad

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapInLinkDao.java

@@ -88,7 +88,11 @@ public LinkDataMap selectInLink(Application inApplication, TimeWindow timeWindow
 
         final Scan scan = scanFactory.createScan("MapInLinkScan", inApplication, timeWindow.getWindowRange(), DESCRIPTOR.getName());
 
-        return selectInLink(scan, DESCRIPTOR.getTable(), resultExtractor, MAP_STATISTICS_CALLER_VER2_NUM_PARTITIONS);
+        final LinkDataMap linkDataMap = selectInLink(scan, DESCRIPTOR.getTable(), resultExtractor, MAP_STATISTICS_CALLER_VER2_NUM_PARTITIONS);
+        if (logger.isDebugEnabled()) {
+            logger.debug("selectInLink {} {}", inApplication, linkDataMap.getLinkDataSize());
+        }
+        return linkDataMap;
     }
 
     private TimeWindowFunction newTimeWindow(boolean timeAggregated) {

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/hbase/HbaseMapOutLinkDao.java

@@ -86,7 +86,11 @@ public LinkDataMap selectOutLink(Application outApplication, TimeWindow timeWind
         ResultsExtractor<LinkDataMap> resultExtractor = new RowMapReduceResultExtractor<>(rowMapper, new LinkTimeWindowReducer(timeWindow));
 
         final Scan scan = scanFactory.createScan("MapOutLinkScan", outApplication, timeWindow.getWindowRange(), DESCRIPTOR.getName());
-        return selectOutLink(scan, DESCRIPTOR.getTable(), resultExtractor, MAP_STATISTICS_CALLEE_VER2_NUM_PARTITIONS);
+        final LinkDataMap linkDataMap = selectOutLink(scan, DESCRIPTOR.getTable(), resultExtractor, MAP_STATISTICS_CALLEE_VER2_NUM_PARTITIONS);
+        if (logger.isDebugEnabled()) {
+            logger.debug("selectOutLink {} {}", outApplication, linkDataMap.getLinkDataSize());
+        }
+        return linkDataMap;
     }
 
     private TimeWindowFunction newTimeWindow(boolean timeAggregated) {

web/src/main/java/com/navercorp/pinpoint/web/applicationmap/dao/mapper/OutLinkMapper.java

@@ -42,6 +42,8 @@
  */
 public class OutLinkMapper implements RowMapper<LinkDataMap> {
 
+    private static final String MERGE_AGENT = "_ALL_";
+
     private final Logger logger = LogManager.getLogger(this.getClass());
 
     private final LinkFilter filter;
@@ -69,7 +71,9 @@ public LinkDataMap mapRow(Result result, int rowNum) throws Exception {
         if (result.isEmpty()) {
             return new LinkDataMap();
         }
-        logger.debug("mapRow:{}", rowNum);
+        if (logger.isDebugEnabled()) {
+            logger.debug("mapRow num:{} size:{}", rowNum, result.size());
+        }
 
         final byte[] rowKey = getOriginalKey(result.getRow());
 
@@ -89,7 +93,8 @@ public LinkDataMap mapRow(Result result, int rowNum) throws Exception {
             String inHost = buffer.readPrefixedString();
             short histogramSlot = buffer.readShort();
 
-            String outAgentId = buffer.readPrefixedString();
+            String outAgentId = readOutAgentId(buffer);
+
 
             long requestCount = CellUtils.valueToLong(cell);
             if (logger.isDebugEnabled()) {
@@ -106,6 +111,15 @@ public LinkDataMap mapRow(Result result, int rowNum) throws Exception {
         return linkDataMap;
     }
 
+    private String readOutAgentId(Buffer buffer) {
+        String outAgentId = buffer.readPrefixedString();
+        if (MERGE_AGENT.equals(outAgentId)) {
+            // for gc
+            return MERGE_AGENT;
+        }
+        return outAgentId;
+    }
+
 
     private Application readInApplication(Buffer buffer) {
         short inServiceType = buffer.readShort();