hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amareshw...@apache.org
Subject svn commit: r1165207 [15/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/Task.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.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 Task implements TBase<Task, Task._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Task");
-
-  private static final TField TASK_ID_FIELD_DESC = new TField("taskId", TType.STRING, (short)1);
-  private static final TField TASK_TYPE_FIELD_DESC = new TField("taskType", TType.I32, (short)2);
-  private static final TField TASK_ATTRIBUTES_FIELD_DESC = new TField("taskAttributes", TType.MAP, (short)3);
-  private static final TField TASK_COUNTERS_FIELD_DESC = new TField("taskCounters", TType.MAP, (short)4);
-  private static final TField OPERATOR_GRAPH_FIELD_DESC = new TField("operatorGraph", TType.STRUCT, (short)5);
-  private static final TField OPERATOR_LIST_FIELD_DESC = new TField("operatorList", 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 taskId;
-  private TaskType taskType;
-  private Map<String,String> taskAttributes;
-  private Map<String,Long> taskCounters;
-  private Graph operatorGraph;
-  private List<Operator> operatorList;
-  private boolean done;
-  private boolean started;
+public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Task");
+
+  private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField TASK_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("taskType", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField TASK_ATTRIBUTES_FIELD_DESC = new org.apache.thrift.protocol.TField("taskAttributes", org.apache.thrift.protocol.TType.MAP, (short)3);
+  private static final org.apache.thrift.protocol.TField TASK_COUNTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("taskCounters", org.apache.thrift.protocol.TType.MAP, (short)4);
+  private static final org.apache.thrift.protocol.TField OPERATOR_GRAPH_FIELD_DESC = new org.apache.thrift.protocol.TField("operatorGraph", org.apache.thrift.protocol.TType.STRUCT, (short)5);
+  private static final org.apache.thrift.protocol.TField OPERATOR_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("operatorList", 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 taskId; // required
+  private TaskType taskType; // required
+  private Map<String,String> taskAttributes; // required
+  private Map<String,Long> taskCounters; // required
+  private Graph operatorGraph; // required
+  private List<Operator> operatorList; // 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 {
     TASK_ID((short)1, "taskId"),
     /**
      * 
@@ -135,32 +129,32 @@ public class Task implements TBase<Task,
   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.TASK_ID, new FieldMetaData("taskId", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.TASK_TYPE, new FieldMetaData("taskType", TFieldRequirementType.DEFAULT, 
-        new EnumMetaData(TType.ENUM, TaskType.class)));
-    tmpMap.put(_Fields.TASK_ATTRIBUTES, new FieldMetaData("taskAttributes", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.STRING))));
-    tmpMap.put(_Fields.TASK_COUNTERS, new FieldMetaData("taskCounters", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.I64))));
-    tmpMap.put(_Fields.OPERATOR_GRAPH, new FieldMetaData("operatorGraph", TFieldRequirementType.OPTIONAL, 
-        new StructMetaData(TType.STRUCT, Graph.class)));
-    tmpMap.put(_Fields.OPERATOR_LIST, new FieldMetaData("operatorList", TFieldRequirementType.OPTIONAL, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, Operator.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.TASK_ID, new org.apache.thrift.meta_data.FieldMetaData("taskId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TASK_TYPE, new org.apache.thrift.meta_data.FieldMetaData("taskType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TaskType.class)));
+    tmpMap.put(_Fields.TASK_ATTRIBUTES, new org.apache.thrift.meta_data.FieldMetaData("taskAttributes", 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.TASK_COUNTERS, new org.apache.thrift.meta_data.FieldMetaData("taskCounters", 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.OPERATOR_GRAPH, new org.apache.thrift.meta_data.FieldMetaData("operatorGraph", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Graph.class)));
+    tmpMap.put(_Fields.OPERATOR_LIST, new org.apache.thrift.meta_data.FieldMetaData("operatorList", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        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, Operator.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(Task.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Task.class, metaDataMap);
   }
 
   public Task() {
@@ -271,7 +265,7 @@ public class Task implements TBase<Task,
     this.taskId = null;
   }
 
-  /** Returns true if field taskId is set (has been asigned a value) and false otherwise */
+  /** Returns true if field taskId is set (has been assigned a value) and false otherwise */
   public boolean isSetTaskId() {
     return this.taskId != null;
   }
@@ -302,7 +296,7 @@ public class Task implements TBase<Task,
     this.taskType = null;
   }
 
-  /** Returns true if field taskType is set (has been asigned a value) and false otherwise */
+  /** Returns true if field taskType is set (has been assigned a value) and false otherwise */
   public boolean isSetTaskType() {
     return this.taskType != null;
   }
@@ -336,7 +330,7 @@ public class Task implements TBase<Task,
     this.taskAttributes = null;
   }
 
-  /** Returns true if field taskAttributes is set (has been asigned a value) and false otherwise */
+  /** Returns true if field taskAttributes is set (has been assigned a value) and false otherwise */
   public boolean isSetTaskAttributes() {
     return this.taskAttributes != null;
   }
@@ -370,7 +364,7 @@ public class Task implements TBase<Task,
     this.taskCounters = null;
   }
 
-  /** Returns true if field taskCounters is set (has been asigned a value) and false otherwise */
+  /** Returns true if field taskCounters is set (has been assigned a value) and false otherwise */
   public boolean isSetTaskCounters() {
     return this.taskCounters != null;
   }
@@ -393,7 +387,7 @@ public class Task implements TBase<Task,
     this.operatorGraph = null;
   }
 
