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:28 UTC

[36/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/PartitionsByExprResult.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
index 525ce0e..1f3e6a8 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.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 PartitionsByExprResult implements org.apache.thrift.TBase<PartitionsByExprResult, PartitionsByExprResult._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 PartitionsByExprResult implements org.apache.thrift.TBase<PartitionsByExprResult, PartitionsByExprResult._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsByExprResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsByExprResult");
 
   private static final org.apache.thrift.protocol.TField PARTITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("partitions", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -141,7 +145,7 @@ public class PartitionsByExprResult implements org.apache.thrift.TBase<Partition
   public PartitionsByExprResult(PartitionsByExprResult other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetPartitions()) {
-      List<Partition> __this__partitions = new ArrayList<Partition>();
+      List<Partition> __this__partitions = new ArrayList<Partition>(other.partitions.size());
       for (Partition other_element : other.partitions) {
         __this__partitions.add(new Partition(other_element));
       }
@@ -305,45 +309,45 @@ public class PartitionsByExprResult implements org.apache.thrift.TBase<Partition
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_partitions = true && (isSetPartitions());
-    builder.append(present_partitions);
+    list.add(present_partitions);
     if (present_partitions)
-      builder.append(partitions);
+      list.add(partitions);
 
     boolean present_hasUnknownPartitions = true;
-    builder.append(present_hasUnknownPartitions);
+    list.add(present_hasUnknownPartitions);
     if (present_hasUnknownPartitions)
-      builder.append(hasUnknownPartitions);
+      list.add(hasUnknownPartitions);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(PartitionsByExprResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    PartitionsByExprResult typedOther = (PartitionsByExprResult)other;
 
-    lastComparison = Boolean.valueOf(isSetPartitions()).compareTo(typedOther.isSetPartitions());
+    lastComparison = Boolean.valueOf(isSetPartitions()).compareTo(other.isSetPartitions());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartitions()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partitions, typedOther.partitions);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partitions, other.partitions);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasUnknownPartitions()).compareTo(typedOther.isSetHasUnknownPartitions());
+    lastComparison = Boolean.valueOf(isSetHasUnknownPartitions()).compareTo(other.isSetHasUnknownPartitions());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetHasUnknownPartitions()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasUnknownPartitions, typedOther.hasUnknownPartitions);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasUnknownPartitions, other.hasUnknownPartitions);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -437,12 +441,12 @@ public class PartitionsByExprResult implements org.apache.thrift.TBase<Partition
               {
                 org.apache.thrift.protocol.TList _list322 = iprot.readListBegin();
                 struct.partitions = new ArrayList<Partition>(_list322.size);
-                for (int _i323 = 0; _i323 < _list322.size; ++_i323)
+                Partition _elem323;
+                for (int _i324 = 0; _i324 < _list322.size; ++_i324)
                 {
-                  Partition _elem324; // optional
-                  _elem324 = new Partition();
-                  _elem324.read(iprot);
-                  struct.partitions.add(_elem324);
+                  _elem323 = new Partition();
+                  _elem323.read(iprot);
+                  struct.partitions.add(_elem323);
                 }
                 iprot.readListEnd();
               }
@@ -520,12 +524,12 @@ public class PartitionsByExprResult implements org.apache.thrift.TBase<Partition
       {
         org.apache.thrift.protocol.TList _list327 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.partitions = new ArrayList<Partition>(_list327.size);
-        for (int _i328 = 0; _i328 < _list327.size; ++_i328)
+        Partition _elem328;
+        for (int _i329 = 0; _i329 < _list327.size; ++_i329)
         {
-          Partition _elem329; // optional
-          _elem329 = new Partition();
-          _elem329.read(iprot);
-          struct.partitions.add(_elem329);
+          _elem328 = new Partition();
+          _elem328.read(iprot);
+          struct.partitions.add(_elem328);
         }
       }
       struct.setPartitionsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
index d224453..49bb5ff 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.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 PartitionsStatsRequest implements org.apache.thrift.TBase<PartitionsStatsRequest, PartitionsStatsRequest._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 PartitionsStatsRequest implements org.apache.thrift.TBase<PartitionsStatsRequest, PartitionsStatsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsStatsRequest> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsStatsRequest");
 
   private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -162,17 +166,11 @@ public class PartitionsStatsRequest implements org.apache.thrift.TBase<Partition
       this.tblName = other.tblName;
     }
     if (other.isSetColNames()) {
-      List<String> __this__colNames = new ArrayList<String>();
-      for (String other_element : other.colNames) {
-        __this__colNames.add(other_element);
-      }
+      List<String> __this__colNames = new ArrayList<String>(other.colNames);
       this.colNames = __this__colNames;
     }
     if (other.isSetPartNames()) {
-      List<String> __this__partNames = new ArrayList<String>();
-      for (String other_element : other.partNames) {
-        __this__partNames.add(other_element);
-      }
+      List<String> __this__partNames = new ArrayList<String>(other.partNames);
       this.partNames = __this__partNames;
     }
   }
@@ -439,75 +437,75 @@ public class PartitionsStatsRequest implements org.apache.thrift.TBase<Partition
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_dbName = true && (isSetDbName());
-    builder.append(present_dbName);
+    list.add(present_dbName);
     if (present_dbName)
-      builder.append(dbName);
+      list.add(dbName);
 
     boolean present_tblName = true && (isSetTblName());
