Author: degenaro
Date: Fri May 6 12:09:16 2016
New Revision: 1742532
URL: http://svn.apache.org/viewvc?rev=1742532&view=rev
Log:
UIMA-4918 DUCC Web Server (WS) numeric values column sorting is inconsistent
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.performance.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1742532&r1=1742531&r2=1742532&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Fri May 6 12:09:16 2016
@@ -1855,10 +1855,7 @@ public class DuccHandler extends DuccAbs
DuccWorkJob job = getJob(jobNo);
if(job != null) {
try {
- //String directory =
job.getLogDirectory()+jobNo;
EffectiveUser eu =
EffectiveUser.create(request);
- //long wiVersion = job.getWiVersion();
- //AlienWorkItemStateReader workItemStateReader
= new AlienWorkItemStateReader(eu, component, directory, wiVersion);
PerformanceSummary performanceSummary = new
PerformanceSummary(job.getLogDirectory()+jobNo);
PerformanceMetricsSummaryMap
performanceMetricsSummaryMap = performanceSummary.readSummary(eu.get());
if( (performanceMetricsSummaryMap == null) ||
(performanceMetricsSummaryMap.size() == 0) ) {
@@ -1866,43 +1863,6 @@ public class DuccHandler extends DuccAbs
}
else {
int casCount =
performanceMetricsSummaryMap.casCount();
- /*
- sb.append("<table>");
- sb.append("<tr>");
- sb.append("<th align=\"right\">");
- sb.append("Job Id:");
- sb.append("<th align=\"left\">");
- sb.append(jobNo);
- sb.append("<th>");
- sb.append(" ");
- sb.append("<th align=\"right\">");
- sb.append("Workitems:");
- sb.append("<th align=\"left\">");
- sb.append(casCount);
- sb.append("</table>");
- sb.append("<br>");
- */
- sb.append("<table class=\"sortable\">");
- sb.append("<tr class=\"ducc-head\">");
- sb.append("<th>");
- sb.append("Name");
- sb.append("</th>");
- sb.append("<th>");
-
sb.append("Total<br><small>ddd:hh:mm:ss</small>");
- sb.append("</th>");
- sb.append("<th
class=\"sorttable_numeric\">");
- sb.append("% of<br>Total");
- sb.append("</th>");
- sb.append("<th
class=\"sorttable_numeric\">");
-
sb.append("Avg<br><small>hh:mm:ss/workitem</small>");
- sb.append("</th>");
- sb.append("<th
class=\"sorttable_numeric\">");
-
sb.append("Min<br><small>hh:mm:ss/workitem</small>");
- sb.append("</th>");
- sb.append("<th
class=\"sorttable_numeric\">");
-
sb.append("Max<br><small>hh:mm:ss/workitem</small>");
- sb.append("</th>");
- sb.append("</tr>");
ArrayList <UimaStatistic> uimaStats =
new ArrayList<UimaStatistic>();
uimaStats.clear();
long analysisTime = 0;
@@ -2002,7 +1962,6 @@ public class DuccHandler extends DuccAbs
ltime = (long)time;
sb.append(FormatHelper.duration(ltime,Precision.Tenths));
}
- sb.append("</table>");
}
}
catch(Exception e) {
@@ -2090,19 +2049,6 @@ public class DuccHandler extends DuccAbs
map.put(key, key);
}
Iterator<String> iterator =
map.keySet().iterator();
- sb.append("<table id=\"specification_table\"
class=\"sortable\">");
- sb.append("<tr class=\"ducc-head\">");
- if(isProvided(usProperties, fsProperties)) {
- sb.append("<th title=\"system provided
if blank\">");
- sb.append(headProvider);
- }
- sb.append("<th>");
- sb.append("Key");
- sb.append("</th>");
- sb.append("<th>");
- sb.append("Value");
- sb.append("</th>");
- sb.append("</tr>");
int i = 0;
int counter = 0;
while(iterator.hasNext()) {
@@ -2118,9 +2064,6 @@ public class DuccHandler extends DuccAbs
}
putJobSpecEntry(properties, provider,
key, value, sb, counter++);
}
- sb.append("</table>");
- sb.append("<br>");
- sb.append("<br>");
}
catch(Throwable t) {
duccLogger.warn(methodName, null, t);
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp?rev=1742532&r1=1742531&r2=1742532&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.files.jsp
Fri May 6 12:09:16 2016
@@ -25,8 +25,8 @@ under the License.
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th title="The file name">Name</th>
- <th title="The file size, in MB" class="sorttable_numeric">Size</th>
+ <th class="none" title="The file name">Name</th>
+ <th class="sorttable_numeric" title="The file size, in MB">Size</th>
</tr>
</thead>
<tbody id="files_data_area">
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.performance.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.performance.jsp?rev=1742532&r1=1742531&r2=1742532&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.performance.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.performance.jsp
Fri May 6 12:09:16 2016
@@ -18,6 +18,22 @@ under the License.
-->
<div id=loading_performance_area>
</div>
-<div class="performance_data_div">
- <span id="performance_data_area"></span>
-</div>
\ No newline at end of file
+<table>
+<caption><b>Specification</b><br><i><small>click column heading to
sort</small></i></caption>
+<tr>
+<td>
+ <table class="sortable">
+ <thead>
+ <tr class="ducc-head">
+ <th class="none" title="the name of the
annotater">Name</th>
+ <th class="none" title="the time spent in the annotater
for all work items">Total<br><small>ddd:hh:mm:ss</small></th>
+ <th class="sorttable_numeric" title="the percentage of time spent in
the annotater">% of<br>Total</th>
+ <th class="none" title="the average time spent in the
annotater">Avg<br><small>hh:mm:ss/workitem</small></th>
+ <th class="none" title="the minimum time spent in the
annotater">Min<br><small>hh:mm:ss/workitem</small></th>
+ <th class="none" title="the maximum time spent in the
annotater">Max<br><small>hh:mm:ss/workitem</small></th>
+ </tr>
+ </thead>
+ <tbody id="performance_data_area">
+ </tbody>
+ </table>
+</table>
\ No newline at end of file
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp?rev=1742532&r1=1742531&r2=1742532&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.processes.jsp
Fri May 6 12:09:16 2016
@@ -25,32 +25,32 @@ under the License.
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th title="The system assigned id for this process"
class="sorttable_numeric">Id</th>
- <th title="The log file name associated with this process">Log</th>
- <th title="The log file size, in MB"
class="sorttable_numeric">Log<br/>Size</th>
- <th title="The host for this process">Host<br>Name</th>
- <th title="The OS assigned PID for this
process"class="sorttable_numeric">PID</th>
- <th title="Process scheduling state">State<br>Scheduler</th>
- <th title="Process scheduling reason (for scheduling
state)">Reason<br>Scheduler<br><small>or extraordinary status</small></th>
- <th title="Process agent state">State<br>Agent</th>
- <th title="Process agent reason (for agent state)">Reason<br>Agent</th>
- <th title="Process exit code or signal">Exit</th>
- <th title="Process initialization time, ddd:hh:mm:ss">Time<br>Init</th>
- <th title="Process run time (not including process initialization time),
ddd:hh:mm:ss">Time<br>Run</th>
- <th title="Process total time spent performing garbage collections,
hh:mm:ss">Time<br>GC</th>
- <th title="Process count of major faults which required loading a
memory page from disk">PgIn</th>
- <th title="Process GB swapped out to disk, current if state=running or
maximum if state=completed" class="sorttable_numeric">Swap</th>
- <th title="%CPU time, as percentage of process (over last reporting
interval if active, else over lifetime)" class="sorttable_numeric">%CPU</th>
- <th title="Resident Storage Size in GB, current if state=running or
maximum if state=completed" class="sorttable_numeric">RSS</th>
- <th title="Average seconds per work item">Time<br>Avg</th>
- <th title="Maximum seconds for any work item">Time<br>Max</th>
- <th title="Minimum seconds for any work item">Time<br>Min</th>
- <th title="The number of work items that completed
successfully">Done</th>
- <th title="The number of work items that failed to complete
successfully">Error</th>
- <th title="The number of work items currently dispatched
(queued+operating)">Dis-<br>patch</th>
- <th title="The number of work items that were retried, excluding
preemptions">Retry</th>
- <th title="The number of work items that were
preempted">Pre-<br>empt</th>
- <th title="The JConsole URL for this process">JConsole<br>URL</th>
+ <th class="sorttable_numeric" title="The system assigned id for this
process">Id</th>
+ <th class="none" title="The log file name associated with
this process">Log</th>
+ <th class="sorttable_numeric" title="The log file size, in
MB">Log<br/>Size</th>
+ <th class="none" title="The host for this
process">Host<br>Name</th>
+ <th class="sorttable_numeric" title="The OS assigned PID for this
process">PID</th>
+ <th class="none" title="Process scheduling
state">State<br>Scheduler</th>
+ <th class="none" title="Process scheduling reason (for
scheduling state)">Reason<br>Scheduler<br><small>or extraordinary
status</small></th>
+ <th class="none" title="Process agent
state">State<br>Agent</th>
+ <th class="none" title="Process agent reason (for agent
state)">Reason<br>Agent</th>
+ <th class="sorttable_numeric" title="Process exit code or
signal">Exit</th>
+ <th class="none" title="Process initialization time,
ddd:hh:mm:ss">Time<br>Init</th>
+ <th class="none" title="Process run time (not including
process initialization time), ddd:hh:mm:ss">Time<br>Run</th>
+ <th class="none" title="Process total time spent
performing garbage collections, hh:mm:ss">Time<br>GC</th>
+ <th class="sorttable_numeric" title="Process count of major faults
which required loading a memory page from disk">PgIn</th>
+ <th class="sorttable_numeric" title="Process GB swapped out to disk,
current if state=running or maximum if state=completed">Swap</th>
+ <th class="sorttable_numeric" title="%CPU time, as percentage of
process (over last reporting interval if active, else over lifetime)">%CPU</th>
+ <th class="sorttable_numeric" title="Resident Storage Size in GB,
current if state=running or maximum if state=completed">RSS</th>
+ <th class="sorttable_numeric" title="Average seconds per work
item">Time<br>Avg</th>
+ <th class="sorttable_numeric" title="Maximum seconds for any work
item">Time<br>Max</th>
+ <th class="sorttable_numeric" title="Minimum seconds for any work
item">Time<br>Min</th>
+ <th class="sorttable_numeric" title="The number of work items that
completed successfully">Done</th>
+ <th class="sorttable_numeric" title="The number of work items that
failed to complete successfully">Error</th>
+ <th class="sorttable_numeric" title="The number of work items currently
dispatched (queued+operating)">Dis-<br>patch</th>
+ <th class="sorttable_numeric" title="The number of work items that were
retried, excluding preemptions">Retry</th>
+ <th class="sorttable_numeric" title="The number of work items that were
preempted">Pre-<br>empt</th>
+ <th class="none" title="The JConsole URL for this
process">JConsole<br>URL</th>
</tr>
</thead>
<tbody id="processes_list_area">
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp?rev=1742532&r1=1742531&r2=1742532&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.specification.jsp
Fri May 6 12:09:16 2016
@@ -16,8 +16,22 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
+
<div id=loading_specification_area>
</div>
-<div class="specification_data_div">
- <span id="specification_data_area"></span>
-</div>
\ No newline at end of file
+<table>
+<caption><b>Specification</b><br><i><small>click column heading to
sort</small></i></caption>
+<tr>
+<td>
+ <table class="sortable">
+ <thead>
+ <tr class="ducc-head">
+ <th class="none" title="the specification variable
source">Provider</th>
+ <th class="none" title="the specification variable
name">Key</th>
+ <th class="none" title="the specification variable
value">Value</th>
+ </tr>
+ </thead>
+ <tbody id="specification_data_area">
+ </tbody>
+ </table>
+</table>
\ No newline at end of file
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp?rev=1742532&r1=1742531&r2=1742532&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/job.details.table.workitems.jsp
Fri May 6 12:09:16 2016
@@ -25,15 +25,15 @@ under the License.
<table class="sortable">
<thead>
<tr class="ducc-head">
- <th title="The system assigned work item sequence number"
class="sorttable_numeric">SeqNo</th>
- <th title="The user assigned work item identity">Id</th>
- <th title="The work item status, normally operating or ended">Status</th>
- <th title="The approx. number of seconds elapsed between work item (a)
requested for processing and (b) start of processing"
class="sorttable_numeric">Delivery<br>Time</th>
- <th title="The approx. number of seconds elapsed between work item (a)
start of processing and (b) end of processing"
class="sorttable_numeric">Process<br>Time</th>
- <th title="The approx. number of seconds invested in current epoch"
class="sorttable_numeric">Investment<br>Time</th>
- <th title="The node for the work item, by address">Node<br>(IP)</th>
- <th title="The node for the work item, by name">Node<br>(Name)</th>
- <th title="The PID for the work item" class="sorttable_numeric">PID</th>
+ <th class="sorttable_numeric" title="The system assigned work item
sequence number">SeqNo</th>
+ <th class="none" title="The user assigned work item
identity">Id</th>
+ <th class="none" title="The work item status, normally
operating or ended">Status</th>
+ <th class="sorttable_numeric" title="The approx. number of seconds elapsed
between work item (a) requested for processing and (b) start of
processing">Delivery<br>Time</th>
+ <th class="sorttable_numeric" title="The approx. number of seconds elapsed
between work item (a) start of processing and (b) end of
processing">Process<br>Time</th>
+ <th class="sorttable_numeric" title="The approx. number of seconds
invested in current epoch">Investment<br>Time</th>
+ <th class="none" title="The node for the work item, by
address">Node<br>(IP)</th>
+ <th class="none" title="The node for the work item, by
name">Node<br>(Name)</th>
+ <th class="sorttable_numeric" title="The PID for the work item">PID</th>
</tr>
</thead>
<tbody id="workitems_data_area">