-  /** Returns true if field operatorGraph is set (has been asigned a value) and false otherwise */
+  /** Returns true if field operatorGraph is set (has been assigned a value) and false otherwise */
   public boolean isSetOperatorGraph() {
     return this.operatorGraph != null;
   }
@@ -431,7 +425,7 @@ public class Task implements TBase<Task,
     this.operatorList = null;
   }
 
-  /** Returns true if field operatorList is set (has been asigned a value) and false otherwise */
+  /** Returns true if field operatorList is set (has been assigned a value) and false otherwise */
   public boolean isSetOperatorList() {
     return this.operatorList != null;
   }
@@ -455,7 +449,7 @@ public class Task implements TBase<Task,
     __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);
   }
@@ -477,7 +471,7 @@ public class Task implements TBase<Task,
     __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);
   }
@@ -576,16 +570,16 @@ public class Task implements TBase<Task,
       return getOperatorList();
 
     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();
@@ -718,7 +712,7 @@ public class Task implements TBase<Task,
       return lastComparison;
     }
     if (isSetTaskId()) {
-      lastComparison = TBaseHelper.compareTo(this.taskId, typedOther.taskId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, typedOther.taskId);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -728,7 +722,7 @@ public class Task implements TBase<Task,
       return lastComparison;
     }
     if (isSetTaskType()) {
-      lastComparison = TBaseHelper.compareTo(this.taskType, typedOther.taskType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskType, typedOther.taskType);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -738,7 +732,7 @@ public class Task implements TBase<Task,
       return lastComparison;
     }
     if (isSetTaskAttributes()) {
-      lastComparison = TBaseHelper.compareTo(this.taskAttributes, typedOther.taskAttributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskAttributes, typedOther.taskAttributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -748,7 +742,7 @@ public class Task implements TBase<Task,
       return lastComparison;
     }
     if (isSetTaskCounters()) {
-      lastComparison = TBaseHelper.compareTo(this.taskCounters, typedOther.taskCounters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskCounters, typedOther.taskCounters);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -758,7 +752,7 @@ public class Task implements TBase<Task,
       return lastComparison;
     }
     if (isSetOperatorGraph()) {
-      lastComparison = TBaseHelper.compareTo(this.operatorGraph, typedOther.operatorGraph);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorGraph, typedOther.operatorGraph);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -768,7 +762,7 @@ public class Task implements TBase<Task,
       return lastComparison;
     }
     if (isSetOperatorList()) {
-      lastComparison = TBaseHelper.compareTo(this.operatorList, typedOther.operatorList);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorList, typedOther.operatorList);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -778,7 +772,7 @@ public class Task implements TBase<Task,
       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;
       }
@@ -788,7 +782,7 @@ public class Task implements TBase<Task,
       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;
       }
