hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amareshw...@apache.org
Subject svn commit: r1165207 [14/19] - in /hive/trunk: ./ cli/ eclipse-templates/ ivy/ jdbc/ lib/ metastore/ metastore/src/gen/thrift/gen-cpp/ metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ metastore/src/gen/thrift/gen-php/hive_met...
Date Mon, 05 Sep 2011 08:47:06 GMT
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,31 +20,25 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class Operator implements TBase<Operator, Operator._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Operator");
-
-  private static final TField OPERATOR_ID_FIELD_DESC = new TField("operatorId", TType.STRING, (short)1);
-  private static final TField OPERATOR_TYPE_FIELD_DESC = new TField("operatorType", TType.I32, (short)2);
-  private static final TField OPERATOR_ATTRIBUTES_FIELD_DESC = new TField("operatorAttributes", TType.MAP, (short)3);
-  private static final TField OPERATOR_COUNTERS_FIELD_DESC = new TField("operatorCounters", TType.MAP, (short)4);
-  private static final TField DONE_FIELD_DESC = new TField("done", TType.BOOL, (short)5);
-  private static final TField STARTED_FIELD_DESC = new TField("started", TType.BOOL, (short)6);
-
-  private String operatorId;
-  private OperatorType operatorType;
-  private Map<String,String> operatorAttributes;
-  private Map<String,Long> operatorCounters;
-  private boolean done;
-  private boolean started;
+public class Operator implements org.apache.thrift.TBase<Operator, Operator._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Operator");
+
+  private static final org.apache.thrift.protocol.TField OPERATOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("operatorId", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField OPERATOR_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("operatorType", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField OPERATOR_ATTRIBUTES_FIELD_DESC = new org.apache.thrift.protocol.TField("operatorAttributes", org.apache.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.thrift.protocol.TField OPERATOR_COUNTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("operatorCounters", org.apache.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.thrift.protocol.TField DONE_FIELD_DESC = new org.apache.thrift.protocol.TField("done", org.apache.thrift.protocol.TType.BOOL, (short)5);
+  private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.BOOL, (short)6);
+
+  private String operatorId; // required
+  private OperatorType operatorType; // required
+  private Map<String,String> operatorAttributes; // required
+  private Map<String,Long> operatorCounters; // required
+  private boolean done; // required
+  private boolean started; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     OPERATOR_ID((short)1, "operatorId"),
     /**
      * 
@@ -125,27 +119,27 @@ public class Operator implements TBase<O
   private static final int __STARTED_ISSET_ID = 1;
   private BitSet __isset_bit_vector = new BitSet(2);
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.OPERATOR_ID, new FieldMetaData("operatorId", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.OPERATOR_TYPE, new FieldMetaData("operatorType", TFieldRequirementType.DEFAULT, 
-        new EnumMetaData(TType.ENUM, OperatorType.class)));
-    tmpMap.put(_Fields.OPERATOR_ATTRIBUTES, new FieldMetaData("operatorAttributes", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.STRING))));
-    tmpMap.put(_Fields.OPERATOR_COUNTERS, new FieldMetaData("operatorCounters", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.I64))));
-    tmpMap.put(_Fields.DONE, new FieldMetaData("done", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
-    tmpMap.put(_Fields.STARTED, new FieldMetaData("started", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.OPERATOR_ID, new org.apache.thrift.meta_data.FieldMetaData("operatorId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.OPERATOR_TYPE, new org.apache.thrift.meta_data.FieldMetaData("operatorType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, OperatorType.class)));
+    tmpMap.put(_Fields.OPERATOR_ATTRIBUTES, new org.apache.thrift.meta_data.FieldMetaData("operatorAttributes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.OPERATOR_COUNTERS, new org.apache.thrift.meta_data.FieldMetaData("operatorCounters", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
+    tmpMap.put(_Fields.DONE, new org.apache.thrift.meta_data.FieldMetaData("done", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.STARTED, new org.apache.thrift.meta_data.FieldMetaData("started", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(Operator.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Operator.class, metaDataMap);
   }
 
   public Operator() {
@@ -244,7 +238,7 @@ public class Operator implements TBase<O
     this.operatorId = null;
   }
 
-  /** Returns true if field operatorId is set (has been asigned a value) and false otherwise */
+  /** Returns true if field operatorId is set (has been assigned a value) and false otherwise */
   public boolean isSetOperatorId() {
     return this.operatorId != null;
   }
@@ -275,7 +269,7 @@ public class Operator implements TBase<O
     this.operatorType = null;
   }
 
-  /** Returns true if field operatorType is set (has been asigned a value) and false otherwise */
+  /** Returns true if field operatorType is set (has been assigned a value) and false otherwise */
   public boolean isSetOperatorType() {
     return this.operatorType != null;
   }
@@ -309,7 +303,7 @@ public class Operator implements TBase<O
     this.operatorAttributes = null;
   }
 
-  /** Returns true if field operatorAttributes is set (has been asigned a value) and false otherwise */
+  /** Returns true if field operatorAttributes is set (has been assigned a value) and false otherwise */
   public boolean isSetOperatorAttributes() {
     return this.operatorAttributes != null;
   }
@@ -343,7 +337,7 @@ public class Operator implements TBase<O
     this.operatorCounters = null;
   }
 
