Repository: kylin Updated Branches: refs/heads/master 1ed861539 -> 10c7f39fa
KYLIN-1717 remove default implementations from kylin.properties Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/10c7f39f Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/10c7f39f Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/10c7f39f Branch: refs/heads/master Commit: 10c7f39fa4b45079bbcf17c51ed5d223bea8efd7 Parents: 1ed8615 Author: shaofengshi <[email protected]> Authored: Wed May 25 16:24:33 2016 +0800 Committer: shaofengshi <[email protected]> Committed: Wed May 25 16:24:33 2016 +0800 ---------------------------------------------------------------------- build/conf/kylin.properties | 16 ---------------- .../org/apache/kylin/common/KylinConfigBase.java | 4 +++- examples/test_case_data/localmeta/kylin.properties | 15 --------------- examples/test_case_data/sandbox/kylin.properties | 17 +---------------- 4 files changed, 4 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/10c7f39f/build/conf/kylin.properties ---------------------------------------------------------------------- diff --git a/build/conf/kylin.properties b/build/conf/kylin.properties index 39712c1..df2c83e 100644 --- a/build/conf/kylin.properties +++ b/build/conf/kylin.properties @@ -15,22 +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 - - -# schedulers -kylin.scheduler.0=org.apache.kylin.job.impl.threadpool.DefaultScheduler - # kylin server's mode kylin.server.mode=all http://git-wip-us.apache.org/repos/asf/kylin/blob/10c7f39f/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 f1496b5..efacbfb 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 @@ -685,7 +685,9 @@ abstract public class KylinConfigBase implements Serializable { } public Map<Integer, String> getSchedulers() { - return convertKeyToInteger(getPropertiesByPrefix("kylin.scheduler.")); + Map<Integer, String> r = convertKeyToInteger(getPropertiesByPrefix("kylin.scheduler.")); + r.put(0, "org.apache.kylin.job.impl.threadpool.DefaultScheduler"); + return r; } public Integer getSchedulerType() { http://git-wip-us.apache.org/repos/asf/kylin/blob/10c7f39f/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 9612180..9ac7625 100644 --- a/examples/test_case_data/localmeta/kylin.properties +++ b/examples/test_case_data/localmeta/kylin.properties @@ -15,21 +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 - -# schedulers -kylin.scheduler.0=org.apache.kylin.job.impl.threadpool.DefaultScheduler - # 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 [email protected] http://git-wip-us.apache.org/repos/asf/kylin/blob/10c7f39f/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 16784ca..e716d88 100644 --- a/examples/test_case_data/sandbox/kylin.properties +++ b/examples/test_case_data/sandbox/kylin.properties @@ -15,21 +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 - -# schedulers -kylin.scheduler.0=org.apache.kylin.job.impl.threadpool.DefaultScheduler - # kylin server's mode kylin.server.mode=all # optional information for the owner of kylin platform, it can be your team's email @@ -59,7 +44,7 @@ kylin.job.mapreduce.default.reduce.input.mb=500 # If true, job engine will not assume that hadoop CLI reside on the same server as it self # you will have to specify kylin.job.remote.cli.hostname, kylin.job.remote.cli.username and kylin.job.remote.cli.password -kylin.job.run.as.remote.cmd=false +kylin.job.run.as.remote.cmd=true # Only necessary when kylin.job.run.as.remote.cmd=true kylin.job.remote.cli.hostname=sandbox