-    builder.append(present_tblName);
+    list.add(present_tblName);
     if (present_tblName)
-      builder.append(tblName);
+      list.add(tblName);
 
     boolean present_colNames = true && (isSetColNames());
-    builder.append(present_colNames);
+    list.add(present_colNames);
     if (present_colNames)
-      builder.append(colNames);
+      list.add(colNames);
 
     boolean present_partNames = true && (isSetPartNames());
-    builder.append(present_partNames);
+    list.add(present_partNames);
     if (present_partNames)
-      builder.append(partNames);
+      list.add(partNames);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(PartitionsStatsRequest other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    PartitionsStatsRequest typedOther = (PartitionsStatsRequest)other;
 
-    lastComparison = Boolean.valueOf(isSetDbName()).compareTo(typedOther.isSetDbName());
+    lastComparison = Boolean.valueOf(isSetDbName()).compareTo(other.isSetDbName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDbName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, typedOther.dbName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, other.dbName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTblName()).compareTo(typedOther.isSetTblName());
+    lastComparison = Boolean.valueOf(isSetTblName()).compareTo(other.isSetTblName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTblName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tblName, typedOther.tblName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tblName, other.tblName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColNames()).compareTo(typedOther.isSetColNames());
+    lastComparison = Boolean.valueOf(isSetColNames()).compareTo(other.isSetColNames());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColNames()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colNames, typedOther.colNames);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colNames, other.colNames);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPartNames()).compareTo(typedOther.isSetPartNames());
+    lastComparison = Boolean.valueOf(isSetPartNames()).compareTo(other.isSetPartNames());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartNames()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partNames, typedOther.partNames);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partNames, other.partNames);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -643,11 +641,11 @@ public class PartitionsStatsRequest implements org.apache.thrift.TBase<Partition
               {
                 org.apache.thrift.protocol.TList _list364 = iprot.readListBegin();
                 struct.colNames = new ArrayList<String>(_list364.size);
-                for (int _i365 = 0; _i365 < _list364.size; ++_i365)
+                String _elem365;
+                for (int _i366 = 0; _i366 < _list364.size; ++_i366)
                 {
-                  String _elem366; // optional
-                  _elem366 = iprot.readString();
-                  struct.colNames.add(_elem366);
+                  _elem365 = iprot.readString();
+                  struct.colNames.add(_elem365);
                 }
                 iprot.readListEnd();
               }
@@ -661,11 +659,11 @@ public class PartitionsStatsRequest implements org.apache.thrift.TBase<Partition
               {
                 org.apache.thrift.protocol.TList _list367 = iprot.readListBegin();
                 struct.partNames = new ArrayList<String>(_list367.size);
-                for (int _i368 = 0; _i368 < _list367.size; ++_i368)
+                String _elem368;
+                for (int _i369 = 0; _i369 < _list367.size; ++_i369)
                 {
-                  String _elem369; // optional
-                  _elem369 = iprot.readString();
-                  struct.partNames.add(_elem369);
+                  _elem368 = iprot.readString();
+                  struct.partNames.add(_elem368);
                 }
                 iprot.readListEnd();
               }
@@ -766,22 +764,22 @@ public class PartitionsStatsRequest implements org.apache.thrift.TBase<Partition
       {
         org.apache.thrift.protocol.TList _list374 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
         struct.colNames = new ArrayList<String>(_list374.size);
-        for (int _i375 = 0; _i375 < _list374.size; ++_i375)
+        String _elem375;
+        for (int _i376 = 0; _i376 < _list374.size; ++_i376)
         {
-          String _elem376; // optional
-          _elem376 = iprot.readString();
-          struct.colNames.add(_elem376);
+          _elem375 = iprot.readString();
+          struct.colNames.add(_elem375);
         }
       }
       struct.setColNamesIsSet(true);
       {
         org.apache.thrift.protocol.TList _list377 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
         struct.partNames = new ArrayList<String>(_list377.size);
-        for (int _i378 = 0; _i378 < _list377.size; ++_i378)
+        String _elem378;
+        for (int _i379 = 0; _i379 < _list377.size; ++_i379)
         {
-          String _elem379; // optional
-          _elem379 = iprot.readString();
-          struct.partNames.add(_elem379);
+          _elem378 = iprot.readString();
+          struct.partNames.add(_elem378);
         }
       }
       struct.setPartNamesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
