You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by su...@apache.org on 2015/07/17 21:53:32 UTC

[40/48] hive git commit: HIVE-9152 - Dynamic Partition Pruning [Spark Branch] (Chao Sun, reviewed by Xuefu Zhang and Chengxiang Li)

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
index ab0b399..6864c01 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.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 EnvironmentContext implements org.apache.thrift.TBase<EnvironmentContext, EnvironmentContext._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 EnvironmentContext implements org.apache.thrift.TBase<EnvironmentContext, EnvironmentContext._Fields>, java.io.Serializable, Cloneable, Comparable<EnvironmentContext> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("EnvironmentContext");
 
   private static final org.apache.thrift.protocol.TField PROPERTIES_FIELD_DESC = new org.apache.thrift.protocol.TField("properties", org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -129,18 +133,7 @@ public class EnvironmentContext implements org.apache.thrift.TBase<EnvironmentCo
    */
   public EnvironmentContext(EnvironmentContext other) {
     if (other.isSetProperties()) {
-      Map<String,String> __this__properties = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.properties.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__properties_copy_key = other_element_key;
-
-        String __this__properties_copy_value = other_element_value;
-
-        __this__properties.put(__this__properties_copy_key, __this__properties_copy_value);
-      }
+      Map<String,String> __this__properties = new HashMap<String,String>(other.properties);
       this.properties = __this__properties;
     }
   }
@@ -250,30 +243,30 @@ public class EnvironmentContext implements org.apache.thrift.TBase<EnvironmentCo
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_properties = true && (isSetProperties());
-    builder.append(present_properties);
+    list.add(present_properties);
     if (present_properties)
-      builder.append(properties);
+      list.add(properties);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(EnvironmentContext other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    EnvironmentContext typedOther = (EnvironmentContext)other;
 
-    lastComparison = Boolean.valueOf(isSetProperties()).compareTo(typedOther.isSetProperties());
+    lastComparison = Boolean.valueOf(isSetProperties()).compareTo(other.isSetProperties());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetProperties()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.properties, typedOther.properties);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.properties, other.properties);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -353,13 +346,13 @@ public class EnvironmentContext implements org.apache.thrift.TBase<EnvironmentCo
               {
                 org.apache.thrift.protocol.TMap _map312 = iprot.readMapBegin();
                 struct.properties = new HashMap<String,String>(2*_map312.size);
-                for (int _i313 = 0; _i313 < _map312.size; ++_i313)
+                String _key313;
+                String _val314;
+                for (int _i315 = 0; _i315 < _map312.size; ++_i315)
                 {
-                  String _key314; // required
-                  String _val315; // required
-                  _key314 = iprot.readString();
-                  _val315 = iprot.readString();
-                  struct.properties.put(_key314, _val315);
+                  _key313 = iprot.readString();
+                  _val314 = iprot.readString();
+                  struct.properties.put(_key313, _val314);
                 }
                 iprot.readMapEnd();
               }
@@ -436,13 +429,13 @@ public class EnvironmentContext implements org.apache.thrift.TBase<EnvironmentCo
         {
           org.apache.thrift.protocol.TMap _map318 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.properties = new HashMap<String,String>(2*_map318.size);
-          for (int _i319 = 0; _i319 < _map318.size; ++_i319)
+          String _key319;
+          String _val320;
+          for (int _i321 = 0; _i321 < _map318.size; ++_i321)
           {
-            String _key320; // required
-            String _val321; // required
-            _key320 = iprot.readString();
-            _val321 = iprot.readString();
-            struct.properties.put(_key320, _val321);
+            _key319 = iprot.readString();
+            _val320 = iprot.readString();
+            struct.properties.put(_key319, _val320);
           }
         }
         struct.setPropertiesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java
index 084c3ee..422b44f 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EventRequestType.java
@@ -1,5 +1,5 @@
 /**
- * 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

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
index a993810..358025b 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FieldSchema.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 FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSchema._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 FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSchema._Fields>, java.io.Serializable, Cloneable, Comparable<FieldSchema> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FieldSchema");
 
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -135,9 +139,9 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc
     String comment)
   {
     this();
-    this.name = name;
-    this.type = type;
-    this.comment = comment;
+    this.name = org.apache.hive.common.util.HiveStringUtils.intern(name);
+    this.type = org.apache.hive.common.util.HiveStringUtils.intern(type);
+    this.comment = org.apache.hive.common.util.HiveStringUtils.intern(comment);
   }
 
   /**
@@ -145,13 +149,13 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc
    */
   public FieldSchema(FieldSchema other) {
     if (other.isSetName()) {
-      this.name = other.name;
+      this.name = org.apache.hive.common.util.HiveStringUtils.intern(other.name);
     }
     if (other.isSetType()) {
-      this.type = other.type;
+      this.type = org.apache.hive.common.util.HiveStringUtils.intern(other.type);
     }
     if (other.isSetComment()) {
-      this.comment = other.comment;
+      this.comment = org.apache.hive.common.util.HiveStringUtils.intern(other.comment);
     }
   }
 
