[09/43] kylin git commit: KYLIN-Storage-Engine-kylin

[shaofengshi]

KYLIN-Storage-Engine-kylin

Signed-off-by: Jason 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7bc420b2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7bc420b2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7bc420b2

Branch: refs/heads/v1.5.4-release2
Commit: 7bc420b211f506c789a15d214b6730591a583ea0
Parents: a9c8f40
Author: zx chen <346839...@qq.com>
Authored: Fri Sep 2 18:19:54 2016 +0800
Committer: Jason 
Committed: Mon Sep 5 12:06:09 2016 +0800

--
 webapp/app/js/model/cubeDescModel.js  |  6 +++---
 webapp/app/js/services/kylinProperties.js | 16 
 2 files changed, 19 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/7bc420b2/webapp/app/js/model/cubeDescModel.js
--
diff --git a/webapp/app/js/model/cubeDescModel.js 
b/webapp/app/js/model/cubeDescModel.js
index c981249..95a0b13 100644
--- a/webapp/app/js/model/cubeDescModel.js
+++ b/webapp/app/js/model/cubeDescModel.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-KylinApp.service('CubeDescModel', function () {
+KylinApp.service('CubeDescModel', function (kylinConfig) {
 
   this.cubeMetaFrame = {};
 
@@ -57,8 +57,8 @@ KylinApp.service('CubeDescModel', function () {
   "retention_range": "0",
   "status_need_notify":['ERROR', 'DISCARDED', 'SUCCEED'],
   "auto_merge_time_ranges": [60480, 241920],
-  "engine_type": 2,
-  "storage_type":2,
+  "engine_type": kylinConfig.getCubeEng(),
+  "storage_type":kylinConfig.getStorageEng(),
   "override_kylin_properties":{}
 };
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/7bc420b2/webapp/app/js/services/kylinProperties.js
--
diff --git a/webapp/app/js/services/kylinProperties.js 
b/webapp/app/js/services/kylinProperties.js
index 68e8766..7110b8c 100644
--- a/webapp/app/js/services/kylinProperties.js
+++ b/webapp/app/js/services/kylinProperties.js
@@ -71,6 +71,22 @@ KylinApp.service('kylinConfig', function (AdminService, 
$log) {
 }
 return this.hiveLimit;
   }
+
+  this.getStorageEng = function () {
+this.StorageEng = this.getProperty("kylin.default.storage.engine").trim();
+  if (!this.StorageEng) {
+return 2;
+  }
+  return this.StorageEng;
+}
+
+  this.getCubeEng = function () {
+this.CubeEng = this.getProperty("kylin.default.cube.engine").trim();
+if (!this.CubeEng) {
+  return 2;
+}
+  return this.CubeEng;
+  }
   //fill config info for Config from backend
   this.initWebConfigInfo = function () {
 

[04/22] kylin git commit: KYLIN-Storage-Engine-kylin

[lidong]

KYLIN-Storage-Engine-kylin

Signed-off-by: Jason 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7bc420b2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7bc420b2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7bc420b2

Branch: refs/heads/1.5.x-CDH5.7
Commit: 7bc420b211f506c789a15d214b6730591a583ea0
Parents: a9c8f40
Author: zx chen <346839...@qq.com>
Authored: Fri Sep 2 18:19:54 2016 +0800
Committer: Jason 
Committed: Mon Sep 5 12:06:09 2016 +0800

--
 webapp/app/js/model/cubeDescModel.js  |  6 +++---
 webapp/app/js/services/kylinProperties.js | 16 
 2 files changed, 19 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/7bc420b2/webapp/app/js/model/cubeDescModel.js
--
diff --git a/webapp/app/js/model/cubeDescModel.js 
b/webapp/app/js/model/cubeDescModel.js
index c981249..95a0b13 100644
--- a/webapp/app/js/model/cubeDescModel.js
+++ b/webapp/app/js/model/cubeDescModel.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-KylinApp.service('CubeDescModel', function () {
+KylinApp.service('CubeDescModel', function (kylinConfig) {
 
   this.cubeMetaFrame = {};
 
@@ -57,8 +57,8 @@ KylinApp.service('CubeDescModel', function () {
   "retention_range": "0",
   "status_need_notify":['ERROR', 'DISCARDED', 'SUCCEED'],
   "auto_merge_time_ranges": [60480, 241920],
-  "engine_type": 2,
-  "storage_type":2,
+  "engine_type": kylinConfig.getCubeEng(),
+  "storage_type":kylinConfig.getStorageEng(),
   "override_kylin_properties":{}
 };
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/7bc420b2/webapp/app/js/services/kylinProperties.js
--
diff --git a/webapp/app/js/services/kylinProperties.js 
b/webapp/app/js/services/kylinProperties.js
index 68e8766..7110b8c 100644
--- a/webapp/app/js/services/kylinProperties.js
+++ b/webapp/app/js/services/kylinProperties.js
@@ -71,6 +71,22 @@ KylinApp.service('kylinConfig', function (AdminService, 
$log) {
 }
 return this.hiveLimit;
   }
+
+  this.getStorageEng = function () {
+this.StorageEng = this.getProperty("kylin.default.storage.engine").trim();
+  if (!this.StorageEng) {
+return 2;
+  }
+  return this.StorageEng;
+}
+
+  this.getCubeEng = function () {
+this.CubeEng = this.getProperty("kylin.default.cube.engine").trim();
+if (!this.CubeEng) {
+  return 2;
+}
+  return this.CubeEng;
+  }
   //fill config info for Config from backend
   this.initWebConfigInfo = function () {
 

kylin git commit: KYLIN-Storage-Engine-kylin

[zhongjian]

Repository: kylin
Updated Branches:
  refs/heads/1.5.4-rc1 d37f0cafe -> 602e71902


KYLIN-Storage-Engine-kylin

Signed-off-by: Jason 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/602e7190
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/602e7190
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/602e7190

Branch: refs/heads/1.5.4-rc1
Commit: 602e719021c050501b94297545ca0288311fdc91
Parents: d37f0ca
Author: zx chen <346839...@qq.com>
Authored: Fri Sep 2 18:19:54 2016 +0800
Committer: Jason 
Committed: Mon Sep 5 13:01:40 2016 +0800

--
 webapp/app/js/model/cubeDescModel.js  |  6 +++---
 webapp/app/js/services/kylinProperties.js | 16 
 2 files changed, 19 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/602e7190/webapp/app/js/model/cubeDescModel.js
--
diff --git a/webapp/app/js/model/cubeDescModel.js 
b/webapp/app/js/model/cubeDescModel.js
index c981249..95a0b13 100644
--- a/webapp/app/js/model/cubeDescModel.js
+++ b/webapp/app/js/model/cubeDescModel.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-KylinApp.service('CubeDescModel', function () {
+KylinApp.service('CubeDescModel', function (kylinConfig) {
 
   this.cubeMetaFrame = {};
 
@@ -57,8 +57,8 @@ KylinApp.service('CubeDescModel', function () {
   "retention_range": "0",
   "status_need_notify":['ERROR', 'DISCARDED', 'SUCCEED'],
   "auto_merge_time_ranges": [60480, 241920],
-  "engine_type": 2,
-  "storage_type":2,
+  "engine_type": kylinConfig.getCubeEng(),
+  "storage_type":kylinConfig.getStorageEng(),
   "override_kylin_properties":{}
 };
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/602e7190/webapp/app/js/services/kylinProperties.js
--
diff --git a/webapp/app/js/services/kylinProperties.js 
b/webapp/app/js/services/kylinProperties.js
index 68e8766..7110b8c 100644
--- a/webapp/app/js/services/kylinProperties.js
+++ b/webapp/app/js/services/kylinProperties.js
@@ -71,6 +71,22 @@ KylinApp.service('kylinConfig', function (AdminService, 
$log) {
 }
 return this.hiveLimit;
   }
+
+  this.getStorageEng = function () {
+this.StorageEng = this.getProperty("kylin.default.storage.engine").trim();
+  if (!this.StorageEng) {
+return 2;
+  }
+  return this.StorageEng;
+}
+
+  this.getCubeEng = function () {
+this.CubeEng = this.getProperty("kylin.default.cube.engine").trim();
+if (!this.CubeEng) {
+  return 2;
+}
+  return this.CubeEng;
+  }
   //fill config info for Config from backend
   this.initWebConfigInfo = function () {
 

kylin git commit: KYLIN-Storage-Engine-kylin

[zhongjian]

Repository: kylin
Updated Branches:
  refs/heads/master a9c8f40ee -> 7bc420b21


KYLIN-Storage-Engine-kylin

Signed-off-by: Jason 


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7bc420b2
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7bc420b2
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7bc420b2

Branch: refs/heads/master
Commit: 7bc420b211f506c789a15d214b6730591a583ea0
Parents: a9c8f40
Author: zx chen <346839...@qq.com>
Authored: Fri Sep 2 18:19:54 2016 +0800
Committer: Jason 
Committed: Mon Sep 5 12:06:09 2016 +0800

--
 webapp/app/js/model/cubeDescModel.js  |  6 +++---
 webapp/app/js/services/kylinProperties.js | 16 
 2 files changed, 19 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/7bc420b2/webapp/app/js/model/cubeDescModel.js
--
diff --git a/webapp/app/js/model/cubeDescModel.js 
b/webapp/app/js/model/cubeDescModel.js
index c981249..95a0b13 100644
--- a/webapp/app/js/model/cubeDescModel.js
+++ b/webapp/app/js/model/cubeDescModel.js
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-KylinApp.service('CubeDescModel', function () {
+KylinApp.service('CubeDescModel', function (kylinConfig) {
 
   this.cubeMetaFrame = {};
 
@@ -57,8 +57,8 @@ KylinApp.service('CubeDescModel', function () {
   "retention_range": "0",
   "status_need_notify":['ERROR', 'DISCARDED', 'SUCCEED'],
   "auto_merge_time_ranges": [60480, 241920],
-  "engine_type": 2,
-  "storage_type":2,
+  "engine_type": kylinConfig.getCubeEng(),
+  "storage_type":kylinConfig.getStorageEng(),
   "override_kylin_properties":{}
 };
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/7bc420b2/webapp/app/js/services/kylinProperties.js
--
diff --git a/webapp/app/js/services/kylinProperties.js 
b/webapp/app/js/services/kylinProperties.js
index 68e8766..7110b8c 100644
--- a/webapp/app/js/services/kylinProperties.js
+++ b/webapp/app/js/services/kylinProperties.js
@@ -71,6 +71,22 @@ KylinApp.service('kylinConfig', function (AdminService, 
$log) {
 }
 return this.hiveLimit;
   }
+
+  this.getStorageEng = function () {
+this.StorageEng = this.getProperty("kylin.default.storage.engine").trim();
+  if (!this.StorageEng) {
+return 2;
+  }
+  return this.StorageEng;
+}
+
+  this.getCubeEng = function () {
+this.CubeEng = this.getProperty("kylin.default.cube.engine").trim();
+if (!this.CubeEng) {
+  return 2;
+}
+  return this.CubeEng;
+  }
   //fill config info for Config from backend
   this.initWebConfigInfo = function () {