Repository: kylin Updated Branches: refs/heads/2.1.x 77e8728c6 -> 266221384
APACHE-KYLIN-2719: fix serviceStartTime of CubeVisitService by changing it to be a local variable Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/26622138 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/26622138 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/26622138 Branch: refs/heads/2.1.x Commit: 266221384c44390631d1c7ed7a30730ffdde3490 Parents: 77e8728 Author: Zhong <nju_y...@apache.org> Authored: Wed Aug 2 14:12:45 2017 +0800 Committer: Zhong <nju_y...@apache.org> Committed: Wed Aug 2 14:12:45 2017 +0800 ---------------------------------------------------------------------- .../v2/coprocessor/endpoint/CubeVisitService.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/26622138/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java index 3b26b71..1877064 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/coprocessor/endpoint/CubeVisitService.java @@ -82,8 +82,6 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement private RegionCoprocessorEnvironment env; - private long serviceStartTime; - abstract static class BaseCellListIterator implements CellListIterator { @Override public final void remove() { @@ -210,11 +208,11 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement return ret; } - private void appendProfileInfo(StringBuilder sb, String info) { + private void appendProfileInfo(StringBuilder sb, String info, long serviceStartTime) { if (info != null) { sb.append(info); } - sb.append("@" + (System.currentTimeMillis() - this.serviceStartTime)); + sb.append("@" + (System.currentTimeMillis() - serviceStartTime)); sb.append(","); } @@ -232,7 +230,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement String queryId = request.hasQueryId() ? request.getQueryId() : "UnknownId"; try (SetThreadName ignored = new SetThreadName("Query %s", queryId)) { - this.serviceStartTime = System.currentTimeMillis(); + final long serviceStartTime = System.currentTimeMillis(); region = (HRegion)env.getRegion(); region.startRegionOperation(); @@ -251,7 +249,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement StorageSideBehavior behavior = StorageSideBehavior.valueOf(scanReq.getStorageBehavior()); final List<RawScan> hbaseRawScans = deserializeRawScans(ByteBuffer.wrap(HBaseZeroCopyByteString.zeroCopyGetBytes(request.getHbaseRawScan()))); - appendProfileInfo(sb, "start latency: " + (this.serviceStartTime - scanReq.getStartTime())); + appendProfileInfo(sb, "start latency: " + (serviceStartTime - scanReq.getStartTime()), serviceStartTime); final List<InnerScannerAsIterator> cellListsForeachRawScan = Lists.newArrayList(); @@ -280,7 +278,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement counter++; } } - appendProfileInfo(sb, "scanned " + counter); + appendProfileInfo(sb, "scanned " + counter, serviceStartTime); } if (behavior.ordinal() < StorageSideBehavior.SCAN_FILTER_AGGR_CHECKMEM.ordinal()) { @@ -342,7 +340,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement finalScanner.close(); } - appendProfileInfo(sb, "agg done"); + appendProfileInfo(sb, "agg done", serviceStartTime); logger.info("Total scanned {} rows and {} bytes", cellListIterator.getTotalScannedRowCount(), cellListIterator.getTotalScannedRowBytes()); @@ -359,7 +357,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement compressedAllRows = CompressionUtils.compress(allRows); } - appendProfileInfo(sb, "compress done"); + appendProfileInfo(sb, "compress done", serviceStartTime); logger.info("Size of final result = {} ({} before compressing)", compressedAllRows.length, allRows.length); OperatingSystemMXBean operatingSystemMXBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean(); @@ -367,7 +365,7 @@ public class CubeVisitService extends CubeVisitProtos.CubeVisitService implement double freePhysicalMemorySize = operatingSystemMXBean.getFreePhysicalMemorySize(); double freeSwapSpaceSize = operatingSystemMXBean.getFreeSwapSpaceSize(); - appendProfileInfo(sb, "server stats done"); + appendProfileInfo(sb, "server stats done", serviceStartTime); sb.append(" debugGitTag:" + debugGitTag); CubeVisitProtos.CubeVisitResponse.Builder responseBuilder = CubeVisitProtos.CubeVisitResponse.newBuilder();
