From 824fb6a6a76faf505585550c94ad0c8b0b4292e4 Mon Sep 17 00:00:00 2001 From: kangkaisen Date: Wed, 28 Jun 2017 20:21:52 +0800 Subject: [PATCH] KYLIN-2695 Should allow user to override spark conf in cube --- .../main/java/org/apache/kylin/engine/spark/SparkExecutable.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java index 1ed2235c7..1e032c65a 100644 --- a/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java +++ b/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java @@ -23,6 +23,8 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.CliCommandExecutor; +import org.apache.kylin.cube.CubeInstance; +import org.apache.kylin.cube.CubeManager; import org.apache.kylin.job.common.PatternedLogger; import org.apache.kylin.job.exception.ExecuteException; import org.apache.kylin.job.execution.AbstractExecutable; @@ -70,7 +72,10 @@ public class SparkExecutable extends AbstractExecutable { @Override protected ExecuteResult doWork(ExecutableContext context) throws ExecuteException { - final KylinConfig config = context.getConfig(); + String cubeName = this.getParam(SparkCubingByLayer.OPTION_CUBE_NAME.getOpt()); + CubeInstance cube = CubeManager.getInstance(context.getConfig()).getCube(cubeName); + final KylinConfig config = cube.getConfig(); + if (KylinConfig.getSparkHome() == null) { throw new NullPointerException(); } -- 2.11.0 (Apple Git-81)