@@ -800,39 +794,39 @@ public class Task implements TBase<Task,
     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: // TASK_ID
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.taskId = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // TASK_TYPE
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.taskType = TaskType.findByValue(iprot.readI32());
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // TASK_ATTRIBUTES
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map22 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map22 = iprot.readMapBegin();
               this.taskAttributes = new HashMap<String,String>(2*_map22.size);
               for (int _i23 = 0; _i23 < _map22.size; ++_i23)
               {
-                String _key24;
-                String _val25;
+                String _key24; // required
+                String _val25; // required
                 _key24 = iprot.readString();
                 _val25 = iprot.readString();
                 this.taskAttributes.put(_key24, _val25);
@@ -840,18 +834,18 @@ public class Task implements TBase<Task,
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 4: // TASK_COUNTERS
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map26 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin();
               this.taskCounters = new HashMap<String,Long>(2*_map26.size);
               for (int _i27 = 0; _i27 < _map26.size; ++_i27)
               {
-                String _key28;
-                long _val29;
+                String _key28; // required
+                long _val29; // required
                 _key28 = iprot.readString();
                 _val29 = iprot.readI64();
                 this.taskCounters.put(_key28, _val29);
@@ -859,25 +853,25 @@ public class Task implements TBase<Task,
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 5: // OPERATOR_GRAPH
-          if (field.type == TType.STRUCT) {
+          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
             this.operatorGraph = new Graph();
             this.operatorGraph.read(iprot);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 6: // OPERATOR_LIST
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list30 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
               this.operatorList = new ArrayList<Operator>(_list30.size);
               for (int _i31 = 0; _i31 < _list30.size; ++_i31)
               {
-                Operator _elem32;
+                Operator _elem32; // required
                 _elem32 = new Operator();
                 _elem32.read(iprot);
                 this.operatorList.add(_elem32);
@@ -885,27 +879,27 @@ public class Task implements TBase<Task,
               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();
     }
@@ -913,7 +907,7 @@ public class Task implements TBase<Task,
     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);
@@ -930,7 +924,7 @@ public class Task implements TBase<Task,
     if (this.taskAttributes != null) {
       oprot.writeFieldBegin(TASK_ATTRIBUTES_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.taskAttributes.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.taskAttributes.size()));
         for (Map.Entry<String, String> _iter33 : this.taskAttributes.entrySet())
         {
           oprot.writeString(_iter33.getKey());
@@ -943,7 +937,7 @@ public class Task implements TBase<Task,
     if (this.taskCounters != null) {
       oprot.writeFieldBegin(TASK_COUNTERS_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.I64, this.taskCounters.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, this.taskCounters.size()));
         for (Map.Entry<String, Long> _iter34 : this.taskCounters.entrySet())
         {
           oprot.writeString(_iter34.getKey());
@@ -964,7 +958,7 @@ public class Task implements TBase<Task,
       if (isSetOperatorList()) {
         oprot.writeFieldBegin(OPERATOR_LIST_FIELD_DESC);
         {
-          oprot.writeListBegin(new TList(TType.STRUCT, this.operatorList.size()));
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.operatorList.size()));
           for (Operator _iter35 : this.operatorList)
           {
             _iter35.write(oprot);
@@ -1052,9 +1046,27 @@ public class Task implements TBase<Task,
     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/TaskType.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.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 TaskType implements TEnum {
+public enum TaskType implements org.apache.thrift.TEnum {
   MAP(0),
   REDUCE(1),
   OTHER(2);

Modified: hive/trunk/ql/src/gen/thrift/gen-php/queryplan/queryplan_types.php
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-php/queryplan/queryplan_types.php?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-php/queryplan/queryplan_types.php (original)
+++ hive/trunk/ql/src/gen/thrift/gen-php/queryplan/queryplan_types.php Mon Sep  5 08:47:02 2011
@@ -1,6 +1,6 @@
 <?php
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */

Modified: hive/trunk/ql/src/gen/thrift/gen-py/queryplan/constants.py
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-py/queryplan/constants.py?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-py/queryplan/constants.py (original)
+++ hive/trunk/ql/src/gen/thrift/gen-py/queryplan/constants.py 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
 #

Modified: hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py (original)
+++ hive/trunk/ql/src/gen/thrift/gen-py/queryplan/ttypes.py 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
 #
@@ -219,25 +219,26 @@ class Adjacency:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('Adjacency')
-    if self.node != None:
+    if self.node is not None:
       oprot.writeFieldBegin('node', TType.STRING, 1)
       oprot.writeString(self.node)
       oprot.writeFieldEnd()
-    if self.children != None:
+    if self.children is not None:
       oprot.writeFieldBegin('children', TType.LIST, 2)
       oprot.writeListBegin(TType.STRING, len(self.children))
       for iter6 in self.children:
         oprot.writeString(iter6)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.adjacencyType != None:
+    if self.adjacencyType is not None:
       oprot.writeFieldBegin('adjacencyType', TType.I32, 3)
       oprot.writeI32(self.adjacencyType)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
-    def validate(self):
-      return
+
+  def validate(self):
+    return
 
 
   def __repr__(self):
@@ -316,18 +317,18 @@ class Graph:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('Graph')
-    if self.nodeType != None:
+    if self.nodeType is not None:
       oprot.writeFieldBegin('nodeType', TType.I32, 1)
       oprot.writeI32(self.nodeType)
       oprot.writeFieldEnd()
-    if self.roots != None:
+    if self.roots is not None:
       oprot.writeFieldBegin('roots', TType.LIST, 2)
       oprot.writeListBegin(TType.STRING, len(self.roots))
       for iter19 in self.roots:
         oprot.writeString(iter19)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.adjacencyList != None:
+    if self.adjacencyList is not None:
       oprot.writeFieldBegin('adjacencyList', TType.LIST, 3)
       oprot.writeListBegin(TType.STRUCT, len(self.adjacencyList))
       for iter20 in self.adjacencyList:
@@ -336,8 +337,9 @@ class Graph:
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
-    def validate(self):
-      return
+
+  def validate(self):
+    return
 
 
   def __repr__(self):
@@ -441,15 +443,15 @@ class Operator:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('Operator')
-    if self.operatorId != None:
+    if self.operatorId is not None:
       oprot.writeFieldBegin('operatorId', TType.STRING, 1)
       oprot.writeString(self.operatorId)
       oprot.writeFieldEnd()
-    if self.operatorType != None:
+    if self.operatorType is not None:
       oprot.writeFieldBegin('operatorType', TType.I32, 2)
       oprot.writeI32(self.operatorType)
       oprot.writeFieldEnd()
-    if self.operatorAttributes != None:
+    if self.operatorAttributes is not None:
       oprot.writeFieldBegin('operatorAttributes', TType.MAP, 3)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.operatorAttributes))
       for kiter35,viter36 in self.operatorAttributes.items():
@@ -457,7 +459,7 @@ class Operator:
         oprot.writeString(viter36)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.operatorCounters != None:
+    if self.operatorCounters is not None:
       oprot.writeFieldBegin('operatorCounters', TType.MAP, 4)
       oprot.writeMapBegin(TType.STRING, TType.I64, len(self.operatorCounters))
       for kiter37,viter38 in self.operatorCounters.items():
@@ -465,18 +467,19 @@ class Operator:
         oprot.writeI64(viter38)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.done != None:
+    if self.done is not None:
       oprot.writeFieldBegin('done', TType.BOOL, 5)
       oprot.writeBool(self.done)
       oprot.writeFieldEnd()
-    if self.started != None:
+    if self.started is not None:
       oprot.writeFieldBegin('started', TType.BOOL, 6)
       oprot.writeBool(self.started)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
-    def validate(self):
-      return
+
+  def validate(self):
+    return
 
 
   def __repr__(self):
@@ -603,15 +606,15 @@ class Task:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('Task')
-    if self.taskId != None:
+    if self.taskId is not None:
       oprot.writeFieldBegin('taskId', TType.STRING, 1)
       oprot.writeString(self.taskId)
       oprot.writeFieldEnd()
-    if self.taskType != None:
+    if self.taskType is not None:
       oprot.writeFieldBegin('taskType', TType.I32, 2)
       oprot.writeI32(self.taskType)
       oprot.writeFieldEnd()
-    if self.taskAttributes != None:
+    if self.taskAttributes is not None:
       oprot.writeFieldBegin('taskAttributes', TType.MAP, 3)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.taskAttributes))
       for kiter59,viter60 in self.taskAttributes.items():
@@ -619,7 +622,7 @@ class Task:
         oprot.writeString(viter60)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.taskCounters != None:
+    if self.taskCounters is not None:
       oprot.writeFieldBegin('taskCounters', TType.MAP, 4)
       oprot.writeMapBegin(TType.STRING, TType.I64, len(self.taskCounters))
       for kiter61,viter62 in self.taskCounters.items():
@@ -627,29 +630,30 @@ class Task:
         oprot.writeI64(viter62)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.operatorGraph != None:
+    if self.operatorGraph is not None:
       oprot.writeFieldBegin('operatorGraph', TType.STRUCT, 5)
       self.operatorGraph.write(oprot)
       oprot.writeFieldEnd()
-    if self.operatorList != None:
+    if self.operatorList is not None:
       oprot.writeFieldBegin('operatorList', TType.LIST, 6)
       oprot.writeListBegin(TType.STRUCT, len(self.operatorList))
       for iter63 in self.operatorList:
         iter63.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.done != None:
+    if self.done is not None:
       oprot.writeFieldBegin('done', TType.BOOL, 7)
       oprot.writeBool(self.done)
       oprot.writeFieldEnd()
-    if self.started != None:
+    if self.started is not None:
       oprot.writeFieldBegin('started', TType.BOOL, 8)
       oprot.writeBool(self.started)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
-    def validate(self):
-      return
+
+  def validate(self):
+    return
 
 
   def __repr__(self):
@@ -767,15 +771,15 @@ class Stage:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('Stage')
-    if self.stageId != None:
+    if self.stageId is not None:
       oprot.writeFieldBegin('stageId', TType.STRING, 1)
       oprot.writeString(self.stageId)
       oprot.writeFieldEnd()
-    if self.stageType != None:
+    if self.stageType is not None:
       oprot.writeFieldBegin('stageType', TType.I32, 2)
       oprot.writeI32(self.stageType)
       oprot.writeFieldEnd()
-    if self.stageAttributes != None:
+    if self.stageAttributes is not None:
       oprot.writeFieldBegin('stageAttributes', TType.MAP, 3)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.stageAttributes))
       for kiter84,viter85 in self.stageAttributes.items():
@@ -783,7 +787,7 @@ class Stage:
         oprot.writeString(viter85)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.stageCounters != None:
+    if self.stageCounters is not None:
       oprot.writeFieldBegin('stageCounters', TType.MAP, 4)
       oprot.writeMapBegin(TType.STRING, TType.I64, len(self.stageCounters))
       for kiter86,viter87 in self.stageCounters.items():
@@ -791,25 +795,26 @@ class Stage:
         oprot.writeI64(viter87)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.taskList != None:
+    if self.taskList is not None:
       oprot.writeFieldBegin('taskList', TType.LIST, 5)
       oprot.writeListBegin(TType.STRUCT, len(self.taskList))
       for iter88 in self.taskList:
         iter88.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.done != None:
+    if self.done is not None:
       oprot.writeFieldBegin('done', TType.BOOL, 6)
       oprot.writeBool(self.done)
       oprot.writeFieldEnd()
-    if self.started != None:
+    if self.started is not None:
       oprot.writeFieldBegin('started', TType.BOOL, 7)
       oprot.writeBool(self.started)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
-    def validate(self):
-      return
+
+  def validate(self):
+    return
 
 
   def __repr__(self):
@@ -936,15 +941,15 @@ class Query:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('Query')
-    if self.queryId != None:
+    if self.queryId is not None:
       oprot.writeFieldBegin('queryId', TType.STRING, 1)
       oprot.writeString(self.queryId)
       oprot.writeFieldEnd()
-    if self.queryType != None:
+    if self.queryType is not None:
       oprot.writeFieldBegin('queryType', TType.STRING, 2)
       oprot.writeString(self.queryType)
       oprot.writeFieldEnd()
-    if self.queryAttributes != None:
+    if self.queryAttributes is not None:
       oprot.writeFieldBegin('queryAttributes', TType.MAP, 3)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.queryAttributes))
       for kiter109,viter110 in self.queryAttributes.items():