index c9ae14e..217178e 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.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 PartitionsStatsResult implements org.apache.thrift.TBase<PartitionsStatsResult, PartitionsStatsResult._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 PartitionsStatsResult implements org.apache.thrift.TBase<PartitionsStatsResult, PartitionsStatsResult._Fields>, java.io.Serializable, Cloneable, Comparable<PartitionsStatsResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PartitionsStatsResult");
 
   private static final org.apache.thrift.protocol.TField PART_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("partStats", org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -130,7 +134,7 @@ public class PartitionsStatsResult implements org.apache.thrift.TBase<Partitions
    */
   public PartitionsStatsResult(PartitionsStatsResult other) {
     if (other.isSetPartStats()) {
-      Map<String,List<ColumnStatisticsObj>> __this__partStats = new HashMap<String,List<ColumnStatisticsObj>>();
+      Map<String,List<ColumnStatisticsObj>> __this__partStats = new HashMap<String,List<ColumnStatisticsObj>>(other.partStats.size());
       for (Map.Entry<String, List<ColumnStatisticsObj>> other_element : other.partStats.entrySet()) {
 
         String other_element_key = other_element.getKey();
@@ -138,7 +142,7 @@ public class PartitionsStatsResult implements org.apache.thrift.TBase<Partitions
 
         String __this__partStats_copy_key = other_element_key;
 
-        List<ColumnStatisticsObj> __this__partStats_copy_value = new ArrayList<ColumnStatisticsObj>();
+        List<ColumnStatisticsObj> __this__partStats_copy_value = new ArrayList<ColumnStatisticsObj>(other_element_value.size());
         for (ColumnStatisticsObj other_element_value_element : other_element_value) {
           __this__partStats_copy_value.add(new ColumnStatisticsObj(other_element_value_element));
         }
@@ -254,30 +258,30 @@ public class PartitionsStatsResult implements org.apache.thrift.TBase<Partitions
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_partStats = true && (isSetPartStats());
-    builder.append(present_partStats);
+    list.add(present_partStats);
     if (present_partStats)
-      builder.append(partStats);
+      list.add(partStats);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(PartitionsStatsResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    PartitionsStatsResult typedOther = (PartitionsStatsResult)other;
 
-    lastComparison = Boolean.valueOf(isSetPartStats()).compareTo(typedOther.isSetPartStats());
+    lastComparison = Boolean.valueOf(isSetPartStats()).compareTo(other.isSetPartStats());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartStats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partStats, typedOther.partStats);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partStats, other.partStats);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -361,24 +365,24 @@ public class PartitionsStatsResult implements org.apache.thrift.TBase<Partitions
               {
                 org.apache.thrift.protocol.TMap _map338 = iprot.readMapBegin();
                 struct.partStats = new HashMap<String,List<ColumnStatisticsObj>>(2*_map338.size);
-                for (int _i339 = 0; _i339 < _map338.size; ++_i339)
+                String _key339;
+                List<ColumnStatisticsObj> _val340;
+                for (int _i341 = 0; _i341 < _map338.size; ++_i341)
                 {
-                  String _key340; // required
-                  List<ColumnStatisticsObj> _val341; // required
-                  _key340 = iprot.readString();
+                  _key339 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TList _list342 = iprot.readListBegin();
-                    _val341 = new ArrayList<ColumnStatisticsObj>(_list342.size);
-                    for (int _i343 = 0; _i343 < _list342.size; ++_i343)
+                    _val340 = new ArrayList<ColumnStatisticsObj>(_list342.size);
+                    ColumnStatisticsObj _elem343;
+                    for (int _i344 = 0; _i344 < _list342.size; ++_i344)
                     {
-                      ColumnStatisticsObj _elem344; // optional
-                      _elem344 = new ColumnStatisticsObj();
-                      _elem344.read(iprot);
-                      _val341.add(_elem344);
+                      _elem343 = new ColumnStatisticsObj();
+                      _elem343.read(iprot);
+                      _val340.add(_elem343);
                     }
                     iprot.readListEnd();
                   }
-                  struct.partStats.put(_key340, _val341);
+                  struct.partStats.put(_key339, _val340);
                 }
                 iprot.readMapEnd();
               }
@@ -459,23 +463,23 @@ public class PartitionsStatsResult implements org.apache.thrift.TBase<Partitions
       {
         org.apache.thrift.protocol.TMap _map349 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
         struct.partStats = new HashMap<String,List<ColumnStatisticsObj>>(2*_map349.size);
-        for (int _i350 = 0; _i350 < _map349.size; ++_i350)
+        String _key350;
+        List<ColumnStatisticsObj> _val351;
+        for (int _i352 = 0; _i352 < _map349.size; ++_i352)
         {
-          String _key351; // required
-          List<ColumnStatisticsObj> _val352; // required
-          _key351 = iprot.readString();
+          _key350 = iprot.readString();
           {
             org.apache.thrift.protocol.TList _list353 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            _val352 = new ArrayList<ColumnStatisticsObj>(_list353.size);
-            for (int _i354 = 0; _i354 < _list353.size; ++_i354)
+            _val351 = new ArrayList<ColumnStatisticsObj>(_list353.size);
+            ColumnStatisticsObj _elem354;
+            for (int _i355 = 0; _i355 < _list353.size; ++_i355)
             {
-              ColumnStatisticsObj _elem355; // optional
-              _elem355 = new ColumnStatisticsObj();
-              _elem355.read(iprot);
-              _val352.add(_elem355);
+              _elem354 = new ColumnStatisticsObj();
+              _elem354.read(iprot);
+              _val351.add(_elem354);
             }
           }
-          struct.partStats.put(_key351, _val352);
+          struct.partStats.put(_key350, _val351);
         }
       }
       struct.setPartStatsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
index 0c9518a..1601823 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.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 PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalPrivilegeSet, PrincipalPrivilegeSet._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 PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalPrivilegeSet, PrincipalPrivilegeSet._Fields>, java.io.Serializable, Cloneable, Comparable<PrincipalPrivilegeSet> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrincipalPrivilegeSet");
 
   private static final org.apache.thrift.protocol.TField USER_PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("userPrivileges", org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -154,7 +158,7 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
    */
   public PrincipalPrivilegeSet(PrincipalPrivilegeSet other) {
     if (other.isSetUserPrivileges()) {
-      Map<String,List<PrivilegeGrantInfo>> __this__userPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>();
+      Map<String,List<PrivilegeGrantInfo>> __this__userPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(other.userPrivileges.size());
       for (Map.Entry<String, List<PrivilegeGrantInfo>> other_element : other.userPrivileges.entrySet()) {
 
         String other_element_key = other_element.getKey();
@@ -162,7 +166,7 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
 
         String __this__userPrivileges_copy_key = other_element_key;
 
-        List<PrivilegeGrantInfo> __this__userPrivileges_copy_value = new ArrayList<PrivilegeGrantInfo>();
+        List<PrivilegeGrantInfo> __this__userPrivileges_copy_value = new ArrayList<PrivilegeGrantInfo>(other_element_value.size());
         for (PrivilegeGrantInfo other_element_value_element : other_element_value) {
           __this__userPrivileges_copy_value.add(new PrivilegeGrantInfo(other_element_value_element));
         }
@@ -172,7 +176,7 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
       this.userPrivileges = __this__userPrivileges;
     }
     if (other.isSetGroupPrivileges()) {
-      Map<String,List<PrivilegeGrantInfo>> __this__groupPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>();
+      Map<String,List<PrivilegeGrantInfo>> __this__groupPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(other.groupPrivileges.size());
       for (Map.Entry<String, List<PrivilegeGrantInfo>> other_element : other.groupPrivileges.entrySet()) {
 
         String other_element_key = other_element.getKey();
@@ -180,7 +184,7 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
 
         String __this__groupPrivileges_copy_key = other_element_key;
 
-        List<PrivilegeGrantInfo> __this__groupPrivileges_copy_value = new ArrayList<PrivilegeGrantInfo>();
+        List<PrivilegeGrantInfo> __this__groupPrivileges_copy_value = new ArrayList<PrivilegeGrantInfo>(other_element_value.size());
         for (PrivilegeGrantInfo other_element_value_element : other_element_value) {
           __this__groupPrivileges_copy_value.add(new PrivilegeGrantInfo(other_element_value_element));
         }
@@ -190,7 +194,7 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
       this.groupPrivileges = __this__groupPrivileges;
     }
     if (other.isSetRolePrivileges()) {
-      Map<String,List<PrivilegeGrantInfo>> __this__rolePrivileges = new HashMap<String,List<PrivilegeGrantInfo>>();
+      Map<String,List<PrivilegeGrantInfo>> __this__rolePrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(other.rolePrivileges.size());
       for (Map.Entry<String, List<PrivilegeGrantInfo>> other_element : other.rolePrivileges.entrySet()) {
 
         String other_element_key = other_element.getKey();
@@ -198,7 +202,7 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
 
         String __this__rolePrivileges_copy_key = other_element_key;
 
-        List<PrivilegeGrantInfo> __this__rolePrivileges_copy_value = new ArrayList<PrivilegeGrantInfo>();
+        List<PrivilegeGrantInfo> __this__rolePrivileges_copy_value = new ArrayList<PrivilegeGrantInfo>(other_element_value.size());
         for (PrivilegeGrantInfo other_element_value_element : other_element_value) {
           __this__rolePrivileges_copy_value.add(new PrivilegeGrantInfo(other_element_value_element));
         }
@@ -428,60 +432,60 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_userPrivileges = true && (isSetUserPrivileges());
-    builder.append(present_userPrivileges);
+    list.add(present_userPrivileges);
     if (present_userPrivileges)
-      builder.append(userPrivileges);
+      list.add(userPrivileges);
 
     boolean present_groupPrivileges = true && (isSetGroupPrivileges());
-    builder.append(present_groupPrivileges);
+    list.add(present_groupPrivileges);
     if (present_groupPrivileges)
-      builder.append(groupPrivileges);
+      list.add(groupPrivileges);
 
     boolean present_rolePrivileges = true && (isSetRolePrivileges());
-    builder.append(present_rolePrivileges);
+    list.add(present_rolePrivileges);
     if (present_rolePrivileges)
-      builder.append(rolePrivileges);
+      list.add(rolePrivileges);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(PrincipalPrivilegeSet other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    PrincipalPrivilegeSet typedOther = (PrincipalPrivilegeSet)other;
 
-    lastComparison = Boolean.valueOf(isSetUserPrivileges()).compareTo(typedOther.isSetUserPrivileges());
+    lastComparison = Boolean.valueOf(isSetUserPrivileges()).compareTo(other.isSetUserPrivileges());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUserPrivileges()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userPrivileges, typedOther.userPrivileges);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userPrivileges, other.userPrivileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetGroupPrivileges()).compareTo(typedOther.isSetGroupPrivileges());
+    lastComparison = Boolean.valueOf(isSetGroupPrivileges()).compareTo(other.isSetGroupPrivileges());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetGroupPrivileges()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupPrivileges, typedOther.groupPrivileges);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupPrivileges, other.groupPrivileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRolePrivileges()).compareTo(typedOther.isSetRolePrivileges());
+    lastComparison = Boolean.valueOf(isSetRolePrivileges()).compareTo(other.isSetRolePrivileges());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRolePrivileges()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rolePrivileges, typedOther.rolePrivileges);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rolePrivileges, other.rolePrivileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -577,24 +581,24 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
               {
                 org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
                 struct.userPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map24.size);
-                for (int _i25 = 0; _i25 < _map24.size; ++_i25)
+                String _key25;
+                List<PrivilegeGrantInfo> _val26;
+                for (int _i27 = 0; _i27 < _map24.size; ++_i27)
                 {
-                  String _key26; // required
-                  List<PrivilegeGrantInfo> _val27; // required
-                  _key26 = iprot.readString();
+                  _key25 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TList _list28 = iprot.readListBegin();
-                    _val27 = new ArrayList<PrivilegeGrantInfo>(_list28.size);
-                    for (int _i29 = 0; _i29 < _list28.size; ++_i29)
+                    _val26 = new ArrayList<PrivilegeGrantInfo>(_list28.size);
+                    PrivilegeGrantInfo _elem29;
+                    for (int _i30 = 0; _i30 < _list28.size; ++_i30)
                     {
-                      PrivilegeGrantInfo _elem30; // optional
-                      _elem30 = new PrivilegeGrantInfo();
-                      _elem30.read(iprot);
-                      _val27.add(_elem30);
+                      _elem29 = new PrivilegeGrantInfo();
+                      _elem29.read(iprot);
+                      _val26.add(_elem29);
                     }
                     iprot.readListEnd();
                   }
-                  struct.userPrivileges.put(_key26, _val27);
+                  struct.userPrivileges.put(_key25, _val26);
                 }
                 iprot.readMapEnd();
               }
@@ -608,24 +612,24 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
               {
                 org.apache.thrift.protocol.TMap _map31 = iprot.readMapBegin();
                 struct.groupPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map31.size);
-                for (int _i32 = 0; _i32 < _map31.size; ++_i32)
+                String _key32;
+                List<PrivilegeGrantInfo> _val33;
+                for (int _i34 = 0; _i34 < _map31.size; ++_i34)
                 {
-                  String _key33; // required
-                  List<PrivilegeGrantInfo> _val34; // required
-                  _key33 = iprot.readString();
+                  _key32 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TList _list35 = iprot.readListBegin();
-                    _val34 = new ArrayList<PrivilegeGrantInfo>(_list35.size);
-                    for (int _i36 = 0; _i36 < _list35.size; ++_i36)
+                    _val33 = new ArrayList<PrivilegeGrantInfo>(_list35.size);
+                    PrivilegeGrantInfo _elem36;
+                    for (int _i37 = 0; _i37 < _list35.size; ++_i37)
                     {
-                      PrivilegeGrantInfo _elem37; // optional
-                      _elem37 = new PrivilegeGrantInfo();
-                      _elem37.read(iprot);
-                      _val34.add(_elem37);
+                      _elem36 = new PrivilegeGrantInfo();
+                      _elem36.read(iprot);
+                      _val33.add(_elem36);
                     }
                     iprot.readListEnd();
                   }
-                  struct.groupPrivileges.put(_key33, _val34);
+                  struct.groupPrivileges.put(_key32, _val33);
                 }
                 iprot.readMapEnd();
               }
