You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2015/06/09 07:10:05 UTC
incubator-kylin git commit: KYLIN-813 ,
show segment start/end Time in Hbase tab , update font-awesome version
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging 716bd9dcc -> b3b0f2f95
KYLIN-813 ,show segment start/end Time in Hbase tab ,update font-awesome version
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/b3b0f2f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/b3b0f2f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/b3b0f2f9
Branch: refs/heads/0.7-staging
Commit: b3b0f2f957fbb58cf0f61ecc72afd658ceebfcdb
Parents: 716bd9d
Author: jiazhong <ji...@ebay.com>
Authored: Tue Jun 9 13:08:10 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Tue Jun 9 13:09:08 2015 +0800
----------------------------------------------------------------------
.../kylin/rest/controller/CubeController.java | 2 +
.../kylin/rest/response/HBaseResponse.java | 26 ++++++++
webapp/app/index.html | 1 -
webapp/app/js/controllers/index.js | 44 -------------
webapp/app/partials/header.html | 2 +-
webapp/app/partials/home.html | 65 --------------------
webapp/app/routes.json | 9 +--
webapp/bower.json | 2 +-
8 files changed, 31 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b3b0f2f9/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
index 51224b8..26c9811 100644
--- a/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
+++ b/server/src/main/java/org/apache/kylin/rest/controller/CubeController.java
@@ -449,6 +449,8 @@ public class CubeController extends BasicController {
}
hr.setTableName(tableName);
+ hr.setDateRangeStart(segment.getDateRangeStart());
+ hr.setDateRangeEnd(segment.getDateRangeEnd());
hbase.add(hr);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b3b0f2f9/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java b/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java
index cd32ae5..302cb02 100644
--- a/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java
+++ b/server/src/main/java/org/apache/kylin/rest/response/HBaseResponse.java
@@ -25,6 +25,8 @@ public class HBaseResponse implements Serializable {
private String tableName;
private long tableSize;
private int regionCount;
+ private long dateRangeStart;
+ private long dateRangeEnd;
public HBaseResponse() {
}
@@ -73,4 +75,28 @@ public class HBaseResponse implements Serializable {
public void setRegionCount(int regionCount) {
this.regionCount = regionCount;
}
+
+ /**
+ * @return the segmentStartTime
+ */
+ public long getDateRangeStart() {
+ return dateRangeStart;
+ }
+
+ /**
+ * @param segmentStartTime
+ * the segmentStartTime to set
+ */
+ public void setDateRangeStart(long dateRangeStart) { this.dateRangeStart = dateRangeStart; }
+
+ /**
+ * @return the segmentEndTime
+ */
+ public long getDateRangeEnd() { return dateRangeEnd; }
+
+ /**
+ * @param segmentEndTime
+ * the segmentEndTime to set
+ */
+ public void setDateRangeEnd(long dateRangeEnd) { this.dateRangeEnd = dateRangeEnd; }
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b3b0f2f9/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/webapp/app/index.html b/webapp/app/index.html
index 44021a9..6824498 100644
--- a/webapp/app/index.html
+++ b/webapp/app/index.html
@@ -140,7 +140,6 @@
<script src="js/model/jobListModel.js"></script>
<script src="js/controllers/page.js"></script>
-<script src="js/controllers/index.js"></script>
<script src="js/controllers/access.js"></script>
<script src="js/controllers/auth.js"></script>
<script src="js/controllers/cubes.js"></script>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b3b0f2f9/webapp/app/js/controllers/index.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/index.js b/webapp/app/js/controllers/index.js
deleted file mode 100644
index a648c1d..0000000
--- a/webapp/app/js/controllers/index.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-
-'use strict';
-
-KylinApp.controller('IndexCtrl', function ($scope, $location, $anchorScroll) {
- // Settings about carousel presentation.
- $scope.myInterval = 5000;
- // Data url for 1x1 pixel transparent gif.
- var carouselImg = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
-
- $scope.slides = [
- {
- image: carouselImg,
- caption: 'Kylin',
- text: 'Get your data ready for analytics'
- },
- {
- image: carouselImg,
- caption: 'Kylin',
- text: 'Process and transform data from multiple sources'
- },
- {
- image: carouselImg,
- caption: 'Kylin',
- text: 'Harness the power of Hadoop with zero coding and no deployment'
- }
- ];
-});
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b3b0f2f9/webapp/app/partials/header.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/header.html b/webapp/app/partials/header.html
index 937f56c..eb94664 100644
--- a/webapp/app/partials/header.html
+++ b/webapp/app/partials/header.html
@@ -26,7 +26,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="home" style="padding: 2px 10px 0px 0px"><img src="image/logo.png" height="40px" width="40px"/><small> Kylin </small></a>
+ <a class="navbar-brand" style="padding: 2px 10px 0px 0px"><img src="image/logo.png" height="40px" width="40px"/><small> Kylin </small></a>
</div>
<div class="navbar-collapse collapse" collapse="isCollapsed">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b3b0f2f9/webapp/app/partials/home.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/home.html b/webapp/app/partials/home.html
deleted file mode 100644
index f6c63d0..0000000
--- a/webapp/app/partials/home.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-* 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.
--->
-
-<!--Big Background Image-->
-<div class="bg-holder">
- <img src="image/Himg.png" />
-</div>
-
-<!--Carousel Part-->
-<div style="height: 442px;">
- <carousel interval="myInterval">
- <slide ng-repeat="slide in slides" active="slide.active">
- <img ng-src="{{slide.image}}" />
- <div class="carousel-caption">
- <h1>{{slide.caption}}</h1>
- <p>{{slide.text}}</p>
- </div>
- </slide>
- </carousel>
-</div>
-
-<!--Features Part-->
-<div id="features" class="container marketing">
- <div class="row">
- <div class="col-xs-12 col-sm-4 feature">
- <a><i class="fa fa-cubes fa-5x"></i></a>
- <h2>Create Cube</h2>
- <p>Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Nullam id dolor id nibh ultricies
- vehicula ut id elit. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo
- cursus magna.</p>
- <p><a class="btn btn-default" href="cubes" role="button">View details »</a></p>
- </div>
- <div class="col-xs-12 col-sm-4 feature">
- <a><i class="fa fa-tasks fa-5x"></i></a>
- <h2>Query Online</h2>
- <p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras
- mattis consectetur purus sit amet fermentum. Fusce dapibus, tellus ac cursus commodo, tortor mauris
- condimentum nibh.</p>
- <p><a class="btn btn-default" href="query" role="button">View details »</a></p>
- </div>
- <div class="col-xs-12 col-sm-4 feature">
- <a><i class="fa fa-sort-amount-asc fa-5x"></i></a>
- <h2>Jobs</h2>
- <p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula
- porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh,
- ut fermentum massa justo sit amet risus.</p>
- <p><a class="btn btn-default" href="jobs" role="button">View details »</a></p>
- </div>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b3b0f2f9/webapp/app/routes.json
----------------------------------------------------------------------
diff --git a/webapp/app/routes.json b/webapp/app/routes.json
index 8a72f09..e13656e 100644
--- a/webapp/app/routes.json
+++ b/webapp/app/routes.json
@@ -1,12 +1,5 @@
[
{
- "url": "/home",
- "params": {
- "templateUrl": "partials/home.html",
- "controller": "IndexCtrl"
- }
- },
- {
"url": "/cubes",
"params": {
"templateUrl": "partials/cubes/cubes.html",
@@ -104,4 +97,4 @@
"reloadOnSearch": false
}
}
-]
\ No newline at end of file
+]
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/b3b0f2f9/webapp/bower.json
----------------------------------------------------------------------
diff --git a/webapp/bower.json b/webapp/bower.json
index 65c23b8..298cba3 100755
--- a/webapp/bower.json
+++ b/webapp/bower.json
@@ -10,7 +10,7 @@
"angular-chosen-localytics": "1.0.6",
"animate.css": "3.0.0",
"bootstrap": "3.0.0",
- "font-awesome": "4.0.3",
+ "font-awesome": "4.3.0",
"angular-ui-ace": "0.1.0",
"angular-base64": "2.0.1",
"angular-tree-control": "0.1.4",