http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
index ab5c0ed..f1a3c0a 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.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.metastore.api;
 
-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 SkewedInfo implements org.apache.thrift.TBase<SkewedInfo, 
SkewedInfo._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 SkewedInfo implements org.apache.thrift.TBase<SkewedInfo, 
SkewedInfo._Fields>, java.io.Serializable, Cloneable, Comparable<SkewedInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("SkewedInfo");
 
   private static final org.apache.thrift.protocol.TField 
SKEWED_COL_NAMES_FIELD_DESC = new 
org.apache.thrift.protocol.TField("skewedColNames", 
org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -151,34 +155,25 @@ public class SkewedInfo implements 
org.apache.thrift.TBase<SkewedInfo, SkewedInf
    */
   public SkewedInfo(SkewedInfo other) {
     if (other.isSetSkewedColNames()) {
-      List<String> __this__skewedColNames = new ArrayList<String>();
-      for (String other_element : other.skewedColNames) {
-        __this__skewedColNames.add(other_element);
-      }
+      List<String> __this__skewedColNames = new 
ArrayList<String>(other.skewedColNames);
       this.skewedColNames = __this__skewedColNames;
     }
     if (other.isSetSkewedColValues()) {
-      List<List<String>> __this__skewedColValues = new 
ArrayList<List<String>>();
+      List<List<String>> __this__skewedColValues = new 
ArrayList<List<String>>(other.skewedColValues.size());
       for (List<String> other_element : other.skewedColValues) {
-        List<String> __this__skewedColValues_copy = new ArrayList<String>();
-        for (String other_element_element : other_element) {
-          __this__skewedColValues_copy.add(other_element_element);
-        }
+        List<String> __this__skewedColValues_copy = new 
ArrayList<String>(other_element);
         __this__skewedColValues.add(__this__skewedColValues_copy);
       }
       this.skewedColValues = __this__skewedColValues;
     }
     if (other.isSetSkewedColValueLocationMaps()) {
-      Map<List<String>,String> __this__skewedColValueLocationMaps = new 
HashMap<List<String>,String>();
+      Map<List<String>,String> __this__skewedColValueLocationMaps = new 
HashMap<List<String>,String>(other.skewedColValueLocationMaps.size());
       for (Map.Entry<List<String>, String> other_element : 
other.skewedColValueLocationMaps.entrySet()) {
 
         List<String> other_element_key = other_element.getKey();
         String other_element_value = other_element.getValue();
 
-        List<String> __this__skewedColValueLocationMaps_copy_key = new 
ArrayList<String>();
-        for (String other_element_key_element : other_element_key) {
-          
__this__skewedColValueLocationMaps_copy_key.add(other_element_key_element);
-        }
+        List<String> __this__skewedColValueLocationMaps_copy_key = new 
ArrayList<String>(other_element_key);
 
         String __this__skewedColValueLocationMaps_copy_value = 
other_element_value;
 
@@ -415,60 +410,60 @@ public class SkewedInfo implements 
org.apache.thrift.TBase<SkewedInfo, SkewedInf
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_skewedColNames = true && (isSetSkewedColNames());
-    builder.append(present_skewedColNames);
+    list.add(present_skewedColNames);
     if (present_skewedColNames)
-      builder.append(skewedColNames);
+      list.add(skewedColNames);
 
     boolean present_skewedColValues = true && (isSetSkewedColValues());
-    builder.append(present_skewedColValues);
+    list.add(present_skewedColValues);
     if (present_skewedColValues)
-      builder.append(skewedColValues);
+      list.add(skewedColValues);
 
     boolean present_skewedColValueLocationMaps = true && 
(isSetSkewedColValueLocationMaps());
-    builder.append(present_skewedColValueLocationMaps);
+    list.add(present_skewedColValueLocationMaps);
     if (present_skewedColValueLocationMaps)
-      builder.append(skewedColValueLocationMaps);
+      list.add(skewedColValueLocationMaps);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(SkewedInfo other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    SkewedInfo typedOther = (SkewedInfo)other;
 
-    lastComparison = 
Boolean.valueOf(isSetSkewedColNames()).compareTo(typedOther.isSetSkewedColNames());
+    lastComparison = 
Boolean.valueOf(isSetSkewedColNames()).compareTo(other.isSetSkewedColNames());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSkewedColNames()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.skewedColNames, 
typedOther.skewedColNames);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.skewedColNames, 
other.skewedColNames);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSkewedColValues()).compareTo(typedOther.isSetSkewedColValues());
+    lastComparison = 
Boolean.valueOf(isSetSkewedColValues()).compareTo(other.isSetSkewedColValues());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSkewedColValues()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.skewedColValues, 
typedOther.skewedColValues);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.skewedColValues, 
other.skewedColValues);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSkewedColValueLocationMaps()).compareTo(typedOther.isSetSkewedColValueLocationMaps());
+    lastComparison = 
Boolean.valueOf(isSetSkewedColValueLocationMaps()).compareTo(other.isSetSkewedColValueLocationMaps());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSkewedColValueLocationMaps()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.skewedColValueLocationMaps, 
typedOther.skewedColValueLocationMaps);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.skewedColValueLocationMaps, 
other.skewedColValueLocationMaps);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -564,11 +559,11 @@ public class SkewedInfo implements 
org.apache.thrift.TBase<SkewedInfo, SkewedInf
               {
                 org.apache.thrift.protocol.TList _list114 = 
iprot.readListBegin();
                 struct.skewedColNames = new ArrayList<String>(_list114.size);
-                for (int _i115 = 0; _i115 < _list114.size; ++_i115)
+                String _elem115;
+                for (int _i116 = 0; _i116 < _list114.size; ++_i116)
                 {
-                  String _elem116; // optional
-                  _elem116 = iprot.readString();
-                  struct.skewedColNames.add(_elem116);
+                  _elem115 = iprot.readString();
+                  struct.skewedColNames.add(_elem115);
                 }
                 iprot.readListEnd();
               }
