You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2015/04/15 21:20:57 UTC
svn commit: r1673933 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event:
RmAdminQLoadReply.java RmQueriedClass.java RmQueriedNodepool.java
Author: challngr
Date: Wed Apr 15 19:20:57 2015
New Revision: 1673933
URL: http://svn.apache.org/r1673933
Log:
UIMA-3824 Format 'compact' as a Python structure.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java?rev=1673933&r1=1673932&r2=1673933&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmAdminQLoadReply.java Wed Apr 15 19:20:57 2015
@@ -59,6 +59,22 @@ public class RmAdminQLoadReply
public String toCompact()
{
StringBuffer sb = new StringBuffer();
+ sb.append("{\n'quantum':");
+ sb.append(Long.toString(shareQuantum));
+ sb.append(",\n'classes': [\n");
+ for ( RmQueriedClass cl : classes ) {
+ sb.append(cl.toCompact());
+ sb.append("\n,");
+ }
+
+ sb.append("],\n'nodepools': [\n");
+ for ( RmQueriedNodepool np : nodepools ) {
+ sb.append(np.toCompact());
+ sb.append("\n,");
+ }
+
+ sb.append("],\n}");
+
return sb.toString();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java?rev=1673933&r1=1673932&r2=1673933&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedClass.java Wed Apr 15 19:20:57 2015
@@ -19,6 +19,7 @@
package org.apache.uima.ducc.common.admin.event;
import java.io.Serializable;
+import java.util.Arrays;
public class RmQueriedClass
implements Serializable
@@ -72,7 +73,19 @@ public class RmQueriedClass
public String toCompact()
{
- return "";
+ StringBuffer sb = new StringBuffer();
+
+ sb.append("{ 'name': '");
+ sb.append(name);
+ sb.append("',\n'policy': '");
+ sb.append(policy);
+ sb.append("',\n 'requested': ");
+ sb.append(Arrays.toString(demanded));
+ sb.append(",\n'awarded': ");
+ sb.append(Arrays.toString(awarded));
+ sb.append(",\n}");
+
+ return sb.toString();
}
public String toConsole()
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java?rev=1673933&r1=1673932&r2=1673933&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/admin/event/RmQueriedNodepool.java Wed Apr 15 19:20:57 2015
@@ -19,6 +19,7 @@
package org.apache.uima.ducc.common.admin.event;
import java.io.Serializable;
+import java.util.Arrays;
public class RmQueriedNodepool
implements Serializable
@@ -123,7 +124,31 @@ public class RmQueriedNodepool
public String toCompact()
{
- return "";
+ StringBuffer sb = new StringBuffer();
+
+ sb.append("{'name': '");
+ sb.append(name);
+ sb.append("',\n 'online': ");
+ sb.append(Integer.toString(online));
+ sb.append(",\n 'dead': ");
+ sb.append(Integer.toString(dead));
+ sb.append(",\n 'offline': ");
+ sb.append(Integer.toString(offline));
+ sb.append(",\n 'total-shares': ");
+ sb.append(Integer.toString(sharesAvailable));
+ sb.append(",\n 'free-shares': ");
+ sb.append(Integer.toString(sharesFree));
+ sb.append(",\n 'all-machines': ");
+ sb.append(Arrays.toString(allMachines));
+ sb.append(",\n 'online-machines': ");
+ sb.append(Arrays.toString(onlineMachines));
+ sb.append(",\n 'free-machines': ");
+ sb.append(Arrays.toString(freeMachines));
+ sb.append(",\n 'virtual-machines': ");
+ sb.append(Arrays.toString(virtualMachines));
+ sb.append(",\n}");
+
+ return sb.toString();
}
public String toConsole()