@@ -952,7 +957,7 @@ class Query:
         oprot.writeString(viter110)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.queryCounters != None:
+    if self.queryCounters is not None:
       oprot.writeFieldBegin('queryCounters', TType.MAP, 4)
       oprot.writeMapBegin(TType.STRING, TType.I64, len(self.queryCounters))
       for kiter111,viter112 in self.queryCounters.items():
@@ -960,29 +965,30 @@ class Query:
         oprot.writeI64(viter112)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.stageGraph != None:
+    if self.stageGraph is not None:
       oprot.writeFieldBegin('stageGraph', TType.STRUCT, 5)
       self.stageGraph.write(oprot)
       oprot.writeFieldEnd()
-    if self.stageList != None:
+    if self.stageList is not None:
       oprot.writeFieldBegin('stageList', TType.LIST, 6)
       oprot.writeListBegin(TType.STRUCT, len(self.stageList))
       for iter113 in self.stageList:
         iter113.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.done != None:
+    if self.done is not None:
       oprot.writeFieldBegin('done', TType.BOOL, 7)
       oprot.writeBool(self.done)
       oprot.writeFieldEnd()
-    if self.started != None:
+    if self.started is not None:
       oprot.writeFieldBegin('started', TType.BOOL, 8)
       oprot.writeBool(self.started)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