@@ -171,7 +175,7 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc
   }
 
   public void setName(String name) {
-    this.name = name;
+    this.name = org.apache.hive.common.util.HiveStringUtils.intern(name);
   }
 
   public void unsetName() {
@@ -194,7 +198,7 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc
   }
 
   public void setType(String type) {
-    this.type = type;
+    this.type = org.apache.hive.common.util.HiveStringUtils.intern(type);
   }
 
   public void unsetType() {
@@ -217,7 +221,7 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc
   }
 
   public void setComment(String comment) {
-    this.comment = comment;
+    this.comment = org.apache.hive.common.util.HiveStringUtils.intern(comment);
   }
 
   public void unsetComment() {
@@ -341,60 +345,60 @@ public class FieldSchema implements org.apache.thrift.TBase<FieldSchema, FieldSc
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_name = true && (isSetName());
-    builder.append(present_name);
+    list.add(present_name);
     if (present_name)
-      builder.append(name);
+      list.add(name);
 
     boolean present_type = true && (isSetType());
-    builder.append(present_type);
+    list.add(present_type);
     if (present_type)
-      builder.append(type);
+      list.add(type);
 
     boolean present_comment = true && (isSetComment());
-    builder.append(present_comment);
+    list.add(present_comment);
     if (present_comment)
-      builder.append(comment);
+      list.add(comment);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(FieldSchema other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    FieldSchema typedOther = (FieldSchema)other;
 
-    lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
+    lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
+    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetComment()).compareTo(typedOther.isSetComment());
+    lastComparison = Boolean.valueOf(isSetComment()).compareTo(other.isSetComment());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetComment()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comment, typedOther.comment);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.comment, other.comment);
       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/FireEventRequest.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
index 44b83da..c19a239 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.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 FireEventRequest implements org.apache.thrift.TBase<FireEventRequest, FireEventRequest._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 FireEventRequest implements org.apache.thrift.TBase<FireEventRequest, FireEventRequest._Fields>, java.io.Serializable, Cloneable, Comparable<FireEventRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventRequest");
 
   private static final org.apache.thrift.protocol.TField SUCCESSFUL_FIELD_DESC = new org.apache.thrift.protocol.TField("successful", org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -125,7 +129,7 @@ public class FireEventRequest implements org.apache.thrift.TBase<FireEventReques
   // isset id assignments
   private static final int __SUCCESSFUL_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.PARTITION_VALS};
+  private static final _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.PARTITION_VALS};
   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);
@@ -173,10 +177,7 @@ public class FireEventRequest implements org.apache.thrift.TBase<FireEventReques
       this.tableName = other.tableName;
     }
     if (other.isSetPartitionVals()) {
-      List<String> __this__partitionVals = new ArrayList<String>();
-      for (String other_element : other.partitionVals) {
-        __this__partitionVals.add(other_element);
-      }
+      List<String> __this__partitionVals = new ArrayList<String>(other.partitionVals);
       this.partitionVals = __this__partitionVals;
     }
   }
@@ -474,90 +475,90 @@ public class FireEventRequest implements org.apache.thrift.TBase<FireEventReques
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_successful = true;
-    builder.append(present_successful);
+    list.add(present_successful);
     if (present_successful)
-      builder.append(successful);
+      list.add(successful);
 
     boolean present_data = true && (isSetData());
-    builder.append(present_data);
+    list.add(present_data);
     if (present_data)
-      builder.append(data);
+      list.add(data);
 
     boolean present_dbName = true && (isSetDbName());
-    builder.append(present_dbName);
+    list.add(present_dbName);
     if (present_dbName)
-      builder.append(dbName);
+      list.add(dbName);
 
     boolean present_tableName = true && (isSetTableName());
-    builder.append(present_tableName);
+    list.add(present_tableName);
     if (present_tableName)
-      builder.append(tableName);
+      list.add(tableName);
 
     boolean present_partitionVals = true && (isSetPartitionVals());
-    builder.append(present_partitionVals);
+    list.add(present_partitionVals);
     if (present_partitionVals)
-      builder.append(partitionVals);
+      list.add(partitionVals);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(FireEventRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    FireEventRequest typedOther = (FireEventRequest)other;
 
-    lastComparison = Boolean.valueOf(isSetSuccessful()).compareTo(typedOther.isSetSuccessful());
+    lastComparison = Boolean.valueOf(isSetSuccessful()).compareTo(other.isSetSuccessful());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSuccessful()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.successful, typedOther.successful);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.successful, other.successful);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetData()).compareTo(typedOther.isSetData());
+    lastComparison = Boolean.valueOf(isSetData()).compareTo(other.isSetData());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetData()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, typedOther.data);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.data, other.data);
       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(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(isSetPartitionVals()).compareTo(typedOther.isSetPartitionVals());
+    lastComparison = Boolean.valueOf(isSetPartitionVals()).compareTo(other.isSetPartitionVals());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartitionVals()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partitionVals, typedOther.partitionVals);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partitionVals, other.partitionVals);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -714,11 +715,11 @@ public class FireEventRequest implements org.apache.thrift.TBase<FireEventReques
               {
                 org.apache.thrift.protocol.TList _list516 = iprot.readListBegin();
                 struct.partitionVals = new ArrayList<String>(_list516.size);
-                for (int _i517 = 0; _i517 < _list516.size; ++_i517)
+                String _elem517;
+                for (int _i518 = 0; _i518 < _list516.size; ++_i518)
                 {
-                  String _elem518; // optional
-                  _elem518 = iprot.readString();
-                  struct.partitionVals.add(_elem518);
+                  _elem517 = iprot.readString();
+                  struct.partitionVals.add(_elem517);
                 }
                 iprot.readListEnd();
               }
