You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2015/10/05 23:00:50 UTC

[18/37] storm git commit: Renumber thrift struct fields consistently from 1

Renumber thrift struct fields consistently from 1


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a6b82f8b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a6b82f8b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a6b82f8b

Branch: refs/heads/master
Commit: a6b82f8b52533476b645cfbb5a80638f98703103
Parents: 1392b24
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Fri May 22 14:55:42 2015 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Fri May 22 14:55:42 2015 -0500

----------------------------------------------------------------------
 .../storm/generated/BoltAggregateStats.java     |   34 +-
 .../storm/generated/CommonAggregateStats.java   |   50 +-
 .../generated/ComponentAggregateStats.java      |   34 +-
 .../storm/generated/ComponentPageInfo.java      |   74 +-
 .../storm/generated/ExecutorAggregateStats.java |   18 +-
 .../storm/generated/SpoutAggregateStats.java    |   10 +-
 .../storm/generated/TopologyPageInfo.java       |   98 +-
 .../backtype/storm/generated/TopologyStats.java |   42 +-
 storm-core/src/py/storm/ttypes.py               | 6119 +++---------------
 storm-core/src/storm.thrift                     |   92 +-
 10 files changed, 1239 insertions(+), 5332 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/a6b82f8b/storm-core/src/jvm/backtype/storm/generated/BoltAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/BoltAggregateStats.java b/storm-core/src/jvm/backtype/storm/generated/BoltAggregateStats.java
index 386ccfd..3234d2b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/BoltAggregateStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/BoltAggregateStats.java
@@ -51,14 +51,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-22")
 public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregateStats, BoltAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<BoltAggregateStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BoltAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField EXECUTE_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("execute_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)513);
-  private static final org.apache.thrift.protocol.TField PROCESS_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("process_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)514);
-  private static final org.apache.thrift.protocol.TField EXECUTED_FIELD_DESC = new org.apache.thrift.protocol.TField("executed", org.apache.thrift.protocol.TType.I64, (short)515);
-  private static final org.apache.thrift.protocol.TField CAPACITY_FIELD_DESC = new org.apache.thrift.protocol.TField("capacity", org.apache.thrift.protocol.TType.DOUBLE, (short)516);
+  private static final org.apache.thrift.protocol.TField EXECUTE_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("execute_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)1);
+  private static final org.apache.thrift.protocol.TField PROCESS_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("process_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)2);
+  private static final org.apache.thrift.protocol.TField EXECUTED_FIELD_DESC = new org.apache.thrift.protocol.TField("executed", org.apache.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.thrift.protocol.TField CAPACITY_FIELD_DESC = new org.apache.thrift.protocol.TField("capacity", org.apache.thrift.protocol.TType.DOUBLE, (short)4);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -73,10 +73,10 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    EXECUTE_LATENCY_MS((short)513, "execute_latency_ms"),
-    PROCESS_LATENCY_MS((short)514, "process_latency_ms"),
-    EXECUTED((short)515, "executed"),
-    CAPACITY((short)516, "capacity");
+    EXECUTE_LATENCY_MS((short)1, "execute_latency_ms"),
+    PROCESS_LATENCY_MS((short)2, "process_latency_ms"),
+    EXECUTED((short)3, "executed"),
+    CAPACITY((short)4, "capacity");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -91,13 +91,13 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 513: // EXECUTE_LATENCY_MS
+        case 1: // EXECUTE_LATENCY_MS
           return EXECUTE_LATENCY_MS;
-        case 514: // PROCESS_LATENCY_MS
+        case 2: // PROCESS_LATENCY_MS
           return PROCESS_LATENCY_MS;
-        case 515: // EXECUTED
+        case 3: // EXECUTED
           return EXECUTED;
-        case 516: // CAPACITY
+        case 4: // CAPACITY
           return CAPACITY;
         default:
           return null;
@@ -567,7 +567,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
           break;
         }
         switch (schemeField.id) {
-          case 513: // EXECUTE_LATENCY_MS
+          case 1: // EXECUTE_LATENCY_MS
             if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
               struct.execute_latency_ms = iprot.readDouble();
               struct.set_execute_latency_ms_isSet(true);
@@ -575,7 +575,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 514: // PROCESS_LATENCY_MS
+          case 2: // PROCESS_LATENCY_MS
             if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
               struct.process_latency_ms = iprot.readDouble();
               struct.set_process_latency_ms_isSet(true);
@@ -583,7 +583,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 515: // EXECUTED
+          case 3: // EXECUTED
             if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
               struct.executed = iprot.readI64();
               struct.set_executed_isSet(true);
@@ -591,7 +591,7 @@ public class BoltAggregateStats implements org.apache.thrift.TBase<BoltAggregate
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 516: // CAPACITY
+          case 4: // CAPACITY
             if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
               struct.capacity = iprot.readDouble();
               struct.set_capacity_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/a6b82f8b/storm-core/src/jvm/backtype/storm/generated/CommonAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/CommonAggregateStats.java b/storm-core/src/jvm/backtype/storm/generated/CommonAggregateStats.java
index d9b29c7..0eea7c2 100644
--- a/storm-core/src/jvm/backtype/storm/generated/CommonAggregateStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/CommonAggregateStats.java
@@ -51,16 +51,16 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-22")
 public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggregateStats, CommonAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<CommonAggregateStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CommonAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)513);
-  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)514);
-  private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("emitted", org.apache.thrift.protocol.TType.I64, (short)515);
-  private static final org.apache.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("transferred", org.apache.thrift.protocol.TType.I64, (short)516);
-  private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.I64, (short)517);
-  private static final org.apache.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("failed", org.apache.thrift.protocol.TType.I64, (short)518);
+  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("emitted", org.apache.thrift.protocol.TType.I64, (short)3);
+  private static final org.apache.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("transferred", org.apache.thrift.protocol.TType.I64, (short)4);
+  private static final org.apache.thrift.protocol.TField ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("acked", org.apache.thrift.protocol.TType.I64, (short)5);
+  private static final org.apache.thrift.protocol.TField FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("failed", org.apache.thrift.protocol.TType.I64, (short)6);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -77,12 +77,12 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    NUM_EXECUTORS((short)513, "num_executors"),
-    NUM_TASKS((short)514, "num_tasks"),
-    EMITTED((short)515, "emitted"),
-    TRANSFERRED((short)516, "transferred"),
-    ACKED((short)517, "acked"),
-    FAILED((short)518, "failed");
+    NUM_EXECUTORS((short)1, "num_executors"),
+    NUM_TASKS((short)2, "num_tasks"),
+    EMITTED((short)3, "emitted"),
+    TRANSFERRED((short)4, "transferred"),
+    ACKED((short)5, "acked"),
+    FAILED((short)6, "failed");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -97,17 +97,17 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 513: // NUM_EXECUTORS
+        case 1: // NUM_EXECUTORS
           return NUM_EXECUTORS;