-  /** Returns true if field operatorCounters is set (has been asigned a value) and false otherwise */
+  /** Returns true if field operatorCounters is set (has been assigned a value) and false otherwise */
   public boolean isSetOperatorCounters() {
     return this.operatorCounters != null;
   }
@@ -367,7 +361,7 @@ public class Operator implements TBase<O
     __isset_bit_vector.clear(__DONE_ISSET_ID);
   }
 
-  /** Returns true if field done is set (has been asigned a value) and false otherwise */
+  /** Returns true if field done is set (has been assigned a value) and false otherwise */
   public boolean isSetDone() {
     return __isset_bit_vector.get(__DONE_ISSET_ID);
   }
@@ -389,7 +383,7 @@ public class Operator implements TBase<O
     __isset_bit_vector.clear(__STARTED_ISSET_ID);
   }
 
-  /** Returns true if field started is set (has been asigned a value) and false otherwise */
+  /** Returns true if field started is set (has been assigned a value) and false otherwise */
   public boolean isSetStarted() {
     return __isset_bit_vector.get(__STARTED_ISSET_ID);
   }
@@ -466,16 +460,16 @@ public class Operator implements TBase<O
       return getOperatorCounters();
 
     case DONE:
-      return new Boolean(isDone());
+      return Boolean.valueOf(isDone());
 
     case STARTED:
