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 2017/07/25 09:45:01 UTC
[14/24] kylin git commit: update kylin-it engine
update kylin-it engine
KryoRegistrator add ComputedColumnDesc
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/1b177a59
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/1b177a59
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/1b177a59
Branch: refs/heads/2.1.x
Commit: 1b177a591b35f5a708b5df00fc589d5d05e1d78d
Parents: a2cb533
Author: 许益铭 <xu...@hys-inc.cn>
Authored: Thu Jul 6 18:10:01 2017 +0800
Committer: Hongbin Ma <ma...@kyligence.io>
Committed: Fri Jul 21 16:13:02 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/metadata/model/ComputedColumnDesc.java | 4 +++-
.../java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java | 1 +
.../test_case_data/localmeta/cube_desc/ci_inner_join_cube.json | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/1b177a59/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java
index 540b5fc..4a50ba7 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/ComputedColumnDesc.java
@@ -22,8 +22,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.base.Preconditions;
import org.apache.kylin.metadata.model.tool.CalciteParser;
+import java.io.Serializable;
+
@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE, getterVisibility = JsonAutoDetect.Visibility.NONE, isGetterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = JsonAutoDetect.Visibility.NONE)
-public class ComputedColumnDesc {
+public class ComputedColumnDesc implements Serializable{
@JsonProperty
private String tableIdentity;
@JsonProperty
http://git-wip-us.apache.org/repos/asf/kylin/blob/1b177a59/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
----------------------------------------------------------------------
diff --git a/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java b/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
index 106653f..1980343 100644
--- a/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
+++ b/engine-spark/src/main/java/org/apache/kylin/engine/spark/KylinKryoRegistrator.java
@@ -266,6 +266,7 @@ public class KylinKryoRegistrator implements KryoRegistrator {
kyroClasses.add(org.apache.kylin.metadata.datatype.StringSerializer.class);
kyroClasses.add(org.apache.kylin.metadata.model.ColumnDesc.class);
kyroClasses.add(org.apache.kylin.metadata.model.DataModelDesc.class);
+ kyroClasses.add(org.apache.kylin.metadata.model.ComputedColumnDesc.class);
kyroClasses.add(org.apache.kylin.metadata.model.DataModelDesc.RealizationCapacity.class);
kyroClasses.add(org.apache.kylin.metadata.model.DataModelDesc.TableKind.class);
kyroClasses.add(org.apache.kylin.metadata.model.DatabaseDesc.class);
http://git-wip-us.apache.org/repos/asf/kylin/blob/1b177a59/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json b/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
index 28a63d5..27acdd3 100644
--- a/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
+++ b/examples/test_case_data/localmeta/cube_desc/ci_inner_join_cube.json
@@ -610,7 +610,7 @@
"status_need_notify": [],
"auto_merge_time_ranges": null,
"retention_range": 0,
- "engine_type": 2,
+ "engine_type": 4,
"storage_type": 2,
"override_kylin_properties": {
"kylin.cube.algorithm": "LAYER"