storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From knusb...@apache.org
Subject [08/18] storm git commit: Upgrade to thrift-0.9.2
Date Tue, 17 Feb 2015 17:11:17 GMT
http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
index c98f423..fa1c3a5 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorInfo.java
@@ -16,13 +16,24 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package backtype.storm.generated;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, ExecutorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorInfo");
 
   private static final org.apache.thrift.protocol.TField TASK_START_FIELD_DESC = new org.apache.thrift.protocol.TField("task_start", org.apache.thrift.protocol.TType.I32, (short)1);
   private static final org.apache.thrift.protocol.TField TASK_END_FIELD_DESC = new org.apache.thrift.protocol.TField("task_end", org.apache.thrift.protocol.TType.I32, (short)2);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new ExecutorInfoStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new ExecutorInfoTupleSchemeFactory());
+  }
+
   private int task_start; // required
   private int task_end; // required
 
@@ -111,8 +131,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
   // isset id assignments
   private static final int __TASK_START_ISSET_ID = 0;
   private static final int __TASK_END_ISSET_ID = 1;
-  private BitSet __isset_bit_vector = new BitSet(2);
-
+  private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -142,8 +161,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
    * Performs a deep copy on <i>other</i>.
    */
   public ExecutorInfo(ExecutorInfo other) {
-    __isset_bit_vector.clear();
-    __isset_bit_vector.or(other.__isset_bit_vector);
+    __isset_bitfield = other.__isset_bitfield;
     this.task_start = other.task_start;
     this.task_end = other.task_end;
   }
@@ -170,16 +188,16 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
   }
 
   public void unset_task_start() {
-    __isset_bit_vector.clear(__TASK_START_ISSET_ID);
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TASK_START_ISSET_ID);
   }
 
   /** Returns true if field task_start is set (has been assigned a value) and false otherwise */
   public boolean is_set_task_start() {
-    return __isset_bit_vector.get(__TASK_START_ISSET_ID);
+    return EncodingUtils.testBit(__isset_bitfield, __TASK_START_ISSET_ID);
   }
 
   public void set_task_start_isSet(boolean value) {
-    __isset_bit_vector.set(__TASK_START_ISSET_ID, value);
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TASK_START_ISSET_ID, value);
   }
 
   public int get_task_end() {
@@ -192,16 +210,16 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
   }
 
   public void unset_task_end() {
-    __isset_bit_vector.clear(__TASK_END_ISSET_ID);
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TASK_END_ISSET_ID);
   }
 
   /** Returns true if field task_end is set (has been assigned a value) and false otherwise */
   public boolean is_set_task_end() {
-    return __isset_bit_vector.get(__TASK_END_ISSET_ID);
+    return EncodingUtils.testBit(__isset_bitfield, __TASK_END_ISSET_ID);
   }
 
   public void set_task_end_isSet(boolean value) {
-    __isset_bit_vector.set(__TASK_END_ISSET_ID, value);
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TASK_END_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, Object value) {
@@ -288,45 +306,45 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_task_start = true;
-    builder.append(present_task_start);
+    list.add(present_task_start);
     if (present_task_start)
-      builder.append(task_start);
+      list.add(task_start);
 
     boolean present_task_end = true;
-    builder.append(present_task_end);
+    list.add(present_task_end);
     if (present_task_end)
-      builder.append(task_end);
+      list.add(task_end);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(ExecutorInfo other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ExecutorInfo typedOther = (ExecutorInfo)other;
 
-    lastComparison = Boolean.valueOf(is_set_task_start()).compareTo(typedOther.is_set_task_start());
+    lastComparison = Boolean.valueOf(is_set_task_start()).compareTo(other.is_set_task_start());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_task_start()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_start, typedOther.task_start);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_start, other.task_start);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_task_end()).compareTo(typedOther.is_set_task_end());
+    lastComparison = Boolean.valueOf(is_set_task_end()).compareTo(other.is_set_task_end());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_task_end()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_end, typedOther.task_end);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.task_end, other.task_end);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -339,52 +357,11 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // TASK_START
-          if (field.type == org.apache.thrift.protocol.TType.I32) {
-            this.task_start = iprot.readI32();
-            set_task_start_isSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // TASK_END
-          if (field.type == org.apache.thrift.protocol.TType.I32) {
-            this.task_end = iprot.readI32();
-            set_task_end_isSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    oprot.writeFieldBegin(TASK_START_FIELD_DESC);
-    oprot.writeI32(this.task_start);
-    oprot.writeFieldEnd();
-    oprot.writeFieldBegin(TASK_END_FIELD_DESC);
-    oprot.writeI32(this.task_end);
-    oprot.writeFieldEnd();
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -413,6 +390,7 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'task_end' is unset! Struct:" + toString());
     }
 
+    // check for sub-struct validity
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -426,12 +404,96 @@ public class ExecutorInfo implements org.apache.thrift.TBase<ExecutorInfo, Execu
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bit_vector = new BitSet(1);
+      __isset_bitfield = 0;
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
+  private static class ExecutorInfoStandardSchemeFactory implements SchemeFactory {
+    public ExecutorInfoStandardScheme getScheme() {
+      return new ExecutorInfoStandardScheme();
+    }
+  }
+
+  private static class ExecutorInfoStandardScheme extends StandardScheme<ExecutorInfo> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorInfo struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // TASK_START
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.task_start = iprot.readI32();
+              struct.set_task_start_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // TASK_END
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.task_end = iprot.readI32();
+              struct.set_task_end_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorInfo struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(TASK_START_FIELD_DESC);
+      oprot.writeI32(struct.task_start);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(TASK_END_FIELD_DESC);
+      oprot.writeI32(struct.task_end);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class ExecutorInfoTupleSchemeFactory implements SchemeFactory {
+    public ExecutorInfoTupleScheme getScheme() {
+      return new ExecutorInfoTupleScheme();
+    }
+  }
+
+  private static class ExecutorInfoTupleScheme extends TupleScheme<ExecutorInfo> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorInfo struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      oprot.writeI32(struct.task_start);
+      oprot.writeI32(struct.task_end);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorInfo struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      struct.task_start = iprot.readI32();
+      struct.set_task_start_isSet(true);
+      struct.task_end = iprot.readI32();
+      struct.set_task_end_isSet(true);
+    }
+  }
+
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java
index 174ecff..06b741c 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSpecificStats.java
@@ -16,13 +16,24 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package backtype.storm.generated;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -35,9 +46,11 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpecificStats, ExecutorSpecificStats._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSpecificStats");
   private static final org.apache.thrift.protocol.TField BOLT_FIELD_DESC = new org.apache.thrift.protocol.TField("bolt", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -162,7 +175,7 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
   }
 
   @Override