@@ -639,24 +643,24 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
               {
                 org.apache.thrift.protocol.TMap _map38 = iprot.readMapBegin();
                 struct.rolePrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map38.size);
-                for (int _i39 = 0; _i39 < _map38.size; ++_i39)
+                String _key39;
+                List<PrivilegeGrantInfo> _val40;
+                for (int _i41 = 0; _i41 < _map38.size; ++_i41)
                 {
-                  String _key40; // required
-                  List<PrivilegeGrantInfo> _val41; // required
-                  _key40 = iprot.readString();
+                  _key39 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TList _list42 = iprot.readListBegin();
-                    _val41 = new ArrayList<PrivilegeGrantInfo>(_list42.size);
-                    for (int _i43 = 0; _i43 < _list42.size; ++_i43)
+                    _val40 = new ArrayList<PrivilegeGrantInfo>(_list42.size);
+                    PrivilegeGrantInfo _elem43;
+                    for (int _i44 = 0; _i44 < _list42.size; ++_i44)
                     {
-                      PrivilegeGrantInfo _elem44; // optional
-                      _elem44 = new PrivilegeGrantInfo();
-                      _elem44.read(iprot);
-                      _val41.add(_elem44);
+                      _elem43 = new PrivilegeGrantInfo();
+                      _elem43.read(iprot);
+                      _val40.add(_elem43);
                     }
                     iprot.readListEnd();
                   }
