Repository: kylin Updated Branches: refs/heads/master dc08186d5 -> e5c176a6a
KYLIN-1714 drop mandatory changes in kylin.properties, keep backward compatible Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e5c176a6 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e5c176a6 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e5c176a6 Branch: refs/heads/master Commit: e5c176a6a18dfdd0623c63c156ba53d21f949450 Parents: dc08186 Author: Li Yang <liy...@apache.org> Authored: Mon May 23 13:56:41 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Mon May 23 13:56:41 2016 +0800 ---------------------------------------------------------------------- build/conf/kylin.properties | 12 ------------ .../org/apache/kylin/common/KylinConfigBase.java | 18 +++++++++++++++--- .../test_case_data/localmeta/kylin.properties | 12 ------------ examples/test_case_data/sandbox/kylin.properties | 12 ------------ 4 files changed, 15 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/e5c176a6/build/conf/kylin.properties ---------------------------------------------------------------------- diff --git a/build/conf/kylin.properties b/build/conf/kylin.properties index b4a49f6..df2c83e 100644 --- a/build/conf/kylin.properties +++ b/build/conf/kylin.properties @@ -15,18 +15,6 @@ # limitations under the License. # -# job engines -kylin.job.engine.0=org.apache.kylin.engine.mr.MRBatchCubingEngine -kylin.job.engine.2=org.apache.kylin.engine.mr.MRBatchCubingEngine2 - -# source engines -kylin.source.engine.0=org.apache.kylin.source.hive.HiveSource - -# storage engines -kylin.storage.engine.0=org.apache.kylin.storage.hbase.HBaseStorage -kylin.storage.engine.1=org.apache.kylin.storage.hybrid.HybridStorage -kylin.storage.engine.2=org.apache.kylin.storage.hbase.HBaseStorage - # kylin server's mode kylin.server.mode=all http://git-wip-us.apache.org/repos/asf/kylin/blob/e5c176a6/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 2bf4363..17e967f 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 @@ -661,15 +661,27 @@ abstract public class KylinConfigBase implements Serializable { } public Map<Integer, String> getJobEngines() { - return convertKeyToInteger(getPropertiesByPrefix("kylin.job.engine.")); + Map<Integer, String> r = convertKeyToInteger(getPropertiesByPrefix("kylin.job.engine.")); + // ref constants in IEngineAware + r.put(0, "org.apache.kylin.engine.mr.MRBatchCubingEngine"); + r.put(2, "org.apache.kylin.engine.mr.MRBatchCubingEngine2"); + return r; } public Map<Integer, String> getSourceEngines() { - return convertKeyToInteger(getPropertiesByPrefix("kylin.source.engine.")); + Map<Integer, String> r = convertKeyToInteger(getPropertiesByPrefix("kylin.source.engine.")); + // ref constants in ISourceAware + r.put(0, "org.apache.kylin.source.hive.HiveSource"); + return r; } public Map<Integer, String> getStorageEngines() { - return convertKeyToInteger(getPropertiesByPrefix("kylin.storage.engine.")); + Map<Integer, String> r = convertKeyToInteger(getPropertiesByPrefix("kylin.storage.engine.")); + // ref constants in IStorageAware + r.put(0, "org.apache.kylin.storage.hbase.HBaseStorage"); + r.put(1, "kylin.storage.engine.1=org.apache.kylin.storage.hybrid.HybridStorage"); + r.put(2, "kylin.storage.engine.2=org.apache.kylin.storage.hbase.HBaseStorage"); + return r; } private Map<Integer, String> convertKeyToInteger(Map<String, String> map) { http://git-wip-us.apache.org/repos/asf/kylin/blob/e5c176a6/examples/test_case_data/localmeta/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/kylin.properties b/examples/test_case_data/localmeta/kylin.properties index 9605d76..9ac7625 100644 --- a/examples/test_case_data/localmeta/kylin.properties +++ b/examples/test_case_data/localmeta/kylin.properties @@ -15,18 +15,6 @@ # limitations under the License. # -# job engines -kylin.job.engine.0=org.apache.kylin.engine.mr.MRBatchCubingEngine -kylin.job.engine.2=org.apache.kylin.engine.mr.MRBatchCubingEngine2 - -# source engines -kylin.source.engine.0=org.apache.kylin.source.hive.HiveSource - -# storage engines -kylin.storage.engine.0=org.apache.kylin.storage.hbase.HBaseStorage -kylin.storage.engine.1=org.apache.kylin.storage.hybrid.HybridStorage -kylin.storage.engine.2=org.apache.kylin.storage.hbase.HBaseStorage - # optional information for the owner of kylin platform, it can be your team's email # currently it will be attached to each kylin's htable attribute kylin.owner=who...@kylin.apache.org http://git-wip-us.apache.org/repos/asf/kylin/blob/e5c176a6/examples/test_case_data/sandbox/kylin.properties ---------------------------------------------------------------------- diff --git a/examples/test_case_data/sandbox/kylin.properties b/examples/test_case_data/sandbox/kylin.properties index 5247b02..c13eb6b 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -15,18 +15,6 @@ # limitations under the License. # -# job engines -kylin.job.engine.0=org.apache.kylin.engine.mr.MRBatchCubingEngine -kylin.job.engine.2=org.apache.kylin.engine.mr.MRBatchCubingEngine2 - -# source engines -kylin.source.engine.0=org.apache.kylin.source.hive.HiveSource - -# storage engines -kylin.storage.engine.0=org.apache.kylin.storage.hbase.HBaseStorage -kylin.storage.engine.1=org.apache.kylin.storage.hybrid.HybridStorage -kylin.storage.engine.2=org.apache.kylin.storage.hbase.HBaseStorage - # kylin server's mode kylin.server.mode=all # optional information for the owner of kylin platform, it can be your team's email