-        case 514: // NUM_TASKS
+        case 2: // NUM_TASKS
           return NUM_TASKS;
-        case 515: // EMITTED
+        case 3: // EMITTED
           return EMITTED;
-        case 516: // TRANSFERRED
+        case 4: // TRANSFERRED
           return TRANSFERRED;
-        case 517: // ACKED
+        case 5: // ACKED
           return ACKED;
-        case 518: // FAILED
+        case 6: // FAILED
           return FAILED;
         default:
           return null;
@@ -719,7 +719,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
           break;
         }
         switch (schemeField.id) {
-          case 513: // NUM_EXECUTORS
+          case 1: // NUM_EXECUTORS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.num_executors = iprot.readI32();
               struct.set_num_executors_isSet(true);
@@ -727,7 +727,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 514: // NUM_TASKS
+          case 2: // NUM_TASKS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.num_tasks = iprot.readI32();
               struct.set_num_tasks_isSet(true);
@@ -735,7 +735,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 515: // EMITTED
+          case 3: // EMITTED
             if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
               struct.emitted = iprot.readI64();
               struct.set_emitted_isSet(true);
@@ -743,7 +743,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 516: // TRANSFERRED
+          case 4: // TRANSFERRED
             if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
               struct.transferred = iprot.readI64();
               struct.set_transferred_isSet(true);
@@ -751,7 +751,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 517: // ACKED
+          case 5: // ACKED
             if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
               struct.acked = iprot.readI64();
               struct.set_acked_isSet(true);
@@ -759,7 +759,7 @@ public class CommonAggregateStats implements org.apache.thrift.TBase<CommonAggre
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 518: // FAILED
+          case 6: // FAILED
             if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
               struct.failed = iprot.readI64();
               struct.set_failed_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/a6b82f8b/storm-core/src/jvm/backtype/storm/generated/ComponentAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ComponentAggregateStats.java b/storm-core/src/jvm/backtype/storm/generated/ComponentAggregateStats.java
index ac16469..ae74b84 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ComponentAggregateStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ComponentAggregateStats.java
@@ -51,14 +51,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-22")
 public class ComponentAggregateStats implements org.apache.thrift.TBase<ComponentAggregateStats, ComponentAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentAggregateStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)513);
