http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
index 29ce977..70b839f 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.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 GrantRevokePrivilegeRequest implements 
org.apache.thrift.TBase<GrantRevokePrivilegeRequest, 
GrantRevokePrivilegeRequest._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 GrantRevokePrivilegeRequest implements 
org.apache.thrift.TBase<GrantRevokePrivilegeRequest, 
GrantRevokePrivilegeRequest._Fields>, java.io.Serializable, Cloneable, 
Comparable<GrantRevokePrivilegeRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GrantRevokePrivilegeRequest");
 
   private static final org.apache.thrift.protocol.TField 
REQUEST_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("requestType", 
org.apache.thrift.protocol.TType.I32, (short)1);
@@ -119,7 +123,7 @@ public class GrantRevokePrivilegeRequest implements 
org.apache.thrift.TBase<Gran
   // isset id assignments
   private static final int __REVOKEGRANTOPTION_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.REVOKE_GRANT_OPTION};
+  private static final _Fields optionals[] = {_Fields.REVOKE_GRANT_OPTION};
   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);
@@ -353,60 +357,60 @@ public class GrantRevokePrivilegeRequest implements 
org.apache.thrift.TBase<Gran
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_requestType = true && (isSetRequestType());
-    builder.append(present_requestType);
+    list.add(present_requestType);
     if (present_requestType)
-      builder.append(requestType.getValue());
+      list.add(requestType.getValue());
 
     boolean present_privileges = true && (isSetPrivileges());
-    builder.append(present_privileges);
+    list.add(present_privileges);
     if (present_privileges)
-      builder.append(privileges);
+      list.add(privileges);
 
     boolean present_revokeGrantOption = true && (isSetRevokeGrantOption());
-    builder.append(present_revokeGrantOption);
+    list.add(present_revokeGrantOption);
     if (present_revokeGrantOption)
-      builder.append(revokeGrantOption);
+      list.add(revokeGrantOption);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GrantRevokePrivilegeRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GrantRevokePrivilegeRequest typedOther = 
(GrantRevokePrivilegeRequest)other;
 
-    lastComparison = 
Boolean.valueOf(isSetRequestType()).compareTo(typedOther.isSetRequestType());
+    lastComparison = 
Boolean.valueOf(isSetRequestType()).compareTo(other.isSetRequestType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRequestType()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.requestType, 
typedOther.requestType);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.requestType, other.requestType);
       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(isSetRevokeGrantOption()).compareTo(typedOther.isSetRevokeGrantOption());
+    lastComparison = 
Boolean.valueOf(isSetRevokeGrantOption()).compareTo(other.isSetRevokeGrantOption());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRevokeGrantOption()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.revokeGrantOption, 
typedOther.revokeGrantOption);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.revokeGrantOption, 
other.revokeGrantOption);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -502,7 +506,7 @@ public class GrantRevokePrivilegeRequest implements 
org.apache.thrift.TBase<Gran
         switch (schemeField.id) {
           case 1: // REQUEST_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.requestType = 
GrantRevokeType.findByValue(iprot.readI32());
+              struct.requestType = 
org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
               struct.setRequestTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
@@ -597,7 +601,7 @@ public class GrantRevokePrivilegeRequest implements 
org.apache.thrift.TBase<Gran
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
-        struct.requestType = GrantRevokeType.findByValue(iprot.readI32());
+        struct.requestType = 
org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
         struct.setRequestTypeIsSet(true);
       }
       if (incoming.get(1)) {

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
index f86bf9f..169f35c 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.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 GrantRevokePrivilegeResponse implements 
org.apache.thrift.TBase<GrantRevokePrivilegeResponse, 
GrantRevokePrivilegeResponse._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 GrantRevokePrivilegeResponse implements 
org.apache.thrift.TBase<GrantRevokePrivilegeResponse, 
GrantRevokePrivilegeResponse._Fields>, java.io.Serializable, Cloneable, 
Comparable<GrantRevokePrivilegeResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GrantRevokePrivilegeResponse");
 
   private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -105,7 +109,7 @@ public class GrantRevokePrivilegeResponse implements 
org.apache.thrift.TBase<Gra
   // isset id assignments
   private static final int __SUCCESS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SUCCESS};
+  private static final _Fields optionals[] = {_Fields.SUCCESS};
   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);
@@ -220,30 +224,30 @@ public class GrantRevokePrivilegeResponse implements 
org.apache.thrift.TBase<Gra
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_success = true && (isSetSuccess());
-    builder.append(present_success);
+    list.add(present_success);
     if (present_success)
-      builder.append(success);
+      list.add(success);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GrantRevokePrivilegeResponse other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GrantRevokePrivilegeResponse typedOther = 
(GrantRevokePrivilegeResponse)other;
 
-    lastComparison = 
Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+    lastComparison = 
Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSuccess()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, 
typedOther.success);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, 
other.success);
       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/GrantRevokeRoleRequest.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java
