You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/15 07:21:41 UTC
[12/52] [abbrv] incubator-kylin git commit: add start&end date for
hbase info in cubeDesigner KYLIN-637
add start&end date for hbase info in cubeDesigner KYLIN-637
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/be5b810b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/be5b810b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/be5b810b
Branch: refs/heads/0.8.0
Commit: be5b810b700fcf26b1476ce092d5d3499686e0bd
Parents: 603fe3f
Author: jiazhong <ji...@ebay.com>
Authored: Thu Mar 12 11:39:44 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri May 15 11:34:17 2015 +0800
----------------------------------------------------------------------
.../kylin/rest/controller/CubeController.java | 2 ++
.../kylin/rest/response/HBaseResponse.java | 26 ++++++++++++++++++++
webapp/app/partials/cubes/cube_detail.html | 2 ++
webapp/app/partials/cubes/cubes.html | 2 +-
webapp/app/partials/jobs/jobs.html | 6 +++--
5 files changed, 35 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/be5b810b/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 556e21b..231c834 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
@@ -448,6 +448,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/be5b810b/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/be5b810b/webapp/app/partials/cubes/cube_detail.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cube_detail.html b/webapp/app/partials/cubes/cube_detail.html
index 59f2d69..51196cf 100755
--- a/webapp/app/partials/cubes/cube_detail.html
+++ b/webapp/app/partials/cubes/cube_detail.html
@@ -107,6 +107,8 @@
<ul>
<li>Region Count: <span class="red">{{table.regionCount}}</span></li>
<li>Size: <span class="red">{{table.tableSize | bytes:2}}</span></li>
+ <li>Start Date (Include): <span class="red">{{table.dateRangeStart | reverseToGMT0}}</span></li>
+ <li>End Date (Exclude): <span class="red">{{table.dateRangeStart | reverseToGMT0}}</span></li>
</ul>
</div>
<div ng-if="cube.hbase">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/be5b810b/webapp/app/partials/cubes/cubes.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubes/cubes.html b/webapp/app/partials/cubes/cubes.html
index 9e6976f..4c21d9a 100644
--- a/webapp/app/partials/cubes/cubes.html
+++ b/webapp/app/partials/cubes/cubes.html
@@ -32,7 +32,7 @@
<!--Cube Name-->
<div class="col-xs-3">
<form ng-submit="cubeList.removeAll();list()" style="display: inline" >
- <span class="input-icon input-icon-right nav-search"><b>Cube Name:</b>
+ <span class="input-icon input-icon-right nav-search" style="font-size:14px;"><b>Cube Name:</b>
<input type="text" placeholder="Filter ..." class="nav-search-input" ng-model="listParams.cubeName" />
<i class="ace-icon fa fa-search blue" ng-click="cubeList.removeAll();list()"></i>
</span>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/be5b810b/webapp/app/partials/jobs/jobs.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/jobs/jobs.html b/webapp/app/partials/jobs/jobs.html
index 3b2ee04..fca5f88 100644
--- a/webapp/app/partials/jobs/jobs.html
+++ b/webapp/app/partials/jobs/jobs.html
@@ -29,12 +29,14 @@
</form>
</div>
<!--Cube Name: -->
- <form class="pull-right" ng-submit="jobList.removeAll();reload()" style="display: inline" >
- <span class="input-icon input-icon-right nav-search"><b>Job Name:</b>
+ <div class="col-xs-3">
+ <form class="" ng-submit="jobList.removeAll();reload()" style="display: inline" >
+ <span class="input-icon input-icon-right nav-search" style="font-size:14px;"><b>Cube Name:</b>
<input type="text" placeholder="Filter ..." class="nav-search-input" ng-model="cubeName" />
<i class="ace-icon fa fa-search blue" ng-click="jobList.removeAll();reload()"></i>
</span>
</form>
+ </div>
</div>
<!--Jobs Table-->