-  private static final org.apache.thrift.protocol.TField COMMON_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("common_stats", org.apache.thrift.protocol.TType.STRUCT, (short)514);
-  private static final org.apache.thrift.protocol.TField SPECIFIC_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("specific_stats", org.apache.thrift.protocol.TType.STRUCT, (short)515);
-  private static final org.apache.thrift.protocol.TField LAST_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("last_error", org.apache.thrift.protocol.TType.STRUCT, (short)516);
+  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.thrift.protocol.TField COMMON_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("common_stats", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.thrift.protocol.TField SPECIFIC_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("specific_stats", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+  private static final org.apache.thrift.protocol.TField LAST_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("last_error", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -77,10 +77,10 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
      * 
      * @see ComponentType
      */
-    TYPE((short)513, "type"),
-    COMMON_STATS((short)514, "common_stats"),
-    SPECIFIC_STATS((short)515, "specific_stats"),
-    LAST_ERROR((short)516, "last_error");
+    TYPE((short)1, "type"),
+    COMMON_STATS((short)2, "common_stats"),
+    SPECIFIC_STATS((short)3, "specific_stats"),
+    LAST_ERROR((short)4, "last_error");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -95,13 +95,13 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 513: // TYPE
+        case 1: // TYPE
           return TYPE;
-        case 514: // COMMON_STATS
+        case 2: // COMMON_STATS
           return COMMON_STATS;
-        case 515: // SPECIFIC_STATS
+        case 3: // SPECIFIC_STATS
           return SPECIFIC_STATS;
-        case 516: // LAST_ERROR
+        case 4: // LAST_ERROR
           return LAST_ERROR;
         default:
           return null;
@@ -601,7 +601,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
           break;
         }
         switch (schemeField.id) {
-          case 513: // TYPE
+          case 1: // TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.type = backtype.storm.generated.ComponentType.findByValue(iprot.readI32());
               struct.set_type_isSet(true);
@@ -609,7 +609,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 514: // COMMON_STATS
+          case 2: // COMMON_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.common_stats = new CommonAggregateStats();
               struct.common_stats.read(iprot);
@@ -618,7 +618,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 515: // SPECIFIC_STATS
+          case 3: // SPECIFIC_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.specific_stats = new SpecificAggregateStats();
               struct.specific_stats.read(iprot);
@@ -627,7 +627,7 @@ public class ComponentAggregateStats implements org.apache.thrift.TBase<Componen
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 516: // LAST_ERROR
+          case 4: // LAST_ERROR
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.last_error = new ErrorInfo();
               struct.last_error.read(iprot);

http://git-wip-us.apache.org/repos/asf/storm/blob/a6b82f8b/storm-core/src/jvm/backtype/storm/generated/ComponentPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ComponentPageInfo.java b/storm-core/src/jvm/backtype/storm/generated/ComponentPageInfo.java
index bb7c30b..93415e9 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ComponentPageInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ComponentPageInfo.java
@@ -51,21 +51,21 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-22")
 public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageInfo, ComponentPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ComponentPageInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ComponentPageInfo");
 
   private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("component_id", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField COMPONENT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("component_type", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)513);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_name", org.apache.thrift.protocol.TType.STRING, (short)514);
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)515);
-  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)516);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_stats", org.apache.thrift.protocol.TType.MAP, (short)517);
-  private static final org.apache.thrift.protocol.TField GSID_TO_INPUT_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("gsid_to_input_stats", org.apache.thrift.protocol.TType.MAP, (short)518);
-  private static final org.apache.thrift.protocol.TField SID_TO_OUTPUT_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("sid_to_output_stats", org.apache.thrift.protocol.TType.MAP, (short)519);
-  private static final org.apache.thrift.protocol.TField EXEC_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("exec_stats", org.apache.thrift.protocol.TType.LIST, (short)520);
-  private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)521);
+  private static final org.apache.thrift.protocol.TField TOPOLOGY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_id", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField TOPOLOGY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_name", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)6);
+  private static final org.apache.thrift.protocol.TField WINDOW_TO_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_stats", org.apache.thrift.protocol.TType.MAP, (short)7);
+  private static final org.apache.thrift.protocol.TField GSID_TO_INPUT_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("gsid_to_input_stats", org.apache.thrift.protocol.TType.MAP, (short)8);
+  private static final org.apache.thrift.protocol.TField SID_TO_OUTPUT_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("sid_to_output_stats", org.apache.thrift.protocol.TType.MAP, (short)9);
+  private static final org.apache.thrift.protocol.TField EXEC_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("exec_stats", org.apache.thrift.protocol.TType.LIST, (short)10);
+  private static final org.apache.thrift.protocol.TField ERRORS_FIELD_DESC = new org.apache.thrift.protocol.TField("errors", org.apache.thrift.protocol.TType.LIST, (short)11);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -93,15 +93,15 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
      * @see ComponentType
      */
     COMPONENT_TYPE((short)2, "component_type"),