index db17aef..74384c9 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.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 GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevokeRoleRequest, 
GrantRevokeRoleRequest._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 GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevokeRoleRequest, 
GrantRevokeRoleRequest._Fields>, java.io.Serializable, Cloneable, 
Comparable<GrantRevokeRoleRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GrantRevokeRoleRequest");
 
   private static final org.apache.thrift.protocol.TField 
REQUEST_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("requestType", 
org.apache.thrift.protocol.TType.I32, (short)1);
@@ -147,7 +151,7 @@ public class GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevo
   // isset id assignments
   private static final int __GRANTOPTION_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = 
{_Fields.GRANTOR,_Fields.GRANTOR_TYPE,_Fields.GRANT_OPTION};
+  private static final _Fields optionals[] = 
{_Fields.GRANTOR,_Fields.GRANTOR_TYPE,_Fields.GRANT_OPTION};
   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);
@@ -605,120 +609,120 @@ public class GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevo
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_requestType = true && (isSetRequestType());
-    builder.append(present_requestType);
+    list.add(present_requestType);
     if (present_requestType)
-      builder.append(requestType.getValue());
+      list.add(requestType.getValue());
 
     boolean present_roleName = true && (isSetRoleName());
-    builder.append(present_roleName);
+    list.add(present_roleName);
     if (present_roleName)
-      builder.append(roleName);
+      list.add(roleName);
 
     boolean present_principalName = true && (isSetPrincipalName());
-    builder.append(present_principalName);
+    list.add(present_principalName);
     if (present_principalName)
-      builder.append(principalName);
+      list.add(principalName);
 
     boolean present_principalType = true && (isSetPrincipalType());
-    builder.append(present_principalType);
+    list.add(present_principalType);
     if (present_principalType)
-      builder.append(principalType.getValue());
+      list.add(principalType.getValue());
 
     boolean present_grantor = true && (isSetGrantor());
-    builder.append(present_grantor);
+    list.add(present_grantor);
     if (present_grantor)
-      builder.append(grantor);
+      list.add(grantor);
 
     boolean present_grantorType = true && (isSetGrantorType());
-    builder.append(present_grantorType);
+    list.add(present_grantorType);
     if (present_grantorType)
-      builder.append(grantorType.getValue());
+      list.add(grantorType.getValue());
 
     boolean present_grantOption = true && (isSetGrantOption());
-    builder.append(present_grantOption);
+    list.add(present_grantOption);
     if (present_grantOption)
-      builder.append(grantOption);
+      list.add(grantOption);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GrantRevokeRoleRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GrantRevokeRoleRequest typedOther = (GrantRevokeRoleRequest)other;
 
-    lastComparison = 
Boolean.valueOf(isSetRequestType()).compareTo(typedOther.isSetRequestType());
+    lastComparison = 
Boolean.valueOf(isSetRequestType()).compareTo(other.isSetRequestType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRequestType()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.requestType, 
typedOther.requestType);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.requestType, other.requestType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    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;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPrincipalName()).compareTo(typedOther.isSetPrincipalName());
+    lastComparison = 
Boolean.valueOf(isSetPrincipalName()).compareTo(other.isSetPrincipalName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrincipalName()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.principalName, 
typedOther.principalName);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.principalName, 
other.principalName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPrincipalType()).compareTo(typedOther.isSetPrincipalType());
+    lastComparison = 
Boolean.valueOf(isSetPrincipalType()).compareTo(other.isSetPrincipalType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrincipalType()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.principalType, 
typedOther.principalType);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.principalType, 
other.principalType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGrantor()).compareTo(typedOther.isSetGrantor());
+    lastComparison = 
Boolean.valueOf(isSetGrantor()).compareTo(other.isSetGrantor());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetGrantor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantor, 
typedOther.grantor);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantor, 
other.grantor);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGrantorType()).compareTo(typedOther.isSetGrantorType());
+    lastComparison = 
Boolean.valueOf(isSetGrantorType()).compareTo(other.isSetGrantorType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetGrantorType()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.grantorType, 
typedOther.grantorType);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.grantorType, other.grantorType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGrantOption()).compareTo(typedOther.isSetGrantOption());
+    lastComparison = 
Boolean.valueOf(isSetGrantOption()).compareTo(other.isSetGrantOption());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetGrantOption()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.grantOption, 
typedOther.grantOption);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.grantOption, other.grantOption);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -847,7 +851,7 @@ public class GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevo
         switch (schemeField.id) {
           case 1: // REQUEST_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.requestType = 
GrantRevokeType.findByValue(iprot.readI32());
+              struct.requestType = 
org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
               struct.setRequestTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
@@ -871,7 +875,7 @@ public class GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevo
             break;
           case 4: // PRINCIPAL_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.principalType = 
PrincipalType.findByValue(iprot.readI32());
+              struct.principalType = 
org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
               struct.setPrincipalTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
@@ -887,7 +891,7 @@ public class GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevo
             break;
           case 6: // GRANTOR_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.grantorType = PrincipalType.findByValue(iprot.readI32());
+              struct.grantorType = 
org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
               struct.setGrantorTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
@@ -1021,7 +1025,7 @@ public class GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevo
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
-        struct.requestType = GrantRevokeType.findByValue(iprot.readI32());
+        struct.requestType = 
org.apache.hadoop.hive.metastore.api.GrantRevokeType.findByValue(iprot.readI32());
         struct.setRequestTypeIsSet(true);
       }
       if (incoming.get(1)) {
@@ -1033,7 +1037,7 @@ public class GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevo
         struct.setPrincipalNameIsSet(true);
       }
       if (incoming.get(3)) {
-        struct.principalType = PrincipalType.findByValue(iprot.readI32());
+        struct.principalType = 
org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
         struct.setPrincipalTypeIsSet(true);
       }
       if (incoming.get(4)) {
@@ -1041,7 +1045,7 @@ public class GrantRevokeRoleRequest implements 
org.apache.thrift.TBase<GrantRevo
         struct.setGrantorIsSet(true);
       }
       if (incoming.get(5)) {
-        struct.grantorType = PrincipalType.findByValue(iprot.readI32());
+        struct.grantorType = 
org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
         struct.setGrantorTypeIsSet(true);
       }
       if (incoming.get(6)) {

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
index b9acbb5..c74d0d2 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.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 GrantRevokeRoleResponse implements 
org.apache.thrift.TBase<GrantRevokeRoleResponse, 
GrantRevokeRoleResponse._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 GrantRevokeRoleResponse implements 
org.apache.thrift.TBase<GrantRevokeRoleResponse, 
GrantRevokeRoleResponse._Fields>, java.io.Serializable, Cloneable, 
Comparable<GrantRevokeRoleResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GrantRevokeRoleResponse");
 
   private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("success", 
org.apache.thrift.protocol.TType.BOOL, (short)1);
@@ -105,7 +109,7 @@ public class GrantRevokeRoleResponse implements 
org.apache.thrift.TBase<GrantRev
   // isset id assignments
   private static final int __SUCCESS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SUCCESS};
