hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xu...@apache.org
Subject [17/54] [abbrv] hive git commit: HIVE-9152 - Dynamic Partition Pruning [Spark Branch] (Chao Sun, reviewed by Xuefu Zhang and Chengxiang Li)
Date Fri, 31 Jul 2015 22:57:18 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
index ff0c1f2..9cda2a7 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/Complex.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.hive.serde2.thrift.test;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields>, java.io.Serializable, Cloneable, Comparable<Complex> {
   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);
@@ -227,43 +231,26 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
       this.aString = other.aString;
     }
     if (other.isSetLint()) {
-      List<Integer> __this__lint = new ArrayList<Integer>();
-      for (Integer other_element : other.lint) {
-        __this__lint.add(other_element);
-      }
+      List<Integer> __this__lint = new ArrayList<Integer>(other.lint);
       this.lint = __this__lint;
     }
     if (other.isSetLString()) {
-      List<String> __this__lString = new ArrayList<String>();
-      for (String other_element : other.lString) {
-        __this__lString.add(other_element);
-      }
+      List<String> __this__lString = new ArrayList<String>(other.lString);
       this.lString = __this__lString;
     }
     if (other.isSetLintString()) {
-      List<IntString> __this__lintString = new ArrayList<IntString>();
+      List<IntString> __this__lintString = new ArrayList<IntString>(other.lintString.size());
       for (IntString other_element : other.lintString) {
         __this__lintString.add(new IntString(other_element));
       }
       this.lintString = __this__lintString;
     }
     if (other.isSetMStringString()) {
-      Map<String,String> __this__mStringString = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.mStringString.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__mStringString_copy_key = other_element_key;
-
-        String __this__mStringString_copy_value = other_element_value;
-
-        __this__mStringString.put(__this__mStringString_copy_key, __this__mStringString_copy_value);
-      }
+      Map<String,String> __this__mStringString = new HashMap<String,String>(other.mStringString);
       this.mStringString = __this__mStringString;
     }
     if (other.isSetAttributes()) {
-      Map<String,Map<String,Map<String,PropValueUnion>>> __this__attributes = new HashMap<String,Map<String,Map<String,PropValueUnion>>>();
+      Map<String,Map<String,Map<String,PropValueUnion>>> __this__attributes = new HashMap<String,Map<String,Map<String,PropValueUnion>>>(other.attributes.size());
       for (Map.Entry<String, Map<String,Map<String,PropValueUnion>>> other_element : other.attributes.entrySet()) {
 
         String other_element_key = other_element.getKey();
@@ -271,7 +258,7 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
 
         String __this__attributes_copy_key = other_element_key;
 
-        Map<String,Map<String,PropValueUnion>> __this__attributes_copy_value = new HashMap<String,Map<String,PropValueUnion>>();
+        Map<String,Map<String,PropValueUnion>> __this__attributes_copy_value = new HashMap<String,Map<String,PropValueUnion>>(other_element_value.size());
         for (Map.Entry<String, Map<String,PropValueUnion>> other_element_value_element : other_element_value.entrySet()) {
 
           String other_element_value_element_key = other_element_value_element.getKey();
@@ -279,7 +266,7 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
 
           String __this__attributes_copy_value_copy_key = other_element_value_element_key;
 
-          Map<String,PropValueUnion> __this__attributes_copy_value_copy_value = new HashMap<String,PropValueUnion>();
+          Map<String,PropValueUnion> __this__attributes_copy_value_copy_value = new HashMap<String,PropValueUnion>(other_element_value_element_value.size());
           for (Map.Entry<String, PropValueUnion> other_element_value_element_value_element : other_element_value_element_value.entrySet()) {
 
             String other_element_value_element_value_element_key = other_element_value_element_value_element.getKey();
@@ -885,165 +872,165 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_aint = true;
-    builder.append(present_aint);
+    list.add(present_aint);
     if (present_aint)
-      builder.append(aint);
+      list.add(aint);
 
     boolean present_aString = true && (isSetAString());
-    builder.append(present_aString);
+    list.add(present_aString);
     if (present_aString)
-      builder.append(aString);
+      list.add(aString);
 
     boolean present_lint = true && (isSetLint());
-    builder.append(present_lint);
+    list.add(present_lint);
     if (present_lint)
-      builder.append(lint);
+      list.add(lint);
 
     boolean present_lString = true && (isSetLString());
-    builder.append(present_lString);
+    list.add(present_lString);
     if (present_lString)
-      builder.append(lString);
+      list.add(lString);
 
     boolean present_lintString = true && (isSetLintString());
-    builder.append(present_lintString);
+    list.add(present_lintString);
     if (present_lintString)
-      builder.append(lintString);
+      list.add(lintString);
 
     boolean present_mStringString = true && (isSetMStringString());
-    builder.append(present_mStringString);
+    list.add(present_mStringString);
     if (present_mStringString)
-      builder.append(mStringString);
+      list.add(mStringString);
 
     boolean present_attributes = true && (isSetAttributes());
-    builder.append(present_attributes);
+    list.add(present_attributes);
     if (present_attributes)
-      builder.append(attributes);
+      list.add(attributes);
 
     boolean present_unionField1 = true && (isSetUnionField1());
-    builder.append(present_unionField1);
+    list.add(present_unionField1);
     if (present_unionField1)
-      builder.append(unionField1);
+      list.add(unionField1);
 
     boolean present_unionField2 = true && (isSetUnionField2());
-    builder.append(present_unionField2);
+    list.add(present_unionField2);
     if (present_unionField2)
-      builder.append(unionField2);
+      list.add(unionField2);
 
     boolean present_unionField3 = true && (isSetUnionField3());
-    builder.append(present_unionField3);
+    list.add(present_unionField3);
     if (present_unionField3)
-      builder.append(unionField3);
+      list.add(unionField3);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Complex other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Complex typedOther = (Complex)other;
 
-    lastComparison = Boolean.valueOf(isSetAint()).compareTo(typedOther.isSetAint());
+    lastComparison = Boolean.valueOf(isSetAint()).compareTo(other.isSetAint());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAint()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aint, typedOther.aint);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aint, other.aint);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAString()).compareTo(typedOther.isSetAString());
+    lastComparison = Boolean.valueOf(isSetAString()).compareTo(other.isSetAString());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAString()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aString, typedOther.aString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aString, other.aString);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLint()).compareTo(typedOther.isSetLint());
+    lastComparison = Boolean.valueOf(isSetLint()).compareTo(other.isSetLint());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLint()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lint, typedOther.lint);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lint, other.lint);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLString()).compareTo(typedOther.isSetLString());
+    lastComparison = Boolean.valueOf(isSetLString()).compareTo(other.isSetLString());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLString()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lString, typedOther.lString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lString, other.lString);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLintString()).compareTo(typedOther.isSetLintString());
+    lastComparison = Boolean.valueOf(isSetLintString()).compareTo(other.isSetLintString());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLintString()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lintString, typedOther.lintString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lintString, other.lintString);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMStringString()).compareTo(typedOther.isSetMStringString());
+    lastComparison = Boolean.valueOf(isSetMStringString()).compareTo(other.isSetMStringString());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMStringString()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mStringString, typedOther.mStringString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mStringString, other.mStringString);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes());
+    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUnionField1()).compareTo(typedOther.isSetUnionField1());
+    lastComparison = Boolean.valueOf(isSetUnionField1()).compareTo(other.isSetUnionField1());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUnionField1()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unionField1, typedOther.unionField1);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unionField1, other.unionField1);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUnionField2()).compareTo(typedOther.isSetUnionField2());
+    lastComparison = Boolean.valueOf(isSetUnionField2()).compareTo(other.isSetUnionField2());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUnionField2()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unionField2, typedOther.unionField2);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unionField2, other.unionField2);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUnionField3()).compareTo(typedOther.isSetUnionField3());
+    lastComparison = Boolean.valueOf(isSetUnionField3()).compareTo(other.isSetUnionField3());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUnionField3()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unionField3, typedOther.unionField3);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.unionField3, other.unionField3);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1209,11 +1196,11 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
               {
                 org.apache.thrift.protocol.TList _list18 = iprot.readListBegin();
                 struct.lint = new ArrayList<Integer>(_list18.size);
-                for (int _i19 = 0; _i19 < _list18.size; ++_i19)
+                int _elem19;
+                for (int _i20 = 0; _i20 < _list18.size; ++_i20)
                 {
-                  int _elem20; // optional
-                  _elem20 = iprot.readI32();
-                  struct.lint.add(_elem20);
+                  _elem19 = iprot.readI32();
+                  struct.lint.add(_elem19);
                 }
                 iprot.readListEnd();
               }
