You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/06/01 04:19:25 UTC
kylin git commit: KYLIN-1669 Deprecate the "Capacity" field from
DataModel
Repository: kylin
Updated Branches:
refs/heads/master e02f0bed2 -> 9d5fa3203
KYLIN-1669 Deprecate the "Capacity" field from DataModel
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9d5fa320
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9d5fa320
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9d5fa320
Branch: refs/heads/master
Commit: 9d5fa320358610546caebb4933601833fbc08740
Parents: e02f0be
Author: shaofengshi <sh...@apache.org>
Authored: Wed Jun 1 12:19:10 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Jun 1 12:19:10 2016 +0800
----------------------------------------------------------------------
.../kylin/cube/model/CubeJoinedFlatTableDesc.java | 5 -----
.../org/apache/kylin/metadata/model/DataModelDesc.java | 1 -
.../kylin/metadata/model/IJoinedFlatTableDesc.java | 8 +++-----
.../apache/kylin/engine/mr/BatchCubingJobBuilder.java | 4 ++--
.../apache/kylin/engine/mr/BatchCubingJobBuilder2.java | 6 +++---
.../apache/kylin/engine/mr/BatchMergeJobBuilder.java | 2 +-
.../apache/kylin/engine/mr/BatchMergeJobBuilder2.java | 2 +-
.../org/apache/kylin/engine/mr/JobBuilderSupport.java | 12 ++++--------
.../engine/mr/invertedindex/BatchIIJobBuilder.java | 2 +-
.../metadata/model_desc/kylin_sales_model.json | 1 -
examples/test_case_data/localmeta/model_desc/ssb.json | 1 -
.../model_desc/test_kylin_inner_join_model_desc.json | 1 -
.../model_desc/test_kylin_left_join_model_desc.json | 1 -
.../model_desc/test_streaming_table_model_desc.json | 1 -
.../invertedindex/model/IIJoinedFlatTableDesc.java | 5 -----
.../apache/kylin/storage/hbase/steps/HBaseMRSteps.java | 6 +++---
webapp/app/js/model/cubeConfig.js | 7 ++++---
webapp/app/js/model/metaModel.js | 3 ---
webapp/app/partials/modelDesigner/model_dimensions.html | 2 +-
webapp/app/partials/modelDesigner/model_measures.html | 2 +-
20 files changed, 24 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
index db1942b..9adac62 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeJoinedFlatTableDesc.java
@@ -167,11 +167,6 @@ public class CubeJoinedFlatTableDesc implements IJoinedFlatTableDesc {
return cubeDesc.getModel();
}
- @Override
- public DataModelDesc.RealizationCapacity getCapacity() {
- return cubeDesc.getModel().getCapacity();
- }
-
private static String colName(String canonicalColName) {
return canonicalColName.replace(".", "_");
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
index f4b52bd..13ed011 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/DataModelDesc.java
@@ -382,7 +382,6 @@ public class DataModelDesc extends RootPersistentEntity {
public static DataModelDesc getCopyOf(DataModelDesc dataModelDesc) {
DataModelDesc newDataModelDesc = new DataModelDesc();
newDataModelDesc.setName(dataModelDesc.getName());
- newDataModelDesc.setCapacity(dataModelDesc.getCapacity());
newDataModelDesc.setDescription(dataModelDesc.getDescription());
newDataModelDesc.setDimensions(dataModelDesc.getDimensions());
newDataModelDesc.setFilterCondition(dataModelDesc.getFilterCondition());
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/core-metadata/src/main/java/org/apache/kylin/metadata/model/IJoinedFlatTableDesc.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/IJoinedFlatTableDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/IJoinedFlatTableDesc.java
index 0124b9b..a9a687f 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/IJoinedFlatTableDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/IJoinedFlatTableDesc.java
@@ -24,12 +24,10 @@ import java.util.List;
*/
public interface IJoinedFlatTableDesc {
- public String getTableName();
+ String getTableName();
- public List<IntermediateColumnDesc> getColumnList();
+ List<IntermediateColumnDesc> getColumnList();
- public DataModelDesc getDataModel();
-
- public DataModelDesc.RealizationCapacity getCapacity();
+ DataModelDesc getDataModel();
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java
index 7f729a6..ec9b1c6 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchCubingJobBuilder.java
@@ -89,7 +89,7 @@ public class BatchCubingJobBuilder extends JobBuilderSupport {
MapReduceExecutable baseCuboidStep = new MapReduceExecutable();
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, ((CubeSegment) seg).getCubeDesc().getModel());
+ appendMapReduceParameters(cmd);
baseCuboidStep.setName(ExecutableConstants.STEP_NAME_BUILD_BASE_CUBOID);
@@ -113,7 +113,7 @@ public class BatchCubingJobBuilder extends JobBuilderSupport {
ndCuboidStep.setName(ExecutableConstants.STEP_NAME_BUILD_N_D_CUBOID + " : " + dimNum + "-Dimension");
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, ((CubeSegment) seg).getCubeDesc().getModel());
+ appendMapReduceParameters(cmd);
appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getRealization().getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_SEGMENT_NAME, seg.getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, cuboidOutputTempPath[totalRowkeyColumnCount - dimNum - 1]);
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/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 7ac94f8..9c4ddb2 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
@@ -104,7 +104,7 @@ public class BatchCubingJobBuilder2 extends JobBuilderSupport {
MapReduceExecutable cubeStep = new MapReduceExecutable();
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, JobEngineConfig.IN_MEM_JOB_CONF_SUFFIX, ((CubeSegment) seg).getCubeDesc().getModel());
+ appendMapReduceParameters(cmd, JobEngineConfig.IN_MEM_JOB_CONF_SUFFIX);
cubeStep.setName(ExecutableConstants.STEP_NAME_BUILD_IN_MEM_CUBE);
@@ -125,7 +125,7 @@ public class BatchCubingJobBuilder2 extends JobBuilderSupport {
MapReduceExecutable baseCuboidStep = new MapReduceExecutable();
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, ((CubeSegment) seg).getCubeDesc().getModel());
+ appendMapReduceParameters(cmd);
baseCuboidStep.setName(ExecutableConstants.STEP_NAME_BUILD_BASE_CUBOID);
@@ -150,7 +150,7 @@ public class BatchCubingJobBuilder2 extends JobBuilderSupport {
ndCuboidStep.setName(ExecutableConstants.STEP_NAME_BUILD_N_D_CUBOID + " : " + dimNum + "-Dimension");
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, ((CubeSegment) seg).getCubeDesc().getModel());
+ appendMapReduceParameters(cmd);
appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getRealization().getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_SEGMENT_NAME, seg.getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, cuboidOutputTempPath[totalRowkeyColumnCount - dimNum - 1]);
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java
index 6f1d445..0769b52 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java
@@ -84,7 +84,7 @@ public class BatchMergeJobBuilder extends JobBuilderSupport {
mergeCuboidDataStep.setName(ExecutableConstants.STEP_NAME_MERGE_CUBOID);
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, seg.getRealization().getDataModelDesc());
+ appendMapReduceParameters(cmd);
appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getCubeInstance().getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_SEGMENT_NAME, seg.getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, inputPath);
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
index e151674..f1d7281 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java
@@ -95,7 +95,7 @@ public class BatchMergeJobBuilder2 extends JobBuilderSupport {
mergeCuboidDataStep.setName(ExecutableConstants.STEP_NAME_MERGE_CUBOID);
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, seg.getRealization().getDataModelDesc());
+ appendMapReduceParameters(cmd);
appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getCubeInstance().getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_SEGMENT_NAME, seg.getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, inputPath);
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
index 151d867..d7676f1 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/JobBuilderSupport.java
@@ -68,7 +68,7 @@ public class JobBuilderSupport {
result.setName(ExecutableConstants.STEP_NAME_FACT_DISTINCT_COLUMNS);
result.setMapReduceJobClass(FactDistinctColumnsJob.class);
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, ((CubeSegment) seg).getCubeDesc().getModel());
+ appendMapReduceParameters(cmd);
appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getRealization().getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_OUTPUT, getFactDistinctColumnsPath(jobId));
appendExecCmdParameters(cmd, BatchConstants.ARG_SEGMENT_NAME, seg.getName());
@@ -161,15 +161,11 @@ public class JobBuilderSupport {
return getRealizationRootPath(jobId) + "/secondary_index/";
}
- public void appendMapReduceParameters(StringBuilder buf, DataModelDesc dataModelDesc) {
- appendMapReduceParameters(buf, JobEngineConfig.DEFAUL_JOB_CONF_SUFFIX, dataModelDesc.getCapacity().toString());
+ public void appendMapReduceParameters(StringBuilder buf) {
+ appendMapReduceParameters(buf, JobEngineConfig.DEFAUL_JOB_CONF_SUFFIX);
}
- public void appendMapReduceParameters(StringBuilder buf, String jobType, DataModelDesc dataModelDesc) {
- appendMapReduceParameters(buf, jobType, dataModelDesc.getCapacity().toString());
- }
-
- public void appendMapReduceParameters(StringBuilder buf, String jobType, String capacity) {
+ public void appendMapReduceParameters(StringBuilder buf, String jobType) {
try {
String jobConf = config.getHadoopJobConfFilePath(jobType);
if (jobConf != null && jobConf.length() > 0) {
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/BatchIIJobBuilder.java
----------------------------------------------------------------------
diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/BatchIIJobBuilder.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/BatchIIJobBuilder.java
index 4841e64..e582fa0 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/BatchIIJobBuilder.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/BatchIIJobBuilder.java
@@ -68,7 +68,7 @@ public class BatchIIJobBuilder extends JobBuilderSupport {
MapReduceExecutable buildIIStep = new MapReduceExecutable();
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, seg.getRealization().getDataModelDesc());
+ appendMapReduceParameters(cmd);
buildIIStep.setName(ExecutableConstants.STEP_NAME_BUILD_II);
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
----------------------------------------------------------------------
diff --git a/examples/sample_cube/metadata/model_desc/kylin_sales_model.json b/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
index 036d2af..d4ca30a 100644
--- a/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
+++ b/examples/sample_cube/metadata/model_desc/kylin_sales_model.json
@@ -34,7 +34,6 @@
"PRICE",
"ITEM_COUNT"
],
- "capacity" : "SMALL",
"last_modified" : 1422435345362,
"fact_table" : "DEFAULT.KYLIN_SALES",
"filter_condition" : null,
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/examples/test_case_data/localmeta/model_desc/ssb.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/model_desc/ssb.json b/examples/test_case_data/localmeta/model_desc/ssb.json
index e8c0de0..52b330f 100644
--- a/examples/test_case_data/localmeta/model_desc/ssb.json
+++ b/examples/test_case_data/localmeta/model_desc/ssb.json
@@ -49,7 +49,6 @@
"columns" : [ "D_YEAR", "D_YEARMONTHNUM", "D_YEARMONTH", "D_WEEKNUMINYEAR" ]
} ],
"metrics" : [ "LO_REVENUE", "LO_SUPPLYCOST", "V_REVENUE" ],
- "capacity" : "MEDIUM",
"last_modified" : 1457444314662,
"fact_table" : "SSB.V_LINEORDER",
"filter_condition" : "",
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/examples/test_case_data/localmeta/model_desc/test_kylin_inner_join_model_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/model_desc/test_kylin_inner_join_model_desc.json b/examples/test_case_data/localmeta/model_desc/test_kylin_inner_join_model_desc.json
index c40a9e1..a8fe363 100644
--- a/examples/test_case_data/localmeta/model_desc/test_kylin_inner_join_model_desc.json
+++ b/examples/test_case_data/localmeta/model_desc/test_kylin_inner_join_model_desc.json
@@ -91,7 +91,6 @@
"PRICE",
"ITEM_COUNT"
],
- "capacity" : "MEDIUM",
"last_modified" : 1422435345352,
"fact_table" : "DEFAULT.TEST_KYLIN_FACT",
"filter_condition" : null,
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/examples/test_case_data/localmeta/model_desc/test_kylin_left_join_model_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/model_desc/test_kylin_left_join_model_desc.json b/examples/test_case_data/localmeta/model_desc/test_kylin_left_join_model_desc.json
index ddb4c81..c85e5d2 100644
--- a/examples/test_case_data/localmeta/model_desc/test_kylin_left_join_model_desc.json
+++ b/examples/test_case_data/localmeta/model_desc/test_kylin_left_join_model_desc.json
@@ -110,7 +110,6 @@
"PRICE",
"ITEM_COUNT"
],
- "capacity": "MEDIUM",
"last_modified": 1422435345352,
"fact_table": "DEFAULT.TEST_KYLIN_FACT",
"filter_condition": null,
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/examples/test_case_data/localmeta/model_desc/test_streaming_table_model_desc.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/model_desc/test_streaming_table_model_desc.json b/examples/test_case_data/localmeta/model_desc/test_streaming_table_model_desc.json
index f80d35f..cfb889a 100644
--- a/examples/test_case_data/localmeta/model_desc/test_streaming_table_model_desc.json
+++ b/examples/test_case_data/localmeta/model_desc/test_streaming_table_model_desc.json
@@ -19,7 +19,6 @@
"gmv",
"item_count"
],
- "capacity": "MEDIUM",
"last_modified": 0,
"fact_table": "default.streaming_table",
"filter_condition": null,
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIJoinedFlatTableDesc.java
----------------------------------------------------------------------
diff --git a/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIJoinedFlatTableDesc.java b/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIJoinedFlatTableDesc.java
index 4ee1ccb..21e5677 100644
--- a/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIJoinedFlatTableDesc.java
+++ b/invertedindex/src/main/java/org/apache/kylin/invertedindex/model/IIJoinedFlatTableDesc.java
@@ -65,9 +65,4 @@ public class IIJoinedFlatTableDesc implements IJoinedFlatTableDesc {
return iiDesc.getModel();
}
- @Override
- public DataModelDesc.RealizationCapacity getCapacity() {
- return DataModelDesc.RealizationCapacity.SMALL;
- }
-
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
index 623274d..dcff5e9 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
@@ -65,7 +65,7 @@ public class HBaseMRSteps extends JobBuilderSupport {
rowkeyDistributionStep.setName(ExecutableConstants.STEP_NAME_GET_CUBOID_KEY_DISTRIBUTION);
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, seg.getRealization().getDataModelDesc());
+ appendMapReduceParameters(cmd);
appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, inputPath);
appendExecCmdParameters(cmd, BatchConstants.ARG_OUTPUT, getRowkeyDistributionOutputPath(jobId));
appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getRealization().getName());
@@ -106,7 +106,7 @@ public class HBaseMRSteps extends JobBuilderSupport {
createHFilesStep.setName(ExecutableConstants.STEP_NAME_CONVERT_CUBOID_TO_HFILE);
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, seg.getRealization().getDataModelDesc());
+ appendMapReduceParameters(cmd);
appendExecCmdParameters(cmd, BatchConstants.ARG_CUBE_NAME, seg.getRealization().getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_PARTITION, getRowkeyDistributionOutputPath(jobId) + "/part-r-00000_hfile");
appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, inputPath);
@@ -247,7 +247,7 @@ public class HBaseMRSteps extends JobBuilderSupport {
createHFilesStep.setName(ExecutableConstants.STEP_NAME_CONVERT_II_TO_HFILE);
StringBuilder cmd = new StringBuilder();
- appendMapReduceParameters(cmd, seg.getRealization().getDataModelDesc());
+ appendMapReduceParameters(cmd);
appendExecCmdParameters(cmd, BatchConstants.ARG_II_NAME, seg.getRealization().getName());
appendExecCmdParameters(cmd, BatchConstants.ARG_INPUT, inputPath);
appendExecCmdParameters(cmd, BatchConstants.ARG_OUTPUT, getHFilePath(jobId));
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/webapp/app/js/model/cubeConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
index 962c65d..82dfca4 100644
--- a/webapp/app/js/model/cubeConfig.js
+++ b/webapp/app/js/model/cubeConfig.js
@@ -22,7 +22,6 @@ KylinApp.constant('cubeConfig', {
measureParamType: ['column', 'constant'],
measureExpressions: ['SUM', 'MIN', 'MAX', 'COUNT', 'COUNT_DISTINCT',"TOP_N", 'RAW'],
dimensionDataTypes: ["string", "tinyint", "int", "bigint", "date"],
- cubeCapacities: ["SMALL", "MEDIUM", "LARGE"],
cubePartitionTypes: ['APPEND'],
joinTypes: [
{name: 'Left', value: 'left'},
@@ -52,14 +51,16 @@ KylinApp.constant('cubeConfig', {
topNTypes: [
{name: 'Top 10', value: "topn(10)"},
{name: 'Top 100', value: "topn(100)"},
- {name: 'Top 1000', value: "topn(1000)"}
+ {name: 'Top 500', value: "topn(500)"},
+ {name: 'Top 1000', value: "topn(1000)"},
+ {name: 'Top 5000', value: "topn(5000)"},
+ {name: 'Top 10000', value: "topn(10000)"}
],
dftSelections: {
measureExpression: 'SUM',
measureParamType: 'column',
measureDataType: {name: 'BIGINT', value: 'bigint'},
distinctDataType: {name: 'Error Rate < 4.88%', value: 'hllc12'},
- cubeCapacity: 'MEDIUM',
queryPriority: {name: 'NORMAL', value: 50},
cubePartitionType: 'APPEND',
topN:{name: 'Top 100', value: "topn(100)"}
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/webapp/app/js/model/metaModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/metaModel.js b/webapp/app/js/model/metaModel.js
index 3f05b3d..fbb0de1 100644
--- a/webapp/app/js/model/metaModel.js
+++ b/webapp/app/js/model/metaModel.js
@@ -28,7 +28,6 @@ KylinApp.service('MetaModel',function(){
fact_table: null,
lookups: [],
filter_condition:null,
- capacity:null,
dimensions:[],
metrics:[],
"partition_desc" : {
@@ -49,7 +48,6 @@ KylinApp.service('MetaModel',function(){
_model.fact_table = model.fact_table;
_model.lookups =model.lookups;
_model.filter_condition = model.filter_condition;
- _model.capacity = model.capacity;
_model.dimensions = model.dimensions;
_model.metrics = model.metrics;
_model.partition_desc = model.partition_desc;
@@ -76,7 +74,6 @@ KylinApp.service('MetaModel',function(){
fact_table: '',
lookups: [],
filter_condition:'',
- capacity:'MEDIUM',
dimensions:[],
metrics:[],
"partition_desc" : {
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/webapp/app/partials/modelDesigner/model_dimensions.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/model_dimensions.html b/webapp/app/partials/modelDesigner/model_dimensions.html
index 641afb9..f767b9d 100644
--- a/webapp/app/partials/modelDesigner/model_dimensions.html
+++ b/webapp/app/partials/modelDesigner/model_dimensions.html
@@ -50,7 +50,7 @@
</table>
</div>
<div ng-if="state.mode=='edit'" class="form-group model-dimension-edit" style="width: 100%">
- <h4 style="margin-left:42px">Dimensions</h4>
+ <h4 style="margin-left:42px">Select dimension columns</h4>
<table style="margin-left:42px; width:92%"
ng-if="modelsManager.selectedModel.dimensions.length > 0"
class="table table-hover list">
http://git-wip-us.apache.org/repos/asf/kylin/blob/9d5fa320/webapp/app/partials/modelDesigner/model_measures.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/model_measures.html b/webapp/app/partials/modelDesigner/model_measures.html
index 13f9958..b6a4719 100644
--- a/webapp/app/partials/modelDesigner/model_measures.html
+++ b/webapp/app/partials/modelDesigner/model_measures.html
@@ -41,7 +41,7 @@
</tbody>
</table>
<div ng-if="state.mode=='edit'" class="form-group" style="width: 100%">
- <h3 class="box-title">Select your measures</h3>
+ <h3 class="box-title">Select measure columns</h3>
<ui-select
close-on-select="false"