-      return new Boolean(isStarted());
+      return Boolean.valueOf(isStarted());
 
     }
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -586,7 +580,7 @@ public class Operator implements TBase<O
       return lastComparison;
     }
     if (isSetOperatorId()) {
-      lastComparison = TBaseHelper.compareTo(this.operatorId, typedOther.operatorId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorId, typedOther.operatorId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -596,7 +590,7 @@ public class Operator implements TBase<O
       return lastComparison;
     }
     if (isSetOperatorType()) {
-      lastComparison = TBaseHelper.compareTo(this.operatorType, typedOther.operatorType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorType, typedOther.operatorType);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -606,7 +600,7 @@ public class Operator implements TBase<O
       return lastComparison;
     }
     if (isSetOperatorAttributes()) {
-      lastComparison = TBaseHelper.compareTo(this.operatorAttributes, typedOther.operatorAttributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorAttributes, typedOther.operatorAttributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -616,7 +610,7 @@ public class Operator implements TBase<O
       return lastComparison;
     }
     if (isSetOperatorCounters()) {
-      lastComparison = TBaseHelper.compareTo(this.operatorCounters, typedOther.operatorCounters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorCounters, typedOther.operatorCounters);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -626,7 +620,7 @@ public class Operator implements TBase<O
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -636,7 +630,7 @@ public class Operator implements TBase<O
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -648,39 +642,39 @@ public class Operator implements TBase<O
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  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 == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // OPERATOR_ID
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.operatorId = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // OPERATOR_TYPE
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.operatorType = OperatorType.findByValue(iprot.readI32());
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // OPERATOR_ATTRIBUTES
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map12 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
               this.operatorAttributes = new HashMap<String,String>(2*_map12.size);
               for (int _i13 = 0; _i13 < _map12.size; ++_i13)
               {
-                String _key14;
-                String _val15;
+                String _key14; // required
+                String _val15; // required
                 _key14 = iprot.readString();
                 _val15 = iprot.readString();
                 this.operatorAttributes.put(_key14, _val15);
@@ -688,18 +682,18 @@ public class Operator implements TBase<O
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 4: // OPERATOR_COUNTERS
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map16 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
               this.operatorCounters = new HashMap<String,Long>(2*_map16.size);
               for (int _i17 = 0; _i17 < _map16.size; ++_i17)
               {
-                String _key18;
-                long _val19;
+                String _key18; // required
+                long _val19; // required
                 _key18 = iprot.readString();
                 _val19 = iprot.readI64();
                 this.operatorCounters.put(_key18, _val19);
@@ -707,27 +701,27 @@ public class Operator implements TBase<O
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 5: // DONE
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.done = iprot.readBool();
             setDoneIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 6: // STARTED
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.started = iprot.readBool();
             setStartedIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -735,7 +729,7 @@ public class Operator implements TBase<O
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -752,7 +746,7 @@ public class Operator implements TBase<O
     if (this.operatorAttributes != null) {
       oprot.writeFieldBegin(OPERATOR_ATTRIBUTES_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.operatorAttributes.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.operatorAttributes.size()));
         for (Map.Entry<String, String> _iter20 : this.operatorAttributes.entrySet())
         {
           oprot.writeString(_iter20.getKey());
@@ -765,7 +759,7 @@ public class Operator implements TBase<O
     if (this.operatorCounters != null) {
       oprot.writeFieldBegin(OPERATOR_COUNTERS_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.I64, this.operatorCounters.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, this.operatorCounters.size()));
         for (Map.Entry<String, Long> _iter21 : this.operatorCounters.entrySet())
         {
           oprot.writeString(_iter21.getKey());
@@ -833,9 +827,27 @@ public class Operator implements TBase<O
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  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);
+      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);
+    }
+  }
+
 }
 

Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-public enum OperatorType implements TEnum {
+public enum OperatorType implements org.apache.thrift.TEnum {
   JOIN(0),
   MAPJOIN(1),
   EXTRACT(2),

Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,35 +20,29 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class Query implements TBase<Query, Query._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Query");
-
-  private static final TField QUERY_ID_FIELD_DESC = new TField("queryId", TType.STRING, (short)1);
-  private static final TField QUERY_TYPE_FIELD_DESC = new TField("queryType", TType.STRING, (short)2);
-  private static final TField QUERY_ATTRIBUTES_FIELD_DESC = new TField("queryAttributes", TType.MAP, (short)3);
-  private static final TField QUERY_COUNTERS_FIELD_DESC = new TField("queryCounters", TType.MAP, (short)4);
-  private static final TField STAGE_GRAPH_FIELD_DESC = new TField("stageGraph", TType.STRUCT, (short)5);
-  private static final TField STAGE_LIST_FIELD_DESC = new TField("stageList", TType.LIST, (short)6);
-  private static final TField DONE_FIELD_DESC = new TField("done", TType.BOOL, (short)7);
-  private static final TField STARTED_FIELD_DESC = new TField("started", TType.BOOL, (short)8);
-
-  private String queryId;
-  private String queryType;
-  private Map<String,String> queryAttributes;
-  private Map<String,Long> queryCounters;
-  private Graph stageGraph;
-  private List<Stage> stageList;
-  private boolean done;
-  private boolean started;
+public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Query");
+
+  private static final org.apache.thrift.protocol.TField QUERY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("queryId", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField QUERY_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("queryType", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField QUERY_ATTRIBUTES_FIELD_DESC = new org.apache.thrift.protocol.TField("queryAttributes", org.apache.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.thrift.protocol.TField QUERY_COUNTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("queryCounters", org.apache.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.thrift.protocol.TField STAGE_GRAPH_FIELD_DESC = new org.apache.thrift.protocol.TField("stageGraph", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+  private static final org.apache.thrift.protocol.TField STAGE_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("stageList", org.apache.thrift.protocol.TType.LIST, (short)6);
+  private static final org.apache.thrift.protocol.TField DONE_FIELD_DESC = new org.apache.thrift.protocol.TField("done", org.apache.thrift.protocol.TType.BOOL, (short)7);
+  private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.BOOL, (short)8);
+
+  private String queryId; // required
+  private String queryType; // required
+  private Map<String,String> queryAttributes; // required
+  private Map<String,Long> queryCounters; // required
+  private Graph stageGraph; // required
+  private List<Stage> stageList; // required
+  private boolean done; // required
+  private boolean started; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     QUERY_ID((short)1, "queryId"),
     QUERY_TYPE((short)2, "queryType"),
     QUERY_ATTRIBUTES((short)3, "queryAttributes"),
@@ -131,32 +125,32 @@ public class Query implements TBase<Quer
   private static final int __STARTED_ISSET_ID = 1;
   private BitSet __isset_bit_vector = new BitSet(2);
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.QUERY_ID, new FieldMetaData("queryId", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.QUERY_TYPE, new FieldMetaData("queryType", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.QUERY_ATTRIBUTES, new FieldMetaData("queryAttributes", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.STRING))));
-    tmpMap.put(_Fields.QUERY_COUNTERS, new FieldMetaData("queryCounters", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.I64))));
-    tmpMap.put(_Fields.STAGE_GRAPH, new FieldMetaData("stageGraph", TFieldRequirementType.DEFAULT, 
-        new StructMetaData(TType.STRUCT, Graph.class)));
-    tmpMap.put(_Fields.STAGE_LIST, new FieldMetaData("stageList", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, Stage.class))));
-    tmpMap.put(_Fields.DONE, new FieldMetaData("done", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
-    tmpMap.put(_Fields.STARTED, new FieldMetaData("started", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.QUERY_ID, new org.apache.thrift.meta_data.FieldMetaData("queryId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.QUERY_TYPE, new org.apache.thrift.meta_data.FieldMetaData("queryType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.QUERY_ATTRIBUTES, new org.apache.thrift.meta_data.FieldMetaData("queryAttributes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.QUERY_COUNTERS, new org.apache.thrift.meta_data.FieldMetaData("queryCounters", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
+    tmpMap.put(_Fields.STAGE_GRAPH, new org.apache.thrift.meta_data.FieldMetaData("stageGraph", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Graph.class)));
+    tmpMap.put(_Fields.STAGE_LIST, new org.apache.thrift.meta_data.FieldMetaData("stageList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Stage.class))));
+    tmpMap.put(_Fields.DONE, new org.apache.thrift.meta_data.FieldMetaData("done", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.STARTED, new org.apache.thrift.meta_data.FieldMetaData("started", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(Query.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Query.class, metaDataMap);
   }
 
   public Query() {
@@ -271,7 +265,7 @@ public class Query implements TBase<Quer
     this.queryId = null;
   }
 
-  /** Returns true if field queryId is set (has been asigned a value) and false otherwise */
+  /** Returns true if field queryId is set (has been assigned a value) and false otherwise */
   public boolean isSetQueryId() {
     return this.queryId != null;
   }
@@ -294,7 +288,7 @@ public class Query implements TBase<Quer
     this.queryType = null;
   }
 
-  /** Returns true if field queryType is set (has been asigned a value) and false otherwise */
+  /** Returns true if field queryType is set (has been assigned a value) and false otherwise */
   public boolean isSetQueryType() {
     return this.queryType != null;
   }
@@ -328,7 +322,7 @@ public class Query implements TBase<Quer
     this.queryAttributes = null;
   }
 
-  /** Returns true if field queryAttributes is set (has been asigned a value) and false otherwise */
+  /** Returns true if field queryAttributes is set (has been assigned a value) and false otherwise */
   public boolean isSetQueryAttributes() {
     return this.queryAttributes != null;
   }
@@ -362,7 +356,7 @@ public class Query implements TBase<Quer
     this.queryCounters = null;
   }
 
-  /** Returns true if field queryCounters is set (has been asigned a value) and false otherwise */
+  /** Returns true if field queryCounters is set (has been assigned a value) and false otherwise */
   public boolean isSetQueryCounters() {
     return this.queryCounters != null;
   }
@@ -385,7 +379,7 @@ public class Query implements TBase<Quer
     this.stageGraph = null;
   }
 
-  /** Returns true if field stageGraph is set (has been asigned a value) and false otherwise */
+  /** Returns true if field stageGraph is set (has been assigned a value) and false otherwise */
   public boolean isSetStageGraph() {
     return this.stageGraph != null;
   }
@@ -423,7 +417,7 @@ public class Query implements TBase<Quer
     this.stageList = null;
   }
 
-  /** Returns true if field stageList is set (has been asigned a value) and false otherwise */
+  /** Returns true if field stageList is set (has been assigned a value) and false otherwise */
   public boolean isSetStageList() {
     return this.stageList != null;
   }
@@ -447,7 +441,7 @@ public class Query implements TBase<Quer
     __isset_bit_vector.clear(__DONE_ISSET_ID);
   }
 
-  /** Returns true if field done is set (has been asigned a value) and false otherwise */
+  /** Returns true if field done is set (has been assigned a value) and false otherwise */
   public boolean isSetDone() {
     return __isset_bit_vector.get(__DONE_ISSET_ID);
   }
@@ -469,7 +463,7 @@ public class Query implements TBase<Quer
     __isset_bit_vector.clear(__STARTED_ISSET_ID);
   }
 
-  /** Returns true if field started is set (has been asigned a value) and false otherwise */
+  /** Returns true if field started is set (has been assigned a value) and false otherwise */
   public boolean isSetStarted() {
     return __isset_bit_vector.get(__STARTED_ISSET_ID);
   }
@@ -568,16 +562,16 @@ public class Query implements TBase<Quer
       return getStageList();
 
     case DONE:
-      return new Boolean(isDone());
+      return Boolean.valueOf(isDone());
 
     case STARTED:
-      return new Boolean(isStarted());
+      return Boolean.valueOf(isStarted());
 
     }
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -710,7 +704,7 @@ public class Query implements TBase<Quer
       return lastComparison;
     }
     if (isSetQueryId()) {
-      lastComparison = TBaseHelper.compareTo(this.queryId, typedOther.queryId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryId, typedOther.queryId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -720,7 +714,7 @@ public class Query implements TBase<Quer
       return lastComparison;
     }
     if (isSetQueryType()) {
-      lastComparison = TBaseHelper.compareTo(this.queryType, typedOther.queryType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryType, typedOther.queryType);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -730,7 +724,7 @@ public class Query implements TBase<Quer
       return lastComparison;
     }
     if (isSetQueryAttributes()) {
-      lastComparison = TBaseHelper.compareTo(this.queryAttributes, typedOther.queryAttributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryAttributes, typedOther.queryAttributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -740,7 +734,7 @@ public class Query implements TBase<Quer
       return lastComparison;
     }
     if (isSetQueryCounters()) {
-      lastComparison = TBaseHelper.compareTo(this.queryCounters, typedOther.queryCounters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryCounters, typedOther.queryCounters);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -750,7 +744,7 @@ public class Query implements TBase<Quer
       return lastComparison;
     }
     if (isSetStageGraph()) {
-      lastComparison = TBaseHelper.compareTo(this.stageGraph, typedOther.stageGraph);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageGraph, typedOther.stageGraph);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -760,7 +754,7 @@ public class Query implements TBase<Quer
       return lastComparison;
     }
     if (isSetStageList()) {
-      lastComparison = TBaseHelper.compareTo(this.stageList, typedOther.stageList);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageList, typedOther.stageList);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -770,7 +764,7 @@ public class Query implements TBase<Quer
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -780,7 +774,7 @@ public class Query implements TBase<Quer
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -792,39 +786,39 @@ public class Query implements TBase<Quer
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  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 == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // QUERY_ID
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.queryId = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // QUERY_TYPE
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.queryType = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // QUERY_ATTRIBUTES
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map50 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin();
               this.queryAttributes = new HashMap<String,String>(2*_map50.size);
               for (int _i51 = 0; _i51 < _map50.size; ++_i51)
               {
-                String _key52;
-                String _val53;
+                String _key52; // required
+                String _val53; // required
                 _key52 = iprot.readString();
                 _val53 = iprot.readString();
                 this.queryAttributes.put(_key52, _val53);
@@ -832,18 +826,18 @@ public class Query implements TBase<Quer
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 4: // QUERY_COUNTERS
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map54 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map54 = iprot.readMapBegin();
               this.queryCounters = new HashMap<String,Long>(2*_map54.size);
               for (int _i55 = 0; _i55 < _map54.size; ++_i55)
               {
-                String _key56;
-                long _val57;
+                String _key56; // required
+                long _val57; // required
                 _key56 = iprot.readString();
                 _val57 = iprot.readI64();
                 this.queryCounters.put(_key56, _val57);
@@ -851,25 +845,25 @@ public class Query implements TBase<Quer
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 5: // STAGE_GRAPH
-          if (field.type == TType.STRUCT) {
+          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
             this.stageGraph = new Graph();
             this.stageGraph.read(iprot);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 6: // STAGE_LIST
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list58 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list58 = iprot.readListBegin();
               this.stageList = new ArrayList<Stage>(_list58.size);
               for (int _i59 = 0; _i59 < _list58.size; ++_i59)
               {
-                Stage _elem60;
+                Stage _elem60; // required
                 _elem60 = new Stage();
                 _elem60.read(iprot);
                 this.stageList.add(_elem60);
@@ -877,27 +871,27 @@ public class Query implements TBase<Quer
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 7: // DONE
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.done = iprot.readBool();
             setDoneIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 8: // STARTED
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.started = iprot.readBool();
             setStartedIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -905,7 +899,7 @@ public class Query implements TBase<Quer
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -922,7 +916,7 @@ public class Query implements TBase<Quer
     if (this.queryAttributes != null) {
       oprot.writeFieldBegin(QUERY_ATTRIBUTES_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.queryAttributes.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.queryAttributes.size()));
         for (Map.Entry<String, String> _iter61 : this.queryAttributes.entrySet())
         {
           oprot.writeString(_iter61.getKey());
@@ -935,7 +929,7 @@ public class Query implements TBase<Quer
     if (this.queryCounters != null) {
       oprot.writeFieldBegin(QUERY_COUNTERS_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.I64, this.queryCounters.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, this.queryCounters.size()));
         for (Map.Entry<String, Long> _iter62 : this.queryCounters.entrySet())
         {
           oprot.writeString(_iter62.getKey());
@@ -953,7 +947,7 @@ public class Query implements TBase<Quer
     if (this.stageList != null) {
       oprot.writeFieldBegin(STAGE_LIST_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRUCT, this.stageList.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.stageList.size()));
         for (Stage _iter63 : this.stageList)
         {
           _iter63.write(oprot);
@@ -1036,9 +1030,27 @@ public class Query implements TBase<Quer
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  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);
+      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);
+    }
+  }
+
 }
 

Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,25 +20,19 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class QueryPlan implements TBase<QueryPlan, QueryPlan._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("QueryPlan");
-
-  private static final TField QUERIES_FIELD_DESC = new TField("queries", TType.LIST, (short)1);
-  private static final TField DONE_FIELD_DESC = new TField("done", TType.BOOL, (short)2);
-  private static final TField STARTED_FIELD_DESC = new TField("started", TType.BOOL, (short)3);
-
-  private List<Query> queries;
-  private boolean done;
-  private boolean started;
+public class QueryPlan implements org.apache.thrift.TBase<QueryPlan, QueryPlan._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("QueryPlan");
+
+  private static final org.apache.thrift.protocol.TField QUERIES_FIELD_DESC = new org.apache.thrift.protocol.TField("queries", org.apache.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.thrift.protocol.TField DONE_FIELD_DESC = new org.apache.thrift.protocol.TField("done", org.apache.thrift.protocol.TType.BOOL, (short)2);
+  private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.BOOL, (short)3);
+
+  private List<Query> queries; // required
+  private boolean done; // required
+  private boolean started; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     QUERIES((short)1, "queries"),
     DONE((short)2, "done"),
     STARTED((short)3, "started");
@@ -106,18 +100,18 @@ public class QueryPlan implements TBase<
   private static final int __STARTED_ISSET_ID = 1;
   private BitSet __isset_bit_vector = new BitSet(2);
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.QUERIES, new FieldMetaData("queries", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, Query.class))));
-    tmpMap.put(_Fields.DONE, new FieldMetaData("done", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
-    tmpMap.put(_Fields.STARTED, new FieldMetaData("started", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.QUERIES, new org.apache.thrift.meta_data.FieldMetaData("queries", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Query.class))));
+    tmpMap.put(_Fields.DONE, new org.apache.thrift.meta_data.FieldMetaData("done", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.STARTED, new org.apache.thrift.meta_data.FieldMetaData("started", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(QueryPlan.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(QueryPlan.class, metaDataMap);
   }
 
   public QueryPlan() {
@@ -193,7 +187,7 @@ public class QueryPlan implements TBase<
     this.queries = null;
   }
 
-  /** Returns true if field queries is set (has been asigned a value) and false otherwise */
+  /** Returns true if field queries is set (has been assigned a value) and false otherwise */
   public boolean isSetQueries() {
     return this.queries != null;
   }
@@ -217,7 +211,7 @@ public class QueryPlan implements TBase<
     __isset_bit_vector.clear(__DONE_ISSET_ID);
   }
 
-  /** Returns true if field done is set (has been asigned a value) and false otherwise */
+  /** Returns true if field done is set (has been assigned a value) and false otherwise */
   public boolean isSetDone() {
     return __isset_bit_vector.get(__DONE_ISSET_ID);
   }
@@ -239,7 +233,7 @@ public class QueryPlan implements TBase<
     __isset_bit_vector.clear(__STARTED_ISSET_ID);
   }
 
-  /** Returns true if field started is set (has been asigned a value) and false otherwise */
+  /** Returns true if field started is set (has been assigned a value) and false otherwise */
   public boolean isSetStarted() {
     return __isset_bit_vector.get(__STARTED_ISSET_ID);
   }
@@ -283,16 +277,16 @@ public class QueryPlan implements TBase<
       return getQueries();
 
     case DONE:
-      return new Boolean(isDone());
+      return Boolean.valueOf(isDone());
 
     case STARTED:
-      return new Boolean(isStarted());
+      return Boolean.valueOf(isStarted());
 
     }
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -370,7 +364,7 @@ public class QueryPlan implements TBase<
       return lastComparison;
     }
     if (isSetQueries()) {
-      lastComparison = TBaseHelper.compareTo(this.queries, typedOther.queries);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queries, typedOther.queries);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -380,7 +374,7 @@ public class QueryPlan implements TBase<
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -390,7 +384,7 @@ public class QueryPlan implements TBase<
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -402,24 +396,24 @@ public class QueryPlan implements TBase<
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  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 == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // QUERIES
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list64 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list64 = iprot.readListBegin();
               this.queries = new ArrayList<Query>(_list64.size);
               for (int _i65 = 0; _i65 < _list64.size; ++_i65)
               {
-                Query _elem66;
+                Query _elem66; // required
                 _elem66 = new Query();
                 _elem66.read(iprot);
                 this.queries.add(_elem66);
@@ -427,27 +421,27 @@ public class QueryPlan implements TBase<
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // DONE
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.done = iprot.readBool();
             setDoneIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // STARTED
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.started = iprot.readBool();
             setStartedIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -455,14 +449,14 @@ public class QueryPlan implements TBase<
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
     if (this.queries != null) {
       oprot.writeFieldBegin(QUERIES_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRUCT, this.queries.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.queries.size()));
         for (Query _iter67 : this.queries)
         {
           _iter67.write(oprot);
@@ -505,9 +499,27 @@ public class QueryPlan implements TBase<
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  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);
+      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);
+    }
+  }
+
 }
 

Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,33 +20,27 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class Stage implements TBase<Stage, Stage._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Stage");
-
-  private static final TField STAGE_ID_FIELD_DESC = new TField("stageId", TType.STRING, (short)1);
-  private static final TField STAGE_TYPE_FIELD_DESC = new TField("stageType", TType.I32, (short)2);
-  private static final TField STAGE_ATTRIBUTES_FIELD_DESC = new TField("stageAttributes", TType.MAP, (short)3);
-  private static final TField STAGE_COUNTERS_FIELD_DESC = new TField("stageCounters", TType.MAP, (short)4);
-  private static final TField TASK_LIST_FIELD_DESC = new TField("taskList", TType.LIST, (short)5);
-  private static final TField DONE_FIELD_DESC = new TField("done", TType.BOOL, (short)6);
-  private static final TField STARTED_FIELD_DESC = new TField("started", TType.BOOL, (short)7);
-
-  private String stageId;
-  private StageType stageType;
-  private Map<String,String> stageAttributes;
-  private Map<String,Long> stageCounters;
-  private List<Task> taskList;
-  private boolean done;
-  private boolean started;
+public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Stage");
+
+  private static final org.apache.thrift.protocol.TField STAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("stageId", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField STAGE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("stageType", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField STAGE_ATTRIBUTES_FIELD_DESC = new org.apache.thrift.protocol.TField("stageAttributes", org.apache.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.thrift.protocol.TField STAGE_COUNTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("stageCounters", org.apache.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.thrift.protocol.TField TASK_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("taskList", org.apache.thrift.protocol.TType.LIST, (short)5);
+  private static final org.apache.thrift.protocol.TField DONE_FIELD_DESC = new org.apache.thrift.protocol.TField("done", org.apache.thrift.protocol.TType.BOOL, (short)6);
+  private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.BOOL, (short)7);
+
+  private String stageId; // required
+  private StageType stageType; // required
+  private Map<String,String> stageAttributes; // required
+  private Map<String,Long> stageCounters; // required
+  private List<Task> taskList; // required
+  private boolean done; // required
+  private boolean started; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     STAGE_ID((short)1, "stageId"),
     /**
      * 
@@ -130,30 +124,30 @@ public class Stage implements TBase<Stag
   private static final int __STARTED_ISSET_ID = 1;
   private BitSet __isset_bit_vector = new BitSet(2);
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.STAGE_ID, new FieldMetaData("stageId", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.STAGE_TYPE, new FieldMetaData("stageType", TFieldRequirementType.DEFAULT, 
-        new EnumMetaData(TType.ENUM, StageType.class)));
-    tmpMap.put(_Fields.STAGE_ATTRIBUTES, new FieldMetaData("stageAttributes", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.STRING))));
-    tmpMap.put(_Fields.STAGE_COUNTERS, new FieldMetaData("stageCounters", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.I64))));
-    tmpMap.put(_Fields.TASK_LIST, new FieldMetaData("taskList", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, Task.class))));
-    tmpMap.put(_Fields.DONE, new FieldMetaData("done", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
-    tmpMap.put(_Fields.STARTED, new FieldMetaData("started", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.STAGE_ID, new org.apache.thrift.meta_data.FieldMetaData("stageId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.STAGE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("stageType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, StageType.class)));
+    tmpMap.put(_Fields.STAGE_ATTRIBUTES, new org.apache.thrift.meta_data.FieldMetaData("stageAttributes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.STAGE_COUNTERS, new org.apache.thrift.meta_data.FieldMetaData("stageCounters", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))));
+    tmpMap.put(_Fields.TASK_LIST, new org.apache.thrift.meta_data.FieldMetaData("taskList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Task.class))));
+    tmpMap.put(_Fields.DONE, new org.apache.thrift.meta_data.FieldMetaData("done", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.STARTED, new org.apache.thrift.meta_data.FieldMetaData("started", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(Stage.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Stage.class, metaDataMap);
   }
 
   public Stage() {
@@ -262,7 +256,7 @@ public class Stage implements TBase<Stag
     this.stageId = null;
   }
 
-  /** Returns true if field stageId is set (has been asigned a value) and false otherwise */
+  /** Returns true if field stageId is set (has been assigned a value) and false otherwise */
   public boolean isSetStageId() {
     return this.stageId != null;
   }
@@ -293,7 +287,7 @@ public class Stage implements TBase<Stag
     this.stageType = null;
   }
 
-  /** Returns true if field stageType is set (has been asigned a value) and false otherwise */
+  /** Returns true if field stageType is set (has been assigned a value) and false otherwise */
   public boolean isSetStageType() {
     return this.stageType != null;
   }
@@ -327,7 +321,7 @@ public class Stage implements TBase<Stag
     this.stageAttributes = null;
   }
 
-  /** Returns true if field stageAttributes is set (has been asigned a value) and false otherwise */
+  /** Returns true if field stageAttributes is set (has been assigned a value) and false otherwise */
   public boolean isSetStageAttributes() {
     return this.stageAttributes != null;
   }
@@ -361,7 +355,7 @@ public class Stage implements TBase<Stag
     this.stageCounters = null;
   }
 