@@ -1227,11 +1214,11 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
               {
                 org.apache.thrift.protocol.TList _list21 = iprot.readListBegin();
                 struct.lString = new ArrayList<String>(_list21.size);
-                for (int _i22 = 0; _i22 < _list21.size; ++_i22)
+                String _elem22;
+                for (int _i23 = 0; _i23 < _list21.size; ++_i23)
                 {
-                  String _elem23; // optional
-                  _elem23 = iprot.readString();
-                  struct.lString.add(_elem23);
+                  _elem22 = iprot.readString();
+                  struct.lString.add(_elem22);
                 }
                 iprot.readListEnd();
               }
@@ -1245,12 +1232,12 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
               {
                 org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
                 struct.lintString = new ArrayList<IntString>(_list24.size);
-                for (int _i25 = 0; _i25 < _list24.size; ++_i25)
+                IntString _elem25;
+                for (int _i26 = 0; _i26 < _list24.size; ++_i26)
                 {
-                  IntString _elem26; // optional
-                  _elem26 = new IntString();
-                  _elem26.read(iprot);
-                  struct.lintString.add(_elem26);
+                  _elem25 = new IntString();
+                  _elem25.read(iprot);
+                  struct.lintString.add(_elem25);
                 }
                 iprot.readListEnd();
               }
@@ -1264,13 +1251,13 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
               {
                 org.apache.thrift.protocol.TMap _map27 = iprot.readMapBegin();
                 struct.mStringString = new HashMap<String,String>(2*_map27.size);
-                for (int _i28 = 0; _i28 < _map27.size; ++_i28)
+                String _key28;
+                String _val29;
+                for (int _i30 = 0; _i30 < _map27.size; ++_i30)
                 {
-                  String _key29; // required
-                  String _val30; // required
-                  _key29 = iprot.readString();
-                  _val30 = iprot.readString();
-                  struct.mStringString.put(_key29, _val30);
+                  _key28 = iprot.readString();
+                  _val29 = iprot.readString();
+                  struct.mStringString.put(_key28, _val29);
                 }
                 iprot.readMapEnd();
               }
@@ -1284,38 +1271,38 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
               {
                 org.apache.thrift.protocol.TMap _map31 = iprot.readMapBegin();
                 struct.attributes = new HashMap<String,Map<String,Map<String,PropValueUnion>>>(2*_map31.size);
-                for (int _i32 = 0; _i32 < _map31.size; ++_i32)
+                String _key32;
+                Map<String,Map<String,PropValueUnion>> _val33;
+                for (int _i34 = 0; _i34 < _map31.size; ++_i34)
                 {
-                  String _key33; // required
-                  Map<String,Map<String,PropValueUnion>> _val34; // required
-                  _key33 = iprot.readString();
+                  _key32 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TMap _map35 = iprot.readMapBegin();
-                    _val34 = new HashMap<String,Map<String,PropValueUnion>>(2*_map35.size);
-                    for (int _i36 = 0; _i36 < _map35.size; ++_i36)
+                    _val33 = new HashMap<String,Map<String,PropValueUnion>>(2*_map35.size);
+                    String _key36;
+                    Map<String,PropValueUnion> _val37;
+                    for (int _i38 = 0; _i38 < _map35.size; ++_i38)
                     {
-                      String _key37; // required
-                      Map<String,PropValueUnion> _val38; // required
-                      _key37 = iprot.readString();
+                      _key36 = iprot.readString();
                       {
                         org.apache.thrift.protocol.TMap _map39 = iprot.readMapBegin();
-                        _val38 = new HashMap<String,PropValueUnion>(2*_map39.size);
-                        for (int _i40 = 0; _i40 < _map39.size; ++_i40)
+                        _val37 = new HashMap<String,PropValueUnion>(2*_map39.size);
+                        String _key40;
+                        PropValueUnion _val41;
+                        for (int _i42 = 0; _i42 < _map39.size; ++_i42)
                         {
-                          String _key41; // required
-                          PropValueUnion _val42; // required
-                          _key41 = iprot.readString();
-                          _val42 = new PropValueUnion();
-                          _val42.read(iprot);
-                          _val38.put(_key41, _val42);
+                          _key40 = iprot.readString();
+                          _val41 = new PropValueUnion();
+                          _val41.read(iprot);
+                          _val37.put(_key40, _val41);
                         }
                         iprot.readMapEnd();
                       }
-                      _val34.put(_key37, _val38);
+                      _val33.put(_key36, _val37);
                     }
                     iprot.readMapEnd();
                   }
-                  struct.attributes.put(_key33, _val34);
+                  struct.attributes.put(_key32, _val33);
                 }
                 iprot.readMapEnd();
               }
@@ -1608,11 +1595,11 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
         {
           org.apache.thrift.protocol.TList _list57 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
           struct.lint = new ArrayList<Integer>(_list57.size);
-          for (int _i58 = 0; _i58 < _list57.size; ++_i58)
+          int _elem58;
+          for (int _i59 = 0; _i59 < _list57.size; ++_i59)
           {
-            int _elem59; // optional
-            _elem59 = iprot.readI32();
-            struct.lint.add(_elem59);
+            _elem58 = iprot.readI32();
+            struct.lint.add(_elem58);
           }
         }
         struct.setLintIsSet(true);
@@ -1621,11 +1608,11 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
         {
           org.apache.thrift.protocol.TList _list60 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.lString = new ArrayList<String>(_list60.size);
-          for (int _i61 = 0; _i61 < _list60.size; ++_i61)
+          String _elem61;
+          for (int _i62 = 0; _i62 < _list60.size; ++_i62)
           {
-            String _elem62; // optional
-            _elem62 = iprot.readString();
-            struct.lString.add(_elem62);
+            _elem61 = iprot.readString();
+            struct.lString.add(_elem61);
           }
         }
         struct.setLStringIsSet(true);
@@ -1634,12 +1621,12 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
         {
           org.apache.thrift.protocol.TList _list63 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.lintString = new ArrayList<IntString>(_list63.size);
-          for (int _i64 = 0; _i64 < _list63.size; ++_i64)
+          IntString _elem64;
+          for (int _i65 = 0; _i65 < _list63.size; ++_i65)
           {
-            IntString _elem65; // optional
-            _elem65 = new IntString();
-            _elem65.read(iprot);
-            struct.lintString.add(_elem65);
+            _elem64 = new IntString();
+            _elem64.read(iprot);
+            struct.lintString.add(_elem64);
           }
         }
         struct.setLintStringIsSet(true);
@@ -1648,13 +1635,13 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
         {
           org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.mStringString = new HashMap<String,String>(2*_map66.size);
-          for (int _i67 = 0; _i67 < _map66.size; ++_i67)
+          String _key67;
+          String _val68;
+          for (int _i69 = 0; _i69 < _map66.size; ++_i69)
           {
-            String _key68; // required
-            String _val69; // required
-            _key68 = iprot.readString();
-            _val69 = iprot.readString();
-            struct.mStringString.put(_key68, _val69);
+            _key67 = iprot.readString();
+            _val68 = iprot.readString();
+            struct.mStringString.put(_key67, _val68);
           }
         }
         struct.setMStringStringIsSet(true);