-  protected Object readValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
+  protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
     _Fields setField = _Fields.findByThriftId(field.id);
     if (setField != null) {
       switch (setField) {
@@ -196,7 +209,46 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
   }
 
   @Override
-  protected void writeValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    switch (setField_) {
+      case BOLT:
+        BoltStats bolt = (BoltStats)value_;
+        bolt.write(oprot);
+        return;
+      case SPOUT:
+        SpoutStats spout = (SpoutStats)value_;
+        spout.write(oprot);
+        return;
+      default:
+        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
+    }
+  }
+
+  @Override
+  protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
+    _Fields setField = _Fields.findByThriftId(fieldID);
+    if (setField != null) {
+      switch (setField) {
+        case BOLT:
+          BoltStats bolt;
+          bolt = new BoltStats();
+          bolt.read(iprot);
+          return bolt;
+        case SPOUT:
+          SpoutStats spout;
+          spout = new SpoutStats();
+          spout.read(iprot);
+          return spout;
+        default:
+          throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
+      }
+    } else {
+      throw new TProtocolException("Couldn't find a field with field id " + fieldID);
+    }
+  }
+
+  @Override
+  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     switch (setField_) {
       case BOLT:
         BoltStats bolt = (BoltStats)value_;
@@ -300,19 +352,19 @@ public class ExecutorSpecificStats extends org.apache.thrift.TUnion<ExecutorSpec
 
   @Override
   public int hashCode() {
-    HashCodeBuilder hcb = new HashCodeBuilder();
-    hcb.append(this.getClass().getName());
+    List<Object> list = new ArrayList<Object>();
+    list.add(this.getClass().getName());
     org.apache.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
-      hcb.append(setField.getThriftFieldId());
+      list.add(setField.getThriftFieldId());
       Object value = getFieldValue();
       if (value instanceof org.apache.thrift.TEnum) {
-        hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
       } else {
-        hcb.append(value);
+        list.add(value);
       }
     }
-    return hcb.toHashCode();
+    return list.hashCode();
   }
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
     try {

http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
index a297fa7..26e63a1 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorStats.java
@@ -16,13 +16,24 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package backtype.storm.generated;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -35,16 +46,25 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, ExecutorStats._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorStats");
 
   private static final org.apache.thrift.protocol.TField EMITTED_FIELD_DESC = new org.apache.thrift.protocol.TField("emitted", org.apache.thrift.protocol.TType.MAP, (short)1);
   private static final org.apache.thrift.protocol.TField TRANSFERRED_FIELD_DESC = new org.apache.thrift.protocol.TField("transferred", org.apache.thrift.protocol.TType.MAP, (short)2);
   private static final org.apache.thrift.protocol.TField SPECIFIC_FIELD_DESC = new org.apache.thrift.protocol.TField("specific", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new ExecutorStatsStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new ExecutorStatsTupleSchemeFactory());
+  }
+
   private Map<String,Map<String,Long>> emitted; // required
   private Map<String,Map<String,Long>> transferred; // required
   private ExecutorSpecificStats specific; // required
@@ -114,7 +134,6 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
   }
 
   // isset id assignments