+  private static final _Fields optionals[] = {_Fields.SUCCESS};
   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);
@@ -220,30 +224,30 @@ public class GrantRevokeRoleResponse implements 
org.apache.thrift.TBase<GrantRev
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_success = true && (isSetSuccess());
-    builder.append(present_success);
+    list.add(present_success);
     if (present_success)
-      builder.append(success);
+      list.add(success);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(GrantRevokeRoleResponse other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    GrantRevokeRoleResponse typedOther = (GrantRevokeRoleResponse)other;
 
-    lastComparison = 
Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+    lastComparison = 
Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSuccess()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, 
typedOther.success);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, 
other.success);
       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/GrantRevokeType.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java
index c949637..f7b4587 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.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/HeartbeatRequest.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java
index 04439b9..9b66b37 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatRequest.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 HeartbeatRequest implements 
org.apache.thrift.TBase<HeartbeatRequest, HeartbeatRequest._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 HeartbeatRequest implements 
org.apache.thrift.TBase<HeartbeatRequest, HeartbeatRequest._Fields>, 
java.io.Serializable, Cloneable, Comparable<HeartbeatRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("HeartbeatRequest");
 
   private static final org.apache.thrift.protocol.TField LOCKID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("lockid", 
org.apache.thrift.protocol.TType.I64, (short)1);
@@ -111,7 +115,7 @@ public class HeartbeatRequest implements 
org.apache.thrift.TBase<HeartbeatReques
   private static final int __LOCKID_ISSET_ID = 0;
   private static final int __TXNID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.LOCKID,_Fields.TXNID};
+  private static final _Fields optionals[] = {_Fields.LOCKID,_Fields.TXNID};
   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);
@@ -275,45 +279,45 @@ public class HeartbeatRequest implements 
org.apache.thrift.TBase<HeartbeatReques
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_lockid = true && (isSetLockid());
-    builder.append(present_lockid);
+    list.add(present_lockid);
     if (present_lockid)
-      builder.append(lockid);
+      list.add(lockid);
 
     boolean present_txnid = true && (isSetTxnid());
-    builder.append(present_txnid);
+    list.add(present_txnid);
     if (present_txnid)
-      builder.append(txnid);
+      list.add(txnid);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(HeartbeatRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    HeartbeatRequest typedOther = (HeartbeatRequest)other;
 
-    lastComparison = 
Boolean.valueOf(isSetLockid()).compareTo(typedOther.isSetLockid());
+    lastComparison = 
Boolean.valueOf(isSetLockid()).compareTo(other.isSetLockid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLockid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lockid, 
typedOther.lockid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lockid, 
other.lockid);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetTxnid()).compareTo(typedOther.isSetTxnid());
+    lastComparison = 
Boolean.valueOf(isSetTxnid()).compareTo(other.isSetTxnid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTxnid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txnid, 
typedOther.txnid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txnid, 
other.txnid);
       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/HeartbeatTxnRangeRequest.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java
