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/25 10:33:52 UTC
[4/4] kylin git commit: KYLIN-1245 fix compile error after code merge
KYLIN-1245 fix compile error after code merge
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/45d021b7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/45d021b7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/45d021b7
Branch: refs/heads/2.0-rc
Commit: 45d021b730bf744e5b0ada9fcdcd5f21f4a24474
Parents: 2aedddf
Author: Li, Yang <ya...@ebay.com>
Authored: Fri Dec 25 17:33:37 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Fri Dec 25 17:33:37 2015 +0800
----------------------------------------------------------------------
.../cube/model/validation/rule/AggregationGroupSizeRule.java | 2 +-
.../apache/kylin/cube/model/validation/rule/FunctionRule.java | 2 +-
.../java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java | 2 +-
.../java/org/apache/kylin/engine/mr/common/CubeStatsReader.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/45d021b7/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupSizeRule.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupSizeRule.java b/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupSizeRule.java
index e37b9a9..e42edc1 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupSizeRule.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/validation/rule/AggregationGroupSizeRule.java
@@ -60,7 +60,7 @@ public class AggregationGroupSizeRule implements IValidatorRule<CubeDesc> {
}
protected int getMaxAgrGroupSize() {
- String size = KylinConfig.getInstanceFromEnv().getProperty(KEY_MAX_AGR_GROUP_SIZE, String.valueOf(DEFAULT_MAX_AGR_GROUP_SIZE));
+ String size = KylinConfig.getInstanceFromEnv().getOptional(KEY_MAX_AGR_GROUP_SIZE, String.valueOf(DEFAULT_MAX_AGR_GROUP_SIZE));
return Integer.parseInt(size);
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/45d021b7/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 1920fc7..881ef44 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
@@ -123,7 +123,7 @@ public class FunctionRule implements IValidatorRule<CubeDesc> {
context.addResult(ResultLevel.ERROR, "Return type for function " + func + " must be one of " + DataType.NUMBER_FAMILY);
}
} else {
- if (StringUtils.equalsIgnoreCase(KylinConfig.getInstanceFromEnv().getProperty(KEY_IGNORE_UNKNOWN_FUNC, "false"), "false")) {
+ if (StringUtils.equalsIgnoreCase(KylinConfig.getInstanceFromEnv().getOptional(KEY_IGNORE_UNKNOWN_FUNC, "false"), "false")) {
context.addResult(ResultLevel.ERROR, "Unrecognized function: [" + func + "]");
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/45d021b7/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java
index 86439a8..292fa1d 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder2.java
@@ -74,7 +74,7 @@ public class BatchCubingJobBuilder2 extends JobBuilderSupport {
private void addLayerCubingSteps(final CubingJob result, final String jobId, final String cuboidRootPath) {
RowKeyDesc rowKeyDesc = ((CubeSegment) seg).getCubeDesc().getRowkey();
- final int groupRowkeyColumnsCount = ((CubeSegment) seg).getCubeDesc().getBuildLevel();
+ final int groupRowkeyColumnsCount = rowKeyDesc.getNCuboidBuildLevels();
final int totalRowkeyColumnsCount = rowKeyDesc.getRowKeyColumns().length;
final String[] cuboidOutputTempPath = getCuboidOutputPaths(cuboidRootPath, totalRowkeyColumnsCount, groupRowkeyColumnsCount);
// base cuboid step
http://git-wip-us.apache.org/repos/asf/kylin/blob/45d021b7/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/CubeStatsReader.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/CubeStatsReader.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/CubeStatsReader.java
index 58900e0..10a4a9c 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/CubeStatsReader.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/common/CubeStatsReader.java
@@ -51,7 +51,7 @@ import org.apache.kylin.cube.cuboid.Cuboid;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.engine.mr.HadoopUtil;
import org.apache.kylin.engine.mr.steps.InMemCuboidJob;
-import org.apache.kylin.metadata.datatype.DataType;
+import org.apache.kylin.metadata.model.DataType;
import org.apache.kylin.metadata.model.MeasureDesc;
import org.apache.kylin.metadata.model.SegmentStatusEnum;
import org.apache.kylin.metadata.model.TblColRef;
@@ -211,7 +211,7 @@ public class CubeStatsReader {
int space = 0;
boolean isMemoryHungry = false;
for (MeasureDesc measureDesc : cubeSegment.getCubeDesc().getMeasures()) {
- if (measureDesc.getFunction().getMeasureType().isMemoryHungry()) {
+ if (measureDesc.getFunction().isCountDistinct()) {
isMemoryHungry = true;
}
DataType returnType = measureDesc.getFunction().getReturnDataType();