You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/12/05 00:10:02 UTC

[21/21] kylin git commit: KYLIN-976 fix compile error after rebase

KYLIN-976 fix compile error after rebase


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

Branch: refs/heads/2.x-staging
Commit: 7561d80c966a68b3630940a55f0421e43c4c59b2
Parents: b0643f9
Author: Yang Li <li...@apache.org>
Authored: Sat Dec 5 07:08:46 2015 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sat Dec 5 07:08:46 2015 +0800

----------------------------------------------------------------------
 .../java/org/apache/kylin/cube/model/v2/CubeDesc.java  | 13 ++++++-------
 .../kylin/cube/model/validation/rule/FunctionRule.java |  4 ----
 .../kylin/job/upgrade/v2/DataModelDescUpgradeV2.java   |  2 +-
 .../storage/hbase/cube/v2/CubeSegmentScanner.java      |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/7561d80c/core-cube/src/main/java/org/apache/kylin/cube/model/v2/CubeDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/v2/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/v2/CubeDesc.java
index b37e5a1..30b977d 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/v2/CubeDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/v2/CubeDesc.java
@@ -41,6 +41,7 @@ import org.apache.kylin.common.persistence.RootPersistentEntity;
 import org.apache.kylin.common.util.Array;
 import org.apache.kylin.common.util.CaseInsensitiveStringMap;
 import org.apache.kylin.common.util.JsonUtil;
+import org.apache.kylin.measure.MeasureType;
 import org.apache.kylin.metadata.MetadataConstants;
 import org.apache.kylin.metadata.MetadataManager;
 import org.apache.kylin.metadata.model.ColumnDesc;
@@ -648,10 +649,7 @@ public class CubeDesc extends RootPersistentEntity {
             func.init(factTable);
             allColumns.addAll(func.getParameter().getColRefs());
 
-            // verify holistic count distinct as a dependent measure
-            if (func.isHolisticCountDistinct() && StringUtils.isBlank(m.getDependentMeasureRef())) {
-                throw new IllegalStateException(m + " is a holistic count distinct but it has no DependentMeasureRef defined!");
-            }
+            func.getMeasureType().validate(func);
         }
     }
 
@@ -729,9 +727,9 @@ public class CubeDesc extends RootPersistentEntity {
         }
     }
 
-    public boolean hasHolisticCountDistinctMeasures() {
+    public boolean hasMemoryHungryMeasures() {
         for (MeasureDesc measure : measures) {
-            if (measure.getFunction().isHolisticCountDistinct()) {
+            if (measure.getFunction().getMeasureType().isMemoryHungry()) {
                 return true;
             }
         }
@@ -818,7 +816,8 @@ public class CubeDesc extends RootPersistentEntity {
         }
 
         for (MeasureDesc measure : measures) {
-            result.addAll(measure.getColumnsNeedDictionary());
+            MeasureType<?> aggrType = measure.getFunction().getMeasureType();
+            result.addAll(aggrType.getColumnsNeedDictionary(measure.getFunction()));
         }
         return result;
     }

http://git-wip-us.apache.org/repos/asf/kylin/blob/7561d80c/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java b/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java
index 530ce07..5a3202d 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/FunctionRule.java
@@ -118,10 +118,6 @@ public class FunctionRule implements IValidatorRule<CubeDesc> {
             if (rtype.isNumberFamily() == false) {
                 context.addResult(ResultLevel.ERROR, "Return type for function " + func + " must be one of " + DataType.NUMBER_FAMILY);
             }
-        } else if (funcDesc.isTopN()) {
-            if (rtype.isTopN() == false) {
-                context.addResult(ResultLevel.ERROR, "Return type for function " + func + " must be one of topn");
-            }
         } else {
             if (StringUtils.equalsIgnoreCase(KylinConfig.getInstanceFromEnv().getProperty(KEY_IGNORE_UNKNOWN_FUNC, "false"), "false")) {
                 context.addResult(ResultLevel.ERROR, "Unrecognized function: [" + func + "]");

http://git-wip-us.apache.org/repos/asf/kylin/blob/7561d80c/core-job/src/main/java/org/apache/kylin/job/upgrade/v2/DataModelDescUpgradeV2.java
----------------------------------------------------------------------
diff --git a/core-job/src/main/java/org/apache/kylin/job/upgrade/v2/DataModelDescUpgradeV2.java b/core-job/src/main/java/org/apache/kylin/job/upgrade/v2/DataModelDescUpgradeV2.java
index 81b277d..003cb6c 100644
--- a/core-job/src/main/java/org/apache/kylin/job/upgrade/v2/DataModelDescUpgradeV2.java
+++ b/core-job/src/main/java/org/apache/kylin/job/upgrade/v2/DataModelDescUpgradeV2.java
@@ -127,7 +127,7 @@ public class DataModelDescUpgradeV2 {
                         if (!modelDimMap.containsKey(cubeDimDesc.getTable())) {
                             modelDimMap.put(cubeDimDesc.getTable(), new HashSet<String>());
                         }
-                        modelDimMap.get(cubeDimDesc.getTable()).addAll(Lists.newArrayList(cubeDimDesc.getDerived() != null ? cubeDimDesc.getDerived() : cubeDimDesc.getColumn()));
+                        modelDimMap.get(cubeDimDesc.getTable()).addAll(Lists.newArrayList(cubeDimDesc.getDerived() != null ? cubeDimDesc.getDerived() : new String[] { cubeDimDesc.getColumn() }));
                     }
 
                     List<DimensionDesc> modelDimDescList = Lists.newArrayListWithCapacity(modelDimMap.size());

http://git-wip-us.apache.org/repos/asf/kylin/blob/7561d80c/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
index 2f78a86..93d7d6e 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeSegmentScanner.java
@@ -30,8 +30,8 @@ import org.apache.kylin.gridtable.GTScanRangePlanner;
 import org.apache.kylin.gridtable.GTScanRequest;
 import org.apache.kylin.gridtable.GTUtil;
 import org.apache.kylin.gridtable.IGTScanner;
+import org.apache.kylin.metadata.datatype.DataType;
 import org.apache.kylin.metadata.filter.TupleFilter;
-import org.apache.kylin.metadata.model.DataType;
 import org.apache.kylin.metadata.model.FunctionDesc;
 import org.apache.kylin.metadata.model.TblColRef;