-    def validate(self):
-      return
+
+  def validate(self):
+    return
 
 
   def __repr__(self):
@@ -1056,25 +1062,26 @@ class QueryPlan:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('QueryPlan')
-    if self.queries != None:
+    if self.queries is not None:
       oprot.writeFieldBegin('queries', TType.LIST, 1)
       oprot.writeListBegin(TType.STRUCT, len(self.queries))
       for iter120 in self.queries:
         iter120.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
-    if self.done != None:
+    if self.done is not None:
       oprot.writeFieldBegin('done', TType.BOOL, 2)
       oprot.writeBool(self.done)
       oprot.writeFieldEnd()
-    if self.started != None:
+    if self.started is not None:
       oprot.writeFieldBegin('started', TType.BOOL, 3)
       oprot.writeBool(self.started)
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
-    def validate(self):
-      return
+
+  def validate(self):
+    return
 
 
   def __repr__(self):

Modified: hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_constants.rb
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_constants.rb?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_constants.rb (original)
+++ hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_constants.rb 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
 #

Modified: hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb (original)
+++ hive/trunk/ql/src/gen/thrift/gen-rb/queryplan_types.rb 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
 #

Modified: hive/trunk/serde/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/serde/ivy.xml?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/ivy.xml (original)
+++ hive/trunk/serde/ivy.xml Mon Sep  5 08:47:02 2011
@@ -29,5 +29,9 @@
         <dependency org="org.slf4j" name="slf4j-api" rev="${slf4j-api.version}"/>
         <dependency org="org.slf4j" name="slf4j-log4j12" rev="${slf4j-log4j12.version}"/>
         <dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}"/>
+        <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
+                    transitive="false"/>
+        <dependency org="org.apache.thrift" name="libfb303" rev="${libfb303.version}"
+                    transitive="false"/>
     </dependencies>
 </ivy-module>

Modified: hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.cpp
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.cpp?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.cpp (original)
+++ hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.cpp 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
  */

Modified: hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.h
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.h?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.h (original)
+++ hive/trunk/serde/src/gen/thrift/gen-cpp/serde_constants.h 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
  */

Modified: hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.cpp
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.cpp?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.cpp (original)
+++ hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.cpp 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
  */

Modified: hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.h
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.h?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.h (original)
+++ hive/trunk/serde/src/gen/thrift/gen-cpp/serde_types.h 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
  */

Modified: hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/Constants.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/Constants.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/Constants.java (original)
+++ hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/Constants.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
  */

Modified: hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.java (original)
+++ hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/InnerStruct.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,21 +20,15 @@ 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 InnerStruct implements org.apache.thrift.TBase<InnerStruct, InnerStruct._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InnerStruct");
 
-public class InnerStruct implements TBase<InnerStruct, InnerStruct._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("InnerStruct");
+  private static final org.apache.thrift.protocol.TField FIELD0_FIELD_DESC = new org.apache.thrift.protocol.TField("field0", org.apache.thrift.protocol.TType.I32, (short)1);
 
-  private static final TField FIELD0_FIELD_DESC = new TField("field0", TType.I32, (short)1);
-
-  private int field0;
+  private int field0; // 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 {
     FIELD0((short)1, "field0");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -95,13 +89,13 @@ public class InnerStruct implements TBas
   private static final int __FIELD0_ISSET_ID = 0;
   private BitSet __isset_bit_vector = new BitSet(1);
 
-  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.FIELD0, new FieldMetaData("field0", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I32)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.FIELD0, new org.apache.thrift.meta_data.FieldMetaData("field0", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(InnerStruct.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(InnerStruct.class, metaDataMap);
   }
 
   public InnerStruct() {
@@ -147,7 +141,7 @@ public class InnerStruct implements TBas
     __isset_bit_vector.clear(__FIELD0_ISSET_ID);
   }
 
-  /** Returns true if field field0 is set (has been asigned a value) and false otherwise */
+  /** Returns true if field field0 is set (has been assigned a value) and false otherwise */
   public boolean isSetField0() {
     return __isset_bit_vector.get(__FIELD0_ISSET_ID);
   }
@@ -172,13 +166,13 @@ public class InnerStruct implements TBas
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case FIELD0:
-      return new Integer(getField0());
+      return Integer.valueOf(getField0());
 
     }
     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();
@@ -234,7 +228,7 @@ public class InnerStruct implements TBas
       return lastComparison;
     }
     if (isSetField0()) {
-      lastComparison = TBaseHelper.compareTo(this.field0, typedOther.field0);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.field0, typedOther.field0);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -246,26 +240,26 @@ public class InnerStruct implements TBas
     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: // FIELD0
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.field0 = iprot.readI32();
             setField0IsSet(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();
     }
@@ -273,7 +267,7 @@ public class InnerStruct implements TBas
     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);
@@ -296,9 +290,27 @@ public class InnerStruct implements TBas
     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/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.java (original)
