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 2015/04/26 06:22:42 UTC
[35/41] incubator-kylin git commit: KYLIN-675
KYLIN-675
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/b5236d67
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b5236d67
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b5236d67
Branch: refs/heads/streaming
Commit: b5236d67ce07d55ebe14bc18dc7b60c32b2970bd
Parents: 9c0bdfa
Author: jiazhong <ji...@ebay.com>
Authored: Fri Apr 10 14:44:13 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Fri Apr 10 14:44:13 2015 +0800
----------------------------------------------------------------------
.../test_case_data/sandbox/kylin.properties | 87 --------------------
webapp/app/js/controllers/cube.js | 4 +-
webapp/app/js/controllers/modelEdit.js | 4 +-
webapp/app/js/controllers/query.js | 1 +
webapp/app/partials/query/query.html | 2 +-
5 files changed, 6 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b5236d67/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
deleted file mode 100644
index cd5d02c..0000000
--- a/examples/test_case_data/sandbox/kylin.properties
+++ /dev/null
@@ -1,87 +0,0 @@
-## Config for Kylin Engine ##
-
-# List of web servers in use, this enables one web server instance to sync up with other servers.
-kylin.rest.servers=localhost:7070
-
-# The metadata store in hbase
-kylin.metadata.url=kylin_metadata_qa@hbase
-
-# The storage for final cube file in hbase
-kylin.storage.url=hbase
-
-# Temp folder in hdfs
-kylin.hdfs.working.dir=/tmp
-
-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
-
-# Only necessary when kylin.job.run.as.remote.cmd=true
-kylin.job.remote.cli.hostname=
-
-# Only necessary when kylin.job.run.as.remote.cmd=true
-kylin.job.remote.cli.username=
-
-# Only necessary when kylin.job.run.as.remote.cmd=true
-kylin.job.remote.cli.password=
-
-# Used by test cases to prepare synthetic data for sample cube
-kylin.job.remote.cli.working.dir=/tmp/kylin
-
-# Max count of concurrent jobs running
-kylin.job.concurrent.max.limit=10
-
-# Time interval to check hadoop job status
-kylin.job.yarn.app.rest.check.interval.seconds=10
-
-
-## Config for Restful APP ##
-# database connection settings:
-ldap.server=
-ldap.username=
-ldap.password=
-ldap.user.searchBase=
-ldap.user.searchPattern=
-ldap.user.groupSearchBase=
-ldap.service.searchBase=OU=
-ldap.service.searchPattern=
-ldap.service.groupSearchBase=
-acl.adminRole=
-acl.defaultRole=
-ganglia.group=
-ganglia.port=8664
-
-## Config for mail service
-
-# If true, will send email notification;
-mail.enabled=false
-mail.host=
-mail.username=
-mail.password=
-mail.sender=
-
-###########################config info for web#######################
-
-#help info ,format{name|displayName|link} ,optional
-kylin.web.help.length=4
-kylin.web.help.0=start|Getting Started|
-kylin.web.help.1=odbc|ODBC Driver|
-kylin.web.help.2=tableau|Tableau Guide|
-kylin.web.help.3=onboard|Cube Design Tutorial|
-#hadoop url link ,optional
-kylin.web.hadoop=
-#job diagnostic url link ,optional
-kylin.web.diagnostic=
-#contact mail on web page ,optional
-kylin.web.contact_mail=
-
-###########################config info for front#######################
-
-#env DEV|QA|PROD
-deploy.env=DEV
-
-###########################config info for sandbox#######################
-kylin.sandbox=true
-
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b5236d67/webapp/app/js/controllers/cube.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cube.js b/webapp/app/js/controllers/cube.js
index 8e184d1..55c54f0 100755
--- a/webapp/app/js/controllers/cube.js
+++ b/webapp/app/js/controllers/cube.js
@@ -357,8 +357,8 @@ KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService,
});
-var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageService, $location, cube,metaModel, buildType,SweetAlert,loadingRequest) {
- $scope.cube = cube;
+var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageService, $location, cube,metaModel, buildType,SweetAlert,loadingRequest,cubesManager) {
+ $scope.cubesManager = cubesManager;
$scope.metaModel={
model:metaModel.model
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b5236d67/webapp/app/js/controllers/modelEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js
index c483752..22a9f23 100644
--- a/webapp/app/js/controllers/modelEdit.js
+++ b/webapp/app/js/controllers/modelEdit.js
@@ -117,7 +117,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati
modelsManager.selectedModel.partition_desc.partition_date_start=null;
}
$scope.state.project = modelsManager.selectedModel.project;
- var _model = angular.copy($scope.model);
+ var _model = angular.copy(modelsManager.selectedModel);
delete _model.project;
$scope.state.modelSchema = angular.toJson(_model, true);
@@ -220,7 +220,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati
if(modelsManager.selectedModel.partition_desc.partition_date_start==0){
modelsManager.selectedModel.partition_desc.partition_date_start = null;
}
- if($scope.model&&(modelsManager.selectedModel.partition_desc.partition_date_start||modelsManager.selectedModel.partition_desc.partition_date_start==0))
+ if(modelsManager.selectedModel&&(modelsManager.selectedModel.partition_desc.partition_date_start||modelsManager.selectedModel.partition_desc.partition_date_start==0))
{
modelsManager.selectedModel.partition_desc.partition_date_start+=new Date().getTimezoneOffset()*60000;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b5236d67/webapp/app/js/controllers/query.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js
index 10be251..4cf699f 100644
--- a/webapp/app/js/controllers/query.js
+++ b/webapp/app/js/controllers/query.js
@@ -354,6 +354,7 @@ KylinApp
$scope.refreshCurQuery = function () {
$scope.curQuery = this.query;
+
}
$scope.showSavePanel = function () {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b5236d67/webapp/app/partials/query/query.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html
index d34dbc7..7947788 100644
--- a/webapp/app/partials/query/query.html
+++ b/webapp/app/partials/query/query.html
@@ -193,7 +193,7 @@
class="{{(query==curQuery)? 'active':''}}">
<span>
<button class="btn {{(query==curQuery)?'active':''}} btn-default btn-xs" style="width: 50px"
- ng-click="refreshCurQuery()">
+ ng-click="refreshCurQuery();$event.stopPropagation();">
{{$index+1}}
<span ng-if="query.status=='failed'">
<i style="color: #f0ad4e" class="fa fa-exclamation-triangle"></i>