-                  struct.rolePrivileges.put(_key40, _val41);
+                  struct.rolePrivileges.put(_key39, _val40);
                 }
                 iprot.readMapEnd();
               }
@@ -824,23 +828,23 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
         {
           org.apache.thrift.protocol.TMap _map57 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
           struct.userPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map57.size);
-          for (int _i58 = 0; _i58 < _map57.size; ++_i58)
+          String _key58;
+          List<PrivilegeGrantInfo> _val59;
+          for (int _i60 = 0; _i60 < _map57.size; ++_i60)
           {
-            String _key59; // required
-            List<PrivilegeGrantInfo> _val60; // required
-            _key59 = iprot.readString();
+            _key58 = iprot.readString();
             {
               org.apache.thrift.protocol.TList _list61 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-              _val60 = new ArrayList<PrivilegeGrantInfo>(_list61.size);
-              for (int _i62 = 0; _i62 < _list61.size; ++_i62)
+              _val59 = new ArrayList<PrivilegeGrantInfo>(_list61.size);
+              PrivilegeGrantInfo _elem62;
+              for (int _i63 = 0; _i63 < _list61.size; ++_i63)
               {
-                PrivilegeGrantInfo _elem63; // optional
-                _elem63 = new PrivilegeGrantInfo();
-                _elem63.read(iprot);
-                _val60.add(_elem63);
+                _elem62 = new PrivilegeGrantInfo();
+                _elem62.read(iprot);
+                _val59.add(_elem62);
               }
             }
-            struct.userPrivileges.put(_key59, _val60);
+            struct.userPrivileges.put(_key58, _val59);
           }
         }
         struct.setUserPrivilegesIsSet(true);