-    TOPOLOGY_ID((short)513, "topology_id"),
-    TOPOLOGY_NAME((short)514, "topology_name"),
-    NUM_EXECUTORS((short)515, "num_executors"),
-    NUM_TASKS((short)516, "num_tasks"),
-    WINDOW_TO_STATS((short)517, "window_to_stats"),
-    GSID_TO_INPUT_STATS((short)518, "gsid_to_input_stats"),
-    SID_TO_OUTPUT_STATS((short)519, "sid_to_output_stats"),
-    EXEC_STATS((short)520, "exec_stats"),
-    ERRORS((short)521, "errors");
+    TOPOLOGY_ID((short)3, "topology_id"),
+    TOPOLOGY_NAME((short)4, "topology_name"),
+    NUM_EXECUTORS((short)5, "num_executors"),
+    NUM_TASKS((short)6, "num_tasks"),
+    WINDOW_TO_STATS((short)7, "window_to_stats"),
+    GSID_TO_INPUT_STATS((short)8, "gsid_to_input_stats"),
+    SID_TO_OUTPUT_STATS((short)9, "sid_to_output_stats"),
+    EXEC_STATS((short)10, "exec_stats"),
+    ERRORS((short)11, "errors");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -120,23 +120,23 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
           return COMPONENT_ID;
         case 2: // COMPONENT_TYPE
           return COMPONENT_TYPE;
-        case 513: // TOPOLOGY_ID
+        case 3: // TOPOLOGY_ID
           return TOPOLOGY_ID;
-        case 514: // TOPOLOGY_NAME
+        case 4: // TOPOLOGY_NAME
           return TOPOLOGY_NAME;
-        case 515: // NUM_EXECUTORS
+        case 5: // NUM_EXECUTORS
           return NUM_EXECUTORS;
-        case 516: // NUM_TASKS
+        case 6: // NUM_TASKS
           return NUM_TASKS;
-        case 517: // WINDOW_TO_STATS
+        case 7: // WINDOW_TO_STATS
           return WINDOW_TO_STATS;
-        case 518: // GSID_TO_INPUT_STATS
+        case 8: // GSID_TO_INPUT_STATS
           return GSID_TO_INPUT_STATS;
-        case 519: // SID_TO_OUTPUT_STATS
+        case 9: // SID_TO_OUTPUT_STATS
           return SID_TO_OUTPUT_STATS;
-        case 520: // EXEC_STATS
+        case 10: // EXEC_STATS
           return EXEC_STATS;
-        case 521: // ERRORS
+        case 11: // ERRORS
           return ERRORS;
         default:
           return null;
@@ -1300,7 +1300,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 513: // TOPOLOGY_ID
+          case 3: // TOPOLOGY_ID
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.topology_id = iprot.readString();
               struct.set_topology_id_isSet(true);
@@ -1308,7 +1308,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 514: // TOPOLOGY_NAME
+          case 4: // TOPOLOGY_NAME
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.topology_name = iprot.readString();
               struct.set_topology_name_isSet(true);