index 062449a..290bbb1 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeRequest.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 HeartbeatTxnRangeRequest implements 
org.apache.thrift.TBase<HeartbeatTxnRangeRequest, 
HeartbeatTxnRangeRequest._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 HeartbeatTxnRangeRequest implements 
org.apache.thrift.TBase<HeartbeatTxnRangeRequest, 
HeartbeatTxnRangeRequest._Fields>, java.io.Serializable, Cloneable, 
Comparable<HeartbeatTxnRangeRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("HeartbeatTxnRangeRequest");
 
   private static final org.apache.thrift.protocol.TField MIN_FIELD_DESC = new 
org.apache.thrift.protocol.TField("min", org.apache.thrift.protocol.TType.I64, 
(short)1);
@@ -285,45 +289,45 @@ public class HeartbeatTxnRangeRequest implements 
org.apache.thrift.TBase<Heartbe
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_min = true;
-    builder.append(present_min);
+    list.add(present_min);
     if (present_min)
-      builder.append(min);
+      list.add(min);
 
     boolean present_max = true;
-    builder.append(present_max);
+    list.add(present_max);
     if (present_max)
-      builder.append(max);
+      list.add(max);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(HeartbeatTxnRangeRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    HeartbeatTxnRangeRequest typedOther = (HeartbeatTxnRangeRequest)other;
 
-    lastComparison = 
Boolean.valueOf(isSetMin()).compareTo(typedOther.isSetMin());
+    lastComparison = Boolean.valueOf(isSetMin()).compareTo(other.isSetMin());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMin()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.min, 
typedOther.min);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.min, 
other.min);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetMax()).compareTo(typedOther.isSetMax());
+    lastComparison = Boolean.valueOf(isSetMax()).compareTo(other.isSetMax());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMax()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.max, 
typedOther.max);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.max, 
other.max);
       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/HeartbeatTxnRangeResponse.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
index caf07d6..96f335c 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.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 HeartbeatTxnRangeResponse implements 
org.apache.thrift.TBase<HeartbeatTxnRangeResponse, 
HeartbeatTxnRangeResponse._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 HeartbeatTxnRangeResponse implements 
org.apache.thrift.TBase<HeartbeatTxnRangeResponse, 
HeartbeatTxnRangeResponse._Fields>, java.io.Serializable, Cloneable, 
Comparable<HeartbeatTxnRangeResponse> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("HeartbeatTxnRangeResponse");
 
   private static final org.apache.thrift.protocol.TField ABORTED_FIELD_DESC = 
new org.apache.thrift.protocol.TField("aborted", 
org.apache.thrift.protocol.TType.SET, (short)1);
@@ -138,17 +142,11 @@ public class HeartbeatTxnRangeResponse implements 
org.apache.thrift.TBase<Heartb
    */
   public HeartbeatTxnRangeResponse(HeartbeatTxnRangeResponse other) {
     if (other.isSetAborted()) {
-      Set<Long> __this__aborted = new HashSet<Long>();
-      for (Long other_element : other.aborted) {
-        __this__aborted.add(other_element);
-      }
+      Set<Long> __this__aborted = new HashSet<Long>(other.aborted);
       this.aborted = __this__aborted;
     }
     if (other.isSetNosuch()) {
-      Set<Long> __this__nosuch = new HashSet<Long>();
-      for (Long other_element : other.nosuch) {
-        __this__nosuch.add(other_element);
-      }
+      Set<Long> __this__nosuch = new HashSet<Long>(other.nosuch);
       this.nosuch = __this__nosuch;
     }
   }
@@ -323,45 +321,45 @@ public class HeartbeatTxnRangeResponse implements 
org.apache.thrift.TBase<Heartb
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_aborted = true && (isSetAborted());
-    builder.append(present_aborted);
+    list.add(present_aborted);
     if (present_aborted)
-      builder.append(aborted);
+      list.add(aborted);
 
     boolean present_nosuch = true && (isSetNosuch());
-    builder.append(present_nosuch);
+    list.add(present_nosuch);
     if (present_nosuch)
-      builder.append(nosuch);
+      list.add(nosuch);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(HeartbeatTxnRangeResponse other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    HeartbeatTxnRangeResponse typedOther = (HeartbeatTxnRangeResponse)other;
 
-    lastComparison = 
Boolean.valueOf(isSetAborted()).compareTo(typedOther.isSetAborted());
+    lastComparison = 
Boolean.valueOf(isSetAborted()).compareTo(other.isSetAborted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAborted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aborted, 
typedOther.aborted);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.aborted, 
other.aborted);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetNosuch()).compareTo(typedOther.isSetNosuch());
+    lastComparison = 
Boolean.valueOf(isSetNosuch()).compareTo(other.isSetNosuch());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNosuch()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nosuch, 
typedOther.nosuch);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nosuch, 
other.nosuch);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -457,11 +455,11 @@ public class HeartbeatTxnRangeResponse implements 
org.apache.thrift.TBase<Heartb
               {
                 org.apache.thrift.protocol.TSet _set468 = iprot.readSetBegin();
                 struct.aborted = new HashSet<Long>(2*_set468.size);
-                for (int _i469 = 0; _i469 < _set468.size; ++_i469)
+                long _elem469;
+                for (int _i470 = 0; _i470 < _set468.size; ++_i470)
                 {
-                  long _elem470; // optional
-                  _elem470 = iprot.readI64();
-                  struct.aborted.add(_elem470);
+                  _elem469 = iprot.readI64();
+                  struct.aborted.add(_elem469);
                 }
                 iprot.readSetEnd();
               }