@@ -1663,36 +1650,36 @@ public class Complex implements org.apache.thrift.TBase<Complex, Complex._Fields
         {
           org.apache.thrift.protocol.TMap _map70 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
           struct.attributes = new HashMap<String,Map<String,Map<String,PropValueUnion>>>(2*_map70.size);
-          for (int _i71 = 0; _i71 < _map70.size; ++_i71)
+          String _key71;
+          Map<String,Map<String,PropValueUnion>> _val72;
+          for (int _i73 = 0; _i73 < _map70.size; ++_i73)
           {
-            String _key72; // required
-            Map<String,Map<String,PropValueUnion>> _val73; // required
-            _key72 = iprot.readString();
+            _key71 = iprot.readString();
             {
               org.apache.thrift.protocol.TMap _map74 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
-              _val73 = new HashMap<String,Map<String,PropValueUnion>>(2*_map74.size);
-              for (int _i75 = 0; _i75 < _map74.size; ++_i75)
+              _val72 = new HashMap<String,Map<String,PropValueUnion>>(2*_map74.size);
+              String _key75;
+              Map<String,PropValueUnion> _val76;
+              for (int _i77 = 0; _i77 < _map74.size; ++_i77)
               {
-                String _key76; // required
-                Map<String,PropValueUnion> _val77; // required
-                _key76 = iprot.readString();
+                _key75 = iprot.readString();
                 {
                   org.apache.thrift.protocol.TMap _map78 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-                  _val77 = new HashMap<String,PropValueUnion>(2*_map78.size);
-                  for (int _i79 = 0; _i79 < _map78.size; ++_i79)
+                  _val76 = new HashMap<String,PropValueUnion>(2*_map78.size);
+                  String _key79;
+                  PropValueUnion _val80;
+                  for (int _i81 = 0; _i81 < _map78.size; ++_i81)
                   {
-                    String _key80; // required
-                    PropValueUnion _val81; // required
-                    _key80 = iprot.readString();
-                    _val81 = new PropValueUnion();
-                    _val81.read(iprot);
-                    _val77.put(_key80, _val81);
+                    _key79 = iprot.readString();
+                    _val80 = new PropValueUnion();
+                    _val80.read(iprot);
+                    _val76.put(_key79, _val80);
                   }
                 }
-                _val73.put(_key76, _val77);
+                _val72.put(_key75, _val76);
               }
             }
-            struct.attributes.put(_key72, _val73);
+            struct.attributes.put(_key71, _val72);
           }
         }
         struct.setAttributesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
index bd580ad..b13ef82 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/IntString.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.hive.serde2.thrift.test;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class IntString implements org.apache.thrift.TBase<IntString, IntString._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class IntString implements org.apache.thrift.TBase<IntString, IntString._Fields>, java.io.Serializable, Cloneable, Comparable<IntString> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IntString");
 
   private static final org.apache.thrift.protocol.TField MYINT_FIELD_DESC = new org.apache.thrift.protocol.TField("myint", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -343,60 +347,60 @@ public class IntString implements org.apache.thrift.TBase<IntString, IntString._
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_myint = true;
-    builder.append(present_myint);
+    list.add(present_myint);
     if (present_myint)
-      builder.append(myint);
+      list.add(myint);
 
     boolean present_myString = true && (isSetMyString());
-    builder.append(present_myString);
+    list.add(present_myString);
     if (present_myString)
-      builder.append(myString);
+      list.add(myString);
 
     boolean present_underscore_int = true;
-    builder.append(present_underscore_int);
+    list.add(present_underscore_int);
     if (present_underscore_int)
-      builder.append(underscore_int);
+      list.add(underscore_int);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(IntString other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    IntString typedOther = (IntString)other;
 
-    lastComparison = Boolean.valueOf(isSetMyint()).compareTo(typedOther.isSetMyint());
+    lastComparison = Boolean.valueOf(isSetMyint()).compareTo(other.isSetMyint());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMyint()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.myint, typedOther.myint);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.myint, other.myint);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMyString()).compareTo(typedOther.isSetMyString());
+    lastComparison = Boolean.valueOf(isSetMyString()).compareTo(other.isSetMyString());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMyString()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.myString, typedOther.myString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.myString, other.myString);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUnderscore_int()).compareTo(typedOther.isSetUnderscore_int());
+    lastComparison = Boolean.valueOf(isSetUnderscore_int()).compareTo(other.isSetUnderscore_int());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUnderscore_int()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.underscore_int, typedOther.underscore_int);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.underscore_int, other.underscore_int);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
----------------------------------------------------------------------
diff --git a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
index fba49e4..a394113 100644
--- a/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
+++ b/serde/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/serde2/thrift/test/MegaStruct.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.hive.serde2.thrift.test;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruct._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruct._Fields>, java.io.Serializable, Cloneable, Comparable<MegaStruct> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MegaStruct");
 
   private static final org.apache.thrift.protocol.TField MY_BOOL_FIELD_DESC = new org.apache.thrift.protocol.TField("my_bool", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -205,7 +209,7 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
   private static final int __MY_64BIT_INT_ISSET_ID = 4;
   private static final int __MY_DOUBLE_ISSET_ID = 5;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.MY_BOOL,_Fields.MY_BYTE,_Fields.MY_16BIT_INT,_Fields.MY_32BIT_INT,_Fields.MY_64BIT_INT,_Fields.MY_DOUBLE,_Fields.MY_STRING,_Fields.MY_BINARY,_Fields.MY_STRING_STRING_MAP,_Fields.MY_STRING_ENUM_MAP,_Fields.MY_ENUM_STRING_MAP,_Fields.MY_ENUM_STRUCT_MAP,_Fields.MY_ENUM_STRINGLIST_MAP,_Fields.MY_ENUM_STRUCTLIST_MAP,_Fields.MY_STRINGLIST,_Fields.MY_STRUCTLIST,_Fields.MY_ENUMLIST,_Fields.MY_STRINGSET,_Fields.MY_ENUMSET,_Fields.MY_STRUCTSET};