@@ -582,21 +577,21 @@ public class SkewedInfo implements 
org.apache.thrift.TBase<SkewedInfo, SkewedInf
               {
                 org.apache.thrift.protocol.TList _list117 = 
iprot.readListBegin();
                 struct.skewedColValues = new 
ArrayList<List<String>>(_list117.size);
-                for (int _i118 = 0; _i118 < _list117.size; ++_i118)
+                List<String> _elem118;
+                for (int _i119 = 0; _i119 < _list117.size; ++_i119)
                 {
-                  List<String> _elem119; // optional
                   {
                     org.apache.thrift.protocol.TList _list120 = 
iprot.readListBegin();
-                    _elem119 = new ArrayList<String>(_list120.size);
-                    for (int _i121 = 0; _i121 < _list120.size; ++_i121)
+                    _elem118 = new ArrayList<String>(_list120.size);
+                    String _elem121;
+                    for (int _i122 = 0; _i122 < _list120.size; ++_i122)
                     {
-                      String _elem122; // optional
-                      _elem122 = iprot.readString();
-                      _elem119.add(_elem122);
+                      _elem121 = iprot.readString();
+                      _elem118.add(_elem121);
                     }
                     iprot.readListEnd();
                   }
-                  struct.skewedColValues.add(_elem119);
+                  struct.skewedColValues.add(_elem118);
                 }
                 iprot.readListEnd();
               }
@@ -610,23 +605,23 @@ public class SkewedInfo implements 
org.apache.thrift.TBase<SkewedInfo, SkewedInf
               {
                 org.apache.thrift.protocol.TMap _map123 = iprot.readMapBegin();
                 struct.skewedColValueLocationMaps = new 
HashMap<List<String>,String>(2*_map123.size);
-                for (int _i124 = 0; _i124 < _map123.size; ++_i124)
+                List<String> _key124;
+                String _val125;
+                for (int _i126 = 0; _i126 < _map123.size; ++_i126)
                 {
-                  List<String> _key125; // required
-                  String _val126; // required
                   {
                     org.apache.thrift.protocol.TList _list127 = 
iprot.readListBegin();
-                    _key125 = new ArrayList<String>(_list127.size);
-                    for (int _i128 = 0; _i128 < _list127.size; ++_i128)
+                    _key124 = new ArrayList<String>(_list127.size);
+                    String _elem128;
+                    for (int _i129 = 0; _i129 < _list127.size; ++_i129)
                     {
-                      String _elem129; // optional
-                      _elem129 = iprot.readString();
-                      _key125.add(_elem129);
+                      _elem128 = iprot.readString();
+                      _key124.add(_elem128);
                     }
                     iprot.readListEnd();
                   }
-                  _val126 = iprot.readString();
-                  struct.skewedColValueLocationMaps.put(_key125, _val126);
+                  _val125 = iprot.readString();
+                  struct.skewedColValueLocationMaps.put(_key124, _val125);
                 }
                 iprot.readMapEnd();
               }
@@ -777,11 +772,11 @@ public class SkewedInfo implements 
org.apache.thrift.TBase<SkewedInfo, SkewedInf
         {
           org.apache.thrift.protocol.TList _list140 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
           struct.skewedColNames = new ArrayList<String>(_list140.size);
-          for (int _i141 = 0; _i141 < _list140.size; ++_i141)
+          String _elem141;
+          for (int _i142 = 0; _i142 < _list140.size; ++_i142)
           {
-            String _elem142; // optional
-            _elem142 = iprot.readString();
-            struct.skewedColNames.add(_elem142);
+            _elem141 = iprot.readString();
+            struct.skewedColNames.add(_elem141);
           }
         }
         struct.setSkewedColNamesIsSet(true);
@@ -790,20 +785,20 @@ public class SkewedInfo implements 
org.apache.thrift.TBase<SkewedInfo, SkewedInf
         {
           org.apache.thrift.protocol.TList _list143 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.LIST, 
iprot.readI32());
           struct.skewedColValues = new ArrayList<List<String>>(_list143.size);
-          for (int _i144 = 0; _i144 < _list143.size; ++_i144)
+          List<String> _elem144;
+          for (int _i145 = 0; _i145 < _list143.size; ++_i145)
           {
-            List<String> _elem145; // optional
             {
               org.apache.thrift.protocol.TList _list146 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-              _elem145 = new ArrayList<String>(_list146.size);
-              for (int _i147 = 0; _i147 < _list146.size; ++_i147)
+              _elem144 = new ArrayList<String>(_list146.size);
+              String _elem147;
+              for (int _i148 = 0; _i148 < _list146.size; ++_i148)
               {
-                String _elem148; // optional
-                _elem148 = iprot.readString();
-                _elem145.add(_elem148);
+                _elem147 = iprot.readString();
+                _elem144.add(_elem147);
               }
             }
-            struct.skewedColValues.add(_elem145);
+            struct.skewedColValues.add(_elem144);
           }
         }
         struct.setSkewedColValuesIsSet(true);
@@ -812,22 +807,22 @@ public class SkewedInfo implements 
org.apache.thrift.TBase<SkewedInfo, SkewedInf
         {
           org.apache.thrift.protocol.TMap _map149 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.LIST, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.skewedColValueLocationMaps = new 
HashMap<List<String>,String>(2*_map149.size);
-          for (int _i150 = 0; _i150 < _map149.size; ++_i150)
+          List<String> _key150;
+          String _val151;
+          for (int _i152 = 0; _i152 < _map149.size; ++_i152)
           {
-            List<String> _key151; // required
-            String _val152; // required
             {
               org.apache.thrift.protocol.TList _list153 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
-              _key151 = new ArrayList<String>(_list153.size);
-              for (int _i154 = 0; _i154 < _list153.size; ++_i154)
+              _key150 = new ArrayList<String>(_list153.size);
+              String _elem154;
+              for (int _i155 = 0; _i155 < _list153.size; ++_i155)
               {
-                String _elem155; // optional
-                _elem155 = iprot.readString();
-                _key151.add(_elem155);
+                _elem154 = iprot.readString();
+                _key150.add(_elem154);
               }
             }
-            _val152 = iprot.readString();
-            struct.skewedColValueLocationMaps.put(_key151, _val152);
+            _val151 = iprot.readString();
+            struct.skewedColValueLocationMaps.put(_key150, _val151);
           }
         }
         struct.setSkewedColValueLocationMapsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
index 813b4f0..13e85e6 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.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.metastore.api;
 
-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 StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescriptor, StorageDescriptor._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 StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescriptor, StorageDescriptor._Fields>, 
java.io.Serializable, Cloneable, Comparable<StorageDescriptor> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("StorageDescriptor");
 
   private static final org.apache.thrift.protocol.TField COLS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("cols", 
org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -162,7 +166,7 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
   private static final int __NUMBUCKETS_ISSET_ID = 1;
   private static final int __STOREDASSUBDIRECTORIES_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = 
{_Fields.SKEWED_INFO,_Fields.STORED_AS_SUB_DIRECTORIES};
+  private static final _Fields optionals[] = 
{_Fields.SKEWED_INFO,_Fields.STORED_AS_SUB_DIRECTORIES};
   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);