@@ -475,11 +473,11 @@ public class HeartbeatTxnRangeResponse implements 
org.apache.thrift.TBase<Heartb
               {
                 org.apache.thrift.protocol.TSet _set471 = iprot.readSetBegin();
                 struct.nosuch = new HashSet<Long>(2*_set471.size);
-                for (int _i472 = 0; _i472 < _set471.size; ++_i472)
+                long _elem472;
+                for (int _i473 = 0; _i473 < _set471.size; ++_i473)
                 {
-                  long _elem473; // optional
-                  _elem473 = iprot.readI64();
-                  struct.nosuch.add(_elem473);
+                  _elem472 = iprot.readI64();
+                  struct.nosuch.add(_elem472);
                 }
                 iprot.readSetEnd();
               }
@@ -564,22 +562,22 @@ public class HeartbeatTxnRangeResponse implements 
org.apache.thrift.TBase<Heartb
       {
         org.apache.thrift.protocol.TSet _set478 = new 
org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, 
iprot.readI32());
         struct.aborted = new HashSet<Long>(2*_set478.size);
-        for (int _i479 = 0; _i479 < _set478.size; ++_i479)
+        long _elem479;
+        for (int _i480 = 0; _i480 < _set478.size; ++_i480)
         {
-          long _elem480; // optional
-          _elem480 = iprot.readI64();
-          struct.aborted.add(_elem480);
+          _elem479 = iprot.readI64();
+          struct.aborted.add(_elem479);
         }
       }
       struct.setAbortedIsSet(true);
       {
         org.apache.thrift.protocol.TSet _set481 = new 
org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, 
iprot.readI32());
         struct.nosuch = new HashSet<Long>(2*_set481.size);
-        for (int _i482 = 0; _i482 < _set481.size; ++_i482)
+        long _elem482;
+        for (int _i483 = 0; _i483 < _set481.size; ++_i483)
         {
-          long _elem483; // optional
-          _elem483 = iprot.readI64();
-          struct.nosuch.add(_elem483);
+          _elem482 = iprot.readI64();
+          struct.nosuch.add(_elem482);
         }
       }
       struct.setNosuchIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
index bd7641d..a490ca0 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectPrivilege.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 HiveObjectPrivilege implements 
org.apache.thrift.TBase<HiveObjectPrivilege, HiveObjectPrivilege._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 HiveObjectPrivilege implements 
org.apache.thrift.TBase<HiveObjectPrivilege, HiveObjectPrivilege._Fields>, 
java.io.Serializable, Cloneable, Comparable<HiveObjectPrivilege> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("HiveObjectPrivilege");
 
   private static final org.apache.thrift.protocol.TField 
HIVE_OBJECT_FIELD_DESC = new org.apache.thrift.protocol.TField("hiveObject", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -411,75 +415,75 @@ public class HiveObjectPrivilege implements 
org.apache.thrift.TBase<HiveObjectPr
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_hiveObject = true && (isSetHiveObject());
-    builder.append(present_hiveObject);
+    list.add(present_hiveObject);
     if (present_hiveObject)
-      builder.append(hiveObject);
+      list.add(hiveObject);
 
     boolean present_principalName = true && (isSetPrincipalName());
-    builder.append(present_principalName);
+    list.add(present_principalName);
     if (present_principalName)
-      builder.append(principalName);
+      list.add(principalName);
 
     boolean present_principalType = true && (isSetPrincipalType());
-    builder.append(present_principalType);
+    list.add(present_principalType);
     if (present_principalType)
-      builder.append(principalType.getValue());
+      list.add(principalType.getValue());
 
     boolean present_grantInfo = true && (isSetGrantInfo());
-    builder.append(present_grantInfo);
+    list.add(present_grantInfo);
     if (present_grantInfo)
-      builder.append(grantInfo);
+      list.add(grantInfo);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(HiveObjectPrivilege other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    HiveObjectPrivilege typedOther = (HiveObjectPrivilege)other;
 
-    lastComparison = 
Boolean.valueOf(isSetHiveObject()).compareTo(typedOther.isSetHiveObject());
+    lastComparison = 
Boolean.valueOf(isSetHiveObject()).compareTo(other.isSetHiveObject());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetHiveObject()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.hiveObject, typedOther.hiveObject);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.hiveObject, other.hiveObject);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPrincipalName()).compareTo(typedOther.isSetPrincipalName());
+    lastComparison = 
Boolean.valueOf(isSetPrincipalName()).compareTo(other.isSetPrincipalName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrincipalName()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.principalName, 
typedOther.principalName);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.principalName, 
other.principalName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPrincipalType()).compareTo(typedOther.isSetPrincipalType());
+    lastComparison = 
Boolean.valueOf(isSetPrincipalType()).compareTo(other.isSetPrincipalType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrincipalType()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.principalType, 
typedOther.principalType);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.principalType, 
other.principalType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetGrantInfo()).compareTo(typedOther.isSetGrantInfo());
+    lastComparison = 
Boolean.valueOf(isSetGrantInfo()).compareTo(other.isSetGrantInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetGrantInfo()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantInfo, 
typedOther.grantInfo);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantInfo, 
other.grantInfo);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -603,7 +607,7 @@ public class HiveObjectPrivilege implements 
org.apache.thrift.TBase<HiveObjectPr
             break;
           case 3: // PRINCIPAL_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.principalType = 
