You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2017/08/03 16:56:39 UTC

[18/51] [partial] hive git commit: HIVE-17170 Move thrift generated code to stand alone metastore (Alan Gates reviewed by Vihang Karajgaonkar)

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/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
deleted file mode 100644
index 63ed662..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * 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.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-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);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new PartitionsStatsResultStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PartitionsStatsResultTupleSchemeFactory());
-  }
-
-  private Map<String,List<ColumnStatisticsObj>> partStats; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    PART_STATS((short)1, "partStats");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // PART_STATS
-          return PART_STATS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  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);
-    tmpMap.put(_Fields.PART_STATS, new org.apache.thrift.meta_data.FieldMetaData("partStats", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnStatisticsObj.class)))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PartitionsStatsResult.class, metaDataMap);
-  }
-
-  public PartitionsStatsResult() {
-  }
-
-  public PartitionsStatsResult(
-    Map<String,List<ColumnStatisticsObj>> partStats)
-  {
-    this();
-    this.partStats = partStats;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public PartitionsStatsResult(PartitionsStatsResult other) {
-    if (other.isSetPartStats()) {
-      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();
-        List<ColumnStatisticsObj> other_element_value = other_element.getValue();
-
-        String __this__partStats_copy_key = other_element_key;
-
-        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));
-        }
-
-        __this__partStats.put(__this__partStats_copy_key, __this__partStats_copy_value);
-      }
-      this.partStats = __this__partStats;
-    }
-  }
-
-  public PartitionsStatsResult deepCopy() {
-    return new PartitionsStatsResult(this);
-  }
-
-  @Override
-  public void clear() {
-    this.partStats = null;
-  }
-
-  public int getPartStatsSize() {
-    return (this.partStats == null) ? 0 : this.partStats.size();
-  }
-
-  public void putToPartStats(String key, List<ColumnStatisticsObj> val) {
-    if (this.partStats == null) {
-      this.partStats = new HashMap<String,List<ColumnStatisticsObj>>();
-    }
-    this.partStats.put(key, val);
-  }
-
-  public Map<String,List<ColumnStatisticsObj>> getPartStats() {
-    return this.partStats;
-  }
-
-  public void setPartStats(Map<String,List<ColumnStatisticsObj>> partStats) {
-    this.partStats = partStats;
-  }
-
-  public void unsetPartStats() {
-    this.partStats = null;
-  }
-
-  /** Returns true if field partStats is set (has been assigned a value) and false otherwise */
-  public boolean isSetPartStats() {
-    return this.partStats != null;
-  }
-
-  public void setPartStatsIsSet(boolean value) {
-    if (!value) {
-      this.partStats = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case PART_STATS:
-      if (value == null) {
-        unsetPartStats();
-      } else {
-        setPartStats((Map<String,List<ColumnStatisticsObj>>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case PART_STATS:
-      return getPartStats();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case PART_STATS:
-      return isSetPartStats();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof PartitionsStatsResult)
-      return this.equals((PartitionsStatsResult)that);
-    return false;
-  }
-
-  public boolean equals(PartitionsStatsResult that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_partStats = true && this.isSetPartStats();
-    boolean that_present_partStats = true && that.isSetPartStats();
-    if (this_present_partStats || that_present_partStats) {
-      if (!(this_present_partStats && that_present_partStats))
-        return false;
-      if (!this.partStats.equals(that.partStats))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_partStats = true && (isSetPartStats());
-    list.add(present_partStats);
-    if (present_partStats)
-      list.add(partStats);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(PartitionsStatsResult other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetPartStats()).compareTo(other.isSetPartStats());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPartStats()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partStats, other.partStats);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("PartitionsStatsResult(");
-    boolean first = true;
-
-    sb.append("partStats:");
-    if (this.partStats == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.partStats);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetPartStats()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'partStats' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class PartitionsStatsResultStandardSchemeFactory implements SchemeFactory {
-    public PartitionsStatsResultStandardScheme getScheme() {
-      return new PartitionsStatsResultStandardScheme();
-    }
-  }
-
-  private static class PartitionsStatsResultStandardScheme extends StandardScheme<PartitionsStatsResult> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, PartitionsStatsResult struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // PART_STATS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map402 = iprot.readMapBegin();
-                struct.partStats = new HashMap<String,List<ColumnStatisticsObj>>(2*_map402.size);
-                String _key403;
-                List<ColumnStatisticsObj> _val404;
-                for (int _i405 = 0; _i405 < _map402.size; ++_i405)
-                {
-                  _key403 = iprot.readString();
-                  {
-                    org.apache.thrift.protocol.TList _list406 = iprot.readListBegin();
-                    _val404 = new ArrayList<ColumnStatisticsObj>(_list406.size);
-                    ColumnStatisticsObj _elem407;
-                    for (int _i408 = 0; _i408 < _list406.size; ++_i408)
-                    {
-                      _elem407 = new ColumnStatisticsObj();
-                      _elem407.read(iprot);
-                      _val404.add(_elem407);
-                    }
-                    iprot.readListEnd();
-                  }
-                  struct.partStats.put(_key403, _val404);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setPartStatsIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, PartitionsStatsResult struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.partStats != null) {
-        oprot.writeFieldBegin(PART_STATS_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.partStats.size()));
-          for (Map.Entry<String, List<ColumnStatisticsObj>> _iter409 : struct.partStats.entrySet())
-          {
-            oprot.writeString(_iter409.getKey());
-            {
-              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter409.getValue().size()));
-              for (ColumnStatisticsObj _iter410 : _iter409.getValue())
-              {
-                _iter410.write(oprot);
-              }
-              oprot.writeListEnd();
-            }
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class PartitionsStatsResultTupleSchemeFactory implements SchemeFactory {
-    public PartitionsStatsResultTupleScheme getScheme() {
-      return new PartitionsStatsResultTupleScheme();
-    }
-  }
-
-  private static class PartitionsStatsResultTupleScheme extends TupleScheme<PartitionsStatsResult> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, PartitionsStatsResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      {
-        oprot.writeI32(struct.partStats.size());
-        for (Map.Entry<String, List<ColumnStatisticsObj>> _iter411 : struct.partStats.entrySet())
-        {
-          oprot.writeString(_iter411.getKey());
-          {
-            oprot.writeI32(_iter411.getValue().size());
-            for (ColumnStatisticsObj _iter412 : _iter411.getValue())
-            {
-              _iter412.write(oprot);
-            }
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsStatsResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map413 = 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*_map413.size);
-        String _key414;
-        List<ColumnStatisticsObj> _val415;
-        for (int _i416 = 0; _i416 < _map413.size; ++_i416)
-        {
-          _key414 = iprot.readString();
-          {
-            org.apache.thrift.protocol.TList _list417 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            _val415 = new ArrayList<ColumnStatisticsObj>(_list417.size);
-            ColumnStatisticsObj _elem418;
-            for (int _i419 = 0; _i419 < _list417.size; ++_i419)
-            {
-              _elem418 = new ColumnStatisticsObj();
-              _elem418.read(iprot);
-              _val415.add(_elem418);
-            }
-          }
-          struct.partStats.put(_key414, _val415);
-        }
-      }
-      struct.setPartStatsIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
deleted file mode 100644
index 8763ec8..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * 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.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-public class PrimaryKeysRequest implements org.apache.thrift.TBase<PrimaryKeysRequest, PrimaryKeysRequest._Fields>, java.io.Serializable, Cloneable, Comparable<PrimaryKeysRequest> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrimaryKeysRequest");
-
-  private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new PrimaryKeysRequestStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PrimaryKeysRequestTupleSchemeFactory());
-  }
-
-  private String db_name; // required
-  private String tbl_name; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    DB_NAME((short)1, "db_name"),
-    TBL_NAME((short)2, "tbl_name");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // DB_NAME
-          return DB_NAME;
-        case 2: // TBL_NAME
-          return TBL_NAME;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  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);
-    tmpMap.put(_Fields.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("db_name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrimaryKeysRequest.class, metaDataMap);
-  }
-
-  public PrimaryKeysRequest() {
-  }
-
-  public PrimaryKeysRequest(
-    String db_name,
-    String tbl_name)
-  {
-    this();
-    this.db_name = db_name;
-    this.tbl_name = tbl_name;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public PrimaryKeysRequest(PrimaryKeysRequest other) {
-    if (other.isSetDb_name()) {
-      this.db_name = other.db_name;
-    }
-    if (other.isSetTbl_name()) {
-      this.tbl_name = other.tbl_name;
-    }
-  }
-
-  public PrimaryKeysRequest deepCopy() {
-    return new PrimaryKeysRequest(this);
-  }
-
-  @Override
-  public void clear() {
-    this.db_name = null;
-    this.tbl_name = null;
-  }
-
-  public String getDb_name() {
-    return this.db_name;
-  }
-
-  public void setDb_name(String db_name) {
-    this.db_name = db_name;
-  }
-
-  public void unsetDb_name() {
-    this.db_name = null;
-  }
-
-  /** Returns true if field db_name is set (has been assigned a value) and false otherwise */
-  public boolean isSetDb_name() {
-    return this.db_name != null;
-  }
-
-  public void setDb_nameIsSet(boolean value) {
-    if (!value) {
-      this.db_name = null;
-    }
-  }
-
-  public String getTbl_name() {
-    return this.tbl_name;
-  }
-
-  public void setTbl_name(String tbl_name) {
-    this.tbl_name = tbl_name;
-  }
-
-  public void unsetTbl_name() {
-    this.tbl_name = null;
-  }
-
-  /** Returns true if field tbl_name is set (has been assigned a value) and false otherwise */
-  public boolean isSetTbl_name() {
-    return this.tbl_name != null;
-  }
-
-  public void setTbl_nameIsSet(boolean value) {
-    if (!value) {
-      this.tbl_name = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DB_NAME:
-      if (value == null) {
-        unsetDb_name();
-      } else {
-        setDb_name((String)value);
-      }
-      break;
-
-    case TBL_NAME:
-      if (value == null) {
-        unsetTbl_name();
-      } else {
-        setTbl_name((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DB_NAME:
-      return getDb_name();
-
-    case TBL_NAME:
-      return getTbl_name();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case DB_NAME:
-      return isSetDb_name();
-    case TBL_NAME:
-      return isSetTbl_name();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof PrimaryKeysRequest)
-      return this.equals((PrimaryKeysRequest)that);
-    return false;
-  }
-
-  public boolean equals(PrimaryKeysRequest that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_db_name = true && this.isSetDb_name();
-    boolean that_present_db_name = true && that.isSetDb_name();
-    if (this_present_db_name || that_present_db_name) {
-      if (!(this_present_db_name && that_present_db_name))
-        return false;
-      if (!this.db_name.equals(that.db_name))
-        return false;
-    }
-
-    boolean this_present_tbl_name = true && this.isSetTbl_name();
-    boolean that_present_tbl_name = true && that.isSetTbl_name();
-    if (this_present_tbl_name || that_present_tbl_name) {
-      if (!(this_present_tbl_name && that_present_tbl_name))
-        return false;
-      if (!this.tbl_name.equals(that.tbl_name))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_db_name = true && (isSetDb_name());
-    list.add(present_db_name);
-    if (present_db_name)
-      list.add(db_name);
-
-    boolean present_tbl_name = true && (isSetTbl_name());
-    list.add(present_tbl_name);
-    if (present_tbl_name)
-      list.add(tbl_name);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(PrimaryKeysRequest other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDb_name()).compareTo(other.isSetDb_name());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDb_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.db_name, other.db_name);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetTbl_name()).compareTo(other.isSetTbl_name());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetTbl_name()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tbl_name, other.tbl_name);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("PrimaryKeysRequest(");
-    boolean first = true;
-
-    sb.append("db_name:");
-    if (this.db_name == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.db_name);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("tbl_name:");
-    if (this.tbl_name == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.tbl_name);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDb_name()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'db_name' is unset! Struct:" + toString());
-    }
-
-    if (!isSetTbl_name()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'tbl_name' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class PrimaryKeysRequestStandardSchemeFactory implements SchemeFactory {
-    public PrimaryKeysRequestStandardScheme getScheme() {
-      return new PrimaryKeysRequestStandardScheme();
-    }
-  }
-
-  private static class PrimaryKeysRequestStandardScheme extends StandardScheme<PrimaryKeysRequest> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, PrimaryKeysRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.db_name = iprot.readString();
-              struct.setDb_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tbl_name = iprot.readString();
-              struct.setTbl_nameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, PrimaryKeysRequest struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.db_name != null) {
-        oprot.writeFieldBegin(DB_NAME_FIELD_DESC);
-        oprot.writeString(struct.db_name);
-        oprot.writeFieldEnd();
-      }
-      if (struct.tbl_name != null) {
-        oprot.writeFieldBegin(TBL_NAME_FIELD_DESC);
-        oprot.writeString(struct.tbl_name);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class PrimaryKeysRequestTupleSchemeFactory implements SchemeFactory {
-    public PrimaryKeysRequestTupleScheme getScheme() {
-      return new PrimaryKeysRequestTupleScheme();
-    }
-  }
-
-  private static class PrimaryKeysRequestTupleScheme extends TupleScheme<PrimaryKeysRequest> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysRequest struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.db_name);
-      oprot.writeString(struct.tbl_name);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysRequest struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.db_name = iprot.readString();
-      struct.setDb_nameIsSet(true);
-      struct.tbl_name = iprot.readString();
-      struct.setTbl_nameIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
deleted file mode 100644
index a25234b..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * 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.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-public class PrimaryKeysResponse implements org.apache.thrift.TBase<PrimaryKeysResponse, PrimaryKeysResponse._Fields>, java.io.Serializable, Cloneable, Comparable<PrimaryKeysResponse> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrimaryKeysResponse");
-
-  private static final org.apache.thrift.protocol.TField PRIMARY_KEYS_FIELD_DESC = new org.apache.thrift.protocol.TField("primaryKeys", org.apache.thrift.protocol.TType.LIST, (short)1);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new PrimaryKeysResponseStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PrimaryKeysResponseTupleSchemeFactory());
-  }
-
-  private List<SQLPrimaryKey> primaryKeys; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    PRIMARY_KEYS((short)1, "primaryKeys");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // PRIMARY_KEYS
-          return PRIMARY_KEYS;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  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);
-    tmpMap.put(_Fields.PRIMARY_KEYS, new org.apache.thrift.meta_data.FieldMetaData("primaryKeys", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SQLPrimaryKey.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrimaryKeysResponse.class, metaDataMap);
-  }
-
-  public PrimaryKeysResponse() {
-  }
-
-  public PrimaryKeysResponse(
-    List<SQLPrimaryKey> primaryKeys)
-  {
-    this();
-    this.primaryKeys = primaryKeys;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public PrimaryKeysResponse(PrimaryKeysResponse other) {
-    if (other.isSetPrimaryKeys()) {
-      List<SQLPrimaryKey> __this__primaryKeys = new ArrayList<SQLPrimaryKey>(other.primaryKeys.size());
-      for (SQLPrimaryKey other_element : other.primaryKeys) {
-        __this__primaryKeys.add(new SQLPrimaryKey(other_element));
-      }
-      this.primaryKeys = __this__primaryKeys;
-    }
-  }
-
-  public PrimaryKeysResponse deepCopy() {
-    return new PrimaryKeysResponse(this);
-  }
-
-  @Override
-  public void clear() {
-    this.primaryKeys = null;
-  }
-
-  public int getPrimaryKeysSize() {
-    return (this.primaryKeys == null) ? 0 : this.primaryKeys.size();
-  }
-
-  public java.util.Iterator<SQLPrimaryKey> getPrimaryKeysIterator() {
-    return (this.primaryKeys == null) ? null : this.primaryKeys.iterator();
-  }
-
-  public void addToPrimaryKeys(SQLPrimaryKey elem) {
-    if (this.primaryKeys == null) {
-      this.primaryKeys = new ArrayList<SQLPrimaryKey>();
-    }
-    this.primaryKeys.add(elem);
-  }
-
-  public List<SQLPrimaryKey> getPrimaryKeys() {
-    return this.primaryKeys;
-  }
-
-  public void setPrimaryKeys(List<SQLPrimaryKey> primaryKeys) {
-    this.primaryKeys = primaryKeys;
-  }
-
-  public void unsetPrimaryKeys() {
-    this.primaryKeys = null;
-  }
-
-  /** Returns true if field primaryKeys is set (has been assigned a value) and false otherwise */
-  public boolean isSetPrimaryKeys() {
-    return this.primaryKeys != null;
-  }
-
-  public void setPrimaryKeysIsSet(boolean value) {
-    if (!value) {
-      this.primaryKeys = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case PRIMARY_KEYS:
-      if (value == null) {
-        unsetPrimaryKeys();
-      } else {
-        setPrimaryKeys((List<SQLPrimaryKey>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case PRIMARY_KEYS:
-      return getPrimaryKeys();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case PRIMARY_KEYS:
-      return isSetPrimaryKeys();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof PrimaryKeysResponse)
-      return this.equals((PrimaryKeysResponse)that);
-    return false;
-  }
-
-  public boolean equals(PrimaryKeysResponse that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_primaryKeys = true && this.isSetPrimaryKeys();
-    boolean that_present_primaryKeys = true && that.isSetPrimaryKeys();
-    if (this_present_primaryKeys || that_present_primaryKeys) {
-      if (!(this_present_primaryKeys && that_present_primaryKeys))
-        return false;
-      if (!this.primaryKeys.equals(that.primaryKeys))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_primaryKeys = true && (isSetPrimaryKeys());
-    list.add(present_primaryKeys);
-    if (present_primaryKeys)
-      list.add(primaryKeys);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(PrimaryKeysResponse other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetPrimaryKeys()).compareTo(other.isSetPrimaryKeys());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPrimaryKeys()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.primaryKeys, other.primaryKeys);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("PrimaryKeysResponse(");
-    boolean first = true;
-
-    sb.append("primaryKeys:");
-    if (this.primaryKeys == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.primaryKeys);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetPrimaryKeys()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'primaryKeys' is unset! Struct:" + toString());
-    }
-
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class PrimaryKeysResponseStandardSchemeFactory implements SchemeFactory {
-    public PrimaryKeysResponseStandardScheme getScheme() {
-      return new PrimaryKeysResponseStandardScheme();
-    }
-  }
-
-  private static class PrimaryKeysResponseStandardScheme extends StandardScheme<PrimaryKeysResponse> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, PrimaryKeysResponse struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // PRIMARY_KEYS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list322 = iprot.readListBegin();
-                struct.primaryKeys = new ArrayList<SQLPrimaryKey>(_list322.size);
-                SQLPrimaryKey _elem323;
-                for (int _i324 = 0; _i324 < _list322.size; ++_i324)
-                {
-                  _elem323 = new SQLPrimaryKey();
-                  _elem323.read(iprot);
-                  struct.primaryKeys.add(_elem323);
-                }
-                iprot.readListEnd();
-              }
-              struct.setPrimaryKeysIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, PrimaryKeysResponse struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.primaryKeys != null) {
-        oprot.writeFieldBegin(PRIMARY_KEYS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.primaryKeys.size()));
-          for (SQLPrimaryKey _iter325 : struct.primaryKeys)
-          {
-            _iter325.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class PrimaryKeysResponseTupleSchemeFactory implements SchemeFactory {
-    public PrimaryKeysResponseTupleScheme getScheme() {
-      return new PrimaryKeysResponseTupleScheme();
-    }
-  }
-
-  private static class PrimaryKeysResponseTupleScheme extends TupleScheme<PrimaryKeysResponse> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysResponse struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      {
-        oprot.writeI32(struct.primaryKeys.size());
-        for (SQLPrimaryKey _iter326 : struct.primaryKeys)
-        {
-          _iter326.write(oprot);
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysResponse struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list327 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.primaryKeys = new ArrayList<SQLPrimaryKey>(_list327.size);
-        SQLPrimaryKey _elem328;
-        for (int _i329 = 0; _i329 < _list327.size; ++_i329)
-        {
-          _elem328 = new SQLPrimaryKey();
-          _elem328.read(iprot);
-          struct.primaryKeys.add(_elem328);
-        }
-      }
-      struct.setPrimaryKeysIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/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
deleted file mode 100644
index e1792bd..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
+++ /dev/null
@@ -1,906 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * 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.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-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);
-  private static final org.apache.thrift.protocol.TField GROUP_PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("groupPrivileges", org.apache.thrift.protocol.TType.MAP, (short)2);
-  private static final org.apache.thrift.protocol.TField ROLE_PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("rolePrivileges", org.apache.thrift.protocol.TType.MAP, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new PrincipalPrivilegeSetStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PrincipalPrivilegeSetTupleSchemeFactory());
-  }
-
-  private Map<String,List<PrivilegeGrantInfo>> userPrivileges; // required
-  private Map<String,List<PrivilegeGrantInfo>> groupPrivileges; // required
-  private Map<String,List<PrivilegeGrantInfo>> rolePrivileges; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    USER_PRIVILEGES((short)1, "userPrivileges"),
-    GROUP_PRIVILEGES((short)2, "groupPrivileges"),
-    ROLE_PRIVILEGES((short)3, "rolePrivileges");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // USER_PRIVILEGES
-          return USER_PRIVILEGES;
-        case 2: // GROUP_PRIVILEGES
-          return GROUP_PRIVILEGES;
-        case 3: // ROLE_PRIVILEGES
-          return ROLE_PRIVILEGES;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  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);
-    tmpMap.put(_Fields.USER_PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("userPrivileges", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrivilegeGrantInfo.class)))));
-    tmpMap.put(_Fields.GROUP_PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("groupPrivileges", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrivilegeGrantInfo.class)))));
-    tmpMap.put(_Fields.ROLE_PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("rolePrivileges", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrivilegeGrantInfo.class)))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrincipalPrivilegeSet.class, metaDataMap);
-  }
-
-  public PrincipalPrivilegeSet() {
-  }
-
-  public PrincipalPrivilegeSet(
-    Map<String,List<PrivilegeGrantInfo>> userPrivileges,
-    Map<String,List<PrivilegeGrantInfo>> groupPrivileges,
-    Map<String,List<PrivilegeGrantInfo>> rolePrivileges)
-  {
-    this();
-    this.userPrivileges = userPrivileges;
-    this.groupPrivileges = groupPrivileges;
-    this.rolePrivileges = rolePrivileges;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public PrincipalPrivilegeSet(PrincipalPrivilegeSet other) {
-    if (other.isSetUserPrivileges()) {
-      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();
-        List<PrivilegeGrantInfo> other_element_value = other_element.getValue();
-
-        String __this__userPrivileges_copy_key = other_element_key;
-
-        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));
-        }
-
-        __this__userPrivileges.put(__this__userPrivileges_copy_key, __this__userPrivileges_copy_value);
-      }
-      this.userPrivileges = __this__userPrivileges;
-    }
-    if (other.isSetGroupPrivileges()) {
-      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();
-        List<PrivilegeGrantInfo> other_element_value = other_element.getValue();
-
-        String __this__groupPrivileges_copy_key = other_element_key;
-
-        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));
-        }
-
-        __this__groupPrivileges.put(__this__groupPrivileges_copy_key, __this__groupPrivileges_copy_value);
-      }
-      this.groupPrivileges = __this__groupPrivileges;
-    }
-    if (other.isSetRolePrivileges()) {
-      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();
-        List<PrivilegeGrantInfo> other_element_value = other_element.getValue();
-
-        String __this__rolePrivileges_copy_key = other_element_key;
-
-        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));
-        }
-
-        __this__rolePrivileges.put(__this__rolePrivileges_copy_key, __this__rolePrivileges_copy_value);
-      }
-      this.rolePrivileges = __this__rolePrivileges;
-    }
-  }
-
-  public PrincipalPrivilegeSet deepCopy() {
-    return new PrincipalPrivilegeSet(this);
-  }
-
-  @Override
-  public void clear() {
-    this.userPrivileges = null;
-    this.groupPrivileges = null;
-    this.rolePrivileges = null;
-  }
-
-  public int getUserPrivilegesSize() {
-    return (this.userPrivileges == null) ? 0 : this.userPrivileges.size();
-  }
-
-  public void putToUserPrivileges(String key, List<PrivilegeGrantInfo> val) {
-    if (this.userPrivileges == null) {
-      this.userPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>();
-    }
-    this.userPrivileges.put(key, val);
-  }
-
-  public Map<String,List<PrivilegeGrantInfo>> getUserPrivileges() {
-    return this.userPrivileges;
-  }
-
-  public void setUserPrivileges(Map<String,List<PrivilegeGrantInfo>> userPrivileges) {
-    this.userPrivileges = userPrivileges;
-  }
-
-  public void unsetUserPrivileges() {
-    this.userPrivileges = null;
-  }
-
-  /** Returns true if field userPrivileges is set (has been assigned a value) and false otherwise */
-  public boolean isSetUserPrivileges() {
-    return this.userPrivileges != null;
-  }
-
-  public void setUserPrivilegesIsSet(boolean value) {
-    if (!value) {
-      this.userPrivileges = null;
-    }
-  }
-
-  public int getGroupPrivilegesSize() {
-    return (this.groupPrivileges == null) ? 0 : this.groupPrivileges.size();
-  }
-
-  public void putToGroupPrivileges(String key, List<PrivilegeGrantInfo> val) {
-    if (this.groupPrivileges == null) {
-      this.groupPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>();
-    }
-    this.groupPrivileges.put(key, val);
-  }
-
-  public Map<String,List<PrivilegeGrantInfo>> getGroupPrivileges() {
-    return this.groupPrivileges;
-  }
-
-  public void setGroupPrivileges(Map<String,List<PrivilegeGrantInfo>> groupPrivileges) {
-    this.groupPrivileges = groupPrivileges;
-  }
-
-  public void unsetGroupPrivileges() {
-    this.groupPrivileges = null;
-  }
-
-  /** Returns true if field groupPrivileges is set (has been assigned a value) and false otherwise */
-  public boolean isSetGroupPrivileges() {
-    return this.groupPrivileges != null;
-  }
-
-  public void setGroupPrivilegesIsSet(boolean value) {
-    if (!value) {
-      this.groupPrivileges = null;
-    }
-  }
-
-  public int getRolePrivilegesSize() {
-    return (this.rolePrivileges == null) ? 0 : this.rolePrivileges.size();
-  }
-
-  public void putToRolePrivileges(String key, List<PrivilegeGrantInfo> val) {
-    if (this.rolePrivileges == null) {
-      this.rolePrivileges = new HashMap<String,List<PrivilegeGrantInfo>>();
-    }
-    this.rolePrivileges.put(key, val);
-  }
-
-  public Map<String,List<PrivilegeGrantInfo>> getRolePrivileges() {
-    return this.rolePrivileges;
-  }
-
-  public void setRolePrivileges(Map<String,List<PrivilegeGrantInfo>> rolePrivileges) {
-    this.rolePrivileges = rolePrivileges;
-  }
-
-  public void unsetRolePrivileges() {
-    this.rolePrivileges = null;
-  }
-
-  /** Returns true if field rolePrivileges is set (has been assigned a value) and false otherwise */
-  public boolean isSetRolePrivileges() {
-    return this.rolePrivileges != null;
-  }
-
-  public void setRolePrivilegesIsSet(boolean value) {
-    if (!value) {
-      this.rolePrivileges = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case USER_PRIVILEGES:
-      if (value == null) {
-        unsetUserPrivileges();
-      } else {
-        setUserPrivileges((Map<String,List<PrivilegeGrantInfo>>)value);
-      }
-      break;
-
-    case GROUP_PRIVILEGES:
-      if (value == null) {
-        unsetGroupPrivileges();
-      } else {
-        setGroupPrivileges((Map<String,List<PrivilegeGrantInfo>>)value);
-      }
-      break;
-
-    case ROLE_PRIVILEGES:
-      if (value == null) {
-        unsetRolePrivileges();
-      } else {
-        setRolePrivileges((Map<String,List<PrivilegeGrantInfo>>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case USER_PRIVILEGES:
-      return getUserPrivileges();
-
-    case GROUP_PRIVILEGES:
-      return getGroupPrivileges();
-
-    case ROLE_PRIVILEGES:
-      return getRolePrivileges();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case USER_PRIVILEGES:
-      return isSetUserPrivileges();
-    case GROUP_PRIVILEGES:
-      return isSetGroupPrivileges();
-    case ROLE_PRIVILEGES:
-      return isSetRolePrivileges();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof PrincipalPrivilegeSet)
-      return this.equals((PrincipalPrivilegeSet)that);
-    return false;
-  }
-
-  public boolean equals(PrincipalPrivilegeSet that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_userPrivileges = true && this.isSetUserPrivileges();
-    boolean that_present_userPrivileges = true && that.isSetUserPrivileges();
-    if (this_present_userPrivileges || that_present_userPrivileges) {
-      if (!(this_present_userPrivileges && that_present_userPrivileges))
-        return false;
-      if (!this.userPrivileges.equals(that.userPrivileges))
-        return false;
-    }
-
-    boolean this_present_groupPrivileges = true && this.isSetGroupPrivileges();
-    boolean that_present_groupPrivileges = true && that.isSetGroupPrivileges();
-    if (this_present_groupPrivileges || that_present_groupPrivileges) {
-      if (!(this_present_groupPrivileges && that_present_groupPrivileges))
-        return false;
-      if (!this.groupPrivileges.equals(that.groupPrivileges))
-        return false;
-    }
-
-    boolean this_present_rolePrivileges = true && this.isSetRolePrivileges();
-    boolean that_present_rolePrivileges = true && that.isSetRolePrivileges();
-    if (this_present_rolePrivileges || that_present_rolePrivileges) {
-      if (!(this_present_rolePrivileges && that_present_rolePrivileges))
-        return false;
-      if (!this.rolePrivileges.equals(that.rolePrivileges))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_userPrivileges = true && (isSetUserPrivileges());
-    list.add(present_userPrivileges);
-    if (present_userPrivileges)
-      list.add(userPrivileges);
-
-    boolean present_groupPrivileges = true && (isSetGroupPrivileges());
-    list.add(present_groupPrivileges);
-    if (present_groupPrivileges)
-      list.add(groupPrivileges);
-
-    boolean present_rolePrivileges = true && (isSetRolePrivileges());
-    list.add(present_rolePrivileges);
-    if (present_rolePrivileges)
-      list.add(rolePrivileges);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(PrincipalPrivilegeSet other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetUserPrivileges()).compareTo(other.isSetUserPrivileges());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUserPrivileges()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userPrivileges, other.userPrivileges);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetGroupPrivileges()).compareTo(other.isSetGroupPrivileges());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGroupPrivileges()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupPrivileges, other.groupPrivileges);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetRolePrivileges()).compareTo(other.isSetRolePrivileges());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRolePrivileges()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rolePrivileges, other.rolePrivileges);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("PrincipalPrivilegeSet(");
-    boolean first = true;
-
-    sb.append("userPrivileges:");
-    if (this.userPrivileges == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.userPrivileges);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("groupPrivileges:");
-    if (this.groupPrivileges == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.groupPrivileges);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("rolePrivileges:");
-    if (this.rolePrivileges == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.rolePrivileges);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class PrincipalPrivilegeSetStandardSchemeFactory implements SchemeFactory {
-    public PrincipalPrivilegeSetStandardScheme getScheme() {
-      return new PrincipalPrivilegeSetStandardScheme();
-    }
-  }
-
-  private static class PrincipalPrivilegeSetStandardScheme extends StandardScheme<PrincipalPrivilegeSet> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, PrincipalPrivilegeSet struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // USER_PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
-                struct.userPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map24.size);
-                String _key25;
-                List<PrivilegeGrantInfo> _val26;
-                for (int _i27 = 0; _i27 < _map24.size; ++_i27)
-                {
-                  _key25 = iprot.readString();
-                  {
-                    org.apache.thrift.protocol.TList _list28 = iprot.readListBegin();
-                    _val26 = new ArrayList<PrivilegeGrantInfo>(_list28.size);
-                    PrivilegeGrantInfo _elem29;
-                    for (int _i30 = 0; _i30 < _list28.size; ++_i30)
-                    {
-                      _elem29 = new PrivilegeGrantInfo();
-                      _elem29.read(iprot);
-                      _val26.add(_elem29);
-                    }
-                    iprot.readListEnd();
-                  }
-                  struct.userPrivileges.put(_key25, _val26);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setUserPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // GROUP_PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map31 = iprot.readMapBegin();
-                struct.groupPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map31.size);
-                String _key32;
-                List<PrivilegeGrantInfo> _val33;
-                for (int _i34 = 0; _i34 < _map31.size; ++_i34)
-                {
-                  _key32 = iprot.readString();
-                  {
-                    org.apache.thrift.protocol.TList _list35 = iprot.readListBegin();
-                    _val33 = new ArrayList<PrivilegeGrantInfo>(_list35.size);
-                    PrivilegeGrantInfo _elem36;
-                    for (int _i37 = 0; _i37 < _list35.size; ++_i37)
-                    {
-                      _elem36 = new PrivilegeGrantInfo();
-                      _elem36.read(iprot);
-                      _val33.add(_elem36);
-                    }
-                    iprot.readListEnd();
-                  }
-                  struct.groupPrivileges.put(_key32, _val33);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setGroupPrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // ROLE_PRIVILEGES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map38 = iprot.readMapBegin();
-                struct.rolePrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map38.size);
-                String _key39;
-                List<PrivilegeGrantInfo> _val40;
-                for (int _i41 = 0; _i41 < _map38.size; ++_i41)
-                {
-                  _key39 = iprot.readString();
-                  {
-                    org.apache.thrift.protocol.TList _list42 = iprot.readListBegin();
-                    _val40 = new ArrayList<PrivilegeGrantInfo>(_list42.size);
-                    PrivilegeGrantInfo _elem43;
-                    for (int _i44 = 0; _i44 < _list42.size; ++_i44)
-                    {
-                      _elem43 = new PrivilegeGrantInfo();
-                      _elem43.read(iprot);
-                      _val40.add(_elem43);
-                    }
-                    iprot.readListEnd();
-                  }
-                  struct.rolePrivileges.put(_key39, _val40);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setRolePrivilegesIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, PrincipalPrivilegeSet struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.userPrivileges != null) {
-        oprot.writeFieldBegin(USER_PRIVILEGES_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.userPrivileges.size()));
-          for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter45 : struct.userPrivileges.entrySet())
-          {
-            oprot.writeString(_iter45.getKey());
-            {
-              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter45.getValue().size()));
-              for (PrivilegeGrantInfo _iter46 : _iter45.getValue())
-              {
-                _iter46.write(oprot);
-              }
-              oprot.writeListEnd();
-            }
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      if (struct.groupPrivileges != null) {
-        oprot.writeFieldBegin(GROUP_PRIVILEGES_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.groupPrivileges.size()));
-          for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter47 : struct.groupPrivileges.entrySet())
-          {
-            oprot.writeString(_iter47.getKey());
-            {
-              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter47.getValue().size()));
-              for (PrivilegeGrantInfo _iter48 : _iter47.getValue())
-              {
-                _iter48.write(oprot);
-              }
-              oprot.writeListEnd();
-            }
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      if (struct.rolePrivileges != null) {
-        oprot.writeFieldBegin(ROLE_PRIVILEGES_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.rolePrivileges.size()));
-          for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter49 : struct.rolePrivileges.entrySet())
-          {
-            oprot.writeString(_iter49.getKey());
-            {
-              oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter49.getValue().size()));
-              for (PrivilegeGrantInfo _iter50 : _iter49.getValue())
-              {
-                _iter50.write(oprot);
-              }
-              oprot.writeListEnd();
-            }
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class PrincipalPrivilegeSetTupleSchemeFactory implements SchemeFactory {
-    public PrincipalPrivilegeSetTupleScheme getScheme() {
-      return new PrincipalPrivilegeSetTupleScheme();
-    }
-  }
-
-  private static class PrincipalPrivilegeSetTupleScheme extends TupleScheme<PrincipalPrivilegeSet> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, PrincipalPrivilegeSet struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetUserPrivileges()) {
-        optionals.set(0);
-      }
-      if (struct.isSetGroupPrivileges()) {
-        optionals.set(1);
-      }
-      if (struct.isSetRolePrivileges()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetUserPrivileges()) {
-        {
-          oprot.writeI32(struct.userPrivileges.size());
-          for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter51 : struct.userPrivileges.entrySet())
-          {
-            oprot.writeString(_iter51.getKey());
-            {
-              oprot.writeI32(_iter51.getValue().size());
-              for (PrivilegeGrantInfo _iter52 : _iter51.getValue())
-              {
-                _iter52.write(oprot);
-              }
-            }
-          }
-        }
-      }
-      if (struct.isSetGroupPrivileges()) {
-        {
-          oprot.writeI32(struct.groupPrivileges.size());
-          for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter53 : struct.groupPrivileges.entrySet())
-          {
-            oprot.writeString(_iter53.getKey());
-            {
-              oprot.writeI32(_iter53.getValue().size());
-              for (PrivilegeGrantInfo _iter54 : _iter53.getValue())
-              {
-                _iter54.write(oprot);
-              }
-            }
-          }
-        }
-      }
-      if (struct.isSetRolePrivileges()) {
-        {
-          oprot.writeI32(struct.rolePrivileges.size());
-          for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter55 : struct.rolePrivileges.entrySet())
-          {
-            oprot.writeString(_iter55.getKey());
-            {
-              oprot.writeI32(_iter55.getValue().size());
-              for (PrivilegeGrantInfo _iter56 : _iter55.getValue())
-              {
-                _iter56.write(oprot);
-              }
-            }
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, PrincipalPrivilegeSet struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        {
-          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);
-          String _key58;
-          List<PrivilegeGrantInfo> _val59;
-          for (int _i60 = 0; _i60 < _map57.size; ++_i60)
-          {
-            _key58 = iprot.readString();
-            {
-              org.apache.thrift.protocol.TList _list61 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-              _val59 = new ArrayList<PrivilegeGrantInfo>(_list61.size);
-              PrivilegeGrantInfo _elem62;
-              for (int _i63 = 0; _i63 < _list61.size; ++_i63)
-              {
-                _elem62 = new PrivilegeGrantInfo();
-                _elem62.read(iprot);
-                _val59.add(_elem62);
-              }
-            }
-            struct.userPrivileges.put(_key58, _val59);
-          }
-        }
-        struct.setUserPrivilegesIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          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);
-          String _key65;
-          List<PrivilegeGrantInfo> _val66;
-          for (int _i67 = 0; _i67 < _map64.size; ++_i67)
-          {
-            _key65 = iprot.readString();
-            {
-              org.apache.thrift.protocol.TList _list68 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-              _val66 = new ArrayList<PrivilegeGrantInfo>(_list68.size);
-              PrivilegeGrantInfo _elem69;
-              for (int _i70 = 0; _i70 < _list68.size; ++_i70)
-              {
-                _elem69 = new PrivilegeGrantInfo();
-                _elem69.read(iprot);
-                _val66.add(_elem69);
-              }
-            }
-            struct.groupPrivileges.put(_key65, _val66);
-          }
-        }
-        struct.setGroupPrivilegesIsSet(true);
-      }
-      if (incoming.get(2)) {
-        {
-          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);
-          String _key72;
-          List<PrivilegeGrantInfo> _val73;
-          for (int _i74 = 0; _i74 < _map71.size; ++_i74)
-          {
-            _key72 = iprot.readString();
-            {
-              org.apache.thrift.protocol.TList _list75 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-              _val73 = new ArrayList<PrivilegeGrantInfo>(_list75.size);
-              PrivilegeGrantInfo _elem76;
-              for (int _i77 = 0; _i77 < _list75.size; ++_i77)
-              {
-                _elem76 = new PrivilegeGrantInfo();
-                _elem76.read(iprot);
-                _val73.add(_elem76);
-              }
-            }
-            struct.rolePrivileges.put(_key72, _val73);
-          }
-        }
-        struct.setRolePrivilegesIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/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
deleted file mode 100644
index 82eb8fd..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.hadoop.hive.metastore.api;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum PrincipalType implements org.apache.thrift.TEnum {
-  USER(1),
-  ROLE(2),
-  GROUP(3);
-
-  private final int value;
-
-  private PrincipalType(int value) {
-    this.value = value;
-  }
-
-  /**
-   * Get the integer value of this enum value, as defined in the Thrift IDL.
-   */
-  public int getValue() {
-    return value;
-  }
-
-  /**
-   * Find a the enum type by its integer value, as defined in the Thrift IDL.
-   * @return null if the value is not found.
-   */
-  public static PrincipalType findByValue(int value) { 
-    switch (value) {
-      case 1:
-        return USER;
-      case 2:
-        return ROLE;
-      case 3:
-        return GROUP;
-      default:
-        return null;
-    }
-  }
-}