+  private static final _Fields optionals[] = {_Fields.MY_BOOL,_Fields.MY_BYTE,_Fields.MY_16BIT_INT,_Fields.MY_32BIT_INT,_Fields.MY_64BIT_INT,_Fields.MY_DOUBLE,_Fields.MY_STRING,_Fields.MY_BINARY,_Fields.MY_STRING_STRING_MAP,_Fields.MY_STRING_ENUM_MAP,_Fields.MY_ENUM_STRING_MAP,_Fields.MY_ENUM_STRUCT_MAP,_Fields.MY_ENUM_STRINGLIST_MAP,_Fields.MY_ENUM_STRUCTLIST_MAP,_Fields.MY_STRINGLIST,_Fields.MY_STRUCTLIST,_Fields.MY_ENUMLIST,_Fields.MY_STRINGSET,_Fields.MY_ENUMSET,_Fields.MY_STRUCTSET};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -292,25 +296,13 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
     }
     if (other.isSetMy_binary()) {
       this.my_binary = org.apache.thrift.TBaseHelper.copyBinary(other.my_binary);
-;
     }
     if (other.isSetMy_string_string_map()) {
-      Map<String,String> __this__my_string_string_map = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.my_string_string_map.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__my_string_string_map_copy_key = other_element_key;
-
-        String __this__my_string_string_map_copy_value = other_element_value;
-
-        __this__my_string_string_map.put(__this__my_string_string_map_copy_key, __this__my_string_string_map_copy_value);
-      }
+      Map<String,String> __this__my_string_string_map = new HashMap<String,String>(other.my_string_string_map);
       this.my_string_string_map = __this__my_string_string_map;
     }
     if (other.isSetMy_string_enum_map()) {
-      Map<String,MyEnum> __this__my_string_enum_map = new HashMap<String,MyEnum>();
+      Map<String,MyEnum> __this__my_string_enum_map = new HashMap<String,MyEnum>(other.my_string_enum_map.size());
       for (Map.Entry<String, MyEnum> other_element : other.my_string_enum_map.entrySet()) {
 
         String other_element_key = other_element.getKey();
@@ -325,7 +317,7 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
       this.my_string_enum_map = __this__my_string_enum_map;
     }
     if (other.isSetMy_enum_string_map()) {
-      Map<MyEnum,String> __this__my_enum_string_map = new HashMap<MyEnum,String>();
+      Map<MyEnum,String> __this__my_enum_string_map = new HashMap<MyEnum,String>(other.my_enum_string_map.size());
       for (Map.Entry<MyEnum, String> other_element : other.my_enum_string_map.entrySet()) {
 
         MyEnum other_element_key = other_element.getKey();
@@ -340,7 +332,7 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
       this.my_enum_string_map = __this__my_enum_string_map;
     }
     if (other.isSetMy_enum_struct_map()) {
-      Map<MyEnum,MiniStruct> __this__my_enum_struct_map = new HashMap<MyEnum,MiniStruct>();
+      Map<MyEnum,MiniStruct> __this__my_enum_struct_map = new HashMap<MyEnum,MiniStruct>(other.my_enum_struct_map.size());
       for (Map.Entry<MyEnum, MiniStruct> other_element : other.my_enum_struct_map.entrySet()) {
 
         MyEnum other_element_key = other_element.getKey();
@@ -355,7 +347,7 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
       this.my_enum_struct_map = __this__my_enum_struct_map;
     }
     if (other.isSetMy_enum_stringlist_map()) {
-      Map<MyEnum,List<String>> __this__my_enum_stringlist_map = new HashMap<MyEnum,List<String>>();
+      Map<MyEnum,List<String>> __this__my_enum_stringlist_map = new HashMap<MyEnum,List<String>>(other.my_enum_stringlist_map.size());
       for (Map.Entry<MyEnum, List<String>> other_element : other.my_enum_stringlist_map.entrySet()) {
 
         MyEnum other_element_key = other_element.getKey();
@@ -363,17 +355,14 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
 
         MyEnum __this__my_enum_stringlist_map_copy_key = other_element_key;
 
-        List<String> __this__my_enum_stringlist_map_copy_value = new ArrayList<String>();
-        for (String other_element_value_element : other_element_value) {
-          __this__my_enum_stringlist_map_copy_value.add(other_element_value_element);
-        }
+        List<String> __this__my_enum_stringlist_map_copy_value = new ArrayList<String>(other_element_value);
 
         __this__my_enum_stringlist_map.put(__this__my_enum_stringlist_map_copy_key, __this__my_enum_stringlist_map_copy_value);
       }
       this.my_enum_stringlist_map = __this__my_enum_stringlist_map;
     }
     if (other.isSetMy_enum_structlist_map()) {
-      Map<MyEnum,List<MiniStruct>> __this__my_enum_structlist_map = new HashMap<MyEnum,List<MiniStruct>>();
+      Map<MyEnum,List<MiniStruct>> __this__my_enum_structlist_map = new HashMap<MyEnum,List<MiniStruct>>(other.my_enum_structlist_map.size());
       for (Map.Entry<MyEnum, List<MiniStruct>> other_element : other.my_enum_structlist_map.entrySet()) {
 
         MyEnum other_element_key = other_element.getKey();
@@ -381,7 +370,7 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
 
         MyEnum __this__my_enum_structlist_map_copy_key = other_element_key;
 
-        List<MiniStruct> __this__my_enum_structlist_map_copy_value = new ArrayList<MiniStruct>();
+        List<MiniStruct> __this__my_enum_structlist_map_copy_value = new ArrayList<MiniStruct>(other_element_value.size());
         for (MiniStruct other_element_value_element : other_element_value) {
           __this__my_enum_structlist_map_copy_value.add(new MiniStruct(other_element_value_element));
         }
@@ -391,42 +380,36 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
       this.my_enum_structlist_map = __this__my_enum_structlist_map;
     }
     if (other.isSetMy_stringlist()) {
-      List<String> __this__my_stringlist = new ArrayList<String>();
-      for (String other_element : other.my_stringlist) {
-        __this__my_stringlist.add(other_element);
-      }
+      List<String> __this__my_stringlist = new ArrayList<String>(other.my_stringlist);
       this.my_stringlist = __this__my_stringlist;
     }
     if (other.isSetMy_structlist()) {
-      List<MiniStruct> __this__my_structlist = new ArrayList<MiniStruct>();
+      List<MiniStruct> __this__my_structlist = new ArrayList<MiniStruct>(other.my_structlist.size());
       for (MiniStruct other_element : other.my_structlist) {
         __this__my_structlist.add(new MiniStruct(other_element));
       }
       this.my_structlist = __this__my_structlist;
     }
     if (other.isSetMy_enumlist()) {
-      List<MyEnum> __this__my_enumlist = new ArrayList<MyEnum>();
+      List<MyEnum> __this__my_enumlist = new ArrayList<MyEnum>(other.my_enumlist.size());
       for (MyEnum other_element : other.my_enumlist) {
         __this__my_enumlist.add(other_element);
       }
       this.my_enumlist = __this__my_enumlist;
     }
     if (other.isSetMy_stringset()) {
-      Set<String> __this__my_stringset = new HashSet<String>();
-      for (String other_element : other.my_stringset) {
-        __this__my_stringset.add(other_element);
-      }
+      Set<String> __this__my_stringset = new HashSet<String>(other.my_stringset);
       this.my_stringset = __this__my_stringset;
     }
     if (other.isSetMy_enumset()) {
-      Set<MyEnum> __this__my_enumset = new HashSet<MyEnum>();
+      Set<MyEnum> __this__my_enumset = new HashSet<MyEnum>(other.my_enumset.size());
       for (MyEnum other_element : other.my_enumset) {
         __this__my_enumset.add(other_element);
       }
       this.my_enumset = __this__my_enumset;
     }
     if (other.isSetMy_structset()) {
-      Set<MiniStruct> __this__my_structset = new HashSet<MiniStruct>();
+      Set<MiniStruct> __this__my_structset = new HashSet<MiniStruct>(other.my_structset.size());
       for (MiniStruct other_element : other.my_structset) {
         __this__my_structset.add(new MiniStruct(other_element));
       }
@@ -629,15 +612,15 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
   }
 
   public ByteBuffer bufferForMy_binary() {
-    return my_binary;
+    return org.apache.thrift.TBaseHelper.copyBinary(my_binary);
   }
 
   public void setMy_binary(byte[] my_binary) {
-    setMy_binary(my_binary == null ? (ByteBuffer)null : ByteBuffer.wrap(my_binary));
+    this.my_binary = my_binary == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(my_binary, my_binary.length));
   }
 
   public void setMy_binary(ByteBuffer my_binary) {
-    this.my_binary = my_binary;
+    this.my_binary = org.apache.thrift.TBaseHelper.copyBinary(my_binary);
   }
 
   public void unsetMy_binary() {
@@ -1567,315 +1550,315 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_my_bool = true && (isSetMy_bool());
-    builder.append(present_my_bool);
+    list.add(present_my_bool);
     if (present_my_bool)
-      builder.append(my_bool);
+      list.add(my_bool);
 
     boolean present_my_byte = true && (isSetMy_byte());
-    builder.append(present_my_byte);
+    list.add(present_my_byte);
     if (present_my_byte)
-      builder.append(my_byte);
+      list.add(my_byte);
 
     boolean present_my_16bit_int = true && (isSetMy_16bit_int());
-    builder.append(present_my_16bit_int);
+    list.add(present_my_16bit_int);
     if (present_my_16bit_int)
-      builder.append(my_16bit_int);
+      list.add(my_16bit_int);
 
     boolean present_my_32bit_int = true && (isSetMy_32bit_int());
-    builder.append(present_my_32bit_int);
+    list.add(present_my_32bit_int);
     if (present_my_32bit_int)
-      builder.append(my_32bit_int);
+      list.add(my_32bit_int);
 
     boolean present_my_64bit_int = true && (isSetMy_64bit_int());
-    builder.append(present_my_64bit_int);
+    list.add(present_my_64bit_int);
     if (present_my_64bit_int)
-      builder.append(my_64bit_int);
+      list.add(my_64bit_int);
 
     boolean present_my_double = true && (isSetMy_double());
-    builder.append(present_my_double);
+    list.add(present_my_double);
     if (present_my_double)
-      builder.append(my_double);
+      list.add(my_double);
 
     boolean present_my_string = true && (isSetMy_string());
-    builder.append(present_my_string);
+    list.add(present_my_string);
     if (present_my_string)
-      builder.append(my_string);
+      list.add(my_string);
 
     boolean present_my_binary = true && (isSetMy_binary());
-    builder.append(present_my_binary);
+    list.add(present_my_binary);
     if (present_my_binary)
-      builder.append(my_binary);
+      list.add(my_binary);
 
     boolean present_my_string_string_map = true && (isSetMy_string_string_map());
-    builder.append(present_my_string_string_map);
+    list.add(present_my_string_string_map);
     if (present_my_string_string_map)
-      builder.append(my_string_string_map);
+      list.add(my_string_string_map);
 
     boolean present_my_string_enum_map = true && (isSetMy_string_enum_map());
-    builder.append(present_my_string_enum_map);
+    list.add(present_my_string_enum_map);
     if (present_my_string_enum_map)
-      builder.append(my_string_enum_map);
+      list.add(my_string_enum_map);
 
     boolean present_my_enum_string_map = true && (isSetMy_enum_string_map());
-    builder.append(present_my_enum_string_map);
+    list.add(present_my_enum_string_map);
     if (present_my_enum_string_map)
-      builder.append(my_enum_string_map);
+      list.add(my_enum_string_map);
 
     boolean present_my_enum_struct_map = true && (isSetMy_enum_struct_map());
-    builder.append(present_my_enum_struct_map);
+    list.add(present_my_enum_struct_map);
     if (present_my_enum_struct_map)
-      builder.append(my_enum_struct_map);
+      list.add(my_enum_struct_map);
 
     boolean present_my_enum_stringlist_map = true && (isSetMy_enum_stringlist_map());
-    builder.append(present_my_enum_stringlist_map);
+    list.add(present_my_enum_stringlist_map);
     if (present_my_enum_stringlist_map)
-      builder.append(my_enum_stringlist_map);
+      list.add(my_enum_stringlist_map);
 
     boolean present_my_enum_structlist_map = true && (isSetMy_enum_structlist_map());
-    builder.append(present_my_enum_structlist_map);
+    list.add(present_my_enum_structlist_map);
     if (present_my_enum_structlist_map)
-      builder.append(my_enum_structlist_map);
+      list.add(my_enum_structlist_map);
 
     boolean present_my_stringlist = true && (isSetMy_stringlist());
-    builder.append(present_my_stringlist);
+    list.add(present_my_stringlist);
     if (present_my_stringlist)
-      builder.append(my_stringlist);
+      list.add(my_stringlist);
 
     boolean present_my_structlist = true && (isSetMy_structlist());
-    builder.append(present_my_structlist);
+    list.add(present_my_structlist);
     if (present_my_structlist)
-      builder.append(my_structlist);
+      list.add(my_structlist);
 
     boolean present_my_enumlist = true && (isSetMy_enumlist());
-    builder.append(present_my_enumlist);
+    list.add(present_my_enumlist);
     if (present_my_enumlist)
-      builder.append(my_enumlist);
+      list.add(my_enumlist);
 
     boolean present_my_stringset = true && (isSetMy_stringset());
-    builder.append(present_my_stringset);
+    list.add(present_my_stringset);
     if (present_my_stringset)
-      builder.append(my_stringset);
+      list.add(my_stringset);
 
     boolean present_my_enumset = true && (isSetMy_enumset());
-    builder.append(present_my_enumset);
+    list.add(present_my_enumset);
     if (present_my_enumset)
-      builder.append(my_enumset);
+      list.add(my_enumset);
 
     boolean present_my_structset = true && (isSetMy_structset());
-    builder.append(present_my_structset);
+    list.add(present_my_structset);
     if (present_my_structset)
-      builder.append(my_structset);
+      list.add(my_structset);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(MegaStruct other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    MegaStruct typedOther = (MegaStruct)other;
 
-    lastComparison = Boolean.valueOf(isSetMy_bool()).compareTo(typedOther.isSetMy_bool());
+    lastComparison = Boolean.valueOf(isSetMy_bool()).compareTo(other.isSetMy_bool());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_bool()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_bool, typedOther.my_bool);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_bool, other.my_bool);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_byte()).compareTo(typedOther.isSetMy_byte());
+    lastComparison = Boolean.valueOf(isSetMy_byte()).compareTo(other.isSetMy_byte());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_byte()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_byte, typedOther.my_byte);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_byte, other.my_byte);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_16bit_int()).compareTo(typedOther.isSetMy_16bit_int());
+    lastComparison = Boolean.valueOf(isSetMy_16bit_int()).compareTo(other.isSetMy_16bit_int());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_16bit_int()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_16bit_int, typedOther.my_16bit_int);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_16bit_int, other.my_16bit_int);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_32bit_int()).compareTo(typedOther.isSetMy_32bit_int());
+    lastComparison = Boolean.valueOf(isSetMy_32bit_int()).compareTo(other.isSetMy_32bit_int());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_32bit_int()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_32bit_int, typedOther.my_32bit_int);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_32bit_int, other.my_32bit_int);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_64bit_int()).compareTo(typedOther.isSetMy_64bit_int());
+    lastComparison = Boolean.valueOf(isSetMy_64bit_int()).compareTo(other.isSetMy_64bit_int());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_64bit_int()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_64bit_int, typedOther.my_64bit_int);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_64bit_int, other.my_64bit_int);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_double()).compareTo(typedOther.isSetMy_double());
+    lastComparison = Boolean.valueOf(isSetMy_double()).compareTo(other.isSetMy_double());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_double()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_double, typedOther.my_double);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_double, other.my_double);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_string()).compareTo(typedOther.isSetMy_string());
+    lastComparison = Boolean.valueOf(isSetMy_string()).compareTo(other.isSetMy_string());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_string()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_string, typedOther.my_string);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_string, other.my_string);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_binary()).compareTo(typedOther.isSetMy_binary());
+    lastComparison = Boolean.valueOf(isSetMy_binary()).compareTo(other.isSetMy_binary());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_binary()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_binary, typedOther.my_binary);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_binary, other.my_binary);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_string_string_map()).compareTo(typedOther.isSetMy_string_string_map());
+    lastComparison = Boolean.valueOf(isSetMy_string_string_map()).compareTo(other.isSetMy_string_string_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_string_string_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_string_string_map, typedOther.my_string_string_map);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_string_string_map, other.my_string_string_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_string_enum_map()).compareTo(typedOther.isSetMy_string_enum_map());
+    lastComparison = Boolean.valueOf(isSetMy_string_enum_map()).compareTo(other.isSetMy_string_enum_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_string_enum_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_string_enum_map, typedOther.my_string_enum_map);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_string_enum_map, other.my_string_enum_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_enum_string_map()).compareTo(typedOther.isSetMy_enum_string_map());
+    lastComparison = Boolean.valueOf(isSetMy_enum_string_map()).compareTo(other.isSetMy_enum_string_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_enum_string_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enum_string_map, typedOther.my_enum_string_map);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enum_string_map, other.my_enum_string_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_enum_struct_map()).compareTo(typedOther.isSetMy_enum_struct_map());
+    lastComparison = Boolean.valueOf(isSetMy_enum_struct_map()).compareTo(other.isSetMy_enum_struct_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_enum_struct_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enum_struct_map, typedOther.my_enum_struct_map);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enum_struct_map, other.my_enum_struct_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_enum_stringlist_map()).compareTo(typedOther.isSetMy_enum_stringlist_map());
+    lastComparison = Boolean.valueOf(isSetMy_enum_stringlist_map()).compareTo(other.isSetMy_enum_stringlist_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_enum_stringlist_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enum_stringlist_map, typedOther.my_enum_stringlist_map);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enum_stringlist_map, other.my_enum_stringlist_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_enum_structlist_map()).compareTo(typedOther.isSetMy_enum_structlist_map());
+    lastComparison = Boolean.valueOf(isSetMy_enum_structlist_map()).compareTo(other.isSetMy_enum_structlist_map());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_enum_structlist_map()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enum_structlist_map, typedOther.my_enum_structlist_map);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enum_structlist_map, other.my_enum_structlist_map);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_stringlist()).compareTo(typedOther.isSetMy_stringlist());
+    lastComparison = Boolean.valueOf(isSetMy_stringlist()).compareTo(other.isSetMy_stringlist());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_stringlist()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_stringlist, typedOther.my_stringlist);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_stringlist, other.my_stringlist);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_structlist()).compareTo(typedOther.isSetMy_structlist());
+    lastComparison = Boolean.valueOf(isSetMy_structlist()).compareTo(other.isSetMy_structlist());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_structlist()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_structlist, typedOther.my_structlist);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_structlist, other.my_structlist);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_enumlist()).compareTo(typedOther.isSetMy_enumlist());
+    lastComparison = Boolean.valueOf(isSetMy_enumlist()).compareTo(other.isSetMy_enumlist());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_enumlist()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enumlist, typedOther.my_enumlist);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enumlist, other.my_enumlist);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_stringset()).compareTo(typedOther.isSetMy_stringset());
+    lastComparison = Boolean.valueOf(isSetMy_stringset()).compareTo(other.isSetMy_stringset());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_stringset()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_stringset, typedOther.my_stringset);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_stringset, other.my_stringset);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_enumset()).compareTo(typedOther.isSetMy_enumset());
+    lastComparison = Boolean.valueOf(isSetMy_enumset()).compareTo(other.isSetMy_enumset());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_enumset()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enumset, typedOther.my_enumset);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_enumset, other.my_enumset);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMy_structset()).compareTo(typedOther.isSetMy_structset());
+    lastComparison = Boolean.valueOf(isSetMy_structset()).compareTo(other.isSetMy_structset());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMy_structset()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_structset, typedOther.my_structset);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.my_structset, other.my_structset);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -2189,13 +2172,13 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
                 struct.my_string_string_map = new HashMap<String,String>(2*_map0.size);