-
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -155,7 +174,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
    */
   public ExecutorStats(ExecutorStats other) {
     if (other.is_set_emitted()) {
-      Map<String,Map<String,Long>> __this__emitted = new HashMap<String,Map<String,Long>>();
+      Map<String,Map<String,Long>> __this__emitted = new HashMap<String,Map<String,Long>>(other.emitted.size());
       for (Map.Entry<String, Map<String,Long>> other_element : other.emitted.entrySet()) {
 
         String other_element_key = other_element.getKey();
@@ -163,25 +182,14 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
 
         String __this__emitted_copy_key = other_element_key;
 
-        Map<String,Long> __this__emitted_copy_value = new HashMap<String,Long>();
-        for (Map.Entry<String, Long> other_element_value_element : other_element_value.entrySet()) {
-
-          String other_element_value_element_key = other_element_value_element.getKey();
-          Long other_element_value_element_value = other_element_value_element.getValue();
-
-          String __this__emitted_copy_value_copy_key = other_element_value_element_key;
-
-          Long __this__emitted_copy_value_copy_value = other_element_value_element_value;
-
-          __this__emitted_copy_value.put(__this__emitted_copy_value_copy_key, __this__emitted_copy_value_copy_value);
-        }
+        Map<String,Long> __this__emitted_copy_value = new HashMap<String,Long>(other_element_value);
 
         __this__emitted.put(__this__emitted_copy_key, __this__emitted_copy_value);
       }
       this.emitted = __this__emitted;
     }
     if (other.is_set_transferred()) {
-      Map<String,Map<String,Long>> __this__transferred = new HashMap<String,Map<String,Long>>();
+      Map<String,Map<String,Long>> __this__transferred = new HashMap<String,Map<String,Long>>(other.transferred.size());
       for (Map.Entry<String, Map<String,Long>> other_element : other.transferred.entrySet()) {
 
         String other_element_key = other_element.getKey();
@@ -189,18 +197,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
 
         String __this__transferred_copy_key = other_element_key;
 
-        Map<String,Long> __this__transferred_copy_value = new HashMap<String,Long>();
-        for (Map.Entry<String, Long> other_element_value_element : other_element_value.entrySet()) {
-
-          String other_element_value_element_key = other_element_value_element.getKey();
-          Long other_element_value_element_value = other_element_value_element.getValue();
-
-          String __this__transferred_copy_value_copy_key = other_element_value_element_key;
-
-          Long __this__transferred_copy_value_copy_value = other_element_value_element_value;
-
-          __this__transferred_copy_value.put(__this__transferred_copy_value_copy_key, __this__transferred_copy_value_copy_value);
-        }
+        Map<String,Long> __this__transferred_copy_value = new HashMap<String,Long>(other_element_value);
 
         __this__transferred.put(__this__transferred_copy_key, __this__transferred_copy_value);
       }
@@ -419,60 +416,60 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_emitted = true && (is_set_emitted());
-    builder.append(present_emitted);
+    list.add(present_emitted);
     if (present_emitted)
-      builder.append(emitted);
+      list.add(emitted);
 
     boolean present_transferred = true && (is_set_transferred());
-    builder.append(present_transferred);
+    list.add(present_transferred);
     if (present_transferred)
-      builder.append(transferred);
+      list.add(transferred);
 
     boolean present_specific = true && (is_set_specific());
-    builder.append(present_specific);
+    list.add(present_specific);
     if (present_specific)
-      builder.append(specific);
+      list.add(specific);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(ExecutorStats other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ExecutorStats typedOther = (ExecutorStats)other;
 
-    lastComparison = Boolean.valueOf(is_set_emitted()).compareTo(typedOther.is_set_emitted());
+    lastComparison = Boolean.valueOf(is_set_emitted()).compareTo(other.is_set_emitted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_emitted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.emitted, typedOther.emitted);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.emitted, other.emitted);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_transferred()).compareTo(typedOther.is_set_transferred());
+    lastComparison = Boolean.valueOf(is_set_transferred()).compareTo(other.is_set_transferred());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_transferred()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.transferred, typedOther.transferred);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.transferred, other.transferred);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_specific()).compareTo(typedOther.is_set_specific());
+    lastComparison = Boolean.valueOf(is_set_specific()).compareTo(other.is_set_specific());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_specific()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.specific, typedOther.specific);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.specific, other.specific);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -485,147 +482,11 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // EMITTED
-          if (field.type == org.apache.thrift.protocol.TType.MAP) {
-            {
-              org.apache.thrift.protocol.TMap _map125 = iprot.readMapBegin();
-              this.emitted = new HashMap<String,Map<String,Long>>(2*_map125.size);
-              for (int _i126 = 0; _i126 < _map125.size; ++_i126)
-              {
-                String _key127; // required
-                Map<String,Long> _val128; // required
-                _key127 = iprot.readString();
-                {
-                  org.apache.thrift.protocol.TMap _map129 = iprot.readMapBegin();
-                  _val128 = new HashMap<String,Long>(2*_map129.size);
-                  for (int _i130 = 0; _i130 < _map129.size; ++_i130)
-                  {
-                    String _key131; // required
-                    long _val132; // required
-                    _key131 = iprot.readString();
-                    _val132 = iprot.readI64();
-                    _val128.put(_key131, _val132);
-                  }
-                  iprot.readMapEnd();
-                }
-                this.emitted.put(_key127, _val128);
-              }
-              iprot.readMapEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // TRANSFERRED
-          if (field.type == org.apache.thrift.protocol.TType.MAP) {
-            {
-              org.apache.thrift.protocol.TMap _map133 = iprot.readMapBegin();
-              this.transferred = new HashMap<String,Map<String,Long>>(2*_map133.size);
-              for (int _i134 = 0; _i134 < _map133.size; ++_i134)
-              {
-                String _key135; // required
-                Map<String,Long> _val136; // required
-                _key135 = iprot.readString();
-                {
-                  org.apache.thrift.protocol.TMap _map137 = iprot.readMapBegin();
-                  _val136 = new HashMap<String,Long>(2*_map137.size);
-                  for (int _i138 = 0; _i138 < _map137.size; ++_i138)
-                  {
-                    String _key139; // required
-                    long _val140; // required
-                    _key139 = iprot.readString();
-                    _val140 = iprot.readI64();
-                    _val136.put(_key139, _val140);
-                  }
-                  iprot.readMapEnd();
-                }
-                this.transferred.put(_key135, _val136);
-              }
-              iprot.readMapEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 3: // SPECIFIC
-          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-            this.specific = new ExecutorSpecificStats();
-            this.specific.read(iprot);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.emitted != null) {
-      oprot.writeFieldBegin(EMITTED_FIELD_DESC);
-      {
-        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.emitted.size()));
-        for (Map.Entry<String, Map<String,Long>> _iter141 : this.emitted.entrySet())
-        {
-          oprot.writeString(_iter141.getKey());
-          {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter141.getValue().size()));
-            for (Map.Entry<String, Long> _iter142 : _iter141.getValue().entrySet())
-            {
-              oprot.writeString(_iter142.getKey());
-              oprot.writeI64(_iter142.getValue());
-            }
-            oprot.writeMapEnd();
-          }
-        }
-        oprot.writeMapEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.transferred != null) {
-      oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC);
-      {
-        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, this.transferred.size()));
-        for (Map.Entry<String, Map<String,Long>> _iter143 : this.transferred.entrySet())
-        {
-          oprot.writeString(_iter143.getKey());
-          {
-            oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter143.getValue().size()));
-            for (Map.Entry<String, Long> _iter144 : _iter143.getValue().entrySet())
-            {
-              oprot.writeString(_iter144.getKey());
-              oprot.writeI64(_iter144.getValue());
-            }
-            oprot.writeMapEnd();
-          }
-        }
-        oprot.writeMapEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.specific != null) {
-      oprot.writeFieldBegin(SPECIFIC_FIELD_DESC);
-      this.specific.write(oprot);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -674,6 +535,7 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'specific' is unset! Struct:" + toString());
     }
 
