You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/02/24 08:24:57 UTC
[1/2] kylin git commit: KYLIN 1875 add lookup css issue
Repository: kylin
Updated Branches:
refs/heads/master cdfde7cb1 -> 9ff78bce7
KYLIN 1875 add lookup css issue
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d59b8ae7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d59b8ae7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d59b8ae7
Branch: refs/heads/master
Commit: d59b8ae7704ddb0cd40ef1458055e19d2eee3819
Parents: cdfde7c
Author: chenzhx <34...@qq.com>
Authored: Fri Feb 24 14:48:58 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Fri Feb 24 16:16:01 2017 +0800
----------------------------------------------------------------------
webapp/app/partials/modelDesigner/data_model.html | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/d59b8ae7/webapp/app/partials/modelDesigner/data_model.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/data_model.html b/webapp/app/partials/modelDesigner/data_model.html
index 9b7070c..ca93c90 100644
--- a/webapp/app/partials/modelDesigner/data_model.html
+++ b/webapp/app/partials/modelDesigner/data_model.html
@@ -131,8 +131,8 @@
<div class="form-group">
<div class="row">
<div class="col-xs-12 form-group">
- <select chosen ng-model="newLookup.joinTable" class="chosen-select col-sm-5"
- ng-options="table as table for table in aliasName"
+ <select chosen ng-model="newLookup.joinTable" class="chosen-select "
+ style="width:45%;" ng-options="table as table for table in aliasName"
name="table_name" ng-disabled="lookupState.editing"
ng-required="true">
<option value=""> -- From Table -- </option>
@@ -142,7 +142,7 @@
<div class="row">
<div class="col-xs-12 form-group">
<!--Join Type-->
- <select class="chosen-select col-sm-5" chosen ng-init="newLookup.join.type='inner'" ng-model="newLookup.join.type"
+ <select class="chosen-select " style="width:45%;" chosen ng-init="newLookup.join.type='inner'" ng-model="newLookup.join.type"
ng-options="joinType.value as joinType.name+' Join' for joinType in cubeConfig.joinTypes">
<option value=""></option>
</select>
@@ -150,18 +150,18 @@
</div>
<div class="row">
<div class="col-xs-12 form-group">
- <select chosen ng-model="newLookup.table" class="chosen-select col-sm-5"
+ <select chosen ng-model="newLookup.table" class="chosen-select" style="width:45%;"
ng-options="table.name as VdmUtil.removeNameSpace(table.name) for table in tableModel.selectProjectTables"
name="table_name" ng-disabled="lookupState.editing"
ng-required="true" ng-change="changeJoinTable()">
<option value=""> -- Select Lookup Table -- </option>
</select>
- <div class="chosen-select col-sm-6" style="float:right;padding-left:0;">
+ <div style="float:right;padding-left:0;width:45%">
<input type="text" class="form-control " name="joinTable_alias" placeholder="Input Table Alias" ng-required="true"
ng-model="newLookup.alias" ng-pattern="/^[A-Z_\d]+$/">
<small class="help-block red" ng-show="!lookup_form.joinTable_alias.$error.required&&lookup_form.joinTable_alias.$invalid && (lookup_form.joinTable_alias.$dirty||lookup_form.$submitted)"><i class="fa fa-exclamation-triangle"></i> Table alias is invalid(A Combination of numbers, uppercase letters or underscores).</small>
</div>
- <span class="col-sm-1 font-color-default" style="float:right;font-size:large;line-height: 30px;"><b>AS</b></span>
+ <span class=" font-color-default" style="float:right;font-size:large;line-height: 30px;width:10%;text-align:center"><b>AS</b></span>
</div>
</div>
</div>
[2/2] kylin git commit: minor,
adjust out-of-box kylin.properties for sparking cubing
Posted by li...@apache.org.
minor, adjust out-of-box kylin.properties for sparking cubing
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9ff78bce
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9ff78bce
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9ff78bce
Branch: refs/heads/master
Commit: 9ff78bce72a56b63dc9e1c8f0b4cd59d0c01b011
Parents: d59b8ae
Author: Li Yang <li...@apache.org>
Authored: Fri Feb 24 16:15:52 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Fri Feb 24 16:20:33 2017 +0800
----------------------------------------------------------------------
build/conf/kylin.properties | 17 ++++++++---------
.../apache/kylin/engine/spark/SparkExecutable.java | 4 ++--
webapp/app/js/model/cubeConfig.js | 2 +-
3 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/9ff78bce/build/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/build/conf/kylin.properties b/build/conf/kylin.properties
index d7ba0b3..46fe86b 100644
--- a/build/conf/kylin.properties
+++ b/build/conf/kylin.properties
@@ -203,8 +203,9 @@ kylin.security.saml.context-path=/kylin
### Spark Engine Configs ###
-# Hadoop conf folder, will export this as "HADOOP_CONF_DIR" before run spark-submit
-#kylin.env.hadoop-conf-dir=/etc/hive/conf
+# Hadoop conf folder, will export this as "HADOOP_CONF_DIR" to run spark-submit
+# This must contain site xmls of core, yarn, hive, and hbase in one folder
+#kylin.env.hadoop-conf-dir=/etc/hadoop/conf
# Estimate the RDD partition numbers
kylin.engine.spark.rdd-partition-cut-mb=10
@@ -215,19 +216,17 @@ kylin.engine.spark.min-partition=1
# Max partition numbers of rdd
kylin.engine.spark.max-partition=5000
-### Spark conf (default is in spark/conf/spark-defaults.conf)
+## Spark conf (default is in spark/conf/spark-defaults.conf)
kylin.engine.spark-conf.spark.master=yarn
kylin.engine.spark-conf.spark.submit.deployMode=cluster
-kylin.engine.spark-conf.spark.yarn.executor.memoryOverhead=1024
-kylin.engine.spark-conf.spark.yarn.driver.memoryOverhead=384
kylin.engine.spark-conf.spark.yarn.queue=default
-kylin.engine.spark-conf.spark.executor.memory=4G
-kylin.engine.spark-conf.spark.executor.cores=4
-kylin.engine.spark-conf.spark.executor.instances=8
-kylin.engine.spark-conf.spark.storage.memoryFraction=0.3
+kylin.engine.spark-conf.spark.executor.memory=1G
+kylin.engine.spark-conf.spark.executor.cores=2
+kylin.engine.spark-conf.spark.executor.instances=1
kylin.engine.spark-conf.spark.eventLog.enabled=true
kylin.engine.spark-conf.spark.eventLog.dir=hdfs\:///kylin/spark-history
kylin.engine.spark-conf.spark.history.fs.logDirectory=hdfs\:///kylin/spark-history
+
## manually upload spark-assembly jar to HDFS and then set this property will avoid repeatedly uploading jar at runtime
#kylin.engine.spark-conf.spark.yarn.jar=hdfs://namenode:8020/kylin/spark/spark-assembly-1.6.3-hadoop2.6.0.jar
#kylin.engine.spark-conf.spark.io.compression.codec=org.apache.spark.io.SnappyCompressionCodec
http://git-wip-us.apache.org/repos/asf/kylin/blob/9ff78bce/engine-spark/src/main/java/org/apache/kylin/engine/spark/SparkExecutable.java
----------------------------------------------------------------------
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 cf7438c..5ad21cf 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
@@ -71,7 +71,7 @@ public class SparkExecutable extends AbstractExecutable {
@Override
protected ExecuteResult doWork(ExecutableContext context) throws ExecuteException {
final KylinConfig config = context.getConfig();
- if (config.getSparkHome() == null) {
+ if (KylinConfig.getSparkHome() == null) {
throw new NullPointerException();
}
if (config.getKylinJobJarPath() == null) {
@@ -117,7 +117,7 @@ public class SparkExecutable extends AbstractExecutable {
stringBuilder.append("--files %s --jars %s %s %s");
try {
- String cmd = String.format(stringBuilder.toString(), hadoopConf, config.getSparkHome(), hbaseConfFile.getAbsolutePath(), jars, jobJar, formatArgs());
+ String cmd = String.format(stringBuilder.toString(), hadoopConf, KylinConfig.getSparkHome(), hbaseConfFile.getAbsolutePath(), jars, jobJar, formatArgs());
logger.info("cmd:" + cmd);
final StringBuilder output = new StringBuilder();
CliCommandExecutor exec = new CliCommandExecutor();
http://git-wip-us.apache.org/repos/asf/kylin/blob/9ff78bce/webapp/app/js/model/cubeConfig.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeConfig.js b/webapp/app/js/model/cubeConfig.js
index 47d0f46..eec3f10 100644
--- a/webapp/app/js/model/cubeConfig.js
+++ b/webapp/app/js/model/cubeConfig.js
@@ -25,7 +25,7 @@ KylinApp.constant('cubeConfig', {
cubePartitionTypes: ['APPEND'],
engineType:[
{name:'MapReduce',value: 2},
- {name:'Spark(Beta)',value: 4}
+ {name:'Spark (Beta)',value: 4}
],
joinTypes: [
{name: 'Left', value: 'left'},