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 2019/03/09 03:31:06 UTC
[kylin] branch engine-flink updated: KYLIN-3853 Support Flink cube
engine for Kylin web UI
This is an automated email from the ASF dual-hosted git repository.
shaofengshi 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 c911e32 KYLIN-3853 Support Flink cube engine for Kylin web UI
c911e32 is described below
commit c911e32a654a4d2ac4448c93dd252bbd70e194aa
Author: yanghua <ya...@gmail.com>
AuthorDate: Fri Mar 8 19:31:54 2019 +0800
KYLIN-3853 Support Flink cube engine for Kylin web UI
---
.../org/apache/kylin/metadata/model/IEngineAware.java | 1 +
engine-flink/pom.xml | 18 ++++++++++++++++++
webapp/app/js/model/cubeConfig.js | 5 +++--
.../app/partials/cubeDesigner/advanced_settings.html | 1 +
4 files changed, 23 insertions(+), 2 deletions(-)
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 4754eca..e338868 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
@@ -26,6 +26,7 @@ public interface IEngineAware {
public static final int ID_MR_V2 = 2;
public static final int ID_MR_II = 3;
public static final int ID_SPARK = 4;
+ public static final int ID_FLINK = 5;
int getEngineType();
}
diff --git a/engine-flink/pom.xml b/engine-flink/pom.xml
index 04ae57a..e646f84 100644
--- a/engine-flink/pom.xml
+++ b/engine-flink/pom.xml
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
index a83d4c9..7ac2883 100644
--- a/webapp/app/js/model/cubeConfig.js
+++ b/webapp/app/js/model/cubeConfig.js
@@ -25,7 +25,8 @@ KylinApp.constant('cubeConfig', {
cubePartitionTypes: ['APPEND'],
engineType:[
{name:'MapReduce',value: 2},
- {name:'Spark',value: 4}
+ {name:'Spark',value: 4},
+ {name:'Flink',value: 5}
],
joinTypes: [
{name: 'Left', value: 'left'},
@@ -200,4 +201,4 @@ KylinApp.constant('cubeConfig', {
'left': '-12px'
}
}
-});
\ No newline at end of file
+});
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index 5b063ef..63551cf 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -382,6 +382,7 @@
</select>
<span ng-if="state.mode=='view'&&cubeMetaFrame.engine_type==2">MapReduce</span>
<span ng-if="state.mode=='view'&&cubeMetaFrame.engine_type==4">Spark</span>
+ <span ng-if="state.mode=='view'&&cubeMetaFrame.engine_type==5">Flink</span>
</div>
</div>
</div>