+++ hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde/test/ThriftTestObj.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 ThriftTestObj implements TBase<ThriftTestObj, ThriftTestObj._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("ThriftTestObj");
-
-  private static final TField FIELD1_FIELD_DESC = new TField("field1", TType.I32, (short)1);
-  private static final TField FIELD2_FIELD_DESC = new TField("field2", TType.STRING, (short)2);
-  private static final TField FIELD3_FIELD_DESC = new TField("field3", TType.LIST, (short)3);
-
-  private int field1;
-  private String field2;
-  private List<InnerStruct> field3;
+public class ThriftTestObj implements org.apache.thrift.TBase<ThriftTestObj, ThriftTestObj._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftTestObj");
+
+  private static final org.apache.thrift.protocol.TField FIELD1_FIELD_DESC = new org.apache.thrift.protocol.TField("field1", org.apache.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.thrift.protocol.TField FIELD2_FIELD_DESC = new org.apache.thrift.protocol.TField("field2", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField FIELD3_FIELD_DESC = new org.apache.thrift.protocol.TField("field3", org.apache.thrift.protocol.TType.LIST, (short)3);
+
+  private int field1; // required
+  private String field2; // required
+  private List<InnerStruct> field3; // 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 {
     FIELD1((short)1, "field1"),
     FIELD2((short)2, "field2"),
     FIELD3((short)3, "field3");
@@ -105,18 +99,18 @@ public class ThriftTestObj implements TB
   private static final int __FIELD1_ISSET_ID = 0;
   private BitSet __isset_bit_vector = new BitSet(1);
 
-  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.FIELD1, new FieldMetaData("field1", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I32)));
-    tmpMap.put(_Fields.FIELD2, new FieldMetaData("field2", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.FIELD3, new FieldMetaData("field3", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, InnerStruct.class))));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.FIELD1, new org.apache.thrift.meta_data.FieldMetaData("field1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.FIELD2, new org.apache.thrift.meta_data.FieldMetaData("field2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.FIELD3, new org.apache.thrift.meta_data.FieldMetaData("field3", 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, InnerStruct.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(ThriftTestObj.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ThriftTestObj.class, metaDataMap);
   }
 
   public ThriftTestObj() {
@@ -178,7 +172,7 @@ public class ThriftTestObj implements TB
     __isset_bit_vector.clear(__FIELD1_ISSET_ID);
   }
 
-  /** Returns true if field field1 is set (has been asigned a value) and false otherwise */
+  /** Returns true if field field1 is set (has been assigned a value) and false otherwise */
   public boolean isSetField1() {
     return __isset_bit_vector.get(__FIELD1_ISSET_ID);
   }
@@ -199,7 +193,7 @@ public class ThriftTestObj implements TB
     this.field2 = null;
   }
 
-  /** Returns true if field field2 is set (has been asigned a value) and false otherwise */
+  /** Returns true if field field2 is set (has been assigned a value) and false otherwise */
   public boolean isSetField2() {
     return this.field2 != null;
   }
@@ -237,7 +231,7 @@ public class ThriftTestObj implements TB
     this.field3 = null;
   }
 
-  /** Returns true if field field3 is set (has been asigned a value) and false otherwise */
+  /** Returns true if field field3 is set (has been assigned a value) and false otherwise */
   public boolean isSetField3() {
     return this.field3 != null;
   }
@@ -280,7 +274,7 @@ public class ThriftTestObj implements TB
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case FIELD1:
-      return new Integer(getField1());
+      return Integer.valueOf(getField1());
 
     case FIELD2:
       return getField2();
@@ -292,7 +286,7 @@ public class ThriftTestObj implements TB
     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 ThriftTestObj implements TB
       return lastComparison;
     }
     if (isSetField1()) {
-      lastComparison = TBaseHelper.compareTo(this.field1, typedOther.field1);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.field1, typedOther.field1);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -380,7 +374,7 @@ public class ThriftTestObj implements TB
       return lastComparison;
     }
     if (isSetField2()) {
-      lastComparison = TBaseHelper.compareTo(this.field2, typedOther.field2);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.field2, typedOther.field2);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -390,7 +384,7 @@ public class ThriftTestObj implements TB
       return lastComparison;
     }
     if (isSetField3()) {
-      lastComparison = TBaseHelper.compareTo(this.field3, typedOther.field3);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.field3, typedOther.field3);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -402,39 +396,39 @@ public class ThriftTestObj implements TB
     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: // FIELD1
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.field1 = iprot.readI32();
             setField1IsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // FIELD2
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.field2 = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // FIELD3
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list0 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
               this.field3 = new ArrayList<InnerStruct>(_list0.size);
               for (int _i1 = 0; _i1 < _list0.size; ++_i1)
               {
-                InnerStruct _elem2;
+                InnerStruct _elem2; // required
                 _elem2 = new InnerStruct();
                 _elem2.read(iprot);
                 this.field3.add(_elem2);
@@ -442,11 +436,11 @@ public class ThriftTestObj implements TB
               iprot.readListEnd();
             }
           } 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();
     }
@@ -454,7 +448,7 @@ public class ThriftTestObj implements TB
     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);
