kylin 1788 enable arbitrary mandatory size Signed-off-by: shaofengshi <shaofeng...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/cdbdb551 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/cdbdb551 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/cdbdb551 Branch: refs/heads/v1.5.3-release-rc2 Commit: cdbdb551403f22bee5e5ea3d96a5592df6eaa5ea Parents: 1c257be Author: Cheng Wang <cheng.w...@kyligence.io> Authored: Wed Jul 20 18:24:53 2016 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Fri Jul 22 12:34:12 2016 +0800 ---------------------------------------------------------------------- .../kylin/cube/model/validation/rule/AggregationGroupRule.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/cdbdb551/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java b/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java index ac382e9..958ac2b 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupRule.java @@ -110,8 +110,9 @@ public class AggregationGroupRule implements IValidatorRule<CubeDesc> { int normalDimSize = normalDims.size(); int hierarchySize = count(agg.getSelectRule().hierarchy_dims); int jointSize = count(agg.getSelectRule().joint_dims); + int mandatorySize = mandatoryDims.size() > 0 ? 1 : 0 ; - if (mandatoryDims.size() + normalDimSize + hierarchySize + jointSize > maxSize) { + if ( mandatorySize + normalDimSize + hierarchySize + jointSize > maxSize) { context.addResult(ResultLevel.ERROR, "Aggregation group " + index + " has too many dimensions"); continue; }