@@ -849,23 +853,23 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
         {
           org.apache.thrift.protocol.TMap _map64 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
           struct.groupPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map64.size);
-          for (int _i65 = 0; _i65 < _map64.size; ++_i65)
+          String _key65;
+          List<PrivilegeGrantInfo> _val66;
+          for (int _i67 = 0; _i67 < _map64.size; ++_i67)
           {
-            String _key66; // required
-            List<PrivilegeGrantInfo> _val67; // required
-            _key66 = iprot.readString();
+            _key65 = iprot.readString();
             {
               org.apache.thrift.protocol.TList _list68 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-              _val67 = new ArrayList<PrivilegeGrantInfo>(_list68.size);
-              for (int _i69 = 0; _i69 < _list68.size; ++_i69)
+              _val66 = new ArrayList<PrivilegeGrantInfo>(_list68.size);
+              PrivilegeGrantInfo _elem69;
+              for (int _i70 = 0; _i70 < _list68.size; ++_i70)
               {
-                PrivilegeGrantInfo _elem70; // optional
-                _elem70 = new PrivilegeGrantInfo();
-                _elem70.read(iprot);
-                _val67.add(_elem70);
+                _elem69 = new PrivilegeGrantInfo();
+                _elem69.read(iprot);
+                _val66.add(_elem69);
               }
             }
-            struct.groupPrivileges.put(_key66, _val67);
+            struct.groupPrivileges.put(_key65, _val66);
           }
         }
         struct.setGroupPrivilegesIsSet(true);
@@ -874,23 +878,23 @@ public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalP
         {
           org.apache.thrift.protocol.TMap _map71 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
           struct.rolePrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map71.size);
-          for (int _i72 = 0; _i72 < _map71.size; ++_i72)
+          String _key72;
+          List<PrivilegeGrantInfo> _val73;
+          for (int _i74 = 0; _i74 < _map71.size; ++_i74)
           {
-            String _key73; // required
-            List<PrivilegeGrantInfo> _val74; // required
-            _key73 = iprot.readString();
+            _key72 = iprot.readString();
             {
               org.apache.thrift.protocol.TList _list75 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-              _val74 = new ArrayList<PrivilegeGrantInfo>(_list75.size);
-              for (int _i76 = 0; _i76 < _list75.size; ++_i76)
+              _val73 = new ArrayList<PrivilegeGrantInfo>(_list75.size);
+              PrivilegeGrantInfo _elem76;
+              for (int _i77 = 0; _i77 < _list75.size; ++_i77)
               {
-                PrivilegeGrantInfo _elem77; // optional
-                _elem77 = new PrivilegeGrantInfo();
-                _elem77.read(iprot);
-                _val74.add(_elem77);
+                _elem76 = new PrivilegeGrantInfo();
+                _elem76.read(iprot);
+                _val73.add(_elem76);
               }
             }
-            struct.rolePrivileges.put(_key73, _val74);
+            struct.rolePrivileges.put(_key72, _val73);
           }
         }
         struct.setRolePrivilegesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