-  /** Returns true if field stageCounters is set (has been asigned a value) and false otherwise */
+  /** Returns true if field stageCounters is set (has been assigned a value) and false otherwise */
   public boolean isSetStageCounters() {
     return this.stageCounters != null;
   }
@@ -399,7 +393,7 @@ public class Stage implements TBase<Stag
     this.taskList = null;
   }
 
-  /** Returns true if field taskList is set (has been asigned a value) and false otherwise */
+  /** Returns true if field taskList is set (has been assigned a value) and false otherwise */
   public boolean isSetTaskList() {
     return this.taskList != null;
   }
@@ -423,7 +417,7 @@ public class Stage implements TBase<Stag
     __isset_bit_vector.clear(__DONE_ISSET_ID);
   }
 
-  /** Returns true if field done is set (has been asigned a value) and false otherwise */
+  /** Returns true if field done is set (has been assigned a value) and false otherwise */
   public boolean isSetDone() {
     return __isset_bit_vector.get(__DONE_ISSET_ID);
   }
@@ -445,7 +439,7 @@ public class Stage implements TBase<Stag
     __isset_bit_vector.clear(__STARTED_ISSET_ID);
   }
 
-  /** Returns true if field started is set (has been asigned a value) and false otherwise */
+  /** Returns true if field started is set (has been assigned a value) and false otherwise */
   public boolean isSetStarted() {
     return __isset_bit_vector.get(__STARTED_ISSET_ID);
   }
