You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2013/06/03 18:15:37 UTC
svn commit: r1489052 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java
uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Author: degenaro
Date: Mon Jun 3 16:15:37 2013
New Revision: 1489052
URL: http://svn.apache.org/r1489052
Log:
UIMA-2902 Performance Metrics reporting compatible with old and new UIMA jars
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java?rev=1489052&r1=1489051&r2=1489052&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java Mon Jun 3 16:15:37 2013
@@ -40,25 +40,37 @@ public class PerformanceMetricsSummaryMa
private AtomicInteger casCount = new AtomicInteger(0);
+ public String delim_old = "Components,";
+ public String delim_new = " Components ";
+ public String delim = delim_new;
+
private String getKey(AnalysisEnginePerformanceMetrics item) {
String key = "?";
try {
String uniqueName = item.getUniqueName();
- key = uniqueName;
- /*
- String delim = "Components,";
- key = delim+uniqueName.split(delim,2)[1];
- */
+ if(uniqueName.contains(delim_old)) {
+ key = uniqueName.split(delim_old,2)[1];
+ }
+ else if(uniqueName.contains(delim_new)) {
+ key = uniqueName.split(delim_new,2)[1];
+ }
+ else {
+ key = uniqueName;
+ }
}
catch(Throwable t) {
}
return key;
}
- private void addEntry(String key, String name) {
+ private String getDisplayName(AnalysisEnginePerformanceMetrics item) {
+ return getKey(item);
+ }
+
+ private void addEntry(String key, String displayName) {
synchronized(map) {
if(!map.containsKey(key)) {
- PerformanceMetricsSummaryItem summaryItem = new PerformanceMetricsSummaryItem(name,key);
+ PerformanceMetricsSummaryItem summaryItem = new PerformanceMetricsSummaryItem(displayName,key);
map.put(key, summaryItem);
}
}
@@ -78,8 +90,8 @@ public class PerformanceMetricsSummaryMa
int count = casCount.addAndGet(1);
for(AnalysisEnginePerformanceMetrics item : list ) {
String key = getKey(item);
- String name = item.getName();
- addEntry(key,name);
+ String displayName = getDisplayName(item);
+ addEntry(key,displayName);
PerformanceMetricsSummaryItem summaryItem = map.get(key);
synchronized(map) {
long timeBefore = summaryItem.getAnalysisTime();
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=1489052&r1=1489051&r2=1489052&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 Mon Jun 3 16:15:37 2013
@@ -1233,17 +1233,14 @@ public class DuccHandler extends DuccAbs
uimaStats.clear();
//long analysisTime = 0;
for (Entry<String, PerformanceMetricsSummaryItem> entry : performanceMetricsSummaryMap.entrySet()) {
- String key = entry.getKey();
- int posName = key.lastIndexOf('=');
- long anTime = entry.getValue().getAnalysisTime();
- long anMinTime = entry.getValue().getAnalysisTimeMin();
- long anMaxTime = entry.getValue().getAnalysisTimeMax();
+ PerformanceMetricsSummaryItem item = entry.getValue();
+ String shortname = item.getName();
+ long anTime = item.getAnalysisTime();
+ long anMinTime = item.getAnalysisTimeMin();
+ long anMaxTime = item.getAnalysisTimeMax();
//analysisTime += anTime;
- if (posName > 0) {
- String shortname = key.substring(posName+1);
- UimaStatistic stat = new UimaStatistic(shortname, entry.getKey(), anTime, anMinTime, anMaxTime);
- uimaStats.add(stat);
- }
+ UimaStatistic stat = new UimaStatistic(shortname, entry.getKey(), anTime, anMinTime, anMaxTime);
+ uimaStats.add(stat);
}
Collections.sort(uimaStats);
int numstats = uimaStats.size();