[kylin] branch engine-flink updated: KYLIN-4064 Make param engineType working in CI

[nic]

This is an automated email from the ASF dual-hosted git repository.

nic pushed a commit to branch engine-flink
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/engine-flink by this push:
     new 1438267  KYLIN-4064 Make param engineType working in CI
1438267 is described below

commit 14382672ae8929d557bd2deb49fbd8d83b2ac544
Author: chao long <wayn...@qq.com>
AuthorDate: Mon Jul 1 22:48:04 2019 +0800

    KYLIN-4064 Make param engineType working in CI
---
 .../kylin/provision/BuildCubeWithEngine.java       | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git 
a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java 
b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
index ec5bc35..eec6f5d 100644
--- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
+++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
@@ -83,7 +83,7 @@ public class BuildCubeWithEngine {
     private CubeManager cubeManager;
     private CubeDescManager cubeDescManager;
     private DefaultScheduler scheduler;
-    protected ExecutableManager jobService;
+    private ExecutableManager jobService;
     private static boolean fastBuildMode = false;
     private static int engineType;
 
@@ -131,8 +131,6 @@ public class BuildCubeWithEngine {
         String specifiedEngineType = System.getProperty("engineType");
         if (StringUtils.isNotEmpty(specifiedEngineType)) {
             engineType = Integer.parseInt(specifiedEngineType);
-        } else {
-            engineType = 2;
         }
 
         System.setProperty(KylinConfig.KYLIN_CONF, confDir);
@@ -195,6 +193,9 @@ public class BuildCubeWithEngine {
         }
 
         cubeDescManager = CubeDescManager.getInstance(kylinConfig);
+
+        // update enginType
+        updateCubeEngineType(Lists.newArrayList("ci_inner_join_cube", 
"ci_left_join_cube"));
     }
 
     public void after() {
@@ -353,12 +354,15 @@ public class BuildCubeWithEngine {
         return doBuildAndMergeOnCube(cubeName);
     }
 
-    @SuppressWarnings("unused")
-    private void updateCubeEngineType(String cubeName) throws IOException {
-        CubeDesc cubeDesc = cubeDescManager.getCubeDesc(cubeName);
-        if (cubeDesc.getEngineType() != engineType) {
-            cubeDesc.setEngineType(engineType);
-            cubeDescManager.updateCubeDesc(cubeDesc);
+    private void updateCubeEngineType(List<String> cubeNames) throws 
IOException {
+        if (engineType != 0) {
+            for(String cubeName : cubeNames) {
+                CubeDesc cubeDesc = cubeDescManager.getCubeDesc(cubeName);
+                if (cubeDesc.getEngineType() != engineType) {
+                    cubeDesc.setEngineType(engineType);
+                    cubeDescManager.updateCubeDesc(cubeDesc);
+                }
+            }
         }
     }