@@ -533,16 +527,16 @@ public class Stage implements TBase<Stag
       return getTaskList();
 
     case DONE:
-      return new Boolean(isDone());
+      return Boolean.valueOf(isDone());
 
     case STARTED:
-      return new Boolean(isStarted());
+      return Boolean.valueOf(isStarted());
 
     }
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -664,7 +658,7 @@ public class Stage implements TBase<Stag
       return lastComparison;
     }
     if (isSetStageId()) {
-      lastComparison = TBaseHelper.compareTo(this.stageId, typedOther.stageId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageId, typedOther.stageId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -674,7 +668,7 @@ public class Stage implements TBase<Stag
       return lastComparison;
     }
     if (isSetStageType()) {
-      lastComparison = TBaseHelper.compareTo(this.stageType, typedOther.stageType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageType, typedOther.stageType);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -684,7 +678,7 @@ public class Stage implements TBase<Stag
       return lastComparison;
     }
     if (isSetStageAttributes()) {
-      lastComparison = TBaseHelper.compareTo(this.stageAttributes, typedOther.stageAttributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageAttributes, typedOther.stageAttributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -694,7 +688,7 @@ public class Stage implements TBase<Stag
       return lastComparison;
     }
     if (isSetStageCounters()) {
-      lastComparison = TBaseHelper.compareTo(this.stageCounters, typedOther.stageCounters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageCounters, typedOther.stageCounters);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -704,7 +698,7 @@ public class Stage implements TBase<Stag
       return lastComparison;
     }
     if (isSetTaskList()) {
-      lastComparison = TBaseHelper.compareTo(this.taskList, typedOther.taskList);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskList, typedOther.taskList);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -714,7 +708,7 @@ public class Stage implements TBase<Stag
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -724,7 +718,7 @@ public class Stage implements TBase<Stag
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -736,39 +730,39 @@ public class Stage implements TBase<Stag
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  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 == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // STAGE_ID
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.stageId = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // STAGE_TYPE
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.stageType = StageType.findByValue(iprot.readI32());
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // STAGE_ATTRIBUTES
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map36 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map36 = iprot.readMapBegin();
               this.stageAttributes = new HashMap<String,String>(2*_map36.size);
               for (int _i37 = 0; _i37 < _map36.size; ++_i37)
               {
-                String _key38;
-                String _val39;
+                String _key38; // required
+                String _val39; // required
                 _key38 = iprot.readString();
                 _val39 = iprot.readString();
                 this.stageAttributes.put(_key38, _val39);
@@ -776,18 +770,18 @@ public class Stage implements TBase<Stag
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 4: // STAGE_COUNTERS
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map40 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map40 = iprot.readMapBegin();
               this.stageCounters = new HashMap<String,Long>(2*_map40.size);
               for (int _i41 = 0; _i41 < _map40.size; ++_i41)
               {
-                String _key42;
-                long _val43;
+                String _key42; // required
+                long _val43; // required
                 _key42 = iprot.readString();
                 _val43 = iprot.readI64();
                 this.stageCounters.put(_key42, _val43);
@@ -795,17 +789,17 @@ public class Stage implements TBase<Stag
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 5: // TASK_LIST
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list44 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list44 = iprot.readListBegin();
               this.taskList = new ArrayList<Task>(_list44.size);
               for (int _i45 = 0; _i45 < _list44.size; ++_i45)
               {
-                Task _elem46;
+                Task _elem46; // required
                 _elem46 = new Task();
                 _elem46.read(iprot);
                 this.taskList.add(_elem46);
@@ -813,27 +807,27 @@ public class Stage implements TBase<Stag
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 6: // DONE
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.done = iprot.readBool();
             setDoneIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 7: // STARTED
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.started = iprot.readBool();
             setStartedIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -841,7 +835,7 @@ public class Stage implements TBase<Stag
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -858,7 +852,7 @@ public class Stage implements TBase<Stag
     if (this.stageAttributes != null) {
       oprot.writeFieldBegin(STAGE_ATTRIBUTES_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.stageAttributes.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.stageAttributes.size()));
         for (Map.Entry<String, String> _iter47 : this.stageAttributes.entrySet())
         {
           oprot.writeString(_iter47.getKey());
@@ -871,7 +865,7 @@ public class Stage implements TBase<Stag
     if (this.stageCounters != null) {
       oprot.writeFieldBegin(STAGE_COUNTERS_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.I64, this.stageCounters.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, this.stageCounters.size()));
         for (Map.Entry<String, Long> _iter48 : this.stageCounters.entrySet())
         {
           oprot.writeString(_iter48.getKey());
@@ -884,7 +878,7 @@ public class Stage implements TBase<Stag
     if (this.taskList != null) {
       oprot.writeFieldBegin(TASK_LIST_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRUCT, this.taskList.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.taskList.size()));
         for (Task _iter49 : this.taskList)
         {
           _iter49.write(oprot);
@@ -959,9 +953,27 @@ public class Stage implements TBase<Stag
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  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);
+      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);
+    }
+  }
+
 }
 

Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-public enum StageType implements TEnum {
+public enum StageType implements org.apache.thrift.TEnum {
   CONDITIONAL(0),
   COPY(1),
   DDL(2),



Mime
View raw message