@@ -216,17 +220,17 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
   {
     this();
     this.cols = cols;
-    this.location = location;
-    this.inputFormat = inputFormat;
-    this.outputFormat = outputFormat;
+    this.location = 
org.apache.hive.common.util.HiveStringUtils.intern(location);
+    this.inputFormat = 
org.apache.hive.common.util.HiveStringUtils.intern(inputFormat);
+    this.outputFormat = 
org.apache.hive.common.util.HiveStringUtils.intern(outputFormat);
     this.compressed = compressed;
     setCompressedIsSet(true);
     this.numBuckets = numBuckets;
     setNumBucketsIsSet(true);
     this.serdeInfo = serdeInfo;
-    this.bucketCols = bucketCols;
+    this.bucketCols = 
org.apache.hive.common.util.HiveStringUtils.intern(bucketCols);
     this.sortCols = sortCols;
-    this.parameters = parameters;
+    this.parameters = 
org.apache.hive.common.util.HiveStringUtils.intern(parameters);
   }
 
   /**
@@ -235,20 +239,20 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
   public StorageDescriptor(StorageDescriptor other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetCols()) {
-      List<FieldSchema> __this__cols = new ArrayList<FieldSchema>();
+      List<FieldSchema> __this__cols = new 
ArrayList<FieldSchema>(other.cols.size());
       for (FieldSchema other_element : other.cols) {
         __this__cols.add(new FieldSchema(other_element));
       }
       this.cols = __this__cols;
     }
     if (other.isSetLocation()) {
-      this.location = other.location;
+      this.location = 
org.apache.hive.common.util.HiveStringUtils.intern(other.location);
     }
     if (other.isSetInputFormat()) {
-      this.inputFormat = other.inputFormat;
+      this.inputFormat = 
org.apache.hive.common.util.HiveStringUtils.intern(other.inputFormat);
     }
     if (other.isSetOutputFormat()) {
-      this.outputFormat = other.outputFormat;
+      this.outputFormat = 
org.apache.hive.common.util.HiveStringUtils.intern(other.outputFormat);
     }
     this.compressed = other.compressed;
     this.numBuckets = other.numBuckets;
@@ -256,32 +260,18 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
       this.serdeInfo = new SerDeInfo(other.serdeInfo);
     }
     if (other.isSetBucketCols()) {
-      List<String> __this__bucketCols = new ArrayList<String>();
-      for (String other_element : other.bucketCols) {
-        __this__bucketCols.add(other_element);
-      }
+      List<String> __this__bucketCols = new 
ArrayList<String>(other.bucketCols);
       this.bucketCols = __this__bucketCols;
     }
     if (other.isSetSortCols()) {
-      List<Order> __this__sortCols = new ArrayList<Order>();
+      List<Order> __this__sortCols = new 
ArrayList<Order>(other.sortCols.size());
       for (Order other_element : other.sortCols) {
         __this__sortCols.add(new Order(other_element));
       }
       this.sortCols = __this__sortCols;
     }
     if (other.isSetParameters()) {
-      Map<String,String> __this__parameters = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : 
other.parameters.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__parameters_copy_key = other_element_key;
-
-        String __this__parameters_copy_value = other_element_value;
-
-        __this__parameters.put(__this__parameters_copy_key, 
__this__parameters_copy_value);
-      }
+      Map<String,String> __this__parameters = new 
HashMap<String,String>(other.parameters);
       this.parameters = __this__parameters;
     }
     if (other.isSetSkewedInfo()) {
@@ -356,7 +346,7 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
   }
 
   public void setLocation(String location) {
-    this.location = location;
+    this.location = 
org.apache.hive.common.util.HiveStringUtils.intern(location);
   }
 
   public void unsetLocation() {
@@ -379,7 +369,7 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
   }
 
   public void setInputFormat(String inputFormat) {
-    this.inputFormat = inputFormat;
+    this.inputFormat = 
org.apache.hive.common.util.HiveStringUtils.intern(inputFormat);
   }
 
   public void unsetInputFormat() {
@@ -402,7 +392,7 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
   }
 
   public void setOutputFormat(String outputFormat) {
-    this.outputFormat = outputFormat;
+    this.outputFormat = 
org.apache.hive.common.util.HiveStringUtils.intern(outputFormat);
   }
 
   public void unsetOutputFormat() {
@@ -507,7 +497,7 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
   }
 
   public void setBucketCols(List<String> bucketCols) {
-    this.bucketCols = bucketCols;
+    this.bucketCols = 
org.apache.hive.common.util.HiveStringUtils.intern(bucketCols);
   }
 
   public void unsetBucketCols() {
@@ -579,7 +569,7 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
   }
 
   public void setParameters(Map<String,String> parameters) {
-    this.parameters = parameters;
+    this.parameters = 
org.apache.hive.common.util.HiveStringUtils.intern(parameters);
   }
 
   public void unsetParameters() {
@@ -946,195 +936,195 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_cols = true && (isSetCols());
-    builder.append(present_cols);
+    list.add(present_cols);
     if (present_cols)
-      builder.append(cols);
+      list.add(cols);
 
     boolean present_location = true && (isSetLocation());
-    builder.append(present_location);
+    list.add(present_location);
     if (present_location)
-      builder.append(location);
+      list.add(location);
 
     boolean present_inputFormat = true && (isSetInputFormat());
-    builder.append(present_inputFormat);
+    list.add(present_inputFormat);
     if (present_inputFormat)
-      builder.append(inputFormat);
+      list.add(inputFormat);
 
     boolean present_outputFormat = true && (isSetOutputFormat());
-    builder.append(present_outputFormat);
+    list.add(present_outputFormat);
     if (present_outputFormat)
-      builder.append(outputFormat);
+      list.add(outputFormat);
 
     boolean present_compressed = true;
-    builder.append(present_compressed);
+    list.add(present_compressed);
     if (present_compressed)
-      builder.append(compressed);
+      list.add(compressed);
 
     boolean present_numBuckets = true;
-    builder.append(present_numBuckets);
+    list.add(present_numBuckets);
     if (present_numBuckets)
-      builder.append(numBuckets);
+      list.add(numBuckets);
 
     boolean present_serdeInfo = true && (isSetSerdeInfo());
-    builder.append(present_serdeInfo);
+    list.add(present_serdeInfo);
     if (present_serdeInfo)
-      builder.append(serdeInfo);
+      list.add(serdeInfo);
 
     boolean present_bucketCols = true && (isSetBucketCols());
-    builder.append(present_bucketCols);
+    list.add(present_bucketCols);
     if (present_bucketCols)
-      builder.append(bucketCols);
+      list.add(bucketCols);
 
     boolean present_sortCols = true && (isSetSortCols());
-    builder.append(present_sortCols);
+    list.add(present_sortCols);
     if (present_sortCols)
-      builder.append(sortCols);
+      list.add(sortCols);
 
     boolean present_parameters = true && (isSetParameters());
-    builder.append(present_parameters);
+    list.add(present_parameters);
     if (present_parameters)
-      builder.append(parameters);
+      list.add(parameters);
 
     boolean present_skewedInfo = true && (isSetSkewedInfo());
-    builder.append(present_skewedInfo);
+    list.add(present_skewedInfo);
     if (present_skewedInfo)
-      builder.append(skewedInfo);
+      list.add(skewedInfo);
 
     boolean present_storedAsSubDirectories = true && 
(isSetStoredAsSubDirectories());
-    builder.append(present_storedAsSubDirectories);
+    list.add(present_storedAsSubDirectories);
     if (present_storedAsSubDirectories)
-      builder.append(storedAsSubDirectories);
+      list.add(storedAsSubDirectories);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(StorageDescriptor other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    StorageDescriptor typedOther = (StorageDescriptor)other;
 
-    lastComparison = 
Boolean.valueOf(isSetCols()).compareTo(typedOther.isSetCols());
+    lastComparison = Boolean.valueOf(isSetCols()).compareTo(other.isSetCols());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCols()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cols, 
typedOther.cols);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cols, 
other.cols);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetLocation()).compareTo(typedOther.isSetLocation());
+    lastComparison = 
Boolean.valueOf(isSetLocation()).compareTo(other.isSetLocation());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLocation()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.location, 
typedOther.location);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.location, 
other.location);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetInputFormat()).compareTo(typedOther.isSetInputFormat());
+    lastComparison = 
Boolean.valueOf(isSetInputFormat()).compareTo(other.isSetInputFormat());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetInputFormat()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.inputFormat, 
typedOther.inputFormat);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.inputFormat, other.inputFormat);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetOutputFormat()).compareTo(typedOther.isSetOutputFormat());
+    lastComparison = 
Boolean.valueOf(isSetOutputFormat()).compareTo(other.isSetOutputFormat());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOutputFormat()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.outputFormat, 
typedOther.outputFormat);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.outputFormat, other.outputFormat);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetCompressed()).compareTo(typedOther.isSetCompressed());
+    lastComparison = 
Boolean.valueOf(isSetCompressed()).compareTo(other.isSetCompressed());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCompressed()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.compressed, typedOther.compressed);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.compressed, other.compressed);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetNumBuckets()).compareTo(typedOther.isSetNumBuckets());
+    lastComparison = 
Boolean.valueOf(isSetNumBuckets()).compareTo(other.isSetNumBuckets());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumBuckets()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.numBuckets, typedOther.numBuckets);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.numBuckets, other.numBuckets);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSerdeInfo()).compareTo(typedOther.isSetSerdeInfo());
+    lastComparison = 
Boolean.valueOf(isSetSerdeInfo()).compareTo(other.isSetSerdeInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSerdeInfo()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serdeInfo, 
typedOther.serdeInfo);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serdeInfo, 
other.serdeInfo);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetBucketCols()).compareTo(typedOther.isSetBucketCols());
+    lastComparison = 
Boolean.valueOf(isSetBucketCols()).compareTo(other.isSetBucketCols());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetBucketCols()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.bucketCols, typedOther.bucketCols);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.bucketCols, other.bucketCols);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSortCols()).compareTo(typedOther.isSetSortCols());
+    lastComparison = 
Boolean.valueOf(isSetSortCols()).compareTo(other.isSetSortCols());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSortCols()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sortCols, 
typedOther.sortCols);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sortCols, 
other.sortCols);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetParameters()).compareTo(typedOther.isSetParameters());
+    lastComparison = 
Boolean.valueOf(isSetParameters()).compareTo(other.isSetParameters());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetParameters()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.parameters, typedOther.parameters);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.parameters, other.parameters);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSkewedInfo()).compareTo(typedOther.isSetSkewedInfo());
+    lastComparison = 
Boolean.valueOf(isSetSkewedInfo()).compareTo(other.isSetSkewedInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSkewedInfo()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.skewedInfo, typedOther.skewedInfo);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.skewedInfo, other.skewedInfo);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetStoredAsSubDirectories()).compareTo(typedOther.isSetStoredAsSubDirectories());
+    lastComparison = 
Boolean.valueOf(isSetStoredAsSubDirectories()).compareTo(other.isSetStoredAsSubDirectories());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStoredAsSubDirectories()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.storedAsSubDirectories, 
typedOther.storedAsSubDirectories);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.storedAsSubDirectories, 
other.storedAsSubDirectories);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1302,12 +1292,12 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
               {
                 org.apache.thrift.protocol.TList _list156 = 
iprot.readListBegin();
                 struct.cols = new ArrayList<FieldSchema>(_list156.size);
-                for (int _i157 = 0; _i157 < _list156.size; ++_i157)
+                FieldSchema _elem157;
+                for (int _i158 = 0; _i158 < _list156.size; ++_i158)
                 {
-                  FieldSchema _elem158; // optional
-                  _elem158 = new FieldSchema();
-                  _elem158.read(iprot);
-                  struct.cols.add(_elem158);
+                  _elem157 = new FieldSchema();
+                  _elem157.read(iprot);
+                  struct.cols.add(_elem157);
                 }
                 iprot.readListEnd();
               }
@@ -1370,11 +1360,11 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
               {
                 org.apache.thrift.protocol.TList _list159 = 
iprot.readListBegin();
                 struct.bucketCols = new ArrayList<String>(_list159.size);
-                for (int _i160 = 0; _i160 < _list159.size; ++_i160)
+                String _elem160;
+                for (int _i161 = 0; _i161 < _list159.size; ++_i161)
                 {
-                  String _elem161; // optional
-                  _elem161 = iprot.readString();
-                  struct.bucketCols.add(_elem161);
+                  _elem160 = iprot.readString();
+                  struct.bucketCols.add(_elem160);
                 }
                 iprot.readListEnd();
               }
@@ -1388,12 +1378,12 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
               {
                 org.apache.thrift.protocol.TList _list162 = 
iprot.readListBegin();
                 struct.sortCols = new ArrayList<Order>(_list162.size);
-                for (int _i163 = 0; _i163 < _list162.size; ++_i163)
+                Order _elem163;
+                for (int _i164 = 0; _i164 < _list162.size; ++_i164)
                 {
-                  Order _elem164; // optional
-                  _elem164 = new Order();
-                  _elem164.read(iprot);
-                  struct.sortCols.add(_elem164);
+                  _elem163 = new Order();
+                  _elem163.read(iprot);
+                  struct.sortCols.add(_elem163);
                 }
                 iprot.readListEnd();
               }
@@ -1407,13 +1397,13 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
               {
                 org.apache.thrift.protocol.TMap _map165 = iprot.readMapBegin();
                 struct.parameters = new HashMap<String,String>(2*_map165.size);
-                for (int _i166 = 0; _i166 < _map165.size; ++_i166)
+                String _key166;
+                String _val167;
+                for (int _i168 = 0; _i168 < _map165.size; ++_i168)
                 {
-                  String _key167; // required
-                  String _val168; // required
-                  _key167 = iprot.readString();
-                  _val168 = iprot.readString();
-                  struct.parameters.put(_key167, _val168);
+                  _key166 = iprot.readString();
+                  _val167 = iprot.readString();
+                  struct.parameters.put(_key166, _val167);
                 }
                 iprot.readMapEnd();
               }
@@ -1665,12 +1655,12 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
         {
           org.apache.thrift.protocol.TList _list177 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
           struct.cols = new ArrayList<FieldSchema>(_list177.size);
-          for (int _i178 = 0; _i178 < _list177.size; ++_i178)
+          FieldSchema _elem178;
+          for (int _i179 = 0; _i179 < _list177.size; ++_i179)
           {
-            FieldSchema _elem179; // optional
-            _elem179 = new FieldSchema();
-            _elem179.read(iprot);
-            struct.cols.add(_elem179);
+            _elem178 = new FieldSchema();
+            _elem178.read(iprot);
+            struct.cols.add(_elem178);
           }
         }
         struct.setColsIsSet(true);
@@ -1704,11 +1694,11 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
         {
           org.apache.thrift.protocol.TList _list180 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
           struct.bucketCols = new ArrayList<String>(_list180.size);
-          for (int _i181 = 0; _i181 < _list180.size; ++_i181)
+          String _elem181;
+          for (int _i182 = 0; _i182 < _list180.size; ++_i182)
           {
-            String _elem182; // optional
-            _elem182 = iprot.readString();
-            struct.bucketCols.add(_elem182);
+            _elem181 = iprot.readString();
+            struct.bucketCols.add(_elem181);
           }
         }
         struct.setBucketColsIsSet(true);
@@ -1717,12 +1707,12 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
         {
           org.apache.thrift.protocol.TList _list183 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
           struct.sortCols = new ArrayList<Order>(_list183.size);
-          for (int _i184 = 0; _i184 < _list183.size; ++_i184)
+          Order _elem184;
+          for (int _i185 = 0; _i185 < _list183.size; ++_i185)
           {
-            Order _elem185; // optional
-            _elem185 = new Order();
-            _elem185.read(iprot);
-            struct.sortCols.add(_elem185);
+            _elem184 = new Order();
+            _elem184.read(iprot);
+            struct.sortCols.add(_elem184);
           }
         }
         struct.setSortColsIsSet(true);
@@ -1731,13 +1721,13 @@ public class StorageDescriptor implements 
org.apache.thrift.TBase<StorageDescrip
         {
           org.apache.thrift.protocol.TMap _map186 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.parameters = new HashMap<String,String>(2*_map186.size);
-          for (int _i187 = 0; _i187 < _map186.size; ++_i187)
+          String _key187;
+          String _val188;
+          for (int _i189 = 0; _i189 < _map186.size; ++_i189)
           {
-            String _key188; // required
-            String _val189; // required
-            _key188 = iprot.readString();
-            _val189 = iprot.readString();
-            struct.parameters.put(_key188, _val189);
+            _key187 = iprot.readString();
+            _val188 = iprot.readString();
+            struct.parameters.put(_key187, _val188);
           }
         }
         struct.setParametersIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java
index db3274a..6409c6b 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StringColumnStatsData.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.metastore.api;
 
-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 StringColumnStatsData implements 
org.apache.thrift.TBase<StringColumnStatsData, StringColumnStatsData._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 StringColumnStatsData implements 
org.apache.thrift.TBase<StringColumnStatsData, StringColumnStatsData._Fields>, 
java.io.Serializable, Cloneable, Comparable<StringColumnStatsData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("StringColumnStatsData");
 
   private static final org.apache.thrift.protocol.TField 
MAX_COL_LEN_FIELD_DESC = new org.apache.thrift.protocol.TField("maxColLen", 
org.apache.thrift.protocol.TType.I64, (short)1);
@@ -401,75 +405,75 @@ public class StringColumnStatsData implements 
org.apache.thrift.TBase<StringColu
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_maxColLen = true;
-    builder.append(present_maxColLen);
+    list.add(present_maxColLen);
     if (present_maxColLen)
-      builder.append(maxColLen);
+      list.add(maxColLen);
 
     boolean present_avgColLen = true;
-    builder.append(present_avgColLen);
+    list.add(present_avgColLen);
     if (present_avgColLen)
-      builder.append(avgColLen);
+      list.add(avgColLen);
 
     boolean present_numNulls = true;
-    builder.append(present_numNulls);
+    list.add(present_numNulls);
     if (present_numNulls)
-      builder.append(numNulls);
+      list.add(numNulls);
 
     boolean present_numDVs = true;
-    builder.append(present_numDVs);
+    list.add(present_numDVs);
     if (present_numDVs)
-      builder.append(numDVs);
+      list.add(numDVs);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(StringColumnStatsData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    StringColumnStatsData typedOther = (StringColumnStatsData)other;
 
-    lastComparison = 
Boolean.valueOf(isSetMaxColLen()).compareTo(typedOther.isSetMaxColLen());
+    lastComparison = 
Boolean.valueOf(isSetMaxColLen()).compareTo(other.isSetMaxColLen());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMaxColLen()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxColLen, 
typedOther.maxColLen);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxColLen, 
other.maxColLen);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetAvgColLen()).compareTo(typedOther.isSetAvgColLen());
+    lastComparison = 
Boolean.valueOf(isSetAvgColLen()).compareTo(other.isSetAvgColLen());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAvgColLen()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.avgColLen, 
typedOther.avgColLen);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.avgColLen, 
other.avgColLen);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetNumNulls()).compareTo(typedOther.isSetNumNulls());
+    lastComparison = 
Boolean.valueOf(isSetNumNulls()).compareTo(other.isSetNumNulls());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumNulls()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numNulls, 
typedOther.numNulls);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numNulls, 
other.numNulls);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetNumDVs()).compareTo(typedOther.isSetNumDVs());
+    lastComparison = 
Boolean.valueOf(isSetNumDVs()).compareTo(other.isSetNumDVs());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumDVs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numDVs, 
typedOther.numDVs);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.numDVs, 
other.numDVs);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
index 484bd6a..55f7dfd 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.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.metastore.api;
 
-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 Table implements org.apache.thrift.TBase<Table, Table._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 Table implements org.apache.thrift.TBase<Table, Table._Fields>, 
java.io.Serializable, Cloneable, Comparable<Table> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Table");
 
   private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC 
= new org.apache.thrift.protocol.TField("tableName", 
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -173,7 +177,7 @@ public class Table implements 
org.apache.thrift.TBase<Table, Table._Fields>, jav
   private static final int __RETENTION_ISSET_ID = 2;
   private static final int __TEMPORARY_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.TEMPORARY};
+  private static final _Fields optionals[] = 
{_Fields.PRIVILEGES,_Fields.TEMPORARY};
   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);
@@ -270,25 +274,14 @@ public class Table implements 
org.apache.thrift.TBase<Table, Table._Fields>, jav
       this.sd = new StorageDescriptor(other.sd);
     }
     if (other.isSetPartitionKeys()) {
-      List<FieldSchema> __this__partitionKeys = new ArrayList<FieldSchema>();
+      List<FieldSchema> __this__partitionKeys = new 
ArrayList<FieldSchema>(other.partitionKeys.size());
       for (FieldSchema other_element : other.partitionKeys) {
         __this__partitionKeys.add(new FieldSchema(other_element));
       }
       this.partitionKeys = __this__partitionKeys;
     }
     if (other.isSetParameters()) {
-      Map<String,String> __this__parameters = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : 
other.parameters.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__parameters_copy_key = other_element_key;
-
-        String __this__parameters_copy_value = other_element_value;
-
-        __this__parameters.put(__this__parameters_copy_key, 
__this__parameters_copy_value);
-      }
+      Map<String,String> __this__parameters = new 
HashMap<String,String>(other.parameters);
       this.parameters = __this__parameters;
     }
     if (other.isSetViewOriginalText()) {
@@ -1024,225 +1017,225 @@ public class Table implements 
org.apache.thrift.TBase<Table, Table._Fields>, jav
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_tableName = true && (isSetTableName());
-    builder.append(present_tableName);
+    list.add(present_tableName);
     if (present_tableName)
-      builder.append(tableName);
+      list.add(tableName);
 
     boolean present_dbName = true && (isSetDbName());
-    builder.append(present_dbName);
+    list.add(present_dbName);
     if (present_dbName)
-      builder.append(dbName);
+      list.add(dbName);
 
     boolean present_owner = true && (isSetOwner());
-    builder.append(present_owner);
+    list.add(present_owner);
     if (present_owner)
-      builder.append(owner);
+      list.add(owner);
 
     boolean present_createTime = true;
-    builder.append(present_createTime);
+    list.add(present_createTime);
     if (present_createTime)
-      builder.append(createTime);
+      list.add(createTime);
 
     boolean present_lastAccessTime = true;
-    builder.append(present_lastAccessTime);
+    list.add(present_lastAccessTime);
     if (present_lastAccessTime)
-      builder.append(lastAccessTime);
+      list.add(lastAccessTime);
 
     boolean present_retention = true;
-    builder.append(present_retention);
+    list.add(present_retention);
     if (present_retention)
-      builder.append(retention);
+      list.add(retention);
 
     boolean present_sd = true && (isSetSd());
-    builder.append(present_sd);
+    list.add(present_sd);
     if (present_sd)
-      builder.append(sd);
+      list.add(sd);
 
     boolean present_partitionKeys = true && (isSetPartitionKeys());
-    builder.append(present_partitionKeys);
+    list.add(present_partitionKeys);
     if (present_partitionKeys)
-      builder.append(partitionKeys);
+      list.add(partitionKeys);
 
     boolean present_parameters = true && (isSetParameters());
-    builder.append(present_parameters);
+    list.add(present_parameters);
     if (present_parameters)
-      builder.append(parameters);
+      list.add(parameters);
 
     boolean present_viewOriginalText = true && (isSetViewOriginalText());
-    builder.append(present_viewOriginalText);
+    list.add(present_viewOriginalText);
     if (present_viewOriginalText)
-      builder.append(viewOriginalText);
+      list.add(viewOriginalText);
 
     boolean present_viewExpandedText = true && (isSetViewExpandedText());
-    builder.append(present_viewExpandedText);
+    list.add(present_viewExpandedText);
     if (present_viewExpandedText)
-      builder.append(viewExpandedText);
+      list.add(viewExpandedText);
 
     boolean present_tableType = true && (isSetTableType());
-    builder.append(present_tableType);
+    list.add(present_tableType);
     if (present_tableType)
-      builder.append(tableType);
+      list.add(tableType);
 
     boolean present_privileges = true && (isSetPrivileges());
-    builder.append(present_privileges);
+    list.add(present_privileges);
     if (present_privileges)
-      builder.append(privileges);
+      list.add(privileges);
 
     boolean present_temporary = true && (isSetTemporary());
-    builder.append(present_temporary);
+    list.add(present_temporary);
     if (present_temporary)
-      builder.append(temporary);
+      list.add(temporary);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Table other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Table typedOther = (Table)other;
 
-    lastComparison = 
Boolean.valueOf(isSetTableName()).compareTo(typedOther.isSetTableName());
+    lastComparison = 
Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTableName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, 
typedOther.tableName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, 
other.tableName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetDbName()).compareTo(typedOther.isSetDbName());
+    lastComparison = 
Boolean.valueOf(isSetDbName()).compareTo(other.isSetDbName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDbName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, 
typedOther.dbName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, 
other.dbName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetOwner()).compareTo(typedOther.isSetOwner());
+    lastComparison = 
Boolean.valueOf(isSetOwner()).compareTo(other.isSetOwner());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOwner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, 
typedOther.owner);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.owner, 
other.owner);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetCreateTime()).compareTo(typedOther.isSetCreateTime());
+    lastComparison = 
Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCreateTime()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.createTime, typedOther.createTime);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.createTime, other.createTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetLastAccessTime()).compareTo(typedOther.isSetLastAccessTime());
+    lastComparison = 
Boolean.valueOf(isSetLastAccessTime()).compareTo(other.isSetLastAccessTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLastAccessTime()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.lastAccessTime, 
typedOther.lastAccessTime);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.lastAccessTime, 
other.lastAccessTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetRetention()).compareTo(typedOther.isSetRetention());
+    lastComparison = 
Boolean.valueOf(isSetRetention()).compareTo(other.isSetRetention());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRetention()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retention, 
typedOther.retention);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.retention, 
other.retention);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetSd()).compareTo(typedOther.isSetSd());
+    lastComparison = Boolean.valueOf(isSetSd()).compareTo(other.isSetSd());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSd()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sd, 
typedOther.sd);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sd, 
other.sd);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPartitionKeys()).compareTo(typedOther.isSetPartitionKeys());
+    lastComparison = 
Boolean.valueOf(isSetPartitionKeys()).compareTo(other.isSetPartitionKeys());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartitionKeys()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.partitionKeys, 
typedOther.partitionKeys);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.partitionKeys, 
other.partitionKeys);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetParameters()).compareTo(typedOther.isSetParameters());
+    lastComparison = 
Boolean.valueOf(isSetParameters()).compareTo(other.isSetParameters());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetParameters()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.parameters, typedOther.parameters);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.parameters, other.parameters);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetViewOriginalText()).compareTo(typedOther.isSetViewOriginalText());
+    lastComparison = 
Boolean.valueOf(isSetViewOriginalText()).compareTo(other.isSetViewOriginalText());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetViewOriginalText()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.viewOriginalText, 
typedOther.viewOriginalText);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.viewOriginalText, 
other.viewOriginalText);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetViewExpandedText()).compareTo(typedOther.isSetViewExpandedText());
+    lastComparison = 
Boolean.valueOf(isSetViewExpandedText()).compareTo(other.isSetViewExpandedText());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetViewExpandedText()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.viewExpandedText, 
typedOther.viewExpandedText);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.viewExpandedText, 
other.viewExpandedText);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetTableType()).compareTo(typedOther.isSetTableType());
+    lastComparison = 
Boolean.valueOf(isSetTableType()).compareTo(other.isSetTableType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTableType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableType, 
typedOther.tableType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableType, 
other.tableType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPrivileges()).compareTo(typedOther.isSetPrivileges());
+    lastComparison = 
Boolean.valueOf(isSetPrivileges()).compareTo(other.isSetPrivileges());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrivileges()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.privileges, typedOther.privileges);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.privileges, other.privileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetTemporary()).compareTo(typedOther.isSetTemporary());
+    lastComparison = 
Boolean.valueOf(isSetTemporary()).compareTo(other.isSetTemporary());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTemporary()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.temporary, 
typedOther.temporary);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.temporary, 
other.temporary);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1479,12 +1472,12 @@ public class Table implements 
org.apache.thrift.TBase<Table, Table._Fields>, jav
               {
                 org.apache.thrift.protocol.TList _list190 = 
iprot.readListBegin();
                 struct.partitionKeys = new 
ArrayList<FieldSchema>(_list190.size);
-                for (int _i191 = 0; _i191 < _list190.size; ++_i191)
+                FieldSchema _elem191;
+                for (int _i192 = 0; _i192 < _list190.size; ++_i192)
                 {
-                  FieldSchema _elem192; // optional
-                  _elem192 = new FieldSchema();
-                  _elem192.read(iprot);
-                  struct.partitionKeys.add(_elem192);
+                  _elem191 = new FieldSchema();
+                  _elem191.read(iprot);
+                  struct.partitionKeys.add(_elem191);
                 }
                 iprot.readListEnd();
               }
@@ -1498,13 +1491,13 @@ public class Table implements 
org.apache.thrift.TBase<Table, Table._Fields>, jav
               {
                 org.apache.thrift.protocol.TMap _map193 = iprot.readMapBegin();
                 struct.parameters = new HashMap<String,String>(2*_map193.size);
-                for (int _i194 = 0; _i194 < _map193.size; ++_i194)
+                String _key194;
+                String _val195;
+                for (int _i196 = 0; _i196 < _map193.size; ++_i196)
                 {
-                  String _key195; // required
-                  String _val196; // required
-                  _key195 = iprot.readString();
-                  _val196 = iprot.readString();
-                  struct.parameters.put(_key195, _val196);
+                  _key194 = iprot.readString();
+                  _val195 = iprot.readString();
+                  struct.parameters.put(_key194, _val195);
                 }
                 iprot.readMapEnd();
               }
@@ -1803,12 +1796,12 @@ public class Table implements 
org.apache.thrift.TBase<Table, Table._Fields>, jav
         {
           org.apache.thrift.protocol.TList _list201 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
           struct.partitionKeys = new ArrayList<FieldSchema>(_list201.size);
-          for (int _i202 = 0; _i202 < _list201.size; ++_i202)
+          FieldSchema _elem202;
+          for (int _i203 = 0; _i203 < _list201.size; ++_i203)
           {
-            FieldSchema _elem203; // optional
-            _elem203 = new FieldSchema();
-            _elem203.read(iprot);
-            struct.partitionKeys.add(_elem203);
+            _elem202 = new FieldSchema();
+            _elem202.read(iprot);
+            struct.partitionKeys.add(_elem202);
           }
         }
         struct.setPartitionKeysIsSet(true);
@@ -1817,13 +1810,13 @@ public class Table implements 
org.apache.thrift.TBase<Table, Table._Fields>, jav
         {
           org.apache.thrift.protocol.TMap _map204 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.parameters = new HashMap<String,String>(2*_map204.size);
-          for (int _i205 = 0; _i205 < _map204.size; ++_i205)
+          String _key205;
+          String _val206;
+          for (int _i207 = 0; _i207 < _map204.size; ++_i207)
           {
-            String _key206; // required
-            String _val207; // required
-            _key206 = iprot.readString();
-            _val207 = iprot.readString();
-            struct.parameters.put(_key206, _val207);
+            _key205 = iprot.readString();
+            _val206 = iprot.readString();
+            struct.parameters.put(_key205, _val206);
           }
         }
         struct.setParametersIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
index 2073829..1faa547 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.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.metastore.api;
 
-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 TableStatsRequest implements 
org.apache.thrift.TBase<TableStatsRequest, TableStatsRequest._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 TableStatsRequest implements 
org.apache.thrift.TBase<TableStatsRequest, TableStatsRequest._Fields>, 
java.io.Serializable, Cloneable, Comparable<TableStatsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TableStatsRequest");
 
   private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = 
new org.apache.thrift.protocol.TField("dbName", 
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -152,10 +156,7 @@ public class TableStatsRequest implements 
org.apache.thrift.TBase<TableStatsRequ
       this.tblName = other.tblName;
     }
     if (other.isSetColNames()) {
-      List<String> __this__colNames = new ArrayList<String>();
-      for (String other_element : other.colNames) {
-        __this__colNames.add(other_element);
-      }
+      List<String> __this__colNames = new ArrayList<String>(other.colNames);
       this.colNames = __this__colNames;
     }
   }
@@ -361,60 +362,60 @@ public class TableStatsRequest implements 
org.apache.thrift.TBase<TableStatsRequ
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_dbName = true && (isSetDbName());
-    builder.append(present_dbName);
+    list.add(present_dbName);
     if (present_dbName)
-      builder.append(dbName);
+      list.add(dbName);
 
     boolean present_tblName = true && (isSetTblName());
-    builder.append(present_tblName);
+    list.add(present_tblName);
     if (present_tblName)
-      builder.append(tblName);
+      list.add(tblName);
 
     boolean present_colNames = true && (isSetColNames());
-    builder.append(present_colNames);
+    list.add(present_colNames);
     if (present_colNames)
-      builder.append(colNames);
+      list.add(colNames);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TableStatsRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TableStatsRequest typedOther = (TableStatsRequest)other;
 
-    lastComparison = 
Boolean.valueOf(isSetDbName()).compareTo(typedOther.isSetDbName());
+    lastComparison = 
Boolean.valueOf(isSetDbName()).compareTo(other.isSetDbName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDbName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, 
typedOther.dbName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, 
other.dbName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetTblName()).compareTo(typedOther.isSetTblName());
+    lastComparison = 
Boolean.valueOf(isSetTblName()).compareTo(other.isSetTblName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTblName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tblName, 
typedOther.tblName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tblName, 
other.tblName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetColNames()).compareTo(typedOther.isSetColNames());
+    lastComparison = 
Boolean.valueOf(isSetColNames()).compareTo(other.isSetColNames());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColNames()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colNames, 
typedOther.colNames);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colNames, 
other.colNames);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -538,11 +539,11 @@ public class TableStatsRequest implements 
org.apache.thrift.TBase<TableStatsRequ
               {
                 org.apache.thrift.protocol.TList _list356 = 
iprot.readListBegin();
                 struct.colNames = new ArrayList<String>(_list356.size);
-                for (int _i357 = 0; _i357 < _list356.size; ++_i357)
+                String _elem357;
+                for (int _i358 = 0; _i358 < _list356.size; ++_i358)
                 {
-                  String _elem358; // optional
-                  _elem358 = iprot.readString();
-                  struct.colNames.add(_elem358);
+                  _elem357 = iprot.readString();
+                  struct.colNames.add(_elem357);
                 }
                 iprot.readListEnd();
               }
@@ -624,11 +625,11 @@ public class TableStatsRequest implements 
org.apache.thrift.TBase<TableStatsRequ
       {
         org.apache.thrift.protocol.TList _list361 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
         struct.colNames = new ArrayList<String>(_list361.size);
-        for (int _i362 = 0; _i362 < _list361.size; ++_i362)
+        String _elem362;
+        for (int _i363 = 0; _i363 < _list361.size; ++_i363)
         {
-          String _elem363; // optional
-          _elem363 = iprot.readString();
-          struct.colNames.add(_elem363);
+          _elem362 = iprot.readString();
+          struct.colNames.add(_elem362);
         }
       }
       struct.setColNamesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
index 541370f..535d2ff 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.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.metastore.api;
 
-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 TableStatsResult implements 
org.apache.thrift.TBase<TableStatsResult, TableStatsResult._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 TableStatsResult implements 
org.apache.thrift.TBase<TableStatsResult, TableStatsResult._Fields>, 
java.io.Serializable, Cloneable, Comparable<TableStatsResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TableStatsResult");
 
   private static final org.apache.thrift.protocol.TField 
TABLE_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("tableStats", 
org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -128,7 +132,7 @@ public class TableStatsResult implements 
org.apache.thrift.TBase<TableStatsResul
    */
   public TableStatsResult(TableStatsResult other) {
     if (other.isSetTableStats()) {
-      List<ColumnStatisticsObj> __this__tableStats = new 
ArrayList<ColumnStatisticsObj>();
+      List<ColumnStatisticsObj> __this__tableStats = new 
ArrayList<ColumnStatisticsObj>(other.tableStats.size());
       for (ColumnStatisticsObj other_element : other.tableStats) {
         __this__tableStats.add(new ColumnStatisticsObj(other_element));
       }
@@ -245,30 +249,30 @@ public class TableStatsResult implements 
org.apache.thrift.TBase<TableStatsResul
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_tableStats = true && (isSetTableStats());
-    builder.append(present_tableStats);
+    list.add(present_tableStats);
     if (present_tableStats)
-      builder.append(tableStats);
+      list.add(tableStats);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TableStatsResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TableStatsResult typedOther = (TableStatsResult)other;
 
-    lastComparison = 
Boolean.valueOf(isSetTableStats()).compareTo(typedOther.isSetTableStats());
+    lastComparison = 
Boolean.valueOf(isSetTableStats()).compareTo(other.isSetTableStats());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTableStats()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.tableStats, typedOther.tableStats);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.tableStats, other.tableStats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -352,12 +356,12 @@ public class TableStatsResult implements 
org.apache.thrift.TBase<TableStatsResul
               {
                 org.apache.thrift.protocol.TList _list330 = 
iprot.readListBegin();
                 struct.tableStats = new 
ArrayList<ColumnStatisticsObj>(_list330.size);
-                for (int _i331 = 0; _i331 < _list330.size; ++_i331)
+                ColumnStatisticsObj _elem331;
+                for (int _i332 = 0; _i332 < _list330.size; ++_i332)
                 {
-                  ColumnStatisticsObj _elem332; // optional
-                  _elem332 = new ColumnStatisticsObj();
-                  _elem332.read(iprot);
-                  struct.tableStats.add(_elem332);
+                  _elem331 = new ColumnStatisticsObj();
+                  _elem331.read(iprot);
+                  struct.tableStats.add(_elem331);
                 }
                 iprot.readListEnd();
               }
@@ -423,12 +427,12 @@ public class TableStatsResult implements 
org.apache.thrift.TBase<TableStatsResul
       {
         org.apache.thrift.protocol.TList _list335 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, 
iprot.readI32());
         struct.tableStats = new ArrayList<ColumnStatisticsObj>(_list335.size);
-        for (int _i336 = 0; _i336 < _list335.size; ++_i336)
+        ColumnStatisticsObj _elem336;
+        for (int _i337 = 0; _i337 < _list335.size; ++_i337)
         {
-          ColumnStatisticsObj _elem337; // optional
-          _elem337 = new ColumnStatisticsObj();
-          _elem337.read(iprot);
-          struct.tableStats.add(_elem337);
+          _elem336 = new ColumnStatisticsObj();
+          _elem336.read(iprot);
+          struct.tableStats.add(_elem336);
         }
       }
       struct.setTableStatsIsSet(true);

Reply via email to