-                for (int _i1 = 0; _i1 < _map0.size; ++_i1)
+                String _key1;
+                String _val2;
+                for (int _i3 = 0; _i3 < _map0.size; ++_i3)
                 {
-                  String _key2; // required
-                  String _val3; // required
-                  _key2 = iprot.readString();
-                  _val3 = iprot.readString();
-                  struct.my_string_string_map.put(_key2, _val3);
+                  _key1 = iprot.readString();
+                  _val2 = iprot.readString();
+                  struct.my_string_string_map.put(_key1, _val2);
                 }
                 iprot.readMapEnd();
               }
@@ -2209,13 +2192,13 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin();
                 struct.my_string_enum_map = new HashMap<String,MyEnum>(2*_map4.size);
-                for (int _i5 = 0; _i5 < _map4.size; ++_i5)
+                String _key5;
+                MyEnum _val6;
+                for (int _i7 = 0; _i7 < _map4.size; ++_i7)
                 {
-                  String _key6; // required
-                  MyEnum _val7; // required
-                  _key6 = iprot.readString();
-                  _val7 = MyEnum.findByValue(iprot.readI32());
-                  struct.my_string_enum_map.put(_key6, _val7);
+                  _key5 = iprot.readString();
+                  _val6 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                  struct.my_string_enum_map.put(_key5, _val6);
                 }
                 iprot.readMapEnd();
               }
