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 2017/02/20 06:23:22 UTC
kylin git commit: KYLIN-2331 update IEngineAware.ID_SPARK to be
consistent with KylinConfig
Repository: kylin
Updated Branches:
refs/heads/master 92533c777 -> bbcb0ed52
KYLIN-2331 update IEngineAware.ID_SPARK to be consistent with KylinConfig
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/bbcb0ed5
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/bbcb0ed5
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/bbcb0ed5
Branch: refs/heads/master
Commit: bbcb0ed52c121bc68bea835e0fa0be7d9397b986
Parents: 92533c7
Author: shaofengshi <sh...@apache.org>
Authored: Mon Feb 20 14:23:12 2017 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Feb 20 14:23:17 2017 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 6 +++---
.../java/org/apache/kylin/metadata/model/IEngineAware.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/bbcb0ed5/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 50d87a4..f7d8452 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -692,9 +692,9 @@ abstract public class KylinConfigBase implements Serializable {
public Map<Integer, String> getJobEngines() {
Map<Integer, String> r = Maps.newLinkedHashMap();
// ref constants in IEngineAware
- r.put(0, "org.apache.kylin.engine.mr.MRBatchCubingEngine");
- r.put(2, "org.apache.kylin.engine.mr.MRBatchCubingEngine2");
- r.put(4, "org.apache.kylin.engine.spark.SparkBatchCubingEngine2");
+ r.put(0, "org.apache.kylin.engine.mr.MRBatchCubingEngine"); //IEngineAware.ID_MR_V1
+ r.put(2, "org.apache.kylin.engine.mr.MRBatchCubingEngine2"); //IEngineAware.ID_MR_V2
+ r.put(4, "org.apache.kylin.engine.spark.SparkBatchCubingEngine2"); //IEngineAware.ID_SPARK
r.putAll(convertKeyToInteger(getPropertiesByPrefix("kylin.engine.provider.")));
return r;
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/bbcb0ed5/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java
index 882b2e3..78f7faa 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/IEngineAware.java
@@ -23,7 +23,7 @@ public interface IEngineAware {
public static final int ID_MR_V1 = 0;
public static final int ID_MR_V2 = 2;
public static final int ID_MR_II = 3;
- public static final int ID_SPARK = 5;
+ public static final int ID_SPARK = 4;
int getEngineType();
}