@@ -844,11 +845,11 @@ public class FireEventRequest implements org.apache.thrift.TBase<FireEventReques
         {
           org.apache.thrift.protocol.TList _list521 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.partitionVals = new ArrayList<String>(_list521.size);
-          for (int _i522 = 0; _i522 < _list521.size; ++_i522)
+          String _elem522;
+          for (int _i523 = 0; _i523 < _list521.size; ++_i523)
           {
-            String _elem523; // optional
-            _elem523 = iprot.readString();
-            struct.partitionVals.add(_elem523);
+            _elem522 = iprot.readString();
+            struct.partitionVals.add(_elem522);
           }
         }
         struct.setPartitionValsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
index 008682e..2830496 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequestData.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,9 +29,11 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 public class FireEventRequestData extends org.apache.thrift.TUnion<FireEventRequestData, FireEventRequestData._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventRequestData");
   private static final org.apache.thrift.protocol.TField INSERT_DATA_FIELD_DESC = new org.apache.thrift.protocol.TField("insertData", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -156,6 +159,7 @@ public class FireEventRequestData extends org.apache.thrift.TUnion<FireEventRequ
           throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
+      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
@@ -270,19 +274,19 @@ public class FireEventRequestData extends org.apache.thrift.TUnion<FireEventRequ
 
   @Override
   public int hashCode() {
-    HashCodeBuilder hcb = new HashCodeBuilder();
-    hcb.append(this.getClass().getName());
+    List<Object> list = new ArrayList<Object>();
+    list.add(this.getClass().getName());
     org.apache.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
-      hcb.append(setField.getThriftFieldId());
+      list.add(setField.getThriftFieldId());
       Object value = getFieldValue();
       if (value instanceof org.apache.thrift.TEnum) {
-        hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
       } else {
-        hcb.append(value);
+        list.add(value);
       }
     }
-    return hcb.toHashCode();
+    return list.hashCode();
   }
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
     try {

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
index 051f411..eebf057 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventResponse.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 FireEventResponse implements org.apache.thrift.TBase<FireEventResponse, FireEventResponse._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 FireEventResponse implements org.apache.thrift.TBase<FireEventResponse, FireEventResponse._Fields>, java.io.Serializable, Cloneable, Comparable<FireEventResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FireEventResponse");
 
 
@@ -161,18 +165,18 @@ public class FireEventResponse implements org.apache.thrift.TBase<FireEventRespo
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(FireEventResponse other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    FireEventResponse typedOther = (FireEventResponse)other;
 
     return 0;
   }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
index c40e33d..0734c82 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.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 Function implements org.apache.thrift.TBase<Function, Function._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 Function implements org.apache.thrift.TBase<Function, Function._Fields>, java.io.Serializable, Cloneable, Comparable<Function> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Function");
 
   private static final org.apache.thrift.protocol.TField FUNCTION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("functionName", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -222,7 +226,7 @@ public class Function implements org.apache.thrift.TBase<Function, Function._Fie
       this.functionType = other.functionType;
     }
     if (other.isSetResourceUris()) {
-      List<ResourceUri> __this__resourceUris = new ArrayList<ResourceUri>();
+      List<ResourceUri> __this__resourceUris = new ArrayList<ResourceUri>(other.resourceUris.size());
       for (ResourceUri other_element : other.resourceUris) {
         __this__resourceUris.add(new ResourceUri(other_element));
       }
@@ -677,135 +681,135 @@ public class Function implements org.apache.thrift.TBase<Function, Function._Fie
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_functionName = true && (isSetFunctionName());
-    builder.append(present_functionName);
+    list.add(present_functionName);
     if (present_functionName)
-      builder.append(functionName);
+      list.add(functionName);
 
     boolean present_dbName = true && (isSetDbName());
-    builder.append(present_dbName);
+    list.add(present_dbName);
     if (present_dbName)
-      builder.append(dbName);
+      list.add(dbName);
 
     boolean present_className = true && (isSetClassName());
-    builder.append(present_className);
+    list.add(present_className);
     if (present_className)
-      builder.append(className);
+      list.add(className);
 
     boolean present_ownerName = true && (isSetOwnerName());
-    builder.append(present_ownerName);
+    list.add(present_ownerName);
     if (present_ownerName)
-      builder.append(ownerName);
+      list.add(ownerName);
 
     boolean present_ownerType = true && (isSetOwnerType());
-    builder.append(present_ownerType);
+    list.add(present_ownerType);
     if (present_ownerType)
-      builder.append(ownerType.getValue());
+      list.add(ownerType.getValue());
 
     boolean present_createTime = true;
-    builder.append(present_createTime);
+    list.add(present_createTime);
     if (present_createTime)
-      builder.append(createTime);
+      list.add(createTime);
 
     boolean present_functionType = true && (isSetFunctionType());
-    builder.append(present_functionType);
+    list.add(present_functionType);
     if (present_functionType)
-      builder.append(functionType.getValue());
+      list.add(functionType.getValue());
 
     boolean present_resourceUris = true && (isSetResourceUris());
-    builder.append(present_resourceUris);
+    list.add(present_resourceUris);
     if (present_resourceUris)
-      builder.append(resourceUris);
+      list.add(resourceUris);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Function other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Function typedOther = (Function)other;
 
-    lastComparison = Boolean.valueOf(isSetFunctionName()).compareTo(typedOther.isSetFunctionName());
+    lastComparison = Boolean.valueOf(isSetFunctionName()).compareTo(other.isSetFunctionName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFunctionName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, typedOther.functionName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionName, other.functionName);
       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(isSetClassName()).compareTo(typedOther.isSetClassName());
+    lastComparison = Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetClassName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.className, typedOther.className);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.className, other.className);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwnerName()).compareTo(typedOther.isSetOwnerName());
+    lastComparison = Boolean.valueOf(isSetOwnerName()).compareTo(other.isSetOwnerName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOwnerName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerName, typedOther.ownerName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerName, other.ownerName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwnerType()).compareTo(typedOther.isSetOwnerType());
+    lastComparison = Boolean.valueOf(isSetOwnerType()).compareTo(other.isSetOwnerType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOwnerType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerType, typedOther.ownerType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerType, other.ownerType);
       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(isSetFunctionType()).compareTo(typedOther.isSetFunctionType());