@@ -2229,13 +2212,13 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TMap _map8 = iprot.readMapBegin();
                 struct.my_enum_string_map = new HashMap<MyEnum,String>(2*_map8.size);
-                for (int _i9 = 0; _i9 < _map8.size; ++_i9)
+                MyEnum _key9;
+                String _val10;
+                for (int _i11 = 0; _i11 < _map8.size; ++_i11)
                 {
-                  MyEnum _key10; // required
-                  String _val11; // required
-                  _key10 = MyEnum.findByValue(iprot.readI32());
-                  _val11 = iprot.readString();
-                  struct.my_enum_string_map.put(_key10, _val11);
+                  _key9 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                  _val10 = iprot.readString();
+                  struct.my_enum_string_map.put(_key9, _val10);
                 }
                 iprot.readMapEnd();
               }
@@ -2249,14 +2232,14 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
                 struct.my_enum_struct_map = new HashMap<MyEnum,MiniStruct>(2*_map12.size);
-                for (int _i13 = 0; _i13 < _map12.size; ++_i13)
+                MyEnum _key13;
+                MiniStruct _val14;
+                for (int _i15 = 0; _i15 < _map12.size; ++_i15)
                 {
-                  MyEnum _key14; // required
-                  MiniStruct _val15; // required
-                  _key14 = MyEnum.findByValue(iprot.readI32());
-                  _val15 = new MiniStruct();
-                  _val15.read(iprot);
-                  struct.my_enum_struct_map.put(_key14, _val15);
+                  _key13 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                  _val14 = new MiniStruct();
+                  _val14.read(iprot);
+                  struct.my_enum_struct_map.put(_key13, _val14);
                 }
                 iprot.readMapEnd();
               }
@@ -2270,23 +2253,23 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
                 struct.my_enum_stringlist_map = new HashMap<MyEnum,List<String>>(2*_map16.size);
-                for (int _i17 = 0; _i17 < _map16.size; ++_i17)
+                MyEnum _key17;
+                List<String> _val18;
+                for (int _i19 = 0; _i19 < _map16.size; ++_i19)
                 {
-                  MyEnum _key18; // required
-                  List<String> _val19; // required
-                  _key18 = MyEnum.findByValue(iprot.readI32());
+                  _key17 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
                   {
                     org.apache.thrift.protocol.TList _list20 = iprot.readListBegin();
-                    _val19 = new ArrayList<String>(_list20.size);
-                    for (int _i21 = 0; _i21 < _list20.size; ++_i21)
+                    _val18 = new ArrayList<String>(_list20.size);
+                    String _elem21;
+                    for (int _i22 = 0; _i22 < _list20.size; ++_i22)
                     {
-                      String _elem22; // optional
-                      _elem22 = iprot.readString();
-                      _val19.add(_elem22);
+                      _elem21 = iprot.readString();
+                      _val18.add(_elem21);
                     }
                     iprot.readListEnd();
                   }
-                  struct.my_enum_stringlist_map.put(_key18, _val19);
+                  struct.my_enum_stringlist_map.put(_key17, _val18);
                 }
                 iprot.readMapEnd();
               }