@@ -1316,7 +1316,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 515: // NUM_EXECUTORS
+          case 5: // NUM_EXECUTORS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.num_executors = iprot.readI32();
               struct.set_num_executors_isSet(true);
@@ -1324,7 +1324,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 516: // NUM_TASKS
+          case 6: // NUM_TASKS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.num_tasks = iprot.readI32();
               struct.set_num_tasks_isSet(true);
@@ -1332,7 +1332,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 517: // WINDOW_TO_STATS
+          case 7: // WINDOW_TO_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map386 = iprot.readMapBegin();
@@ -1353,7 +1353,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 518: // GSID_TO_INPUT_STATS
+          case 8: // GSID_TO_INPUT_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map390 = iprot.readMapBegin();
@@ -1375,7 +1375,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 519: // SID_TO_OUTPUT_STATS
+          case 9: // SID_TO_OUTPUT_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map394 = iprot.readMapBegin();
@@ -1396,7 +1396,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 520: // EXEC_STATS
+          case 10: // EXEC_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list398 = iprot.readListBegin();
@@ -1415,7 +1415,7 @@ public class ComponentPageInfo implements org.apache.thrift.TBase<ComponentPageI
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 521: // ERRORS
+          case 11: // ERRORS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list401 = iprot.readListBegin();

http://git-wip-us.apache.org/repos/asf/storm/blob/a6b82f8b/storm-core/src/jvm/backtype/storm/generated/ExecutorAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorAggregateStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorAggregateStats.java
index 0796632..629caa6 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorAggregateStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorAggregateStats.java
@@ -51,12 +51,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-22")
 public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorAggregateStats, ExecutorAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorAggregateStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField EXEC_SUMMARY_FIELD_DESC = new org.apache.thrift.protocol.TField("exec_summary", org.apache.thrift.protocol.TType.STRUCT, (short)513);