+    lastComparison = Boolean.valueOf(isSetFunctionType()).compareTo(other.isSetFunctionType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFunctionType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionType, typedOther.functionType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.functionType, other.functionType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetResourceUris()).compareTo(typedOther.isSetResourceUris());
+    lastComparison = Boolean.valueOf(isSetResourceUris()).compareTo(other.isSetResourceUris());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetResourceUris()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceUris, typedOther.resourceUris);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceUris, other.resourceUris);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -968,7 +972,7 @@ public class Function implements org.apache.thrift.TBase<Function, Function._Fie
             break;
           case 5: // OWNER_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.ownerType = PrincipalType.findByValue(iprot.readI32());
+              struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
               struct.setOwnerTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -984,7 +988,7 @@ public class Function implements org.apache.thrift.TBase<Function, Function._Fie
             break;
           case 7: // FUNCTION_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.functionType = FunctionType.findByValue(iprot.readI32());
+              struct.functionType = org.apache.hadoop.hive.metastore.api.FunctionType.findByValue(iprot.readI32());
               struct.setFunctionTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -995,12 +999,12 @@ public class Function implements org.apache.thrift.TBase<Function, Function._Fie
               {
                 org.apache.thrift.protocol.TList _list420 = iprot.readListBegin();
                 struct.resourceUris = new ArrayList<ResourceUri>(_list420.size);
-                for (int _i421 = 0; _i421 < _list420.size; ++_i421)
+                ResourceUri _elem421;
+                for (int _i422 = 0; _i422 < _list420.size; ++_i422)
                 {
-                  ResourceUri _elem422; // optional
-                  _elem422 = new ResourceUri();
-                  _elem422.read(iprot);
-                  struct.resourceUris.add(_elem422);
+                  _elem421 = new ResourceUri();
+                  _elem421.read(iprot);
+                  struct.resourceUris.add(_elem421);
                 }
                 iprot.readListEnd();
               }