@@ -2300,24 +2283,24 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TMap _map23 = iprot.readMapBegin();
                 struct.my_enum_structlist_map = new HashMap<MyEnum,List<MiniStruct>>(2*_map23.size);
-                for (int _i24 = 0; _i24 < _map23.size; ++_i24)
+                MyEnum _key24;
+                List<MiniStruct> _val25;
+                for (int _i26 = 0; _i26 < _map23.size; ++_i26)
                 {
-                  MyEnum _key25; // required
-                  List<MiniStruct> _val26; // required
-                  _key25 = MyEnum.findByValue(iprot.readI32());
+                  _key24 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
                   {
                     org.apache.thrift.protocol.TList _list27 = iprot.readListBegin();
-                    _val26 = new ArrayList<MiniStruct>(_list27.size);
-                    for (int _i28 = 0; _i28 < _list27.size; ++_i28)
+                    _val25 = new ArrayList<MiniStruct>(_list27.size);
+                    MiniStruct _elem28;
+                    for (int _i29 = 0; _i29 < _list27.size; ++_i29)
                     {
-                      MiniStruct _elem29; // optional
-                      _elem29 = new MiniStruct();
-                      _elem29.read(iprot);
-                      _val26.add(_elem29);
+                      _elem28 = new MiniStruct();
+                      _elem28.read(iprot);
+                      _val25.add(_elem28);
                     }
                     iprot.readListEnd();
                   }
-                  struct.my_enum_structlist_map.put(_key25, _val26);
+                  struct.my_enum_structlist_map.put(_key24, _val25);
                 }
                 iprot.readMapEnd();
               }
@@ -2331,11 +2314,11 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
                 struct.my_stringlist = new ArrayList<String>(_list30.size);
-                for (int _i31 = 0; _i31 < _list30.size; ++_i31)
+                String _elem31;
+                for (int _i32 = 0; _i32 < _list30.size; ++_i32)
                 {
-                  String _elem32; // optional
-                  _elem32 = iprot.readString();
-                  struct.my_stringlist.add(_elem32);
+                  _elem31 = iprot.readString();
+                  struct.my_stringlist.add(_elem31);
                 }
                 iprot.readListEnd();
               }
@@ -2349,12 +2332,12 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TList _list33 = iprot.readListBegin();
                 struct.my_structlist = new ArrayList<MiniStruct>(_list33.size);
-                for (int _i34 = 0; _i34 < _list33.size; ++_i34)
+                MiniStruct _elem34;
+                for (int _i35 = 0; _i35 < _list33.size; ++_i35)
                 {
-                  MiniStruct _elem35; // optional
-                  _elem35 = new MiniStruct();
-                  _elem35.read(iprot);
-                  struct.my_structlist.add(_elem35);
+                  _elem34 = new MiniStruct();
+                  _elem34.read(iprot);
+                  struct.my_structlist.add(_elem34);
                 }
                 iprot.readListEnd();
               }
@@ -2368,11 +2351,11 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TList _list36 = iprot.readListBegin();
                 struct.my_enumlist = new ArrayList<MyEnum>(_list36.size);
-                for (int _i37 = 0; _i37 < _list36.size; ++_i37)
+                MyEnum _elem37;
+                for (int _i38 = 0; _i38 < _list36.size; ++_i38)
                 {
-                  MyEnum _elem38; // optional
-                  _elem38 = MyEnum.findByValue(iprot.readI32());
-                  struct.my_enumlist.add(_elem38);
+                  _elem37 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                  struct.my_enumlist.add(_elem37);
                 }
                 iprot.readListEnd();
               }
@@ -2386,11 +2369,11 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TSet _set39 = iprot.readSetBegin();
                 struct.my_stringset = new HashSet<String>(2*_set39.size);
-                for (int _i40 = 0; _i40 < _set39.size; ++_i40)
+                String _elem40;
+                for (int _i41 = 0; _i41 < _set39.size; ++_i41)
                 {
-                  String _elem41; // optional
-                  _elem41 = iprot.readString();
-                  struct.my_stringset.add(_elem41);
+                  _elem40 = iprot.readString();
+                  struct.my_stringset.add(_elem40);
                 }
                 iprot.readSetEnd();
               }
@@ -2404,11 +2387,11 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TSet _set42 = iprot.readSetBegin();
                 struct.my_enumset = new HashSet<MyEnum>(2*_set42.size);
-                for (int _i43 = 0; _i43 < _set42.size; ++_i43)
+                MyEnum _elem43;
+                for (int _i44 = 0; _i44 < _set42.size; ++_i44)
                 {
-                  MyEnum _elem44; // optional
-                  _elem44 = MyEnum.findByValue(iprot.readI32());
-                  struct.my_enumset.add(_elem44);
+                  _elem43 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+                  struct.my_enumset.add(_elem43);
                 }
                 iprot.readSetEnd();
               }
@@ -2422,12 +2405,12 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
               {
                 org.apache.thrift.protocol.TSet _set45 = iprot.readSetBegin();
                 struct.my_structset = new HashSet<MiniStruct>(2*_set45.size);
-                for (int _i46 = 0; _i46 < _set45.size; ++_i46)
+                MiniStruct _elem46;
+                for (int _i47 = 0; _i47 < _set45.size; ++_i47)
                 {
-                  MiniStruct _elem47; // optional
-                  _elem47 = new MiniStruct();
-                  _elem47.read(iprot);
-                  struct.my_structset.add(_elem47);
+                  _elem46 = new MiniStruct();
+                  _elem46.read(iprot);
+                  struct.my_structset.add(_elem46);
                 }
                 iprot.readSetEnd();
               }
@@ -2952,13 +2935,13 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TMap _map76 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.my_string_string_map = new HashMap<String,String>(2*_map76.size);
-          for (int _i77 = 0; _i77 < _map76.size; ++_i77)
+          String _key77;
+          String _val78;
+          for (int _i79 = 0; _i79 < _map76.size; ++_i79)
           {
-            String _key78; // required
-            String _val79; // required
-            _key78 = iprot.readString();
-            _val79 = iprot.readString();
-            struct.my_string_string_map.put(_key78, _val79);
+            _key77 = iprot.readString();
+            _val78 = iprot.readString();
+            struct.my_string_string_map.put(_key77, _val78);
           }
         }
         struct.setMy_string_string_mapIsSet(true);
@@ -2967,13 +2950,13 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I32, iprot.readI32());
           struct.my_string_enum_map = new HashMap<String,MyEnum>(2*_map80.size);
-          for (int _i81 = 0; _i81 < _map80.size; ++_i81)
+          String _key81;
+          MyEnum _val82;
+          for (int _i83 = 0; _i83 < _map80.size; ++_i83)
           {
-            String _key82; // required
-            MyEnum _val83; // required
-            _key82 = iprot.readString();
-            _val83 = MyEnum.findByValue(iprot.readI32());
-            struct.my_string_enum_map.put(_key82, _val83);
+            _key81 = iprot.readString();
+            _val82 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+            struct.my_string_enum_map.put(_key81, _val82);
           }
         }
         struct.setMy_string_enum_mapIsSet(true);
@@ -2982,13 +2965,13 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.my_enum_string_map = new HashMap<MyEnum,String>(2*_map84.size);
-          for (int _i85 = 0; _i85 < _map84.size; ++_i85)
+          MyEnum _key85;
+          String _val86;
+          for (int _i87 = 0; _i87 < _map84.size; ++_i87)
           {
-            MyEnum _key86; // required
-            String _val87; // required
-            _key86 = MyEnum.findByValue(iprot.readI32());
-            _val87 = iprot.readString();
-            struct.my_enum_string_map.put(_key86, _val87);
+            _key85 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+            _val86 = iprot.readString();
+            struct.my_enum_string_map.put(_key85, _val86);
           }
         }
         struct.setMy_enum_string_mapIsSet(true);
