You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/01/29 13:31:06 UTC
git commit: TAJO-564: Show execution block's progress in
querydetail.jsp. (hyoungjunkim via hyunsik)
Updated Branches:
refs/heads/master 179a707fc -> c57804f70
TAJO-564: Show execution block's progress in querydetail.jsp. (hyoungjunkim via hyunsik)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/c57804f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/c57804f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/c57804f7
Branch: refs/heads/master
Commit: c57804f7082c2392f5ab90367acf19cc87f48e7c
Parents: 179a707
Author: Hyunsik Choi <hy...@apache.org>
Authored: Wed Jan 29 21:30:35 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Wed Jan 29 21:30:35 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../java/org/apache/tajo/master/querymaster/SubQuery.java | 8 ++++++++
.../src/main/java/org/apache/tajo/util/JSPUtil.java | 5 +++++
.../src/main/resources/webapps/worker/querydetail.jsp | 8 ++++++--
.../src/main/resources/webapps/worker/querytasks.jsp | 5 ++++-
5 files changed, 26 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/c57804f7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 333740d..4506841 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -125,6 +125,9 @@ Release 0.8.0 - unreleased
IMPROVEMENTS
+ TAJO-564: Show execution block's progress in querydetail.jsp.
+ (hyoungjunkim via hyunsik)
+
TAJO-497: Rearrange reserved and non-reserved keywords. (sirpkt via hyunsik)
TAJO-475: Table partition catalog recap. (Min Zhou and hyunsik)
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/c57804f7/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
index a43bfd5..a229169 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/querymaster/SubQuery.java
@@ -275,6 +275,14 @@ public class SubQuery implements EventHandler<SubQueryEvent> {
}
}
+ public int getCompletedObjectCount() {
+ return completedObjectCount;
+ }
+
+ public int getTotalScheduledObjectsCount() {
+ return totalScheduledObjectsCount;
+ }
+
public ExecutionBlock getBlock() {
return block;
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/c57804f7/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/util/JSPUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/util/JSPUtil.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/util/JSPUtil.java
index 89a3b03..281290c 100644
--- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/util/JSPUtil.java
+++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/util/JSPUtil.java
@@ -188,4 +188,9 @@ public class JSPUtil {
}
});
}
+
+ static final DecimalFormat PERCENT_FORMAT = new DecimalFormat("###.0");
+ public static String percentFormat(float value) {
+ return PERCENT_FORMAT.format(value * 100.0f);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/c57804f7/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querydetail.jsp
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querydetail.jsp b/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querydetail.jsp
index 174b223..7656dfb 100644
--- a/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querydetail.jsp
+++ b/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querydetail.jsp
@@ -59,16 +59,20 @@
<h3><%=queryId.toString()%> <a href='queryplan.jsp?queryId=<%=queryId%>'>[Query Plan]</a></h3>
<table width="100%" border="1" class="border_table">
- <tr><th>ID</th><th>State</th><th>Started</th><th>Finished</th><th>Running time</th></tr>
+ <tr><th>ID</th><th>State</th><th>Started</th><th>Finished</th><th>Running time</th><th>Progress</th><th>Tasks</th></tr>
<%
for(SubQuery eachSubQuery: subQueries) {
+ eachSubQuery.getCompletedObjectCount();
+ String detailLink = "querytasks.jsp?queryId=" + queryId + "&ebid=" + eachSubQuery.getId();
%>
<tr>
- <td><a href='querytasks.jsp?queryId=<%=queryId%>&ebid=<%=eachSubQuery.getId()%>'><%=eachSubQuery.getId()%></a></td>
+ <td><a href='<%=detailLink%>'><%=eachSubQuery.getId()%></a></td>
<td><%=eachSubQuery.getState()%></td>
<td><%=df.format(eachSubQuery.getStartTime())%></td>
<td><%=eachSubQuery.getFinishTime() == 0 ? "-" : df.format(eachSubQuery.getFinishTime())%></td>
<td><%=JSPUtil.getElapsedTime(eachSubQuery.getStartTime(), eachSubQuery.getFinishTime())%></td>
+ <td align='center'><%=JSPUtil.percentFormat(eachSubQuery.getProgress())%>%</td>
+ <td align='center'><a href='<%=detailLink%>&status=SUCCEEDED'><%=eachSubQuery.getCompletedObjectCount()%></a>/<a href='<%=detailLink%>&status=ALL'><%=eachSubQuery.getTotalScheduledObjectsCount()%></a></td>
</tr>
<%
} //end of for
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/c57804f7/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querytasks.jsp
----------------------------------------------------------------------
diff --git a/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querytasks.jsp b/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querytasks.jsp
index fc2ce7c..5ba83ab 100644
--- a/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querytasks.jsp
+++ b/tajo-core/tajo-core-backend/src/main/resources/webapps/worker/querytasks.jsp
@@ -126,10 +126,11 @@
<input type="hidden" name="sortOrder" value="<%=sortOrder%>"/>
</form>
<table border="1" width="100%" class="border_table">
- <tr><th><a href='<%=url%>id'>Id</a></th><th>Status</th><th><a href='<%=url%>startTime'>Start Time</a></th><th><a href='<%=url%>runTime'>Running Time</a></th><th><a href='<%=url%>host'>Host</a></th></tr>
+ <tr><th>No</th><th><a href='<%=url%>id'>Id</a></th><th>Status</th><th><a href='<%=url%>startTime'>Start Time</a></th><th><a href='<%=url%>runTime'>Running Time</a></th><th><a href='<%=url%>host'>Host</a></th></tr>
<%
QueryUnit[] queryUnits = subQuery.getQueryUnits();
JSPUtil.sortQueryUnit(queryUnits, sort, sortOrder);
+ int rowNo = 1;
for(QueryUnit eachQueryUnit: queryUnits) {
if(!"ALL".equals(status)) {
if(!status.equals(eachQueryUnit.getState().toString())) {
@@ -154,6 +155,7 @@
%>
<tr>
+ <td><%=rowNo%></td>
<td><a href="<%=queryUnitDetailUrl%>"><%=eachQueryUnit.getId()%></a></td>
<td><%=eachQueryUnit.getState()%></td>
<td><%=eachQueryUnit.getLaunchTime() == 0 ? "-" : df.format(eachQueryUnit.getLaunchTime())%></td>
@@ -161,6 +163,7 @@
<td><%=queryUnitHost%></td>
</tr>
<%
+ rowNo++;
}
%>
</table>