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 2016/03/27 03:32:29 UTC
[26/50] [abbrv] kylin git commit: KYLIN-1074 set default value for
load hive table limit
KYLIN-1074 set default value for load hive table limit
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f6bc6521
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f6bc6521
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f6bc6521
Branch: refs/heads/1.3.x
Commit: f6bc6521721cc3ee0477327ba4e88093f06bf83c
Parents: a5111fb
Author: ZhongJian <zh...@ZhongJians-MacBook-Pro.local>
Authored: Tue Mar 1 22:20:19 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Tue Mar 1 22:37:59 2016 +0800
----------------------------------------------------------------------
webapp/app/js/services/kylinProperties.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/f6bc6521/webapp/app/js/services/kylinProperties.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/services/kylinProperties.js b/webapp/app/js/services/kylinProperties.js
index adb8ea9..e48496b 100644
--- a/webapp/app/js/services/kylinProperties.js
+++ b/webapp/app/js/services/kylinProperties.js
@@ -20,7 +20,7 @@ KylinApp.service('kylinConfig', function (AdminService, $log) {
var _config;
var timezone;
var deployEnv;
- var hiveLimit = 20;
+ var hiveLimit;
this.init = function () {
@@ -57,14 +57,17 @@ KylinApp.service('kylinConfig', function (AdminService, $log) {
}
this.getDeployEnv = function () {
+ this.deployEnv = this.getProperty("deploy.env");
if (!this.deployEnv) {
- this.deployEnv = this.getProperty("deploy.env").trim();
+ return "DEV";
}
- return this.deployEnv.toUpperCase();
+ return this.deployEnv.toUpperCase().trim();
}
+
this.getHiveLimit = function () {
+ this.hiveLimit = this.getProperty("kylin.web.hive.limit");
if (!this.hiveLimit) {
- this.hiveLimit = this.getProperty("kylin.web.hive.limit");
+ return 20;
}
return this.hiveLimit;
}