@@ -2997,14 +2980,14 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TMap _map88 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.my_enum_struct_map = new HashMap<MyEnum,MiniStruct>(2*_map88.size);
-          for (int _i89 = 0; _i89 < _map88.size; ++_i89)
+          MyEnum _key89;
+          MiniStruct _val90;
+          for (int _i91 = 0; _i91 < _map88.size; ++_i91)
           {
-            MyEnum _key90; // required
-            MiniStruct _val91; // required
-            _key90 = MyEnum.findByValue(iprot.readI32());
-            _val91 = new MiniStruct();
-            _val91.read(iprot);
-            struct.my_enum_struct_map.put(_key90, _val91);
+            _key89 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+            _val90 = new MiniStruct();
+            _val90.read(iprot);
+            struct.my_enum_struct_map.put(_key89, _val90);
           }
         }
         struct.setMy_enum_struct_mapIsSet(true);
@@ -3013,22 +2996,22 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TMap _map92 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
           struct.my_enum_stringlist_map = new HashMap<MyEnum,List<String>>(2*_map92.size);
-          for (int _i93 = 0; _i93 < _map92.size; ++_i93)
+          MyEnum _key93;
+          List<String> _val94;
+          for (int _i95 = 0; _i95 < _map92.size; ++_i95)
           {
-            MyEnum _key94; // required
-            List<String> _val95; // required
-            _key94 = MyEnum.findByValue(iprot.readI32());
+            _key93 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
             {
               org.apache.thrift.protocol.TList _list96 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-              _val95 = new ArrayList<String>(_list96.size);
-              for (int _i97 = 0; _i97 < _list96.size; ++_i97)
+              _val94 = new ArrayList<String>(_list96.size);
+              String _elem97;
+              for (int _i98 = 0; _i98 < _list96.size; ++_i98)
               {
-                String _elem98; // optional
-                _elem98 = iprot.readString();
-                _val95.add(_elem98);
+                _elem97 = iprot.readString();
+                _val94.add(_elem97);
               }
             }
-            struct.my_enum_stringlist_map.put(_key94, _val95);
+            struct.my_enum_stringlist_map.put(_key93, _val94);
           }
         }
         struct.setMy_enum_stringlist_mapIsSet(true);
@@ -3037,23 +3020,23 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TMap _map99 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
           struct.my_enum_structlist_map = new HashMap<MyEnum,List<MiniStruct>>(2*_map99.size);
-          for (int _i100 = 0; _i100 < _map99.size; ++_i100)
+          MyEnum _key100;
+          List<MiniStruct> _val101;
+          for (int _i102 = 0; _i102 < _map99.size; ++_i102)
           {
-            MyEnum _key101; // required
-            List<MiniStruct> _val102; // required
-            _key101 = MyEnum.findByValue(iprot.readI32());
+            _key100 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
             {
               org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-              _val102 = new ArrayList<MiniStruct>(_list103.size);
-              for (int _i104 = 0; _i104 < _list103.size; ++_i104)
+              _val101 = new ArrayList<MiniStruct>(_list103.size);
+              MiniStruct _elem104;
+              for (int _i105 = 0; _i105 < _list103.size; ++_i105)
               {
-                MiniStruct _elem105; // optional
-                _elem105 = new MiniStruct();
-                _elem105.read(iprot);
-                _val102.add(_elem105);
+                _elem104 = new MiniStruct();
+                _elem104.read(iprot);
+                _val101.add(_elem104);
               }
             }
-            struct.my_enum_structlist_map.put(_key101, _val102);
+            struct.my_enum_structlist_map.put(_key100, _val101);
           }
         }
         struct.setMy_enum_structlist_mapIsSet(true);
@@ -3062,11 +3045,11 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TList _list106 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.my_stringlist = new ArrayList<String>(_list106.size);
-          for (int _i107 = 0; _i107 < _list106.size; ++_i107)
+          String _elem107;
+          for (int _i108 = 0; _i108 < _list106.size; ++_i108)
           {
-            String _elem108; // optional
-            _elem108 = iprot.readString();
-            struct.my_stringlist.add(_elem108);
+            _elem107 = iprot.readString();
+            struct.my_stringlist.add(_elem107);
           }
         }
         struct.setMy_stringlistIsSet(true);
@@ -3075,12 +3058,12 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TList _list109 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.my_structlist = new ArrayList<MiniStruct>(_list109.size);
-          for (int _i110 = 0; _i110 < _list109.size; ++_i110)
+          MiniStruct _elem110;
+          for (int _i111 = 0; _i111 < _list109.size; ++_i111)
           {
-            MiniStruct _elem111; // optional
-            _elem111 = new MiniStruct();
-            _elem111.read(iprot);
-            struct.my_structlist.add(_elem111);
+            _elem110 = new MiniStruct();
+            _elem110.read(iprot);
+            struct.my_structlist.add(_elem110);
           }
         }
         struct.setMy_structlistIsSet(true);
@@ -3089,11 +3072,11 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TList _list112 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
           struct.my_enumlist = new ArrayList<MyEnum>(_list112.size);
-          for (int _i113 = 0; _i113 < _list112.size; ++_i113)
+          MyEnum _elem113;
+          for (int _i114 = 0; _i114 < _list112.size; ++_i114)
           {
-            MyEnum _elem114; // optional
-            _elem114 = MyEnum.findByValue(iprot.readI32());
-            struct.my_enumlist.add(_elem114);
+            _elem113 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+            struct.my_enumlist.add(_elem113);
           }
         }
         struct.setMy_enumlistIsSet(true);
@@ -3102,11 +3085,11 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TSet _set115 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.my_stringset = new HashSet<String>(2*_set115.size);
-          for (int _i116 = 0; _i116 < _set115.size; ++_i116)
+          String _elem116;
+          for (int _i117 = 0; _i117 < _set115.size; ++_i117)
           {
-            String _elem117; // optional
-            _elem117 = iprot.readString();
-            struct.my_stringset.add(_elem117);
+            _elem116 = iprot.readString();
+            struct.my_stringset.add(_elem116);
           }
         }
         struct.setMy_stringsetIsSet(true);
@@ -3115,11 +3098,11 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TSet _set118 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
           struct.my_enumset = new HashSet<MyEnum>(2*_set118.size);
-          for (int _i119 = 0; _i119 < _set118.size; ++_i119)
+          MyEnum _elem119;
+          for (int _i120 = 0; _i120 < _set118.size; ++_i120)
           {
-            MyEnum _elem120; // optional
-            _elem120 = MyEnum.findByValue(iprot.readI32());
-            struct.my_enumset.add(_elem120);
+            _elem119 = org.apache.hadoop.hive.serde2.thrift.test.MyEnum.findByValue(iprot.readI32());
+            struct.my_enumset.add(_elem119);
           }
         }
         struct.setMy_enumsetIsSet(true);
@@ -3128,12 +3111,12 @@ public class MegaStruct implements org.apache.thrift.TBase<MegaStruct, MegaStruc
         {
           org.apache.thrift.protocol.TSet _set121 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.my_structset = new HashSet<MiniStruct>(2*_set121.size);
-          for (int _i122 = 0; _i122 < _set121.size; ++_i122)
+          MiniStruct _elem122;
+          for (int _i123 = 0; _i123 < _set121.size; ++_i123)
           {
-            MiniStruct _elem123; // optional
-            _elem123 = new MiniStruct();
-            _elem123.read(iprot);
-            struct.my_structset.add(_elem123);
+            _elem122 = new MiniStruct();
+            _elem122.read(iprot);
+            struct.my_structset.add(_elem122);
           }
         }
         struct.setMy_structsetIsSet(true);


Mime
View raw message