index d405d4a..65e937e 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.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/PrivilegeBag.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
index 4285ed8..dead805 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.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 PrivilegeBag implements org.apache.thrift.TBase<PrivilegeBag, PrivilegeBag._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 PrivilegeBag implements org.apache.thrift.TBase<PrivilegeBag, PrivilegeBag._Fields>, java.io.Serializable, Cloneable, Comparable<PrivilegeBag> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrivilegeBag");
 
   private static final org.apache.thrift.protocol.TField PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("privileges", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -128,7 +132,7 @@ public class PrivilegeBag implements org.apache.thrift.TBase<PrivilegeBag, Privi
    */
   public PrivilegeBag(PrivilegeBag other) {
     if (other.isSetPrivileges()) {
-      List<HiveObjectPrivilege> __this__privileges = new ArrayList<HiveObjectPrivilege>();
+      List<HiveObjectPrivilege> __this__privileges = new ArrayList<HiveObjectPrivilege>(other.privileges.size());
       for (HiveObjectPrivilege other_element : other.privileges) {
         __this__privileges.add(new HiveObjectPrivilege(other_element));
       }
@@ -245,30 +249,30 @@ public class PrivilegeBag implements org.apache.thrift.TBase<PrivilegeBag, Privi
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_privileges = true && (isSetPrivileges());
-    builder.append(present_privileges);
+    list.add(present_privileges);
     if (present_privileges)
-      builder.append(privileges);
+      list.add(privileges);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(PrivilegeBag other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    PrivilegeBag typedOther = (PrivilegeBag)other;
 
-    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;
       }
@@ -348,12 +352,12 @@ public class PrivilegeBag implements org.apache.thrift.TBase<PrivilegeBag, Privi
               {
                 org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
                 struct.privileges = new ArrayList<HiveObjectPrivilege>(_list16.size);
-                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
+                HiveObjectPrivilege _elem17;
+                for (int _i18 = 0; _i18 < _list16.size; ++_i18)
                 {
-                  HiveObjectPrivilege _elem18; // optional
-                  _elem18 = new HiveObjectPrivilege();
-                  _elem18.read(iprot);
-                  struct.privileges.add(_elem18);
+                  _elem17 = new HiveObjectPrivilege();
+                  _elem17.read(iprot);
+                  struct.privileges.add(_elem17);
                 }
                 iprot.readListEnd();
               }
@@ -428,12 +432,12 @@ public class PrivilegeBag implements org.apache.thrift.TBase<PrivilegeBag, Privi
         {
           org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.privileges = new ArrayList<HiveObjectPrivilege>(_list21.size);
-          for (int _i22 = 0; _i22 < _list21.size; ++_i22)
+          HiveObjectPrivilege _elem22;
+          for (int _i23 = 0; _i23 < _list21.size; ++_i23)
           {
-            HiveObjectPrivilege _elem23; // optional
-            _elem23 = new HiveObjectPrivilege();
-            _elem23.read(iprot);
-            struct.privileges.add(_elem23);
+            _elem22 = new HiveObjectPrivilege();
+            _elem22.read(iprot);
+            struct.privileges.add(_elem22);
           }
         }
         struct.setPrivilegesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
index 5869457..1ebe09b 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.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 PrivilegeGrantInfo implements org.apache.thrift.TBase<PrivilegeGrantInfo, PrivilegeGrantInfo._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 PrivilegeGrantInfo implements org.apache.thrift.TBase<PrivilegeGrantInfo, PrivilegeGrantInfo._Fields>, java.io.Serializable, Cloneable, Comparable<PrivilegeGrantInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrivilegeGrantInfo");
 
   private static final org.apache.thrift.protocol.TField PRIVILEGE_FIELD_DESC = new org.apache.thrift.protocol.TField("privilege", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -471,90 +475,90 @@ public class PrivilegeGrantInfo implements org.apache.thrift.TBase<PrivilegeGran
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_privilege = true && (isSetPrivilege());
-    builder.append(present_privilege);
+    list.add(present_privilege);
     if (present_privilege)
-      builder.append(privilege);
+      list.add(privilege);
 
     boolean present_createTime = true;
-    builder.append(present_createTime);
+    list.add(present_createTime);
     if (present_createTime)
-      builder.append(createTime);
+      list.add(createTime);
 
     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;
-    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(PrivilegeGrantInfo other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    PrivilegeGrantInfo typedOther = (PrivilegeGrantInfo)other;
 
-    lastComparison = Boolean.valueOf(isSetPrivilege()).compareTo(typedOther.isSetPrivilege());
+    lastComparison = Boolean.valueOf(isSetPrivilege()).compareTo(other.isSetPrivilege());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPrivilege()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.privilege, typedOther.privilege);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.privilege, other.privilege);
       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(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;
       }
@@ -681,7 +685,7 @@ public class PrivilegeGrantInfo implements org.apache.thrift.TBase<PrivilegeGran
             break;
           case 4: // 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);
@@ -797,7 +801,7 @@ public class PrivilegeGrantInfo implements org.apache.thrift.TBase<PrivilegeGran
         struct.setGrantorIsSet(true);
       }
       if (incoming.get(3)) {
-        struct.grantorType = PrincipalType.findByValue(iprot.readI32());
+        struct.grantorType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
         struct.setGrantorTypeIsSet(true);
       }
       if (incoming.get(4)) {

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
index c2bb231..9207934 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.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 RequestPartsSpec extends org.apache.thrift.TUnion<RequestPartsSpec, RequestPartsSpec._Fields> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RequestPartsSpec");
   private static final org.apache.thrift.protocol.TField NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("names", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -167,11 +170,11 @@ public class RequestPartsSpec extends org.apache.thrift.TUnion<RequestPartsSpec,
             {
               org.apache.thrift.protocol.TList _list404 = iprot.readListBegin();
               names = new ArrayList<String>(_list404.size);
-              for (int _i405 = 0; _i405 < _list404.size; ++_i405)
+              String _elem405;
+              for (int _i406 = 0; _i406 < _list404.size; ++_i406)
               {
-                String _elem406; // optional
-                _elem406 = iprot.readString();
-                names.add(_elem406);
+                _elem405 = iprot.readString();
+                names.add(_elem405);
               }
               iprot.readListEnd();
             }
@@ -186,12 +189,12 @@ public class RequestPartsSpec extends org.apache.thrift.TUnion<RequestPartsSpec,
             {
               org.apache.thrift.protocol.TList _list407 = iprot.readListBegin();
               exprs = new ArrayList<DropPartitionsExpr>(_list407.size);
-              for (int _i408 = 0; _i408 < _list407.size; ++_i408)
+              DropPartitionsExpr _elem408;
+              for (int _i409 = 0; _i409 < _list407.size; ++_i409)
               {
-                DropPartitionsExpr _elem409; // optional
-                _elem409 = new DropPartitionsExpr();
-                _elem409.read(iprot);
-                exprs.add(_elem409);
+                _elem408 = new DropPartitionsExpr();
+                _elem408.read(iprot);
+                exprs.add(_elem408);
               }
               iprot.readListEnd();
             }
@@ -204,6 +207,7 @@ public class RequestPartsSpec extends org.apache.thrift.TUnion<RequestPartsSpec,
           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;
     }
   }
@@ -248,11 +252,11 @@ public class RequestPartsSpec extends org.apache.thrift.TUnion<RequestPartsSpec,
           {
             org.apache.thrift.protocol.TList _list412 = iprot.readListBegin();
             names = new ArrayList<String>(_list412.size);
-            for (int _i413 = 0; _i413 < _list412.size; ++_i413)
+            String _elem413;
+            for (int _i414 = 0; _i414 < _list412.size; ++_i414)
             {
-              String _elem414; // optional
-              _elem414 = iprot.readString();
-              names.add(_elem414);
+              _elem413 = iprot.readString();
+              names.add(_elem413);
             }
             iprot.readListEnd();
           }
@@ -262,12 +266,12 @@ public class RequestPartsSpec extends org.apache.thrift.TUnion<RequestPartsSpec,
           {
             org.apache.thrift.protocol.TList _list415 = iprot.readListBegin();
             exprs = new ArrayList<DropPartitionsExpr>(_list415.size);
-            for (int _i416 = 0; _i416 < _list415.size; ++_i416)
+            DropPartitionsExpr _elem416;
+            for (int _i417 = 0; _i417 < _list415.size; ++_i417)
             {
-              DropPartitionsExpr _elem417; // optional
-              _elem417 = new DropPartitionsExpr();
-              _elem417.read(iprot);
-              exprs.add(_elem417);
+              _elem416 = new DropPartitionsExpr();
+              _elem416.read(iprot);
+              exprs.add(_elem416);
             }
             iprot.readListEnd();
           }
@@ -399,19 +403,19 @@ public class RequestPartsSpec extends org.apache.thrift.TUnion<RequestPartsSpec,
 
   @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/ResourceType.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java
index b8cb4f1..861a6db 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.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/ResourceUri.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java
index c230eab..5aa4c51 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.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 ResourceUri implements org.apache.thrift.TBase<ResourceUri, ResourceUri._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 ResourceUri implements org.apache.thrift.TBase<ResourceUri, ResourceUri._Fields>, java.io.Serializable, Cloneable, Comparable<ResourceUri> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ResourceUri");
 
   private static final org.apache.thrift.protocol.TField RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceType", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -295,45 +299,45 @@ public class ResourceUri implements org.apache.thrift.TBase<ResourceUri, Resourc
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_resourceType = true && (isSetResourceType());
-    builder.append(present_resourceType);
+    list.add(present_resourceType);
     if (present_resourceType)
-      builder.append(resourceType.getValue());
+      list.add(resourceType.getValue());
 
     boolean present_uri = true && (isSetUri());
-    builder.append(present_uri);
+    list.add(present_uri);
     if (present_uri)
-      builder.append(uri);
+      list.add(uri);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(ResourceUri other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ResourceUri typedOther = (ResourceUri)other;
 
-    lastComparison = Boolean.valueOf(isSetResourceType()).compareTo(typedOther.isSetResourceType());
+    lastComparison = Boolean.valueOf(isSetResourceType()).compareTo(other.isSetResourceType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetResourceType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, typedOther.resourceType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, other.resourceType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUri()).compareTo(typedOther.isSetUri());
+    lastComparison = Boolean.valueOf(isSetUri()).compareTo(other.isSetUri());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUri()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uri, typedOther.uri);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uri, other.uri);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -418,7 +422,7 @@ public class ResourceUri implements org.apache.thrift.TBase<ResourceUri, Resourc
         switch (schemeField.id) {
           case 1: // RESOURCE_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.resourceType = ResourceType.findByValue(iprot.readI32());
+              struct.resourceType = org.apache.hadoop.hive.metastore.api.ResourceType.findByValue(iprot.readI32());
               struct.setResourceTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -493,7 +497,7 @@ public class ResourceUri implements org.apache.thrift.TBase<ResourceUri, Resourc
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.resourceType = ResourceType.findByValue(iprot.readI32());
+        struct.resourceType = org.apache.hadoop.hive.metastore.api.ResourceType.findByValue(iprot.readI32());
         struct.setResourceTypeIsSet(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/Role.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
index 35fcf58..c1bb4cb 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.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 Role implements org.apache.thrift.TBase<Role, Role._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 Role implements org.apache.thrift.TBase<Role, Role._Fields>, java.io.Serializable, Cloneable, Comparable<Role> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Role");
 
   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);
@@ -343,60 +347,60 @@ public class Role implements org.apache.thrift.TBase<Role, Role._Fields>, java.i
 
   @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);
 
     boolean present_createTime = true;
-    builder.append(present_createTime);
+    list.add(present_createTime);
     if (present_createTime)
-      builder.append(createTime);
+      list.add(createTime);
 
     boolean present_ownerName = true && (isSetOwnerName());
-    builder.append(present_ownerName);
+    list.add(present_ownerName);
     if (present_ownerName)
-      builder.append(ownerName);
+      list.add(ownerName);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Role other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Role typedOther = (Role)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;
       }
     }
-    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(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;
       }