@@ -469,7 +463,7 @@ public class ThriftTestObj implements TB
     if (this.field3 != null) {
       oprot.writeFieldBegin(FIELD3_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRUCT, this.field3.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.field3.size()));
         for (InnerStruct _iter3 : this.field3)
         {
           _iter3.write(oprot);
@@ -510,9 +504,27 @@ public class ThriftTestObj implements TB
     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/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
URL: http://svn.apache.org/viewvc/hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java (original)
+++ hive/trunk/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.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 Complex implements TBase<Complex, Complex._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Complex");
-
-  private static final TField AINT_FIELD_DESC = new TField("aint", TType.I32, (short)1);
-  private static final TField A_STRING_FIELD_DESC = new TField("aString", TType.STRING, (short)2);
-  private static final TField LINT_FIELD_DESC = new TField("lint", TType.LIST, (short)3);
-  private static final TField L_STRING_FIELD_DESC = new TField("lString", TType.LIST, (short)4);
-  private static final TField LINT_STRING_FIELD_DESC = new TField("lintString", TType.LIST, (short)5);
-  private static final TField M_STRING_STRING_FIELD_DESC = new TField("mStringString", TType.MAP, (short)6);
-
-  private int aint;
-  private String aString;
-  private List<Integer> lint;
-  private List<String> lString;
-  private List<IntString> lintString;
-  private Map<String,String> mStringString;
+public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Complex");
+
+  private static final org.apache.thrift.protocol.TField AINT_FIELD_DESC = new org.apache.thrift.protocol.TField("aint", org.apache.thrift.protocol.TType.I32, (short)1);
+  private static final org.apache.thrift.protocol.TField A_STRING_FIELD_DESC = new org.apache.thrift.protocol.TField("aString", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField LINT_FIELD_DESC = new org.apache.thrift.protocol.TField("lint", org.apache.thrift.protocol.TType.LIST, (short)3);
+  private static final org.apache.thrift.protocol.TField L_STRING_FIELD_DESC = new org.apache.thrift.protocol.TField("lString", org.apache.thrift.protocol.TType.LIST, (short)4);
+  private static final org.apache.thrift.protocol.TField LINT_STRING_FIELD_DESC = new org.apache.thrift.protocol.TField("lintString", org.apache.thrift.protocol.TType.LIST, (short)5);
+  private static final org.apache.thrift.protocol.TField M_STRING_STRING_FIELD_DESC = new org.apache.thrift.protocol.TField("mStringString", org.apache.thrift.protocol.TType.MAP, (short)6);
+
+  private int aint; // required
+  private String aString; // required
+  private List<Integer> lint; // required
+  private List<String> lString; // required
+  private List<IntString> lintString; // required
+  private Map<String,String> mStringString; // 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 {
     AINT((short)1, "aint"),
     A_STRING((short)2, "aString"),
     LINT((short)3, "lint"),
@@ -120,28 +114,28 @@ public class Complex implements TBase<Co
   private static final int __AINT_ISSET_ID = 0;
   private BitSet __isset_bit_vector = new BitSet(1);
 
-  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.AINT, new FieldMetaData("aint", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I32)));
-    tmpMap.put(_Fields.A_STRING, new FieldMetaData("aString", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.LINT, new FieldMetaData("lint", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new FieldValueMetaData(TType.I32))));
-    tmpMap.put(_Fields.L_STRING, new FieldMetaData("lString", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new FieldValueMetaData(TType.STRING))));
-    tmpMap.put(_Fields.LINT_STRING, new FieldMetaData("lintString", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, IntString.class))));
-    tmpMap.put(_Fields.M_STRING_STRING, new FieldMetaData("mStringString", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.STRING))));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.AINT, new org.apache.thrift.meta_data.FieldMetaData("aint", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.A_STRING, new org.apache.thrift.meta_data.FieldMetaData("aString", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.LINT, new org.apache.thrift.meta_data.FieldMetaData("lint", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
+    tmpMap.put(_Fields.L_STRING, new org.apache.thrift.meta_data.FieldMetaData("lString", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.LINT_STRING, new org.apache.thrift.meta_data.FieldMetaData("lintString", 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, IntString.class))));
+    tmpMap.put(_Fields.M_STRING_STRING, new org.apache.thrift.meta_data.FieldMetaData("mStringString", 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))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(Complex.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Complex.class, metaDataMap);
   }
 
   public Complex() {
@@ -241,7 +235,7 @@ public class Complex implements TBase<Co
     __isset_bit_vector.clear(__AINT_ISSET_ID);
   }
 
-  /** Returns true if field aint is set (has been asigned a value) and false otherwise */
+  /** Returns true if field aint is set (has been assigned a value) and false otherwise */
   public boolean isSetAint() {
     return __isset_bit_vector.get(__AINT_ISSET_ID);
   }
@@ -262,7 +256,7 @@ public class Complex implements TBase<Co
     this.aString = null;
   }
 
-  /** Returns true if field aString is set (has been asigned a value) and false otherwise */
+  /** Returns true if field aString is set (has been assigned a value) and false otherwise */
   public boolean isSetAString() {
     return this.aString != null;
   }
@@ -300,7 +294,7 @@ public class Complex implements TBase<Co
     this.lint = null;
   }
 
-  /** Returns true if field lint is set (has been asigned a value) and false otherwise */
+  /** Returns true if field lint is set (has been assigned a value) and false otherwise */
   public boolean isSetLint() {
     return this.lint != null;
   }
@@ -338,7 +332,7 @@ public class Complex implements TBase<Co
     this.lString = null;
   }
 
-  /** Returns true if field lString is set (has been asigned a value) and false otherwise */
+  /** Returns true if field lString is set (has been assigned a value) and false otherwise */
   public boolean isSetLString() {
     return this.lString != null;
   }
@@ -376,7 +370,7 @@ public class Complex implements TBase<Co
     this.lintString = null;
   }
 
-  /** Returns true if field lintString is set (has been asigned a value) and false otherwise */
+  /** Returns true if field lintString is set (has been assigned a value) and false otherwise */
   public boolean isSetLintString() {
     return this.lintString != null;
   }