-  private static final org.apache.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("stats", org.apache.thrift.protocol.TType.STRUCT, (short)514);
+  private static final org.apache.thrift.protocol.TField EXEC_SUMMARY_FIELD_DESC = new org.apache.thrift.protocol.TField("exec_summary", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.thrift.protocol.TField STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("stats", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -69,8 +69,8 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    EXEC_SUMMARY((short)513, "exec_summary"),
-    STATS((short)514, "stats");
+    EXEC_SUMMARY((short)1, "exec_summary"),
+    STATS((short)2, "stats");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -85,9 +85,9 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 513: // EXEC_SUMMARY
+        case 1: // EXEC_SUMMARY
           return EXEC_SUMMARY;
-        case 514: // STATS
+        case 2: // STATS
           return STATS;
         default:
           return null;
@@ -427,7 +427,7 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
           break;
         }
         switch (schemeField.id) {
-          case 513: // EXEC_SUMMARY
+          case 1: // EXEC_SUMMARY
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.exec_summary = new ExecutorSummary();
               struct.exec_summary.read(iprot);
@@ -436,7 +436,7 @@ public class ExecutorAggregateStats implements org.apache.thrift.TBase<ExecutorA
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 514: // STATS
+          case 2: // STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.stats = new ComponentAggregateStats();
               struct.stats.read(iprot);

http://git-wip-us.apache.org/repos/asf/storm/blob/a6b82f8b/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java b/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java
index 65cc126..cf5072c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/SpoutAggregateStats.java
@@ -51,11 +51,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-22")
 public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggregateStats, SpoutAggregateStats._Fields>, java.io.Serializable, Cloneable, Comparable<SpoutAggregateStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SpoutAggregateStats");
 
-  private static final org.apache.thrift.protocol.TField COMPLETE_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("complete_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)513);
+  private static final org.apache.thrift.protocol.TField COMPLETE_LATENCY_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("complete_latency_ms", org.apache.thrift.protocol.TType.DOUBLE, (short)1);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -67,7 +67,7 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    COMPLETE_LATENCY_MS((short)513, "complete_latency_ms");
+    COMPLETE_LATENCY_MS((short)1, "complete_latency_ms");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -82,7 +82,7 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 513: // COMPLETE_LATENCY_MS
+        case 1: // COMPLETE_LATENCY_MS
           return COMPLETE_LATENCY_MS;
         default:
           return null;
@@ -339,7 +339,7 @@ public class SpoutAggregateStats implements org.apache.thrift.TBase<SpoutAggrega
           break;
         }
         switch (schemeField.id) {
-          case 513: // COMPLETE_LATENCY_MS
+          case 1: // COMPLETE_LATENCY_MS
             if (schemeField.type == org.apache.thrift.protocol.TType.DOUBLE) {
               struct.complete_latency_ms = iprot.readDouble();
               struct.set_complete_latency_ms_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/a6b82f8b/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java b/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
index 9ad97d7..9cbf62b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyPageInfo.java
@@ -51,23 +51,23 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-22")
 public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInfo, TopologyPageInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyPageInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyPageInfo");
 
   private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)513);
-  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)514);
-  private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)515);
-  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)516);
-  private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)517);
-  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)518);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_conf", org.apache.thrift.protocol.TType.STRING, (short)519);
-  private static final org.apache.thrift.protocol.TField ID_TO_SPOUT_AGG_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("id_to_spout_agg_stats", org.apache.thrift.protocol.TType.MAP, (short)520);
-  private static final org.apache.thrift.protocol.TField ID_TO_BOLT_AGG_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("id_to_bolt_agg_stats", org.apache.thrift.protocol.TType.MAP, (short)521);
-  private static final org.apache.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("sched_status", org.apache.thrift.protocol.TType.STRING, (short)522);
-  private static final org.apache.thrift.protocol.TField TOPOLOGY_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_stats", org.apache.thrift.protocol.TType.STRUCT, (short)523);
-  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)524);
+  private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField UPTIME_SECS_FIELD_DESC = new org.apache.thrift.protocol.TField("uptime_secs", org.apache.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField NUM_TASKS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_tasks", org.apache.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.thrift.protocol.TField NUM_WORKERS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_workers", org.apache.thrift.protocol.TType.I32, (short)6);
+  private static final org.apache.thrift.protocol.TField NUM_EXECUTORS_FIELD_DESC = new org.apache.thrift.protocol.TField("num_executors", org.apache.thrift.protocol.TType.I32, (short)7);
+  private static final org.apache.thrift.protocol.TField TOPOLOGY_CONF_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_conf", org.apache.thrift.protocol.TType.STRING, (short)8);
+  private static final org.apache.thrift.protocol.TField ID_TO_SPOUT_AGG_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("id_to_spout_agg_stats", org.apache.thrift.protocol.TType.MAP, (short)9);
+  private static final org.apache.thrift.protocol.TField ID_TO_BOLT_AGG_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("id_to_bolt_agg_stats", org.apache.thrift.protocol.TType.MAP, (short)10);
+  private static final org.apache.thrift.protocol.TField SCHED_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("sched_status", org.apache.thrift.protocol.TType.STRING, (short)11);
+  private static final org.apache.thrift.protocol.TField TOPOLOGY_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("topology_stats", org.apache.thrift.protocol.TType.STRUCT, (short)12);
+  private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRING, (short)13);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -92,18 +92,18 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     ID((short)1, "id"),
-    NAME((short)513, "name"),
-    UPTIME_SECS((short)514, "uptime_secs"),
-    STATUS((short)515, "status"),
-    NUM_TASKS((short)516, "num_tasks"),
-    NUM_WORKERS((short)517, "num_workers"),
-    NUM_EXECUTORS((short)518, "num_executors"),
-    TOPOLOGY_CONF((short)519, "topology_conf"),
-    ID_TO_SPOUT_AGG_STATS((short)520, "id_to_spout_agg_stats"),
-    ID_TO_BOLT_AGG_STATS((short)521, "id_to_bolt_agg_stats"),
-    SCHED_STATUS((short)522, "sched_status"),
-    TOPOLOGY_STATS((short)523, "topology_stats"),
-    OWNER((short)524, "owner");
+    NAME((short)2, "name"),
+    UPTIME_SECS((short)3, "uptime_secs"),
+    STATUS((short)4, "status"),
+    NUM_TASKS((short)5, "num_tasks"),
+    NUM_WORKERS((short)6, "num_workers"),
+    NUM_EXECUTORS((short)7, "num_executors"),
+    TOPOLOGY_CONF((short)8, "topology_conf"),
+    ID_TO_SPOUT_AGG_STATS((short)9, "id_to_spout_agg_stats"),
+    ID_TO_BOLT_AGG_STATS((short)10, "id_to_bolt_agg_stats"),
+    SCHED_STATUS((short)11, "sched_status"),
+    TOPOLOGY_STATS((short)12, "topology_stats"),
+    OWNER((short)13, "owner");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -120,29 +120,29 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
       switch(fieldId) {
         case 1: // ID
           return ID;
-        case 513: // NAME
+        case 2: // NAME
           return NAME;
-        case 514: // UPTIME_SECS
+        case 3: // UPTIME_SECS
           return UPTIME_SECS;
-        case 515: // STATUS
+        case 4: // STATUS
           return STATUS;
-        case 516: // NUM_TASKS
+        case 5: // NUM_TASKS
           return NUM_TASKS;
-        case 517: // NUM_WORKERS
+        case 6: // NUM_WORKERS
           return NUM_WORKERS;
-        case 518: // NUM_EXECUTORS
+        case 7: // NUM_EXECUTORS
           return NUM_EXECUTORS;
-        case 519: // TOPOLOGY_CONF
+        case 8: // TOPOLOGY_CONF
           return TOPOLOGY_CONF;
-        case 520: // ID_TO_SPOUT_AGG_STATS
+        case 9: // ID_TO_SPOUT_AGG_STATS
           return ID_TO_SPOUT_AGG_STATS;
-        case 521: // ID_TO_BOLT_AGG_STATS
+        case 10: // ID_TO_BOLT_AGG_STATS
           return ID_TO_BOLT_AGG_STATS;
-        case 522: // SCHED_STATUS
+        case 11: // SCHED_STATUS
           return SCHED_STATUS;
-        case 523: // TOPOLOGY_STATS
+        case 12: // TOPOLOGY_STATS
           return TOPOLOGY_STATS;
-        case 524: // OWNER
+        case 13: // OWNER
           return OWNER;
         default:
           return null;
@@ -1366,7 +1366,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 513: // NAME
+          case 2: // NAME
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.name = iprot.readString();
               struct.set_name_isSet(true);
@@ -1374,7 +1374,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 514: // UPTIME_SECS
+          case 3: // UPTIME_SECS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.uptime_secs = iprot.readI32();
               struct.set_uptime_secs_isSet(true);
@@ -1382,7 +1382,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 515: // STATUS
+          case 4: // STATUS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.status = iprot.readString();
               struct.set_status_isSet(true);
@@ -1390,7 +1390,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 516: // NUM_TASKS
+          case 5: // NUM_TASKS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.num_tasks = iprot.readI32();
               struct.set_num_tasks_isSet(true);
@@ -1398,7 +1398,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 517: // NUM_WORKERS
+          case 6: // NUM_WORKERS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.num_workers = iprot.readI32();
               struct.set_num_workers_isSet(true);
@@ -1406,7 +1406,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 518: // NUM_EXECUTORS
+          case 7: // NUM_EXECUTORS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.num_executors = iprot.readI32();
               struct.set_num_executors_isSet(true);
@@ -1414,7 +1414,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 519: // TOPOLOGY_CONF
+          case 8: // TOPOLOGY_CONF
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.topology_conf = iprot.readString();
               struct.set_topology_conf_isSet(true);
@@ -1422,7 +1422,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 520: // ID_TO_SPOUT_AGG_STATS
+          case 9: // ID_TO_SPOUT_AGG_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map366 = iprot.readMapBegin();
@@ -1443,7 +1443,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 521: // ID_TO_BOLT_AGG_STATS
+          case 10: // ID_TO_BOLT_AGG_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map370 = iprot.readMapBegin();
@@ -1464,7 +1464,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 522: // SCHED_STATUS
+          case 11: // SCHED_STATUS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.sched_status = iprot.readString();
               struct.set_sched_status_isSet(true);
@@ -1472,7 +1472,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 523: // TOPOLOGY_STATS
+          case 12: // TOPOLOGY_STATS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.topology_stats = new TopologyStats();
               struct.topology_stats.read(iprot);
@@ -1481,7 +1481,7 @@ public class TopologyPageInfo implements org.apache.thrift.TBase<TopologyPageInf
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 524: // OWNER
+          case 13: // OWNER
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.owner = iprot.readString();
               struct.set_owner_isSet(true);

http://git-wip-us.apache.org/repos/asf/storm/blob/a6b82f8b/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java b/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java
index 359e588..62f9e04 100644
--- a/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/TopologyStats.java
@@ -51,15 +51,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-5-22")
 public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, TopologyStats._Fields>, java.io.Serializable, Cloneable, Comparable<TopologyStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TopologyStats");
 
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_emitted", org.apache.thrift.protocol.TType.MAP, (short)513);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_transferred", org.apache.thrift.protocol.TType.MAP, (short)514);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_COMPLETE_LATENCIES_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_complete_latencies_ms", org.apache.thrift.protocol.TType.MAP, (short)515);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_acked", org.apache.thrift.protocol.TType.MAP, (short)516);
-  private static final org.apache.thrift.protocol.TField WINDOW_TO_FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_failed", org.apache.thrift.protocol.TType.MAP, (short)517);
+  private static final org.apache.thrift.protocol.TField WINDOW_TO_EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_emitted", org.apache.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.thrift.protocol.TField WINDOW_TO_TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_transferred", org.apache.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.thrift.protocol.TField WINDOW_TO_COMPLETE_LATENCIES_MS_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_complete_latencies_ms", org.apache.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.thrift.protocol.TField WINDOW_TO_ACKED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_acked", org.apache.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.thrift.protocol.TField WINDOW_TO_FAILED_FIELD_DESC = new org.apache.thrift.protocol.TField("window_to_failed", org.apache.thrift.protocol.TType.MAP, (short)5);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -75,11 +75,11 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    WINDOW_TO_EMITTED((short)513, "window_to_emitted"),
-    WINDOW_TO_TRANSFERRED((short)514, "window_to_transferred"),
-    WINDOW_TO_COMPLETE_LATENCIES_MS((short)515, "window_to_complete_latencies_ms"),
-    WINDOW_TO_ACKED((short)516, "window_to_acked"),
-    WINDOW_TO_FAILED((short)517, "window_to_failed");
+    WINDOW_TO_EMITTED((short)1, "window_to_emitted"),
+    WINDOW_TO_TRANSFERRED((short)2, "window_to_transferred"),
+    WINDOW_TO_COMPLETE_LATENCIES_MS((short)3, "window_to_complete_latencies_ms"),
+    WINDOW_TO_ACKED((short)4, "window_to_acked"),
+    WINDOW_TO_FAILED((short)5, "window_to_failed");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -94,15 +94,15 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 513: // WINDOW_TO_EMITTED
+        case 1: // WINDOW_TO_EMITTED
           return WINDOW_TO_EMITTED;