+    // check for sub-struct validity
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -692,5 +554,263 @@ public class ExecutorStats implements org.apache.thrift.TBase<ExecutorStats, Exe
     }
   }
 
+  private static class ExecutorStatsStandardSchemeFactory implements SchemeFactory {
+    public ExecutorStatsStandardScheme getScheme() {
+      return new ExecutorStatsStandardScheme();
+    }
+  }
+
+  private static class ExecutorStatsStandardScheme extends StandardScheme<ExecutorStats> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorStats struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // EMITTED
+            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+              {
+                org.apache.thrift.protocol.TMap _map250 = iprot.readMapBegin();
+                struct.emitted = new HashMap<String,Map<String,Long>>(2*_map250.size);
+                String _key251;
+                Map<String,Long> _val252;
+                for (int _i253 = 0; _i253 < _map250.size; ++_i253)
+                {
+                  _key251 = iprot.readString();
+                  {
+                    org.apache.thrift.protocol.TMap _map254 = iprot.readMapBegin();
+                    _val252 = new HashMap<String,Long>(2*_map254.size);
+                    String _key255;
+                    long _val256;
+                    for (int _i257 = 0; _i257 < _map254.size; ++_i257)
+                    {
+                      _key255 = iprot.readString();
+                      _val256 = iprot.readI64();
+                      _val252.put(_key255, _val256);
+                    }
+                    iprot.readMapEnd();
+                  }
+                  struct.emitted.put(_key251, _val252);
+                }
+                iprot.readMapEnd();
+              }
+              struct.set_emitted_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // TRANSFERRED
+            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+              {
+                org.apache.thrift.protocol.TMap _map258 = iprot.readMapBegin();
+                struct.transferred = new HashMap<String,Map<String,Long>>(2*_map258.size);
+                String _key259;
+                Map<String,Long> _val260;
+                for (int _i261 = 0; _i261 < _map258.size; ++_i261)
+                {
+                  _key259 = iprot.readString();
+                  {
+                    org.apache.thrift.protocol.TMap _map262 = iprot.readMapBegin();
+                    _val260 = new HashMap<String,Long>(2*_map262.size);
+                    String _key263;
+                    long _val264;
+                    for (int _i265 = 0; _i265 < _map262.size; ++_i265)
+                    {
+                      _key263 = iprot.readString();
+                      _val264 = iprot.readI64();
+                      _val260.put(_key263, _val264);
+                    }
+                    iprot.readMapEnd();
+                  }
+                  struct.transferred.put(_key259, _val260);
+                }
+                iprot.readMapEnd();
+              }
+              struct.set_transferred_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // SPECIFIC
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.specific = new ExecutorSpecificStats();
+              struct.specific.read(iprot);
+              struct.set_specific_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorStats struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.emitted != null) {
+        oprot.writeFieldBegin(EMITTED_FIELD_DESC);
+        {
+          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.emitted.size()));
+          for (Map.Entry<String, Map<String,Long>> _iter266 : struct.emitted.entrySet())
+          {
+            oprot.writeString(_iter266.getKey());
+            {
+              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter266.getValue().size()));
+              for (Map.Entry<String, Long> _iter267 : _iter266.getValue().entrySet())
+              {
+                oprot.writeString(_iter267.getKey());
+                oprot.writeI64(_iter267.getValue());
+              }
+              oprot.writeMapEnd();
+            }
+          }
+          oprot.writeMapEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (struct.transferred != null) {
+        oprot.writeFieldBegin(TRANSFERRED_FIELD_DESC);
+        {
+          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.transferred.size()));
+          for (Map.Entry<String, Map<String,Long>> _iter268 : struct.transferred.entrySet())
+          {
+            oprot.writeString(_iter268.getKey());
+            {
+              oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, _iter268.getValue().size()));
+              for (Map.Entry<String, Long> _iter269 : _iter268.getValue().entrySet())
+              {
+                oprot.writeString(_iter269.getKey());
+                oprot.writeI64(_iter269.getValue());
+              }
+              oprot.writeMapEnd();
+            }
+          }
+          oprot.writeMapEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (struct.specific != null) {
+        oprot.writeFieldBegin(SPECIFIC_FIELD_DESC);
+        struct.specific.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class ExecutorStatsTupleSchemeFactory implements SchemeFactory {
+    public ExecutorStatsTupleScheme getScheme() {
+      return new ExecutorStatsTupleScheme();
+    }
+  }
+
+  private static class ExecutorStatsTupleScheme extends TupleScheme<ExecutorStats> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      {
+        oprot.writeI32(struct.emitted.size());
+        for (Map.Entry<String, Map<String,Long>> _iter270 : struct.emitted.entrySet())
+        {
+          oprot.writeString(_iter270.getKey());
+          {
+            oprot.writeI32(_iter270.getValue().size());
+            for (Map.Entry<String, Long> _iter271 : _iter270.getValue().entrySet())
+            {
+              oprot.writeString(_iter271.getKey());
+              oprot.writeI64(_iter271.getValue());
+            }
+          }
+        }
+      }
+      {
+        oprot.writeI32(struct.transferred.size());
+        for (Map.Entry<String, Map<String,Long>> _iter272 : struct.transferred.entrySet())
+        {
+          oprot.writeString(_iter272.getKey());
+          {
+            oprot.writeI32(_iter272.getValue().size());
+            for (Map.Entry<String, Long> _iter273 : _iter272.getValue().entrySet())
+            {
+              oprot.writeString(_iter273.getKey());
+              oprot.writeI64(_iter273.getValue());
+            }
+          }
+        }
+      }
+      struct.specific.write(oprot);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorStats struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      {
+        org.apache.thrift.protocol.TMap _map274 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        struct.emitted = new HashMap<String,Map<String,Long>>(2*_map274.size);
+        String _key275;
+        Map<String,Long> _val276;
+        for (int _i277 = 0; _i277 < _map274.size; ++_i277)
+        {
+          _key275 = iprot.readString();
+          {
+            org.apache.thrift.protocol.TMap _map278 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            _val276 = new HashMap<String,Long>(2*_map278.size);
+            String _key279;
+            long _val280;
+            for (int _i281 = 0; _i281 < _map278.size; ++_i281)
+            {
+              _key279 = iprot.readString();
+              _val280 = iprot.readI64();
+              _val276.put(_key279, _val280);
+            }
+          }
+          struct.emitted.put(_key275, _val276);
+        }
+      }
+      struct.set_emitted_isSet(true);
+      {
+        org.apache.thrift.protocol.TMap _map282 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+        struct.transferred = new HashMap<String,Map<String,Long>>(2*_map282.size);
+        String _key283;
+        Map<String,Long> _val284;
+        for (int _i285 = 0; _i285 < _map282.size; ++_i285)
+        {
+          _key283 = iprot.readString();
+          {
+            org.apache.thrift.protocol.TMap _map286 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+            _val284 = new HashMap<String,Long>(2*_map286.size);
+            String _key287;
+            long _val288;
+            for (int _i289 = 0; _i289 < _map286.size; ++_i289)
+            {
+              _key287 = iprot.readString();
+              _val288 = iprot.readI64();
+              _val284.put(_key287, _val288);
+            }
+          }
+          struct.transferred.put(_key283, _val284);
+        }
+      }
+      struct.set_transferred_isSet(true);
+      struct.specific = new ExecutorSpecificStats();
+      struct.specific.read(iprot);
+      struct.set_specific_isSet(true);
+    }
+  }
+
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
index daa9a6e..3191508 100644
--- a/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
+++ b/storm-core/src/jvm/backtype/storm/generated/ExecutorSummary.java
@@ -16,13 +16,24 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package backtype.storm.generated;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -35,10 +46,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary, ExecutorSummary._Fields>, java.io.Serializable, Cloneable, Comparable<ExecutorSummary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExecutorSummary");
 
   private static final org.apache.thrift.protocol.TField EXECUTOR_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("executor_info", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -48,12 +62,18 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   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)5);
   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)7);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new ExecutorSummaryStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new ExecutorSummaryTupleSchemeFactory());