PrincipalType.findByValue(iprot.readI32());
+              struct.principalType = 
org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
               struct.setPrincipalTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
@@ -710,7 +714,7 @@ public class HiveObjectPrivilege implements 
org.apache.thrift.TBase<HiveObjectPr
         struct.setPrincipalNameIsSet(true);
       }
       if (incoming.get(2)) {
-        struct.principalType = PrincipalType.findByValue(iprot.readI32());
+        struct.principalType = 
org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
         struct.setPrincipalTypeIsSet(true);
       }
       if (incoming.get(3)) {

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
index b22b211..9de47ad 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.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 HiveObjectRef implements org.apache.thrift.TBase<HiveObjectRef, 
HiveObjectRef._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 HiveObjectRef implements org.apache.thrift.TBase<HiveObjectRef, 
HiveObjectRef._Fields>, java.io.Serializable, Cloneable, 
Comparable<HiveObjectRef> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("HiveObjectRef");
 
   private static final org.apache.thrift.protocol.TField 
OBJECT_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("objectType", 
org.apache.thrift.protocol.TType.I32, (short)1);
@@ -177,10 +181,7 @@ public class HiveObjectRef implements 
org.apache.thrift.TBase<HiveObjectRef, Hiv
       this.objectName = other.objectName;
     }
     if (other.isSetPartValues()) {
-      List<String> __this__partValues = new ArrayList<String>();
-      for (String other_element : other.partValues) {
-        __this__partValues.add(other_element);
-      }
+      List<String> __this__partValues = new 
ArrayList<String>(other.partValues);
       this.partValues = __this__partValues;
     }
     if (other.isSetColumnName()) {
@@ -489,90 +490,90 @@ public class HiveObjectRef implements 
org.apache.thrift.TBase<HiveObjectRef, Hiv
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_objectType = true && (isSetObjectType());
-    builder.append(present_objectType);
+    list.add(present_objectType);
     if (present_objectType)
-      builder.append(objectType.getValue());
+      list.add(objectType.getValue());
 
     boolean present_dbName = true && (isSetDbName());
-    builder.append(present_dbName);
+    list.add(present_dbName);
     if (present_dbName)
-      builder.append(dbName);
+      list.add(dbName);
 
     boolean present_objectName = true && (isSetObjectName());
-    builder.append(present_objectName);
+    list.add(present_objectName);
     if (present_objectName)
-      builder.append(objectName);
+      list.add(objectName);
 
     boolean present_partValues = true && (isSetPartValues());
-    builder.append(present_partValues);
+    list.add(present_partValues);
     if (present_partValues)
-      builder.append(partValues);
+      list.add(partValues);
 
     boolean present_columnName = true && (isSetColumnName());
-    builder.append(present_columnName);
+    list.add(present_columnName);
     if (present_columnName)
-      builder.append(columnName);
+      list.add(columnName);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(HiveObjectRef other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    HiveObjectRef typedOther = (HiveObjectRef)other;
 
-    lastComparison = 
Boolean.valueOf(isSetObjectType()).compareTo(typedOther.isSetObjectType());
+    lastComparison = 
Boolean.valueOf(isSetObjectType()).compareTo(other.isSetObjectType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetObjectType()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.objectType, typedOther.objectType);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.objectType, other.objectType);
       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(isSetObjectName()).compareTo(typedOther.isSetObjectName());
+    lastComparison = 
Boolean.valueOf(isSetObjectName()).compareTo(other.isSetObjectName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetObjectName()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.objectName, typedOther.objectName);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.objectName, other.objectName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetPartValues()).compareTo(typedOther.isSetPartValues());
+    lastComparison = 
Boolean.valueOf(isSetPartValues()).compareTo(other.isSetPartValues());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartValues()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.partValues, typedOther.partValues);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.partValues, other.partValues);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetColumnName()).compareTo(typedOther.isSetColumnName());
+    lastComparison = 
Boolean.valueOf(isSetColumnName()).compareTo(other.isSetColumnName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumnName()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.columnName, typedOther.columnName);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.columnName, other.columnName);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -681,7 +682,7 @@ public class HiveObjectRef implements 
org.apache.thrift.TBase<HiveObjectRef, Hiv
         switch (schemeField.id) {
           case 1: // OBJECT_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.objectType = HiveObjectType.findByValue(iprot.readI32());
+              struct.objectType = 
org.apache.hadoop.hive.metastore.api.HiveObjectType.findByValue(iprot.readI32());
               struct.setObjectTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, 
schemeField.type);
@@ -708,11 +709,11 @@ public class HiveObjectRef implements 
org.apache.thrift.TBase<HiveObjectRef, Hiv
               {
                 org.apache.thrift.protocol.TList _list8 = 
iprot.readListBegin();
                 struct.partValues = new ArrayList<String>(_list8.size);
-                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
+                String _elem9;
+                for (int _i10 = 0; _i10 < _list8.size; ++_i10)
                 {
-                  String _elem10; // optional
-                  _elem10 = iprot.readString();
-                  struct.partValues.add(_elem10);
+                  _elem9 = iprot.readString();
+                  struct.partValues.add(_elem9);
                 }
                 iprot.readListEnd();
               }
