kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject kylin git commit: KYLIN-1226 bug fix and more log
Date Mon, 14 Dec 2015 06:31:59 GMT
Repository: kylin
Updated Branches:
  refs/heads/2.0-rc 2887b3480 -> c064fdf0f


KYLIN-1226 bug fix and more log


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c064fdf0
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c064fdf0
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c064fdf0

Branch: refs/heads/2.0-rc
Commit: c064fdf0fec3194367bc7cb11834d47c1ed9efc9
Parents: 2887b34
Author: Li, Yang <yangli9@ebay.com>
Authored: Mon Dec 14 14:31:17 2015 +0800
Committer: Li, Yang <yangli9@ebay.com>
Committed: Mon Dec 14 14:31:49 2015 +0800

----------------------------------------------------------------------
 .../org/apache/kylin/common/util/MemoryBudgetController.java   | 6 +++---
 .../org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/c064fdf0/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
b/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
index dc49b17..e454414 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
@@ -102,7 +102,7 @@ public class MemoryBudgetController {
             try {
                 reserve(consumer, requestMB);
                 if (debug && waitStart > 0)
-                    logger.debug(consumer + " waited " + (System.currentTimeMillis() - waitStart)
+ " ms on the " + requestMB + " MB request");
+                    logger.info(consumer + " waited " + (System.currentTimeMillis() - waitStart)
+ " ms on the " + requestMB + " MB request");
                 return;
             } catch (NotEnoughBudgetException ex) {
                 // retry
@@ -170,7 +170,7 @@ public class MemoryBudgetController {
 
         if (debug) {
             if (getSystemAvailMB() < getRemainingBudgetMB()) {
-                logger.debug("Remaining budget is " + getRemainingBudgetMB() + " MB free,
but system only has " + getSystemAvailMB() + " MB free. If this persists, some memory calculation
must be wrong.");
+                logger.info("Remaining budget is " + getRemainingBudgetMB() + " MB free,
but system only has " + getSystemAvailMB() + " MB free. If this persists, some memory calculation
must be wrong.");
             }
         }
     }
@@ -221,7 +221,7 @@ public class MemoryBudgetController {
             booking.remove(entry.consumer);
         }
         if (debug) {
-            logger.debug(entry.consumer + " reserved " + entry.reservedMB + " MB, total reserved
" + totalReservedMB + " MB, remaining budget " + getRemainingBudgetMB() + " MB");
+            logger.info(entry.consumer + " reserved " + entry.reservedMB + " MB, total reserved
" + totalReservedMB + " MB, remaining budget " + getRemainingBudgetMB() + " MB");
         }
 
         if (delta < 0) {

http://git-wip-us.apache.org/repos/asf/kylin/blob/c064fdf0/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java
b/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java
index 3929d1b..a3e3a03 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/inmemcubing/InMemCubeBuilder.java
@@ -372,7 +372,7 @@ public class InMemCubeBuilder extends AbstractInMemCubeBuilder {
     public static double getAggrCacheOversizeFactor(CubeDesc cubeDesc) {
         double r = BASE_CUBOID_CACHE_OVERSIZE_FACTOR;
         for (MeasureDesc m : cubeDesc.getMeasures()) {
-            if (m.getFunction().isHolisticCountDistinct())
+            if (m.getFunction().isCountDistinct())
                 r += BASE_CUBOID_CACHE_OVERSIZE_FACTOR;
         }
         return r;


Mime
View raw message