+  }
+
   private ExecutorInfo executor_info; // required
   private String component_id; // required
   private String host; // required
   private int port; // required
   private int uptime_secs; // required
-  private ExecutorStats stats; // required
+  private ExecutorStats stats; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -131,8 +151,8 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   // isset id assignments
   private static final int __PORT_ISSET_ID = 0;
   private static final int __UPTIME_SECS_ISSET_ID = 1;
-  private BitSet __isset_bit_vector = new BitSet(2);
-
+  private byte __isset_bitfield = 0;
+  private static final _Fields optionals[] = {_Fields.STATS};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -176,8 +196,7 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
    * Performs a deep copy on <i>other</i>.
    */
   public ExecutorSummary(ExecutorSummary other) {
-    __isset_bit_vector.clear();
-    __isset_bit_vector.or(other.__isset_bit_vector);
+    __isset_bitfield = other.__isset_bitfield;
     if (other.is_set_executor_info()) {
       this.executor_info = new ExecutorInfo(other.executor_info);
     }
@@ -289,16 +308,16 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   }
 
   public void unset_port() {
-    __isset_bit_vector.clear(__PORT_ISSET_ID);
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   /** Returns true if field port is set (has been assigned a value) and false otherwise */
   public boolean is_set_port() {
-    return __isset_bit_vector.get(__PORT_ISSET_ID);
+    return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   public void set_port_isSet(boolean value) {
-    __isset_bit_vector.set(__PORT_ISSET_ID, value);
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
   public int get_uptime_secs() {
@@ -311,16 +330,16 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   }
 
   public void unset_uptime_secs() {
-    __isset_bit_vector.clear(__UPTIME_SECS_ISSET_ID);
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   /** Returns true if field uptime_secs is set (has been assigned a value) and false otherwise */
   public boolean is_set_uptime_secs() {
-    return __isset_bit_vector.get(__UPTIME_SECS_ISSET_ID);
+    return EncodingUtils.testBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID);
   }
 
   public void set_uptime_secs_isSet(boolean value) {
-    __isset_bit_vector.set(__UPTIME_SECS_ISSET_ID, value);
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPTIME_SECS_ISSET_ID, value);
   }
 
   public ExecutorStats get_stats() {
@@ -518,105 +537,105 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_executor_info = true && (is_set_executor_info());
-    builder.append(present_executor_info);
+    list.add(present_executor_info);
     if (present_executor_info)
-      builder.append(executor_info);
+      list.add(executor_info);
 
     boolean present_component_id = true && (is_set_component_id());
-    builder.append(present_component_id);
+    list.add(present_component_id);
     if (present_component_id)
-      builder.append(component_id);
+      list.add(component_id);
 
     boolean present_host = true && (is_set_host());
-    builder.append(present_host);
+    list.add(present_host);
     if (present_host)
-      builder.append(host);
+      list.add(host);
 
     boolean present_port = true;
-    builder.append(present_port);
+    list.add(present_port);
     if (present_port)
-      builder.append(port);
+      list.add(port);
 
     boolean present_uptime_secs = true;
-    builder.append(present_uptime_secs);
+    list.add(present_uptime_secs);
     if (present_uptime_secs)
-      builder.append(uptime_secs);
+      list.add(uptime_secs);
 
     boolean present_stats = true && (is_set_stats());
-    builder.append(present_stats);
+    list.add(present_stats);
     if (present_stats)
-      builder.append(stats);
+      list.add(stats);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(ExecutorSummary other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ExecutorSummary typedOther = (ExecutorSummary)other;
 
-    lastComparison = Boolean.valueOf(is_set_executor_info()).compareTo(typedOther.is_set_executor_info());
+    lastComparison = Boolean.valueOf(is_set_executor_info()).compareTo(other.is_set_executor_info());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_executor_info()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_info, typedOther.executor_info);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.executor_info, other.executor_info);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_component_id()).compareTo(typedOther.is_set_component_id());
+    lastComparison = Boolean.valueOf(is_set_component_id()).compareTo(other.is_set_component_id());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_component_id()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_id, typedOther.component_id);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.component_id, other.component_id);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_host()).compareTo(typedOther.is_set_host());
+    lastComparison = Boolean.valueOf(is_set_host()).compareTo(other.is_set_host());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_host()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, other.host);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_port()).compareTo(typedOther.is_set_port());
+    lastComparison = Boolean.valueOf(is_set_port()).compareTo(other.is_set_port());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_port()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(typedOther.is_set_uptime_secs());
+    lastComparison = Boolean.valueOf(is_set_uptime_secs()).compareTo(other.is_set_uptime_secs());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_uptime_secs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, typedOther.uptime_secs);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uptime_secs, other.uptime_secs);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_stats()).compareTo(typedOther.is_set_stats());
+    lastComparison = Boolean.valueOf(is_set_stats()).compareTo(other.is_set_stats());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_stats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, typedOther.stats);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stats, other.stats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -629,104 +648,11 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // EXECUTOR_INFO
-          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-            this.executor_info = new ExecutorInfo();
-            this.executor_info.read(iprot);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // COMPONENT_ID
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.component_id = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 3: // HOST
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.host = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 4: // PORT
-          if (field.type == org.apache.thrift.protocol.TType.I32) {
-            this.port = iprot.readI32();
-            set_port_isSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 5: // UPTIME_SECS
-          if (field.type == org.apache.thrift.protocol.TType.I32) {
-            this.uptime_secs = iprot.readI32();
-            set_uptime_secs_isSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 7: // STATS
-          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-            this.stats = new ExecutorStats();
-            this.stats.read(iprot);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.executor_info != null) {
-      oprot.writeFieldBegin(EXECUTOR_INFO_FIELD_DESC);
-      this.executor_info.write(oprot);
-      oprot.writeFieldEnd();
-    }
-    if (this.component_id != null) {
-      oprot.writeFieldBegin(COMPONENT_ID_FIELD_DESC);
-      oprot.writeString(this.component_id);
-      oprot.writeFieldEnd();
-    }
-    if (this.host != null) {
-      oprot.writeFieldBegin(HOST_FIELD_DESC);
-      oprot.writeString(this.host);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldBegin(PORT_FIELD_DESC);
-    oprot.writeI32(this.port);
-    oprot.writeFieldEnd();
-    oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
-    oprot.writeI32(this.uptime_secs);
-    oprot.writeFieldEnd();
-    if (this.stats != null) {
-      if (is_set_stats()) {
-        oprot.writeFieldBegin(STATS_FIELD_DESC);
-        this.stats.write(oprot);
-        oprot.writeFieldEnd();
-      }
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -801,6 +727,13 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'uptime_secs' is unset! Struct:" + toString());
     }
 
+    // check for sub-struct validity
+    if (executor_info != null) {
+      executor_info.validate();
+    }
+    if (stats != null) {
+      stats.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -814,12 +747,176 @@ public class ExecutorSummary implements org.apache.thrift.TBase<ExecutorSummary,
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bit_vector = new BitSet(1);
+      __isset_bitfield = 0;
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
+  private static class ExecutorSummaryStandardSchemeFactory implements SchemeFactory {
+    public ExecutorSummaryStandardScheme getScheme() {
+      return new ExecutorSummaryStandardScheme();
+    }
+  }
+
+  private static class ExecutorSummaryStandardScheme extends StandardScheme<ExecutorSummary> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, ExecutorSummary struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // EXECUTOR_INFO
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.executor_info = new ExecutorInfo();
+              struct.executor_info.read(iprot);
+              struct.set_executor_info_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // COMPONENT_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.component_id = iprot.readString();
+              struct.set_component_id_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // HOST
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.host = iprot.readString();
+              struct.set_host_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // PORT
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.port = iprot.readI32();
+              struct.set_port_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 5: // UPTIME_SECS
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.uptime_secs = iprot.readI32();
+              struct.set_uptime_secs_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 7: // STATS
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.stats = new ExecutorStats();
+              struct.stats.read(iprot);
+              struct.set_stats_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, ExecutorSummary struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.executor_info != null) {
+        oprot.writeFieldBegin(EXECUTOR_INFO_FIELD_DESC);
+        struct.executor_info.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (struct.component_id != null) {
+        oprot.writeFieldBegin(COMPONENT_ID_FIELD_DESC);
+        oprot.writeString(struct.component_id);
+        oprot.writeFieldEnd();
+      }
+      if (struct.host != null) {
+        oprot.writeFieldBegin(HOST_FIELD_DESC);
+        oprot.writeString(struct.host);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(PORT_FIELD_DESC);
+      oprot.writeI32(struct.port);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(UPTIME_SECS_FIELD_DESC);
+      oprot.writeI32(struct.uptime_secs);
+      oprot.writeFieldEnd();
+      if (struct.stats != null) {
+        if (struct.is_set_stats()) {
+          oprot.writeFieldBegin(STATS_FIELD_DESC);
+          struct.stats.write(oprot);
+          oprot.writeFieldEnd();
+        }
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class ExecutorSummaryTupleSchemeFactory implements SchemeFactory {
+    public ExecutorSummaryTupleScheme getScheme() {
+      return new ExecutorSummaryTupleScheme();
+    }
+  }
+
+  private static class ExecutorSummaryTupleScheme extends TupleScheme<ExecutorSummary> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, ExecutorSummary struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      struct.executor_info.write(oprot);
+      oprot.writeString(struct.component_id);
+      oprot.writeString(struct.host);
+      oprot.writeI32(struct.port);
+      oprot.writeI32(struct.uptime_secs);
+      BitSet optionals = new BitSet();
+      if (struct.is_set_stats()) {
+        optionals.set(0);
+      }
+      oprot.writeBitSet(optionals, 1);
+      if (struct.is_set_stats()) {
+        struct.stats.write(oprot);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, ExecutorSummary struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      struct.executor_info = new ExecutorInfo();
+      struct.executor_info.read(iprot);
+      struct.set_executor_info_isSet(true);
+      struct.component_id = iprot.readString();
+      struct.set_component_id_isSet(true);
+      struct.host = iprot.readString();
+      struct.set_host_isSet(true);
+      struct.port = iprot.readI32();
+      struct.set_port_isSet(true);
+      struct.uptime_secs = iprot.readI32();
+      struct.set_uptime_secs_isSet(true);
+      BitSet incoming = iprot.readBitSet(1);
+      if (incoming.get(0)) {
+        struct.stats = new ExecutorStats();
+        struct.stats.read(iprot);
+        struct.set_stats_isSet(true);
+      }
+    }
+  }
+
 }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/ef51dbee/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
index 02ed3ed..fa60c6b 100644
--- a/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
+++ b/storm-core/src/jvm/backtype/storm/generated/GlobalStreamId.java
@@ -16,13 +16,24 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package backtype.storm.generated;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -35,15 +46,24 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-2-2")
+public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, GlobalStreamId._Fields>, java.io.Serializable, Cloneable, Comparable<GlobalStreamId> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GlobalStreamId");
 
   private static final org.apache.thrift.protocol.TField COMPONENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("componentId", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField STREAM_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("streamId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new GlobalStreamIdStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new GlobalStreamIdTupleSchemeFactory());
+  }
+
   private String componentId; // required
   private String streamId; // required
 
@@ -109,7 +129,6 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
   }
 
   // isset id assignments
-
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -285,45 +304,45 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_componentId = true && (is_set_componentId());
-    builder.append(present_componentId);
+    list.add(present_componentId);
     if (present_componentId)
-      builder.append(componentId);
+      list.add(componentId);
 
     boolean present_streamId = true && (is_set_streamId());
-    builder.append(present_streamId);
+    list.add(present_streamId);
     if (present_streamId)
-      builder.append(streamId);
+      list.add(streamId);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GlobalStreamId other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GlobalStreamId typedOther = (GlobalStreamId)other;
 
-    lastComparison = Boolean.valueOf(is_set_componentId()).compareTo(typedOther.is_set_componentId());
+    lastComparison = Boolean.valueOf(is_set_componentId()).compareTo(other.is_set_componentId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_componentId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.componentId, typedOther.componentId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.componentId, other.componentId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(is_set_streamId()).compareTo(typedOther.is_set_streamId());
+    lastComparison = Boolean.valueOf(is_set_streamId()).compareTo(other.is_set_streamId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (is_set_streamId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streamId, typedOther.streamId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.streamId, other.streamId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -336,54 +355,11 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // COMPONENT_ID
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.componentId = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // STREAM_ID
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.streamId = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.componentId != null) {
-      oprot.writeFieldBegin(COMPONENT_ID_FIELD_DESC);
-      oprot.writeString(this.componentId);
-      oprot.writeFieldEnd();
-    }
-    if (this.streamId != null) {
-      oprot.writeFieldBegin(STREAM_ID_FIELD_DESC);
-      oprot.writeString(this.streamId);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -420,6 +396,7 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'streamId' is unset! Struct:" + toString());
     }
 
+    // check for sub-struct validity
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -438,5 +415,93 @@ public class GlobalStreamId implements org.apache.thrift.TBase<GlobalStreamId, G
     }
   }
 
+  private static class GlobalStreamIdStandardSchemeFactory implements SchemeFactory {
+    public GlobalStreamIdStandardScheme getScheme() {
+      return new GlobalStreamIdStandardScheme();
+    }
+  }
+
+  private static class GlobalStreamIdStandardScheme extends StandardScheme<GlobalStreamId> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, GlobalStreamId struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // COMPONENT_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.componentId = iprot.readString();
+              struct.set_componentId_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // STREAM_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.streamId = iprot.readString();
+              struct.set_streamId_isSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, GlobalStreamId struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.componentId != null) {
+        oprot.writeFieldBegin(COMPONENT_ID_FIELD_DESC);
+        oprot.writeString(struct.componentId);
+        oprot.writeFieldEnd();
+      }
+      if (struct.streamId != null) {
+        oprot.writeFieldBegin(STREAM_ID_FIELD_DESC);
+        oprot.writeString(struct.streamId);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class GlobalStreamIdTupleSchemeFactory implements SchemeFactory {
+    public GlobalStreamIdTupleScheme getScheme() {
+      return new GlobalStreamIdTupleScheme();
+    }
+  }
+
+  private static class GlobalStreamIdTupleScheme extends TupleScheme<GlobalStreamId> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      oprot.writeString(struct.componentId);
+      oprot.writeString(struct.streamId);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, GlobalStreamId struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      struct.componentId = iprot.readString();
+      struct.set_componentId_isSet(true);
+      struct.streamId = iprot.readString();
+      struct.set_streamId_isSet(true);
+    }
+  }
+
 }
 


Mime
View raw message