[kylin] branch 2.6.x updated: KYLIN-3929 Check satisfaction before execute cubeplanner algorithm

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shaofengshi pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/2.6.x by this push:
     new 4286d69  KYLIN-3929 Check satisfaction before execute cubeplanner algorithm
4286d69 is described below

commit 4286d69f895d5f2b50c4a8a87d3f418c4ba9b32e
Author: chao long <wa...@qq.com>
AuthorDate: Tue Apr 2 10:01:15 2019 +0800

    KYLIN-3929 Check satisfaction before execute cubeplanner algorithm
---
 .../org/apache/kylin/cube/cuboid/algorithm/CuboidRecommender.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/core-cube/src/main/java/org/apache/kylin/cube/cuboid/algorithm/CuboidRecommender.java b/core-cube/src/main/java/org/apache/kylin/cube/cuboid/algorithm/CuboidRecommender.java
index 0e6a844..01c6749 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/cuboid/algorithm/CuboidRecommender.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/cuboid/algorithm/CuboidRecommender.java
@@ -133,6 +133,10 @@ public class CuboidRecommender {
         int allCuboidCount = cuboidStats.getAllCuboidsForMandatory().size()
                 + cuboidStats.getAllCuboidsForSelection().size();
 
+        if (!ifForceRecommend && allCuboidCount <= threshold1) {
+            return null;
+        }
+
         BenefitPolicy benefitPolicy = new PBPUSCalculator(cuboidStats);
         CuboidRecommendAlgorithm algorithm = null;
 
@@ -162,9 +166,6 @@ public class CuboidRecommender {
             }
         }
 
-        if (!ifForceRecommend && allCuboidCount <= threshold1) {
-            return null;
-        }
         return recommendCuboidsWithStats;
     }