@@ -410,7 +404,7 @@ public class Complex implements TBase<Co
     this.mStringString = null;
   }
 
-  /** Returns true if field mStringString is set (has been asigned a value) and false otherwise */
+  /** Returns true if field mStringString is set (has been assigned a value) and false otherwise */
   public boolean isSetMStringString() {
     return this.mStringString != null;
   }
@@ -477,7 +471,7 @@ public class Complex implements TBase<Co
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case AINT:
-      return new Integer(getAint());
+      return Integer.valueOf(getAint());
 
     case A_STRING:
       return getAString();
@@ -498,7 +492,7 @@ public class Complex implements TBase<Co
     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();
@@ -609,7 +603,7 @@ public class Complex implements TBase<Co
       return lastComparison;
     }
     if (isSetAint()) {
-      lastComparison = TBaseHelper.compareTo(this.aint, typedOther.aint);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aint, typedOther.aint);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -619,7 +613,7 @@ public class Complex implements TBase<Co
       return lastComparison;
     }
     if (isSetAString()) {
-      lastComparison = TBaseHelper.compareTo(this.aString, typedOther.aString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aString, typedOther.aString);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -629,7 +623,7 @@ public class Complex implements TBase<Co
       return lastComparison;
     }
     if (isSetLint()) {
-      lastComparison = TBaseHelper.compareTo(this.lint, typedOther.lint);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lint, typedOther.lint);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -639,7 +633,7 @@ public class Complex implements TBase<Co
       return lastComparison;
     }
     if (isSetLString()) {
-      lastComparison = TBaseHelper.compareTo(this.lString, typedOther.lString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lString, typedOther.lString);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -649,7 +643,7 @@ public class Complex implements TBase<Co
       return lastComparison;
     }
     if (isSetLintString()) {
-      lastComparison = TBaseHelper.compareTo(this.lintString, typedOther.lintString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lintString, typedOther.lintString);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -659,7 +653,7 @@ public class Complex implements TBase<Co
       return lastComparison;
     }
     if (isSetMStringString()) {
-      lastComparison = TBaseHelper.compareTo(this.mStringString, typedOther.mStringString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mStringString, typedOther.mStringString);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -671,73 +665,73 @@ public class Complex implements TBase<Co
     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: // AINT
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.aint = iprot.readI32();
             setAintIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // A_STRING
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.aString = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // LINT
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list0 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
               this.lint = new ArrayList<Integer>(_list0.size);
               for (int _i1 = 0; _i1 < _list0.size; ++_i1)
               {
-                int _elem2;
+                int _elem2; // required
                 _elem2 = iprot.readI32();
                 this.lint.add(_elem2);
               }
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 4: // L_STRING
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list3 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
               this.lString = new ArrayList<String>(_list3.size);
               for (int _i4 = 0; _i4 < _list3.size; ++_i4)
               {
-                String _elem5;
+                String _elem5; // required
                 _elem5 = iprot.readString();
                 this.lString.add(_elem5);
               }
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 5: // LINT_STRING
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list6 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list6 = iprot.readListBegin();
               this.lintString = new ArrayList<IntString>(_list6.size);
               for (int _i7 = 0; _i7 < _list6.size; ++_i7)
               {
-                IntString _elem8;
+                IntString _elem8; // required
                 _elem8 = new IntString();
                 _elem8.read(iprot);
                 this.lintString.add(_elem8);
@@ -745,18 +739,18 @@ public class Complex implements TBase<Co
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 6: // M_STRING_STRING
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map9 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map9 = iprot.readMapBegin();
               this.mStringString = new HashMap<String,String>(2*_map9.size);
               for (int _i10 = 0; _i10 < _map9.size; ++_i10)
               {
-                String _key11;
-                String _val12;
+                String _key11; // required
+                String _val12; // required
                 _key11 = iprot.readString();
                 _val12 = iprot.readString();
                 this.mStringString.put(_key11, _val12);
@@ -764,11 +758,11 @@ public class Complex implements TBase<Co
               iprot.readMapEnd();
             }
           } 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();
     }
@@ -776,7 +770,7 @@ public class Complex implements TBase<Co
     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);
@@ -791,7 +785,7 @@ public class Complex implements TBase<Co
     if (this.lint != null) {
       oprot.writeFieldBegin(LINT_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.I32, this.lint.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, this.lint.size()));
         for (int _iter13 : this.lint)
         {
           oprot.writeI32(_iter13);
@@ -803,7 +797,7 @@ public class Complex implements TBase<Co
     if (this.lString != null) {
       oprot.writeFieldBegin(L_STRING_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRING, this.lString.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.lString.size()));
         for (String _iter14 : this.lString)
         {
           oprot.writeString(_iter14);
@@ -815,7 +809,7 @@ public class Complex implements TBase<Co
     if (this.lintString != null) {
       oprot.writeFieldBegin(LINT_STRING_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRUCT, this.lintString.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.lintString.size()));
         for (IntString _iter15 : this.lintString)
         {
           _iter15.write(oprot);
@@ -827,7 +821,7 @@ public class Complex implements TBase<Co
     if (this.mStringString != null) {
       oprot.writeFieldBegin(M_STRING_STRING_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.mStringString.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.mStringString.size()));
         for (Map.Entry<String, String> _iter16 : this.mStringString.entrySet())
         {
           oprot.writeString(_iter16.getKey());
@@ -893,9 +887,27 @@ public class Complex implements TBase<Co
     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);
+    }
+  }
+
 }
 



Mime
View raw message