APACHE-KYLIN-2723: rename query metrics related size to count
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/38d78924 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/38d78924 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/38d78924 Branch: refs/heads/yaho-cube-planner Commit: 38d78924fb1939590e6ccd37839ad563266073c1 Parents: 8261b3a Author: Zhong <nju_y...@apache.org> Authored: Wed Aug 9 00:12:34 2017 +0800 Committer: Zhong <nju_y...@apache.org> Committed: Wed Aug 9 00:12:34 2017 +0800 ---------------------------------------------------------------------- .../query/CubeSegmentRecordEventWrapper.java | 33 ++++++++++---------- .../metrics/query/QueryRecordEventWrapper.java | 26 +++++++-------- .../metrics/query/RPCRecordEventWrapper.java | 14 ++++----- 3 files changed, 37 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/38d78924/core-metrics/src/main/java/org/apache/kylin/metrics/query/CubeSegmentRecordEventWrapper.java ---------------------------------------------------------------------- diff --git a/core-metrics/src/main/java/org/apache/kylin/metrics/query/CubeSegmentRecordEventWrapper.java b/core-metrics/src/main/java/org/apache/kylin/metrics/query/CubeSegmentRecordEventWrapper.java index 6316c8e..5460848 100644 --- a/core-metrics/src/main/java/org/apache/kylin/metrics/query/CubeSegmentRecordEventWrapper.java +++ b/core-metrics/src/main/java/org/apache/kylin/metrics/query/CubeSegmentRecordEventWrapper.java @@ -36,10 +36,10 @@ public class CubeSegmentRecordEventWrapper extends RecordEventWrapper { this.metricsEvent.put(PropertyEnum.TIME_SUM.toString(), 0L); this.metricsEvent.put(PropertyEnum.TIME_MAX.toString(), 0L); this.metricsEvent.put(PropertyEnum.SKIP_COUNT.toString(), 0L); - this.metricsEvent.put(PropertyEnum.SCAN_SIZE.toString(), 0L); - this.metricsEvent.put(PropertyEnum.RETURN_SIZE.toString(), 0L); - this.metricsEvent.put(PropertyEnum.AGGR_FILTER_SIZE.toString(), 0L); - this.metricsEvent.put(PropertyEnum.AGGR_SIZE.toString(), 0L); + this.metricsEvent.put(PropertyEnum.SCAN_COUNT.toString(), 0L); + this.metricsEvent.put(PropertyEnum.RETURN_COUNT.toString(), 0L); + this.metricsEvent.put(PropertyEnum.AGGR_FILTER_COUNT.toString(), 0L); + this.metricsEvent.put(PropertyEnum.AGGR_COUNT.toString(), 0L); this.metricsEvent.put(PropertyEnum.IF_SUCCESS.toString(), true); } @@ -58,16 +58,16 @@ public class CubeSegmentRecordEventWrapper extends RecordEventWrapper { this.metricsEvent.put(PropertyEnum.WEIGHT_PER_HIT.toString(), weightPerHit); } - public void addRPCStats(long callTimeMs, long skipCount, long scanSize, long returnSize, long aggrSize, + public void addRPCStats(long callTimeMs, long skipCount, long scanCount, long returnCount, long aggrCount, boolean ifSuccess) { Long curCallCount = (Long) this.metricsEvent.get(PropertyEnum.CALL_COUNT.toString()); Long curTimeSum = (Long) this.metricsEvent.get(PropertyEnum.TIME_SUM.toString()); Long curTimeMax = (Long) this.metricsEvent.get(PropertyEnum.TIME_MAX.toString()); Long curSkipCount = (Long) this.metricsEvent.get(PropertyEnum.SKIP_COUNT.toString()); - Long curScanSize = (Long) this.metricsEvent.get(PropertyEnum.SCAN_SIZE.toString()); - Long curReturnSize = (Long) this.metricsEvent.get(PropertyEnum.RETURN_SIZE.toString()); - Long curAggrAndFilterSize = (Long) this.metricsEvent.get(PropertyEnum.AGGR_FILTER_SIZE.toString()); - Long curAggrSize = (Long) this.metricsEvent.get(PropertyEnum.AGGR_SIZE.toString()); + Long curScanCount = (Long) this.metricsEvent.get(PropertyEnum.SCAN_COUNT.toString()); + Long curReturnCount = (Long) this.metricsEvent.get(PropertyEnum.RETURN_COUNT.toString()); + Long curAggrAndFilterCount = (Long) this.metricsEvent.get(PropertyEnum.AGGR_FILTER_COUNT.toString()); + Long curAggrCount = (Long) this.metricsEvent.get(PropertyEnum.AGGR_COUNT.toString()); Boolean curIfSuccess = (Boolean) this.metricsEvent.get(PropertyEnum.IF_SUCCESS.toString()); this.metricsEvent.put(PropertyEnum.CALL_COUNT.toString(), curCallCount + 1); @@ -76,10 +76,11 @@ public class CubeSegmentRecordEventWrapper extends RecordEventWrapper { this.metricsEvent.put(PropertyEnum.TIME_MAX.toString(), callTimeMs); } this.metricsEvent.put(PropertyEnum.SKIP_COUNT.toString(), curSkipCount + skipCount); - this.metricsEvent.put(PropertyEnum.SCAN_SIZE.toString(), curScanSize + scanSize); - this.metricsEvent.put(PropertyEnum.RETURN_SIZE.toString(), curReturnSize + returnSize); - this.metricsEvent.put(PropertyEnum.AGGR_FILTER_SIZE.toString(), curAggrAndFilterSize + scanSize - returnSize); - this.metricsEvent.put(PropertyEnum.AGGR_SIZE.toString(), curAggrSize + aggrSize); + this.metricsEvent.put(PropertyEnum.SCAN_COUNT.toString(), curScanCount + scanCount); + this.metricsEvent.put(PropertyEnum.RETURN_COUNT.toString(), curReturnCount + returnCount); + this.metricsEvent.put(PropertyEnum.AGGR_FILTER_COUNT.toString(), + curAggrAndFilterCount + scanCount - returnCount); + this.metricsEvent.put(PropertyEnum.AGGR_COUNT.toString(), curAggrCount + aggrCount); this.metricsEvent.put(PropertyEnum.IF_SUCCESS.toString(), curIfSuccess && ifSuccess); } @@ -91,9 +92,9 @@ public class CubeSegmentRecordEventWrapper extends RecordEventWrapper { PROJECT("PROJECT"), CUBE("CUBE_NAME"), SEGMENT("SEGMENT_NAME"), CUBOID_SOURCE("CUBOID_SOURCE"), CUBOID_TARGET( "CUBOID_TARGET"), IF_MATCH("IF_MATCH"), FILTER_MASK("FILTER_MASK"), IF_SUCCESS("IF_SUCCESS"), // TIME_SUM("STORAGE_CALL_TIME_SUM"), TIME_MAX("STORAGE_CALL_TIME_MAX"), WEIGHT_PER_HIT( - "WEIGHT_PER_HIT"), CALL_COUNT("STORAGE_CALL_COUNT"), SKIP_COUNT("STORAGE_COUNT_SKIP"), SCAN_SIZE( - "STORAGE_SIZE_SCAN"), RETURN_SIZE("STORAGE_SIZE_RETURN"), AGGR_FILTER_SIZE( - "STORAGE_SIZE_AGGREGATE_FILTER"), AGGR_SIZE("STORAGE_SIZE_AGGREGATE"); + "WEIGHT_PER_HIT"), CALL_COUNT("STORAGE_CALL_COUNT"), SKIP_COUNT("STORAGE_COUNT_SKIP"), SCAN_COUNT( + "STORAGE_COUNT_SCAN"), RETURN_COUNT("STORAGE_COUNT_RETURN"), AGGR_FILTER_COUNT( + "STORAGE_COUNT_AGGREGATE_FILTER"), AGGR_COUNT("STORAGE_COUNT_AGGREGATE"); private final String propertyName; http://git-wip-us.apache.org/repos/asf/kylin/blob/38d78924/core-metrics/src/main/java/org/apache/kylin/metrics/query/QueryRecordEventWrapper.java ---------------------------------------------------------------------- diff --git a/core-metrics/src/main/java/org/apache/kylin/metrics/query/QueryRecordEventWrapper.java b/core-metrics/src/main/java/org/apache/kylin/metrics/query/QueryRecordEventWrapper.java index f6cf051..937a83d 100644 --- a/core-metrics/src/main/java/org/apache/kylin/metrics/query/QueryRecordEventWrapper.java +++ b/core-metrics/src/main/java/org/apache/kylin/metrics/query/QueryRecordEventWrapper.java @@ -33,8 +33,8 @@ public class QueryRecordEventWrapper extends RecordEventWrapper { private void initStats() { this.metricsEvent.put(PropertyEnum.EXCEPTION.toString(), "NULL"); this.metricsEvent.put(PropertyEnum.TIME_COST.toString(), 0L); - this.metricsEvent.put(PropertyEnum.CALCITE_RETURN_SIZE.toString(), 0L); - this.metricsEvent.put(PropertyEnum.STORAGE_RETURN_SIZE.toString(), 0L); + this.metricsEvent.put(PropertyEnum.CALCITE_RETURN_COUNT.toString(), 0L); + this.metricsEvent.put(PropertyEnum.STORAGE_RETURN_COUNT.toString(), 0L); setDependentStats(); } @@ -47,22 +47,22 @@ public class QueryRecordEventWrapper extends RecordEventWrapper { this.metricsEvent.put(PropertyEnum.REALIZATION_TYPE.toString(), realizationType); } - public void addStorageStats(long addReturnSizeByStorage) { - Long curReturnSizeByStorage = (Long) this.metricsEvent.get(PropertyEnum.STORAGE_RETURN_SIZE.toString()); - this.metricsEvent.put(PropertyEnum.STORAGE_RETURN_SIZE.toString(), - curReturnSizeByStorage + addReturnSizeByStorage); + public void addStorageStats(long addReturnCountByStorage) { + Long curReturnCountByStorage = (Long) this.metricsEvent.get(PropertyEnum.STORAGE_RETURN_COUNT.toString()); + this.metricsEvent.put(PropertyEnum.STORAGE_RETURN_COUNT.toString(), + curReturnCountByStorage + addReturnCountByStorage); } - public void setStats(long callTimeMs, long returnSizeByCalcite) { + public void setStats(long callTimeMs, long returnCountByCalcite) { this.metricsEvent.put(PropertyEnum.TIME_COST.toString(), callTimeMs); - this.metricsEvent.put(PropertyEnum.CALCITE_RETURN_SIZE.toString(), returnSizeByCalcite); + this.metricsEvent.put(PropertyEnum.CALCITE_RETURN_COUNT.toString(), returnCountByCalcite); setDependentStats(); } private void setDependentStats() { - this.metricsEvent.put(PropertyEnum.AGGR_FILTER_SIZE.toString(), - Math.max(0L, (Long) this.metricsEvent.get(PropertyEnum.STORAGE_RETURN_SIZE.toString()) - - (Long) this.metricsEvent.get(PropertyEnum.CALCITE_RETURN_SIZE.toString()))); + this.metricsEvent.put(PropertyEnum.AGGR_FILTER_COUNT.toString(), + Math.max(0L, (Long) this.metricsEvent.get(PropertyEnum.STORAGE_RETURN_COUNT.toString()) + - (Long) this.metricsEvent.get(PropertyEnum.CALCITE_RETURN_COUNT.toString()))); } public <T extends Throwable> void setStats(Class<T> exceptionClassName) { @@ -72,8 +72,8 @@ public class QueryRecordEventWrapper extends RecordEventWrapper { public enum PropertyEnum { ID_CODE("QUERY_HASH_CODE"), TYPE("QUERY_TYPE"), PROJECT("PROJECT"), REALIZATION( "REALIZATION"), REALIZATION_TYPE("REALIZATION_TYPE"), EXCEPTION("EXCEPTION"), // - TIME_COST("QUERY_TIME_COST"), CALCITE_RETURN_SIZE("CALCITE_SIZE_RETURN"), STORAGE_RETURN_SIZE( - "STORAGE_SIZE_RETURN"), AGGR_FILTER_SIZE("CALCITE_SIZE_AGGREGATE_FILTER"); + TIME_COST("QUERY_TIME_COST"), CALCITE_RETURN_COUNT("CALCITE_COUNT_RETURN"), STORAGE_RETURN_COUNT( + "STORAGE_COUNT_RETURN"), AGGR_FILTER_COUNT("CALCITE_COUNT_AGGREGATE_FILTER"); private final String propertyName; http://git-wip-us.apache.org/repos/asf/kylin/blob/38d78924/core-metrics/src/main/java/org/apache/kylin/metrics/query/RPCRecordEventWrapper.java ---------------------------------------------------------------------- diff --git a/core-metrics/src/main/java/org/apache/kylin/metrics/query/RPCRecordEventWrapper.java b/core-metrics/src/main/java/org/apache/kylin/metrics/query/RPCRecordEventWrapper.java index b9ac087..e8774a4 100644 --- a/core-metrics/src/main/java/org/apache/kylin/metrics/query/RPCRecordEventWrapper.java +++ b/core-metrics/src/main/java/org/apache/kylin/metrics/query/RPCRecordEventWrapper.java @@ -36,13 +36,13 @@ public class RPCRecordEventWrapper extends RecordEventWrapper { this.metricsEvent.put(PropertyEnum.RPC_SERVER.toString(), rpcServer); } - public void setRPCCallStats(long callTimeMs, long skipCount, long scanSize, long returnSize, long aggrSize) { + public void setRPCCallStats(long callTimeMs, long skipCount, long scanCount, long returnCount, long aggrCount) { this.metricsEvent.put(PropertyEnum.CALL_TIME.toString(), callTimeMs); this.metricsEvent.put(PropertyEnum.SKIP_COUNT.toString(), skipCount); //Number of skips on region servers based on region meta or fuzzy filter - this.metricsEvent.put(PropertyEnum.SCAN_SIZE.toString(), scanSize); //Size scanned by region server - this.metricsEvent.put(PropertyEnum.RETURN_SIZE.toString(), returnSize);//Size returned by region server - this.metricsEvent.put(PropertyEnum.AGGR_FILTER_SIZE.toString(), scanSize - returnSize); //Size filtered and aggregated by coprocessor - this.metricsEvent.put(PropertyEnum.AGGR_SIZE.toString(), aggrSize); //Size aggregated by coprocessor + this.metricsEvent.put(PropertyEnum.SCAN_COUNT.toString(), scanCount); //Count scanned by region server + this.metricsEvent.put(PropertyEnum.RETURN_COUNT.toString(), returnCount);//Count returned by region server + this.metricsEvent.put(PropertyEnum.AGGR_FILTER_COUNT.toString(), scanCount - returnCount); //Count filtered & aggregated by coprocessor + this.metricsEvent.put(PropertyEnum.AGGR_COUNT.toString(), aggrCount); //Count aggregated by coprocessor } public <T extends Throwable> void setStats(Class<T> exceptionClassName) { @@ -51,8 +51,8 @@ public class RPCRecordEventWrapper extends RecordEventWrapper { public enum PropertyEnum { PROJECT("PROJECT"), REALIZATION("REALIZATION"), RPC_SERVER("RPC_SERVER"), EXCEPTION("EXCEPTION"), // - CALL_TIME("CALL_TIME"), SKIP_COUNT("COUNT_SKIP"), SCAN_SIZE("SIZE_SCAN"), RETURN_SIZE( - "SIZE_RETURN"), AGGR_FILTER_SIZE("SIZE_AGGREGATE_FILTER"), AGGR_SIZE("SIZE_AGGREGATE"); + CALL_TIME("CALL_TIME"), SKIP_COUNT("COUNT_SKIP"), SCAN_COUNT("COUNT_SCAN"), RETURN_COUNT( + "COUNT_RETURN"), AGGR_FILTER_COUNT("COUNT_AGGREGATE_FILTER"), AGGR_COUNT("COUNT_AGGREGATE"); private final String propertyName;