@@ -836,7 +837,7 @@ public class HiveObjectRef implements 
org.apache.thrift.TBase<HiveObjectRef, Hiv
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(5);
       if (incoming.get(0)) {
-        struct.objectType = HiveObjectType.findByValue(iprot.readI32());
+        struct.objectType = 
org.apache.hadoop.hive.metastore.api.HiveObjectType.findByValue(iprot.readI32());
         struct.setObjectTypeIsSet(true);
       }
       if (incoming.get(1)) {
@@ -851,11 +852,11 @@ public class HiveObjectRef implements 
org.apache.thrift.TBase<HiveObjectRef, Hiv
         {
           org.apache.thrift.protocol.TList _list13 = new 
org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, 
iprot.readI32());
           struct.partValues = new ArrayList<String>(_list13.size);
-          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
+          String _elem14;
+          for (int _i15 = 0; _i15 < _list13.size; ++_i15)
           {
-            String _elem15; // optional
-            _elem15 = iprot.readString();
-            struct.partValues.add(_elem15);
+            _elem14 = iprot.readString();
+            struct.partValues.add(_elem14);
           }
         }
         struct.setPartValuesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
index 995331e..427930f 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectType.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/Index.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
index cb3a435..763c7cd 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.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 Index implements org.apache.thrift.TBase<Index, Index._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 Index implements org.apache.thrift.TBase<Index, Index._Fields>, 
java.io.Serializable, Cloneable, Comparable<Index> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("Index");
 
   private static final org.apache.thrift.protocol.TField INDEX_NAME_FIELD_DESC 
= new org.apache.thrift.protocol.TField("indexName", 
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -238,18 +242,7 @@ public class Index implements 
org.apache.thrift.TBase<Index, Index._Fields>, jav
       this.sd = new StorageDescriptor(other.sd);
     }
     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;
     }
     this.deferredRebuild = other.deferredRebuild;
@@ -774,165 +767,165 @@ public class Index implements 
org.apache.thrift.TBase<Index, Index._Fields>, jav
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_indexName = true && (isSetIndexName());
-    builder.append(present_indexName);
+    list.add(present_indexName);
     if (present_indexName)
-      builder.append(indexName);
+      list.add(indexName);
 
     boolean present_indexHandlerClass = true && (isSetIndexHandlerClass());
-    builder.append(present_indexHandlerClass);
+    list.add(present_indexHandlerClass);
     if (present_indexHandlerClass)
-      builder.append(indexHandlerClass);
+      list.add(indexHandlerClass);
 
     boolean present_dbName = true && (isSetDbName());
-    builder.append(present_dbName);
+    list.add(present_dbName);
     if (present_dbName)
-      builder.append(dbName);
+      list.add(dbName);
 
     boolean present_origTableName = true && (isSetOrigTableName());
-    builder.append(present_origTableName);
+    list.add(present_origTableName);
     if (present_origTableName)
-      builder.append(origTableName);
+      list.add(origTableName);
 
     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_indexTableName = true && (isSetIndexTableName());
-    builder.append(present_indexTableName);
+    list.add(present_indexTableName);
     if (present_indexTableName)
-      builder.append(indexTableName);
+      list.add(indexTableName);
 
     boolean present_sd = true && (isSetSd());
-    builder.append(present_sd);
+    list.add(present_sd);
     if (present_sd)
-      builder.append(sd);
+      list.add(sd);
 
     boolean present_parameters = true && (isSetParameters());
-    builder.append(present_parameters);
+    list.add(present_parameters);
     if (present_parameters)
-      builder.append(parameters);
+      list.add(parameters);
 
     boolean present_deferredRebuild = true;
