yiming187 closed pull request #44: change the style of return that make it read easy URL: https://github.com/apache/kylin/pull/44
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRequest.java b/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRequest.java index dc90ed66af..1f07f849ce 100644 --- a/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRequest.java +++ b/core-cube/src/main/java/org/apache/kylin/gridtable/GTScanRequest.java @@ -381,11 +381,22 @@ public GTScanRequest deserialize(ByteBuffer in) { long timeout = BytesUtil.readVLong(in); String storageBehavior = BytesUtil.readUTFString(in); - return new GTScanRequestBuilder().setInfo(sInfo).setRanges(sRanges).setDimensions(sColumns).// - setAggrGroupBy(sAggGroupBy).setAggrMetrics(sAggrMetrics).setAggrMetricsFuncs(sAggrMetricFuncs).// - setFilterPushDown(sGTFilter).setAllowStorageAggregation(sAllowPreAggr).setAggCacheMemThreshold(sAggrCacheGB).// - setStorageScanRowNumThreshold(storageScanRowNumThreshold).setStoragePushDownLimit(storagePushDownLimit).// - setStartTime(startTime).setTimeout(timeout).setStorageBehavior(storageBehavior).createGTScanRequest(); + return new GTScanRequestBuilder() + .setInfo(sInfo) + .setRanges(sRanges) + .setDimensions(sColumns) + .setAggrGroupBy(sAggGroupBy) + .setAggrMetrics(sAggrMetrics) + .setAggrMetricsFuncs(sAggrMetricFuncs) + .setFilterPushDown(sGTFilter) + .setAllowStorageAggregation(sAllowPreAggr) + .setAggCacheMemThreshold(sAggrCacheGB) + .setStorageScanRowNumThreshold(storageScanRowNumThreshold) + .setStoragePushDownLimit(storagePushDownLimit) + .setStartTime(startTime) + .setTimeout(timeout) + .setStorageBehavior(storageBehavior) + .createGTScanRequest(); } private void serializeGTRecord(GTRecord gtRecord, ByteBuffer out) { diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java index b05a629db9..548e355302 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/CubeScanRangePlanner.java @@ -148,10 +148,19 @@ public GTScanRequest planScanRequest() { GTScanRequest scanRequest; List<GTScanRange> scanRanges = this.planScanRanges(); if (scanRanges != null && scanRanges.size() != 0) { - scanRequest = new GTScanRequestBuilder().setInfo(gtInfo).setRanges(scanRanges).setDimensions(gtDimensions).// - setAggrGroupBy(gtAggrGroups).setAggrMetrics(gtAggrMetrics).setAggrMetricsFuncs(gtAggrFuncs).setFilterPushDown(gtFilter).// - setAllowStorageAggregation(context.isNeedStorageAggregation()).setAggCacheMemThreshold(cubeSegment.getCubeInstance().getConfig().getQueryCoprocessorMemGB()).// - setStoragePushDownLimit(context.getFinalPushDownLimit()).setStorageScanRowNumThreshold(context.getThreshold()).createGTScanRequest(); + scanRequest = new GTScanRequestBuilder() + .setInfo(gtInfo) + .setRanges(scanRanges) + .setDimensions(gtDimensions) + .setAggrGroupBy(gtAggrGroups) + .setAggrMetrics(gtAggrMetrics) + .setAggrMetricsFuncs(gtAggrFuncs) + .setFilterPushDown(gtFilter) + .setAllowStorageAggregation(context.isNeedStorageAggregation()) + .setAggCacheMemThreshold(cubeSegment.getCubeInstance().getConfig().getQueryCoprocessorMemGB()) + .setStoragePushDownLimit(context.getFinalPushDownLimit()) + .setStorageScanRowNumThreshold(context.getThreshold()) + .createGTScanRequest(); } else { scanRequest = null; } ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services