@@ -1163,7 +1167,7 @@ public class Function implements org.apache.thrift.TBase<Function, Function._Fie
         struct.setOwnerNameIsSet(true);
       }
       if (incoming.get(4)) {
-        struct.ownerType = PrincipalType.findByValue(iprot.readI32());
+        struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
         struct.setOwnerTypeIsSet(true);
       }
       if (incoming.get(5)) {
@@ -1171,19 +1175,19 @@ public class Function implements org.apache.thrift.TBase<Function, Function._Fie
         struct.setCreateTimeIsSet(true);
       }
       if (incoming.get(6)) {
-        struct.functionType = FunctionType.findByValue(iprot.readI32());
+        struct.functionType = org.apache.hadoop.hive.metastore.api.FunctionType.findByValue(iprot.readI32());
         struct.setFunctionTypeIsSet(true);
       }
       if (incoming.get(7)) {
         {
           org.apache.thrift.protocol.TList _list425 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.resourceUris = new ArrayList<ResourceUri>(_list425.size);
-          for (int _i426 = 0; _i426 < _list425.size; ++_i426)
+          ResourceUri _elem426;
+          for (int _i427 = 0; _i427 < _list425.size; ++_i427)
           {
-            ResourceUri _elem427; // optional
-            _elem427 = new ResourceUri();
-            _elem427.read(iprot);
-            struct.resourceUris.add(_elem427);
+            _elem426 = new ResourceUri();
+            _elem426.read(iprot);
+            struct.resourceUris.add(_elem426);
           }
         }
         struct.setResourceUrisIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java
index 8f5b9b1..6958566 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FunctionType.java
@@ -1,5 +1,5 @@
 /**
- * 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

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
index 9fe8d82..d04b7a6 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.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 GetOpenTxnsInfoResponse implements org.apache.thrift.TBase<GetOpenTxnsInfoResponse, GetOpenTxnsInfoResponse._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 GetOpenTxnsInfoResponse implements org.apache.thrift.TBase<GetOpenTxnsInfoResponse, GetOpenTxnsInfoResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetOpenTxnsInfoResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetOpenTxnsInfoResponse");
 
   private static final org.apache.thrift.protocol.TField TXN_HIGH_WATER_MARK_FIELD_DESC = new org.apache.thrift.protocol.TField("txn_high_water_mark", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -142,7 +146,7 @@ public class GetOpenTxnsInfoResponse implements org.apache.thrift.TBase<GetOpenT
     __isset_bitfield = other.__isset_bitfield;
     this.txn_high_water_mark = other.txn_high_water_mark;
     if (other.isSetOpen_txns()) {
-      List<TxnInfo> __this__open_txns = new ArrayList<TxnInfo>();
+      List<TxnInfo> __this__open_txns = new ArrayList<TxnInfo>(other.open_txns.size());
       for (TxnInfo other_element : other.open_txns) {
         __this__open_txns.add(new TxnInfo(other_element));
       }
@@ -305,45 +309,45 @@ public class GetOpenTxnsInfoResponse implements org.apache.thrift.TBase<GetOpenT
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_txn_high_water_mark = true;
-    builder.append(present_txn_high_water_mark);
+    list.add(present_txn_high_water_mark);
     if (present_txn_high_water_mark)
-      builder.append(txn_high_water_mark);
+      list.add(txn_high_water_mark);
 
     boolean present_open_txns = true && (isSetOpen_txns());
-    builder.append(present_open_txns);
+    list.add(present_open_txns);
     if (present_open_txns)
-      builder.append(open_txns);
+      list.add(open_txns);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GetOpenTxnsInfoResponse other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GetOpenTxnsInfoResponse typedOther = (GetOpenTxnsInfoResponse)other;
 
-    lastComparison = Boolean.valueOf(isSetTxn_high_water_mark()).compareTo(typedOther.isSetTxn_high_water_mark());
+    lastComparison = Boolean.valueOf(isSetTxn_high_water_mark()).compareTo(other.isSetTxn_high_water_mark());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTxn_high_water_mark()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txn_high_water_mark, typedOther.txn_high_water_mark);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txn_high_water_mark, other.txn_high_water_mark);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOpen_txns()).compareTo(typedOther.isSetOpen_txns());
+    lastComparison = Boolean.valueOf(isSetOpen_txns()).compareTo(other.isSetOpen_txns());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOpen_txns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.open_txns, typedOther.open_txns);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.open_txns, other.open_txns);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -445,12 +449,12 @@ public class GetOpenTxnsInfoResponse implements org.apache.thrift.TBase<GetOpenT
               {
                 org.apache.thrift.protocol.TList _list428 = iprot.readListBegin();
                 struct.open_txns = new ArrayList<TxnInfo>(_list428.size);
-                for (int _i429 = 0; _i429 < _list428.size; ++_i429)
+                TxnInfo _elem429;
+                for (int _i430 = 0; _i430 < _list428.size; ++_i430)
                 {
-                  TxnInfo _elem430; // optional
-                  _elem430 = new TxnInfo();
-                  _elem430.read(iprot);
-                  struct.open_txns.add(_elem430);
+                  _elem429 = new TxnInfo();
+                  _elem429.read(iprot);
+                  struct.open_txns.add(_elem429);
                 }
                 iprot.readListEnd();
               }
@@ -522,12 +526,12 @@ public class GetOpenTxnsInfoResponse implements org.apache.thrift.TBase<GetOpenT
       {
         org.apache.thrift.protocol.TList _list433 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.open_txns = new ArrayList<TxnInfo>(_list433.size);
-        for (int _i434 = 0; _i434 < _list433.size; ++_i434)
+        TxnInfo _elem434;
+        for (int _i435 = 0; _i435 < _list433.size; ++_i435)
         {
-          TxnInfo _elem435; // optional
-          _elem435 = new TxnInfo();
-          _elem435.read(iprot);
-          struct.open_txns.add(_elem435);
+          _elem434 = new TxnInfo();
+          _elem434.read(iprot);
+          struct.open_txns.add(_elem434);
         }
       }
       struct.setOpen_txnsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
index 917ecea..d601175 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.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 GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsResponse, GetOpenTxnsResponse._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 GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsResponse, GetOpenTxnsResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetOpenTxnsResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetOpenTxnsResponse");
 
   private static final org.apache.thrift.protocol.TField TXN_HIGH_WATER_MARK_FIELD_DESC = new org.apache.thrift.protocol.TField("txn_high_water_mark", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -142,10 +146,7 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
     __isset_bitfield = other.__isset_bitfield;
     this.txn_high_water_mark = other.txn_high_water_mark;
     if (other.isSetOpen_txns()) {
-      Set<Long> __this__open_txns = new HashSet<Long>();
-      for (Long other_element : other.open_txns) {
-        __this__open_txns.add(other_element);
-      }
+      Set<Long> __this__open_txns = new HashSet<Long>(other.open_txns);
       this.open_txns = __this__open_txns;
     }
   }
@@ -305,45 +306,45 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_txn_high_water_mark = true;
-    builder.append(present_txn_high_water_mark);
+    list.add(present_txn_high_water_mark);
     if (present_txn_high_water_mark)
-      builder.append(txn_high_water_mark);
+      list.add(txn_high_water_mark);
 
     boolean present_open_txns = true && (isSetOpen_txns());
-    builder.append(present_open_txns);
+    list.add(present_open_txns);
     if (present_open_txns)
-      builder.append(open_txns);
+      list.add(open_txns);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GetOpenTxnsResponse other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GetOpenTxnsResponse typedOther = (GetOpenTxnsResponse)other;
 
-    lastComparison = Boolean.valueOf(isSetTxn_high_water_mark()).compareTo(typedOther.isSetTxn_high_water_mark());
+    lastComparison = Boolean.valueOf(isSetTxn_high_water_mark()).compareTo(other.isSetTxn_high_water_mark());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTxn_high_water_mark()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txn_high_water_mark, typedOther.txn_high_water_mark);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txn_high_water_mark, other.txn_high_water_mark);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOpen_txns()).compareTo(typedOther.isSetOpen_txns());
+    lastComparison = Boolean.valueOf(isSetOpen_txns()).compareTo(other.isSetOpen_txns());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOpen_txns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.open_txns, typedOther.open_txns);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.open_txns, other.open_txns);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -445,11 +446,11 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
               {
                 org.apache.thrift.protocol.TSet _set436 = iprot.readSetBegin();
                 struct.open_txns = new HashSet<Long>(2*_set436.size);
-                for (int _i437 = 0; _i437 < _set436.size; ++_i437)
+                long _elem437;
+                for (int _i438 = 0; _i438 < _set436.size; ++_i438)
                 {
-                  long _elem438; // optional
-                  _elem438 = iprot.readI64();
-                  struct.open_txns.add(_elem438);
+                  _elem437 = iprot.readI64();
+                  struct.open_txns.add(_elem437);
                 }
                 iprot.readSetEnd();
               }
@@ -521,11 +522,11 @@ public class GetOpenTxnsResponse implements org.apache.thrift.TBase<GetOpenTxnsR
       {
         org.apache.thrift.protocol.TSet _set441 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32());
         struct.open_txns = new HashSet<Long>(2*_set441.size);
-        for (int _i442 = 0; _i442 < _set441.size; ++_i442)
+        long _elem442;
+        for (int _i443 = 0; _i443 < _set441.size; ++_i443)
         {
-          long _elem443; // optional
-          _elem443 = iprot.readI64();
-          struct.open_txns.add(_elem443);
+          _elem442 = iprot.readI64();
+          struct.open_txns.add(_elem442);
         }
       }
       struct.setOpen_txnsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java
index 565eba9..0df8619 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleRequest.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 GetPrincipalsInRoleRequest implements org.apache.thrift.TBase<GetPrincipalsInRoleRequest, GetPrincipalsInRoleRequest._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 GetPrincipalsInRoleRequest implements org.apache.thrift.TBase<GetPrincipalsInRoleRequest, GetPrincipalsInRoleRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetPrincipalsInRoleRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPrincipalsInRoleRequest");
 
   private static final org.apache.thrift.protocol.TField ROLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("roleName", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -225,30 +229,30 @@ public class GetPrincipalsInRoleRequest implements org.apache.thrift.TBase<GetPr
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_roleName = true && (isSetRoleName());
-    builder.append(present_roleName);
+    list.add(present_roleName);
     if (present_roleName)
-      builder.append(roleName);
+      list.add(roleName);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GetPrincipalsInRoleRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GetPrincipalsInRoleRequest typedOther = (GetPrincipalsInRoleRequest)other;
 
-    lastComparison = Boolean.valueOf(isSetRoleName()).compareTo(typedOther.isSetRoleName());
+    lastComparison = Boolean.valueOf(isSetRoleName()).compareTo(other.isSetRoleName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRoleName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.roleName, typedOther.roleName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.roleName, other.roleName);
       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/GetPrincipalsInRoleResponse.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
index 3ef6224..67684ac 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.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 GetPrincipalsInRoleResponse implements org.apache.thrift.TBase<GetPrincipalsInRoleResponse, GetPrincipalsInRoleResponse._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 GetPrincipalsInRoleResponse implements org.apache.thrift.TBase<GetPrincipalsInRoleResponse, GetPrincipalsInRoleResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetPrincipalsInRoleResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetPrincipalsInRoleResponse");
 
   private static final org.apache.thrift.protocol.TField PRINCIPAL_GRANTS_FIELD_DESC = new org.apache.thrift.protocol.TField("principalGrants", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -128,7 +132,7 @@ public class GetPrincipalsInRoleResponse implements org.apache.thrift.TBase<GetP
    */
   public GetPrincipalsInRoleResponse(GetPrincipalsInRoleResponse other) {
     if (other.isSetPrincipalGrants()) {
-      List<RolePrincipalGrant> __this__principalGrants = new ArrayList<RolePrincipalGrant>();
+      List<RolePrincipalGrant> __this__principalGrants = new ArrayList<RolePrincipalGrant>(other.principalGrants.size());
       for (RolePrincipalGrant other_element : other.principalGrants) {
         __this__principalGrants.add(new RolePrincipalGrant(other_element));
       }
@@ -245,30 +249,30 @@ public class GetPrincipalsInRoleResponse implements org.apache.thrift.TBase<GetP
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_principalGrants = true && (isSetPrincipalGrants());
-    builder.append(present_principalGrants);
+    list.add(present_principalGrants);
     if (present_principalGrants)
-      builder.append(principalGrants);
+      list.add(principalGrants);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GetPrincipalsInRoleResponse other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GetPrincipalsInRoleResponse typedOther = (GetPrincipalsInRoleResponse)other;
 
-    lastComparison = Boolean.valueOf(isSetPrincipalGrants()).compareTo(typedOther.isSetPrincipalGrants());
+    lastComparison = Boolean.valueOf(isSetPrincipalGrants()).compareTo(other.isSetPrincipalGrants());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrincipalGrants()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principalGrants, typedOther.principalGrants);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principalGrants, other.principalGrants);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -352,12 +356,12 @@ public class GetPrincipalsInRoleResponse implements org.apache.thrift.TBase<GetP
               {
                 org.apache.thrift.protocol.TList _list86 = iprot.readListBegin();
                 struct.principalGrants = new ArrayList<RolePrincipalGrant>(_list86.size);
-                for (int _i87 = 0; _i87 < _list86.size; ++_i87)
+                RolePrincipalGrant _elem87;
+                for (int _i88 = 0; _i88 < _list86.size; ++_i88)
                 {
-                  RolePrincipalGrant _elem88; // optional
-                  _elem88 = new RolePrincipalGrant();
-                  _elem88.read(iprot);
-                  struct.principalGrants.add(_elem88);
+                  _elem87 = new RolePrincipalGrant();
+                  _elem87.read(iprot);
+                  struct.principalGrants.add(_elem87);
                 }
                 iprot.readListEnd();
               }
@@ -423,12 +427,12 @@ public class GetPrincipalsInRoleResponse implements org.apache.thrift.TBase<GetP
       {
         org.apache.thrift.protocol.TList _list91 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.principalGrants = new ArrayList<RolePrincipalGrant>(_list91.size);
-        for (int _i92 = 0; _i92 < _list91.size; ++_i92)
+        RolePrincipalGrant _elem92;
+        for (int _i93 = 0; _i93 < _list91.size; ++_i93)
         {
-          RolePrincipalGrant _elem93; // optional
-          _elem93 = new RolePrincipalGrant();
-          _elem93.read(iprot);
-          struct.principalGrants.add(_elem93);
+          _elem92 = new RolePrincipalGrant();
+          _elem92.read(iprot);
+          struct.principalGrants.add(_elem92);
         }
       }
       struct.setPrincipalGrantsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java
index 84b73c3..3ab34ee 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalRequest.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 GetRoleGrantsForPrincipalRequest implements org.apache.thrift.TBase<GetRoleGrantsForPrincipalRequest, GetRoleGrantsForPrincipalRequest._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 GetRoleGrantsForPrincipalRequest implements org.apache.thrift.TBase<GetRoleGrantsForPrincipalRequest, GetRoleGrantsForPrincipalRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetRoleGrantsForPrincipalRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetRoleGrantsForPrincipalRequest");
 
   private static final org.apache.thrift.protocol.TField PRINCIPAL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("principal_name", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -295,45 +299,45 @@ public class GetRoleGrantsForPrincipalRequest implements org.apache.thrift.TBase
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_principal_name = true && (isSetPrincipal_name());
-    builder.append(present_principal_name);
+    list.add(present_principal_name);
     if (present_principal_name)
-      builder.append(principal_name);
+      list.add(principal_name);
 
     boolean present_principal_type = true && (isSetPrincipal_type());
-    builder.append(present_principal_type);
+    list.add(present_principal_type);
     if (present_principal_type)
-      builder.append(principal_type.getValue());
+      list.add(principal_type.getValue());
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GetRoleGrantsForPrincipalRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GetRoleGrantsForPrincipalRequest typedOther = (GetRoleGrantsForPrincipalRequest)other;
 
-    lastComparison = Boolean.valueOf(isSetPrincipal_name()).compareTo(typedOther.isSetPrincipal_name());
+    lastComparison = Boolean.valueOf(isSetPrincipal_name()).compareTo(other.isSetPrincipal_name());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrincipal_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal_name, typedOther.principal_name);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal_name, other.principal_name);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPrincipal_type()).compareTo(typedOther.isSetPrincipal_type());
+    lastComparison = Boolean.valueOf(isSetPrincipal_type()).compareTo(other.isSetPrincipal_type());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrincipal_type()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal_type, typedOther.principal_type);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principal_type, other.principal_type);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -434,7 +438,7 @@ public class GetRoleGrantsForPrincipalRequest implements org.apache.thrift.TBase
             break;
           case 2: // PRINCIPAL_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.principal_type = PrincipalType.findByValue(iprot.readI32());