-    builder.append(present_deferredRebuild);
+    list.add(present_deferredRebuild);
     if (present_deferredRebuild)
-      builder.append(deferredRebuild);
+      list.add(deferredRebuild);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Index other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Index typedOther = (Index)other;
 
-    lastComparison = 
Boolean.valueOf(isSetIndexName()).compareTo(typedOther.isSetIndexName());
+    lastComparison = 
Boolean.valueOf(isSetIndexName()).compareTo(other.isSetIndexName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetIndexName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.indexName, 
typedOther.indexName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.indexName, 
other.indexName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = 
Boolean.valueOf(isSetIndexHandlerClass()).compareTo(typedOther.isSetIndexHandlerClass());
+    lastComparison = 
Boolean.valueOf(isSetIndexHandlerClass()).compareTo(other.isSetIndexHandlerClass());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetIndexHandlerClass()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.indexHandlerClass, 
typedOther.indexHandlerClass);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.indexHandlerClass, 
other.indexHandlerClass);
       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(isSetOrigTableName()).compareTo(typedOther.isSetOrigTableName());
+    lastComparison = 
Boolean.valueOf(isSetOrigTableName()).compareTo(other.isSetOrigTableName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOrigTableName()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.origTableName, 
typedOther.origTableName);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.origTableName, 
other.origTableName);
       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(isSetIndexTableName()).compareTo(typedOther.isSetIndexTableName());
+    lastComparison = 
Boolean.valueOf(isSetIndexTableName()).compareTo(other.isSetIndexTableName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetIndexTableName()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.indexTableName, 
typedOther.indexTableName);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.indexTableName, 
other.indexTableName);
       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(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(isSetDeferredRebuild()).compareTo(typedOther.isSetDeferredRebuild());
+    lastComparison = 
Boolean.valueOf(isSetDeferredRebuild()).compareTo(other.isSetDeferredRebuild());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDeferredRebuild()) {
-      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.deferredRebuild, 
typedOther.deferredRebuild);
+      lastComparison = 
org.apache.thrift.TBaseHelper.compareTo(this.deferredRebuild, 
other.deferredRebuild);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1142,13 +1135,13 @@ public class Index implements 
org.apache.thrift.TBase<Index, Index._Fields>, jav
               {
                 org.apache.thrift.protocol.TMap _map260 = iprot.readMapBegin();
                 struct.parameters = new HashMap<String,String>(2*_map260.size);
-                for (int _i261 = 0; _i261 < _map260.size; ++_i261)
+                String _key261;
+                String _val262;
+                for (int _i263 = 0; _i263 < _map260.size; ++_i263)
                 {
-                  String _key262; // required
-                  String _val263; // required
-                  _key262 = iprot.readString();
-                  _val263 = iprot.readString();
-                  struct.parameters.put(_key262, _val263);
+                  _key261 = iprot.readString();
+                  _val262 = iprot.readString();
+                  struct.parameters.put(_key261, _val262);
                 }
                 iprot.readMapEnd();
               }
@@ -1359,13 +1352,13 @@ public class Index implements 
org.apache.thrift.TBase<Index, Index._Fields>, jav
         {
           org.apache.thrift.protocol.TMap _map266 = 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*_map266.size);
-          for (int _i267 = 0; _i267 < _map266.size; ++_i267)
+          String _key267;
+          String _val268;
+          for (int _i269 = 0; _i269 < _map266.size; ++_i269)
           {
-            String _key268; // required
-            String _val269; // required
-            _key268 = iprot.readString();
-            _val269 = iprot.readString();
-            struct.parameters.put(_key268, _val269);
+            _key267 = iprot.readString();
+            _val268 = iprot.readString();
+            struct.parameters.put(_key267, _val268);
           }
         }
         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/IndexAlreadyExistsException.java
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IndexAlreadyExistsException.java
 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IndexAlreadyExistsException.java
index f90a65d..817d873 100644
--- 
a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IndexAlreadyExistsException.java
+++ 
b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IndexAlreadyExistsException.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 IndexAlreadyExistsException extends TException implements 
org.apache.thrift.TBase<IndexAlreadyExistsException, 
IndexAlreadyExistsException._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 IndexAlreadyExistsException extends TException implements 
org.apache.thrift.TBase<IndexAlreadyExistsException, 
IndexAlreadyExistsException._Fields>, java.io.Serializable, Cloneable, 
Comparable<IndexAlreadyExistsException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("IndexAlreadyExistsException");
 
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = 
new org.apache.thrift.protocol.TField("message", 
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -225,30 +229,30 @@ public class IndexAlreadyExistsException extends 
TException implements org.apach
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_message = true && (isSetMessage());
-    builder.append(present_message);
+    list.add(present_message);
     if (present_message)
-      builder.append(message);
+      list.add(message);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(IndexAlreadyExistsException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    IndexAlreadyExistsException typedOther = 
(IndexAlreadyExistsException)other;
 
-    lastComparison = 
Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = 
Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, 
typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, 
other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }

Reply via email to