-        case 514: // WINDOW_TO_TRANSFERRED
+        case 2: // WINDOW_TO_TRANSFERRED
           return WINDOW_TO_TRANSFERRED;
-        case 515: // WINDOW_TO_COMPLETE_LATENCIES_MS
+        case 3: // WINDOW_TO_COMPLETE_LATENCIES_MS
           return WINDOW_TO_COMPLETE_LATENCIES_MS;
-        case 516: // WINDOW_TO_ACKED
+        case 4: // WINDOW_TO_ACKED
           return WINDOW_TO_ACKED;
-        case 517: // WINDOW_TO_FAILED
+        case 5: // WINDOW_TO_FAILED
           return WINDOW_TO_FAILED;
         default:
           return null;
@@ -734,7 +734,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
           break;
         }
         switch (schemeField.id) {
-          case 513: // WINDOW_TO_EMITTED
+          case 1: // WINDOW_TO_EMITTED
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map316 = iprot.readMapBegin();
@@ -754,7 +754,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 514: // WINDOW_TO_TRANSFERRED
+          case 2: // WINDOW_TO_TRANSFERRED
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map320 = iprot.readMapBegin();
@@ -774,7 +774,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 515: // WINDOW_TO_COMPLETE_LATENCIES_MS
+          case 3: // WINDOW_TO_COMPLETE_LATENCIES_MS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map324 = iprot.readMapBegin();
@@ -794,7 +794,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 516: // WINDOW_TO_ACKED
+          case 4: // WINDOW_TO_ACKED
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map328 = iprot.readMapBegin();
@@ -814,7 +814,7 @@ public class TopologyStats implements org.apache.thrift.TBase<TopologyStats, Top
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 517: // WINDOW_TO_FAILED
+          case 5: // WINDOW_TO_FAILED
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map332 = iprot.readMapBegin();