+              struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
               struct.setPrincipal_typeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -489,7 +493,7 @@ public class GetRoleGrantsForPrincipalRequest implements org.apache.thrift.TBase
       TTupleProtocol iprot = (TTupleProtocol) prot;
       struct.principal_name = iprot.readString();
       struct.setPrincipal_nameIsSet(true);
-      struct.principal_type = PrincipalType.findByValue(iprot.readI32());
+      struct.principal_type = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
       struct.setPrincipal_typeIsSet(true);
     }
   }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
index 3ddc1ac..f1c6c02 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.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 GetRoleGrantsForPrincipalResponse implements org.apache.thrift.TBase<GetRoleGrantsForPrincipalResponse, GetRoleGrantsForPrincipalResponse._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 GetRoleGrantsForPrincipalResponse implements org.apache.thrift.TBase<GetRoleGrantsForPrincipalResponse, GetRoleGrantsForPrincipalResponse._Fields>, java.io.Serializable, Cloneable, Comparable<GetRoleGrantsForPrincipalResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetRoleGrantsForPrincipalResponse");
 
   private static final org.apache.thrift.protocol.TField PRINCIPAL_GRANTS_FIELD_DESC = new org.apache.thrift.protocol.TField("principalGrants", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -128,7 +132,7 @@ public class GetRoleGrantsForPrincipalResponse implements org.apache.thrift.TBas
    */
   public GetRoleGrantsForPrincipalResponse(GetRoleGrantsForPrincipalResponse other) {
     if (other.isSetPrincipalGrants()) {
-      List<RolePrincipalGrant> __this__principalGrants = new ArrayList<RolePrincipalGrant>();
+      List<RolePrincipalGrant> __this__principalGrants = new ArrayList<RolePrincipalGrant>(other.principalGrants.size());
       for (RolePrincipalGrant other_element : other.principalGrants) {
         __this__principalGrants.add(new RolePrincipalGrant(other_element));
       }
@@ -245,30 +249,30 @@ public class GetRoleGrantsForPrincipalResponse implements org.apache.thrift.TBas
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_principalGrants = true && (isSetPrincipalGrants());
-    builder.append(present_principalGrants);
+    list.add(present_principalGrants);
     if (present_principalGrants)
-      builder.append(principalGrants);
+      list.add(principalGrants);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GetRoleGrantsForPrincipalResponse other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GetRoleGrantsForPrincipalResponse typedOther = (GetRoleGrantsForPrincipalResponse)other;
 
-    lastComparison = Boolean.valueOf(isSetPrincipalGrants()).compareTo(typedOther.isSetPrincipalGrants());
+    lastComparison = Boolean.valueOf(isSetPrincipalGrants()).compareTo(other.isSetPrincipalGrants());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrincipalGrants()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principalGrants, typedOther.principalGrants);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principalGrants, other.principalGrants);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -352,12 +356,12 @@ public class GetRoleGrantsForPrincipalResponse implements org.apache.thrift.TBas
               {
                 org.apache.thrift.protocol.TList _list78 = iprot.readListBegin();
                 struct.principalGrants = new ArrayList<RolePrincipalGrant>(_list78.size);
-                for (int _i79 = 0; _i79 < _list78.size; ++_i79)
+                RolePrincipalGrant _elem79;
+                for (int _i80 = 0; _i80 < _list78.size; ++_i80)
                 {
-                  RolePrincipalGrant _elem80; // optional
-                  _elem80 = new RolePrincipalGrant();
-                  _elem80.read(iprot);
-                  struct.principalGrants.add(_elem80);
+                  _elem79 = new RolePrincipalGrant();
+                  _elem79.read(iprot);
+                  struct.principalGrants.add(_elem79);
                 }
                 iprot.readListEnd();
               }
@@ -423,12 +427,12 @@ public class GetRoleGrantsForPrincipalResponse implements org.apache.thrift.TBas
       {
         org.apache.thrift.protocol.TList _list83 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.principalGrants = new ArrayList<RolePrincipalGrant>(_list83.size);
-        for (int _i84 = 0; _i84 < _list83.size; ++_i84)
+        RolePrincipalGrant _elem84;
+        for (int _i85 = 0; _i85 < _list83.size; ++_i85)
         {
-          RolePrincipalGrant _elem85; // optional
-          _elem85 = new RolePrincipalGrant();
-          _elem85.read(iprot);
-          struct.principalGrants.add(_elem85);
+          _elem84 = new RolePrincipalGrant();
+          _elem84.read(iprot);
+          struct.principalGrants.add(_elem84);
         }
       }
       struct.setPrincipalGrantsIsSet(true);