hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject [16/51] [partial] hive git commit: HIVE-17170 Move thrift generated code to stand alone metastore (Alan Gates reviewed by Vihang Karajgaonkar)
Date Thu, 03 Aug 2017 16:56:37 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/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
deleted file mode 100644
index 77067c6..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
+++ /dev/null
@@ -1,438 +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"})
-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);
-  private static final org.apache.thrift.protocol.TField EXPRS_FIELD_DESC = new org.apache.thrift.protocol.TField("exprs", org.apache.thrift.protocol.TType.LIST, (short)2);
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    NAMES((short)1, "names"),
-    EXPRS((short)2, "exprs");
-
-    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: // NAMES
-          return NAMES;
-        case 2: // EXPRS
-          return EXPRS;
-        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;
-    }
-  }
-
-  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.NAMES, new org.apache.thrift.meta_data.FieldMetaData("names", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    tmpMap.put(_Fields.EXPRS, new org.apache.thrift.meta_data.FieldMetaData("exprs", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        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, DropPartitionsExpr.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RequestPartsSpec.class, metaDataMap);
-  }
-
-  public RequestPartsSpec() {
-    super();
-  }
-
-  public RequestPartsSpec(_Fields setField, Object value) {
-    super(setField, value);
-  }
-
-  public RequestPartsSpec(RequestPartsSpec other) {
-    super(other);
-  }
-  public RequestPartsSpec deepCopy() {
-    return new RequestPartsSpec(this);
-  }
-
-  public static RequestPartsSpec names(List<String> value) {
-    RequestPartsSpec x = new RequestPartsSpec();
-    x.setNames(value);
-    return x;
-  }
-
-  public static RequestPartsSpec exprs(List<DropPartitionsExpr> value) {
-    RequestPartsSpec x = new RequestPartsSpec();
-    x.setExprs(value);
-    return x;
-  }
-
-
-  @Override
-  protected void checkType(_Fields setField, Object value) throws ClassCastException {
-    switch (setField) {
-      case NAMES:
-        if (value instanceof List) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type List<String> for field 'names', but got " + value.getClass().getSimpleName());
-      case EXPRS:
-        if (value instanceof List) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type List<DropPartitionsExpr> for field 'exprs', but got " + value.getClass().getSimpleName());
-      default:
-        throw new IllegalArgumentException("Unknown field id " + setField);
-    }
-  }
-
-  @Override
-  protected Object standardSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, org.apache.thrift.protocol.TField field) throws org.apache.thrift.TException {
-    _Fields setField = _Fields.findByThriftId(field.id);
-    if (setField != null) {
-      switch (setField) {
-        case NAMES:
-          if (field.type == NAMES_FIELD_DESC.type) {
-            List<String> names;
-            {
-              org.apache.thrift.protocol.TList _list468 = iprot.readListBegin();
-              names = new ArrayList<String>(_list468.size);
-              String _elem469;
-              for (int _i470 = 0; _i470 < _list468.size; ++_i470)
-              {
-                _elem469 = iprot.readString();
-                names.add(_elem469);
-              }
-              iprot.readListEnd();
-            }
-            return names;
-          } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case EXPRS:
-          if (field.type == EXPRS_FIELD_DESC.type) {
-            List<DropPartitionsExpr> exprs;
-            {
-              org.apache.thrift.protocol.TList _list471 = iprot.readListBegin();
-              exprs = new ArrayList<DropPartitionsExpr>(_list471.size);
-              DropPartitionsExpr _elem472;
-              for (int _i473 = 0; _i473 < _list471.size; ++_i473)
-              {
-                _elem472 = new DropPartitionsExpr();
-                _elem472.read(iprot);
-                exprs.add(_elem472);
-              }
-              iprot.readListEnd();
-            }
-            return exprs;
-          } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        default:
-          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;
-    }
-  }
-
-  @Override
-  protected void standardSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    switch (setField_) {
-      case NAMES:
-        List<String> names = (List<String>)value_;
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, names.size()));
-          for (String _iter474 : names)
-          {
-            oprot.writeString(_iter474);
-          }
-          oprot.writeListEnd();
-        }
-        return;
-      case EXPRS:
-        List<DropPartitionsExpr> exprs = (List<DropPartitionsExpr>)value_;
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, exprs.size()));
-          for (DropPartitionsExpr _iter475 : exprs)
-          {
-            _iter475.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        return;
-      default:
-        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
-    }
-  }
-
-  @Override
-  protected Object tupleSchemeReadValue(org.apache.thrift.protocol.TProtocol iprot, short fieldID) throws org.apache.thrift.TException {
-    _Fields setField = _Fields.findByThriftId(fieldID);
-    if (setField != null) {
-      switch (setField) {
-        case NAMES:
-          List<String> names;
-          {
-            org.apache.thrift.protocol.TList _list476 = iprot.readListBegin();
-            names = new ArrayList<String>(_list476.size);
-            String _elem477;
-            for (int _i478 = 0; _i478 < _list476.size; ++_i478)
-            {
-              _elem477 = iprot.readString();
-              names.add(_elem477);
-            }
-            iprot.readListEnd();
-          }
-          return names;
-        case EXPRS:
-          List<DropPartitionsExpr> exprs;
-          {
-            org.apache.thrift.protocol.TList _list479 = iprot.readListBegin();
-            exprs = new ArrayList<DropPartitionsExpr>(_list479.size);
-            DropPartitionsExpr _elem480;
-            for (int _i481 = 0; _i481 < _list479.size; ++_i481)
-            {
-              _elem480 = new DropPartitionsExpr();
-              _elem480.read(iprot);
-              exprs.add(_elem480);
-            }
-            iprot.readListEnd();
-          }
-          return exprs;
-        default:
-          throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
-      }
-    } else {
-      throw new TProtocolException("Couldn't find a field with field id " + fieldID);
-    }
-  }
-
-  @Override
-  protected void tupleSchemeWriteValue(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    switch (setField_) {
-      case NAMES:
-        List<String> names = (List<String>)value_;
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, names.size()));
-          for (String _iter482 : names)
-          {
-            oprot.writeString(_iter482);
-          }
-          oprot.writeListEnd();
-        }
-        return;
-      case EXPRS:
-        List<DropPartitionsExpr> exprs = (List<DropPartitionsExpr>)value_;
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, exprs.size()));
-          for (DropPartitionsExpr _iter483 : exprs)
-          {
-            _iter483.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        return;
-      default:
-        throw new IllegalStateException("Cannot write union with unknown field " + setField_);
-    }
-  }
-
-  @Override
-  protected org.apache.thrift.protocol.TField getFieldDesc(_Fields setField) {
-    switch (setField) {
-      case NAMES:
-        return NAMES_FIELD_DESC;
-      case EXPRS:
-        return EXPRS_FIELD_DESC;
-      default:
-        throw new IllegalArgumentException("Unknown field id " + setField);
-    }
-  }
-
-  @Override
-  protected org.apache.thrift.protocol.TStruct getStructDesc() {
-    return STRUCT_DESC;
-  }
-
-  @Override
-  protected _Fields enumForId(short id) {
-    return _Fields.findByThriftIdOrThrow(id);
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-
-  public List<String> getNames() {
-    if (getSetField() == _Fields.NAMES) {
-      return (List<String>)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'names' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setNames(List<String> value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.NAMES;
-    value_ = value;
-  }
-
-  public List<DropPartitionsExpr> getExprs() {
-    if (getSetField() == _Fields.EXPRS) {
-      return (List<DropPartitionsExpr>)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'exprs' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setExprs(List<DropPartitionsExpr> value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.EXPRS;
-    value_ = value;
-  }
-
-  public boolean isSetNames() {
-    return setField_ == _Fields.NAMES;
-  }
-
-
-  public boolean isSetExprs() {
-    return setField_ == _Fields.EXPRS;
-  }
-
-
-  public boolean equals(Object other) {
-    if (other instanceof RequestPartsSpec) {
-      return equals((RequestPartsSpec)other);
-    } else {
-      return false;
-    }
-  }
-
-  public boolean equals(RequestPartsSpec other) {
-    return other != null && getSetField() == other.getSetField() && getFieldValue().equals(other.getFieldValue());
-  }
-
-  @Override
-  public int compareTo(RequestPartsSpec other) {
-    int lastComparison = org.apache.thrift.TBaseHelper.compareTo(getSetField(), other.getSetField());
-    if (lastComparison == 0) {
-      return org.apache.thrift.TBaseHelper.compareTo(getFieldValue(), other.getFieldValue());
-    }
-    return lastComparison;
-  }
-
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-    list.add(this.getClass().getName());
-    org.apache.thrift.TFieldIdEnum setField = getSetField();
-    if (setField != null) {
-      list.add(setField.getThriftFieldId());
-      Object value = getFieldValue();
-      if (value instanceof org.apache.thrift.TEnum) {
-        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
-      } else {
-        list.add(value);
-      }
-    }
-    return list.hashCode();
-  }
-  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);
-    }
-  }
-
-
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/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
deleted file mode 100644
index a15c1ee..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceType.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 ResourceType implements org.apache.thrift.TEnum {
-  JAR(1),
-  FILE(2),
-  ARCHIVE(3);
-
-  private final int value;
-
-  private ResourceType(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 ResourceType findByValue(int value) { 
-    switch (value) {
-      case 1:
-        return JAR;
-      case 2:
-        return FILE;
-      case 3:
-        return ARCHIVE;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/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
deleted file mode 100644
index 994a498..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ResourceUri.java
+++ /dev/null
@@ -1,511 +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 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);
-  private static final org.apache.thrift.protocol.TField URI_FIELD_DESC = new org.apache.thrift.protocol.TField("uri", 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 ResourceUriStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ResourceUriTupleSchemeFactory());
-  }
-
-  private ResourceType resourceType; // required
-  private String uri; // 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 {
-    /**
-     * 
-     * @see ResourceType
-     */
-    RESOURCE_TYPE((short)1, "resourceType"),
-    URI((short)2, "uri");
-
-    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: // RESOURCE_TYPE
-          return RESOURCE_TYPE;
-        case 2: // URI
-          return URI;
-        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.RESOURCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("resourceType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ResourceType.class)));
-    tmpMap.put(_Fields.URI, new org.apache.thrift.meta_data.FieldMetaData("uri", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ResourceUri.class, metaDataMap);
-  }
-
-  public ResourceUri() {
-  }
-
-  public ResourceUri(
-    ResourceType resourceType,
-    String uri)
-  {
-    this();
-    this.resourceType = resourceType;
-    this.uri = uri;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ResourceUri(ResourceUri other) {
-    if (other.isSetResourceType()) {
-      this.resourceType = other.resourceType;
-    }
-    if (other.isSetUri()) {
-      this.uri = other.uri;
-    }
-  }
-
-  public ResourceUri deepCopy() {
-    return new ResourceUri(this);
-  }
-
-  @Override
-  public void clear() {
-    this.resourceType = null;
-    this.uri = null;
-  }
-
-  /**
-   * 
-   * @see ResourceType
-   */
-  public ResourceType getResourceType() {
-    return this.resourceType;
-  }
-
-  /**
-   * 
-   * @see ResourceType
-   */
-  public void setResourceType(ResourceType resourceType) {
-    this.resourceType = resourceType;
-  }
-
-  public void unsetResourceType() {
-    this.resourceType = null;
-  }
-
-  /** Returns true if field resourceType is set (has been assigned a value) and false otherwise */
-  public boolean isSetResourceType() {
-    return this.resourceType != null;
-  }
-
-  public void setResourceTypeIsSet(boolean value) {
-    if (!value) {
-      this.resourceType = null;
-    }
-  }
-
-  public String getUri() {
-    return this.uri;
-  }
-
-  public void setUri(String uri) {
-    this.uri = uri;
-  }
-
-  public void unsetUri() {
-    this.uri = null;
-  }
-
-  /** Returns true if field uri is set (has been assigned a value) and false otherwise */
-  public boolean isSetUri() {
-    return this.uri != null;
-  }
-
-  public void setUriIsSet(boolean value) {
-    if (!value) {
-      this.uri = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case RESOURCE_TYPE:
-      if (value == null) {
-        unsetResourceType();
-      } else {
-        setResourceType((ResourceType)value);
-      }
-      break;
-
-    case URI:
-      if (value == null) {
-        unsetUri();
-      } else {
-        setUri((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case RESOURCE_TYPE:
-      return getResourceType();
-
-    case URI:
-      return getUri();
-
-    }
-    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 RESOURCE_TYPE:
-      return isSetResourceType();
-    case URI:
-      return isSetUri();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ResourceUri)
-      return this.equals((ResourceUri)that);
-    return false;
-  }
-
-  public boolean equals(ResourceUri that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_resourceType = true && this.isSetResourceType();
-    boolean that_present_resourceType = true && that.isSetResourceType();
-    if (this_present_resourceType || that_present_resourceType) {
-      if (!(this_present_resourceType && that_present_resourceType))
-        return false;
-      if (!this.resourceType.equals(that.resourceType))
-        return false;
-    }
-
-    boolean this_present_uri = true && this.isSetUri();
-    boolean that_present_uri = true && that.isSetUri();
-    if (this_present_uri || that_present_uri) {
-      if (!(this_present_uri && that_present_uri))
-        return false;
-      if (!this.uri.equals(that.uri))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_resourceType = true && (isSetResourceType());
-    list.add(present_resourceType);
-    if (present_resourceType)
-      list.add(resourceType.getValue());
-
-    boolean present_uri = true && (isSetUri());
-    list.add(present_uri);
-    if (present_uri)
-      list.add(uri);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(ResourceUri other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetResourceType()).compareTo(other.isSetResourceType());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetResourceType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, other.resourceType);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetUri()).compareTo(other.isSetUri());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUri()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uri, other.uri);
-      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("ResourceUri(");
-    boolean first = true;
-
-    sb.append("resourceType:");
-    if (this.resourceType == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.resourceType);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("uri:");
-    if (this.uri == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.uri);
-    }
-    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 ResourceUriStandardSchemeFactory implements SchemeFactory {
-    public ResourceUriStandardScheme getScheme() {
-      return new ResourceUriStandardScheme();
-    }
-  }
-
-  private static class ResourceUriStandardScheme extends StandardScheme<ResourceUri> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ResourceUri 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: // RESOURCE_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              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);
-            }
-            break;
-          case 2: // URI
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.uri = iprot.readString();
-              struct.setUriIsSet(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, ResourceUri struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.resourceType != null) {
-        oprot.writeFieldBegin(RESOURCE_TYPE_FIELD_DESC);
-        oprot.writeI32(struct.resourceType.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.uri != null) {
-        oprot.writeFieldBegin(URI_FIELD_DESC);
-        oprot.writeString(struct.uri);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ResourceUriTupleSchemeFactory implements SchemeFactory {
-    public ResourceUriTupleScheme getScheme() {
-      return new ResourceUriTupleScheme();
-    }
-  }
-
-  private static class ResourceUriTupleScheme extends TupleScheme<ResourceUri> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ResourceUri struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetResourceType()) {
-        optionals.set(0);
-      }
-      if (struct.isSetUri()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetResourceType()) {
-        oprot.writeI32(struct.resourceType.getValue());
-      }
-      if (struct.isSetUri()) {
-        oprot.writeString(struct.uri);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ResourceUri struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.resourceType = org.apache.hadoop.hive.metastore.api.ResourceType.findByValue(iprot.readI32());
-        struct.setResourceTypeIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.uri = iprot.readString();
-        struct.setUriIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/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
deleted file mode 100644
index 612c64d..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
+++ /dev/null
@@ -1,601 +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 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);
-  private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I32, (short)2);
-  private static final org.apache.thrift.protocol.TField OWNER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerName", org.apache.thrift.protocol.TType.STRING, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new RoleStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new RoleTupleSchemeFactory());
-  }
-
-  private String roleName; // required
-  private int createTime; // required
-  private String ownerName; // 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 {
-    ROLE_NAME((short)1, "roleName"),
-    CREATE_TIME((short)2, "createTime"),
-    OWNER_NAME((short)3, "ownerName");
-
-    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: // ROLE_NAME
-          return ROLE_NAME;
-        case 2: // CREATE_TIME
-          return CREATE_TIME;
-        case 3: // OWNER_NAME
-          return OWNER_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
-  private static final int __CREATETIME_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  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.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.OWNER_NAME, new org.apache.thrift.meta_data.FieldMetaData("ownerName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Role.class, metaDataMap);
-  }
-
-  public Role() {
-  }
-
-  public Role(
-    String roleName,
-    int createTime,
-    String ownerName)
-  {
-    this();
-    this.roleName = roleName;
-    this.createTime = createTime;
-    setCreateTimeIsSet(true);
-    this.ownerName = ownerName;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public Role(Role other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetRoleName()) {
-      this.roleName = other.roleName;
-    }
-    this.createTime = other.createTime;
-    if (other.isSetOwnerName()) {
-      this.ownerName = other.ownerName;
-    }
-  }
-
-  public Role deepCopy() {
-    return new Role(this);
-  }
-
-  @Override
-  public void clear() {
-    this.roleName = null;
-    setCreateTimeIsSet(false);
-    this.createTime = 0;
-    this.ownerName = null;
-  }
-
-  public String getRoleName() {
-    return this.roleName;
-  }
-
-  public void setRoleName(String roleName) {
-    this.roleName = roleName;
-  }
-
-  public void unsetRoleName() {
-    this.roleName = null;
-  }
-
-  /** Returns true if field roleName is set (has been assigned a value) and false otherwise */
-  public boolean isSetRoleName() {
-    return this.roleName != null;
-  }
-
-  public void setRoleNameIsSet(boolean value) {
-    if (!value) {
-      this.roleName = null;
-    }
-  }
-
-  public int getCreateTime() {
-    return this.createTime;
-  }
-
-  public void setCreateTime(int createTime) {
-    this.createTime = createTime;
-    setCreateTimeIsSet(true);
-  }
-
-  public void unsetCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
-  }
-
-  /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
-  public boolean isSetCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
-  }
-
-  public void setCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
-  }
-
-  public String getOwnerName() {
-    return this.ownerName;
-  }
-
-  public void setOwnerName(String ownerName) {
-    this.ownerName = ownerName;
-  }
-
-  public void unsetOwnerName() {
-    this.ownerName = null;
-  }
-
-  /** Returns true if field ownerName is set (has been assigned a value) and false otherwise */
-  public boolean isSetOwnerName() {
-    return this.ownerName != null;
-  }
-
-  public void setOwnerNameIsSet(boolean value) {
-    if (!value) {
-      this.ownerName = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case ROLE_NAME:
-      if (value == null) {
-        unsetRoleName();
-      } else {
-        setRoleName((String)value);
-      }
-      break;
-
-    case CREATE_TIME:
-      if (value == null) {
-        unsetCreateTime();
-      } else {
-        setCreateTime((Integer)value);
-      }
-      break;
-
-    case OWNER_NAME:
-      if (value == null) {
-        unsetOwnerName();
-      } else {
-        setOwnerName((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ROLE_NAME:
-      return getRoleName();
-
-    case CREATE_TIME:
-      return getCreateTime();
-
-    case OWNER_NAME:
-      return getOwnerName();
-
-    }
-    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 ROLE_NAME:
-      return isSetRoleName();
-    case CREATE_TIME:
-      return isSetCreateTime();
-    case OWNER_NAME:
-      return isSetOwnerName();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof Role)
-      return this.equals((Role)that);
-    return false;
-  }
-
-  public boolean equals(Role that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_roleName = true && this.isSetRoleName();
-    boolean that_present_roleName = true && that.isSetRoleName();
-    if (this_present_roleName || that_present_roleName) {
-      if (!(this_present_roleName && that_present_roleName))
-        return false;
-      if (!this.roleName.equals(that.roleName))
-        return false;
-    }
-
-    boolean this_present_createTime = true;
-    boolean that_present_createTime = true;
-    if (this_present_createTime || that_present_createTime) {
-      if (!(this_present_createTime && that_present_createTime))
-        return false;
-      if (this.createTime != that.createTime)
-        return false;
-    }
-
-    boolean this_present_ownerName = true && this.isSetOwnerName();
-    boolean that_present_ownerName = true && that.isSetOwnerName();
-    if (this_present_ownerName || that_present_ownerName) {
-      if (!(this_present_ownerName && that_present_ownerName))
-        return false;
-      if (!this.ownerName.equals(that.ownerName))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_roleName = true && (isSetRoleName());
-    list.add(present_roleName);
-    if (present_roleName)
-      list.add(roleName);
-
-    boolean present_createTime = true;
-    list.add(present_createTime);
-    if (present_createTime)
-      list.add(createTime);
-
-    boolean present_ownerName = true && (isSetOwnerName());
-    list.add(present_ownerName);
-    if (present_ownerName)
-      list.add(ownerName);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(Role other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetRoleName()).compareTo(other.isSetRoleName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRoleName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.roleName, other.roleName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCreateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, other.createTime);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetOwnerName()).compareTo(other.isSetOwnerName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetOwnerName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerName, other.ownerName);
-      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("Role(");
-    boolean first = true;
-
-    sb.append("roleName:");
-    if (this.roleName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.roleName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("createTime:");
-    sb.append(this.createTime);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("ownerName:");
-    if (this.ownerName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.ownerName);
-    }
-    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 {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      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 RoleStandardSchemeFactory implements SchemeFactory {
-    public RoleStandardScheme getScheme() {
-      return new RoleStandardScheme();
-    }
-  }
-
-  private static class RoleStandardScheme extends StandardScheme<Role> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, Role 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: // ROLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.roleName = iprot.readString();
-              struct.setRoleNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // CREATE_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.createTime = iprot.readI32();
-              struct.setCreateTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // OWNER_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.ownerName = iprot.readString();
-              struct.setOwnerNameIsSet(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, Role struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.roleName != null) {
-        oprot.writeFieldBegin(ROLE_NAME_FIELD_DESC);
-        oprot.writeString(struct.roleName);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(CREATE_TIME_FIELD_DESC);
-      oprot.writeI32(struct.createTime);
-      oprot.writeFieldEnd();
-      if (struct.ownerName != null) {
-        oprot.writeFieldBegin(OWNER_NAME_FIELD_DESC);
-        oprot.writeString(struct.ownerName);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class RoleTupleSchemeFactory implements SchemeFactory {
-    public RoleTupleScheme getScheme() {
-      return new RoleTupleScheme();
-    }
-  }
-
-  private static class RoleTupleScheme extends TupleScheme<Role> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, Role struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetRoleName()) {
-        optionals.set(0);
-      }
-      if (struct.isSetCreateTime()) {
-        optionals.set(1);
-      }
-      if (struct.isSetOwnerName()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetRoleName()) {
-        oprot.writeString(struct.roleName);
-      }
-      if (struct.isSetCreateTime()) {
-        oprot.writeI32(struct.createTime);
-      }
-      if (struct.isSetOwnerName()) {
-        oprot.writeString(struct.ownerName);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, Role struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.roleName = iprot.readString();
-        struct.setRoleNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.createTime = iprot.readI32();
-        struct.setCreateTimeIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.ownerName = iprot.readString();
-        struct.setOwnerNameIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/453c8ed4/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java
deleted file mode 100644
index 81e8d16..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RolePrincipalGrant.java
+++ /dev/null
@@ -1,1035 +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 RolePrincipalGrant implements org.apache.thrift.TBase<RolePrincipalGrant, RolePrincipalGrant._Fields>, java.io.Serializable, Cloneable, Comparable<RolePrincipalGrant> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RolePrincipalGrant");
-
-  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);
-  private static final org.apache.thrift.protocol.TField PRINCIPAL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("principalName", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField PRINCIPAL_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("principalType", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField GRANT_OPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("grantOption", org.apache.thrift.protocol.TType.BOOL, (short)4);
-  private static final org.apache.thrift.protocol.TField GRANT_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("grantTime", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField GRANTOR_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("grantorName", org.apache.thrift.protocol.TType.STRING, (short)6);
-  private static final org.apache.thrift.protocol.TField GRANTOR_PRINCIPAL_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("grantorPrincipalType", org.apache.thrift.protocol.TType.I32, (short)7);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new RolePrincipalGrantStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new RolePrincipalGrantTupleSchemeFactory());
-  }
-
-  private String roleName; // required
-  private String principalName; // required
-  private PrincipalType principalType; // required
-  private boolean grantOption; // required
-  private int grantTime; // required
-  private String grantorName; // required
-  private PrincipalType grantorPrincipalType; // 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 {
-    ROLE_NAME((short)1, "roleName"),
-    PRINCIPAL_NAME((short)2, "principalName"),
-    /**
-     * 
-     * @see PrincipalType
-     */
-    PRINCIPAL_TYPE((short)3, "principalType"),
-    GRANT_OPTION((short)4, "grantOption"),
-    GRANT_TIME((short)5, "grantTime"),
-    GRANTOR_NAME((short)6, "grantorName"),
-    /**
-     * 
-     * @see PrincipalType
-     */
-    GRANTOR_PRINCIPAL_TYPE((short)7, "grantorPrincipalType");
-
-    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: // ROLE_NAME
-          return ROLE_NAME;
-        case 2: // PRINCIPAL_NAME
-          return PRINCIPAL_NAME;
-        case 3: // PRINCIPAL_TYPE
-          return PRINCIPAL_TYPE;
-        case 4: // GRANT_OPTION
-          return GRANT_OPTION;
-        case 5: // GRANT_TIME
-          return GRANT_TIME;
-        case 6: // GRANTOR_NAME
-          return GRANTOR_NAME;
-        case 7: // GRANTOR_PRINCIPAL_TYPE
-          return GRANTOR_PRINCIPAL_TYPE;
-        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
-  private static final int __GRANTOPTION_ISSET_ID = 0;
-  private static final int __GRANTTIME_ISSET_ID = 1;
-  private byte __isset_bitfield = 0;
-  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.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PRINCIPAL_NAME, new org.apache.thrift.meta_data.FieldMetaData("principalName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PRINCIPAL_TYPE, new org.apache.thrift.meta_data.FieldMetaData("principalType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, PrincipalType.class)));
-    tmpMap.put(_Fields.GRANT_OPTION, new org.apache.thrift.meta_data.FieldMetaData("grantOption", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.GRANT_TIME, new org.apache.thrift.meta_data.FieldMetaData("grantTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.GRANTOR_NAME, new org.apache.thrift.meta_data.FieldMetaData("grantorName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.GRANTOR_PRINCIPAL_TYPE, new org.apache.thrift.meta_data.FieldMetaData("grantorPrincipalType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, PrincipalType.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RolePrincipalGrant.class, metaDataMap);
-  }
-
-  public RolePrincipalGrant() {
-  }
-
-  public RolePrincipalGrant(
-    String roleName,
-    String principalName,
-    PrincipalType principalType,
-    boolean grantOption,
-    int grantTime,
-    String grantorName,
-    PrincipalType grantorPrincipalType)
-  {
-    this();
-    this.roleName = roleName;
-    this.principalName = principalName;
-    this.principalType = principalType;
-    this.grantOption = grantOption;
-    setGrantOptionIsSet(true);
-    this.grantTime = grantTime;
-    setGrantTimeIsSet(true);
-    this.grantorName = grantorName;
-    this.grantorPrincipalType = grantorPrincipalType;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public RolePrincipalGrant(RolePrincipalGrant other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetRoleName()) {
-      this.roleName = other.roleName;
-    }
-    if (other.isSetPrincipalName()) {
-      this.principalName = other.principalName;
-    }
-    if (other.isSetPrincipalType()) {
-      this.principalType = other.principalType;
-    }
-    this.grantOption = other.grantOption;
-    this.grantTime = other.grantTime;
-    if (other.isSetGrantorName()) {
-      this.grantorName = other.grantorName;
-    }
-    if (other.isSetGrantorPrincipalType()) {
-      this.grantorPrincipalType = other.grantorPrincipalType;
-    }
-  }
-
-  public RolePrincipalGrant deepCopy() {
-    return new RolePrincipalGrant(this);
-  }
-
-  @Override
-  public void clear() {
-    this.roleName = null;
-    this.principalName = null;
-    this.principalType = null;
-    setGrantOptionIsSet(false);
-    this.grantOption = false;
-    setGrantTimeIsSet(false);
-    this.grantTime = 0;
-    this.grantorName = null;
-    this.grantorPrincipalType = null;
-  }
-
-  public String getRoleName() {
-    return this.roleName;
-  }
-
-  public void setRoleName(String roleName) {
-    this.roleName = roleName;
-  }
-
-  public void unsetRoleName() {
-    this.roleName = null;
-  }
-
-  /** Returns true if field roleName is set (has been assigned a value) and false otherwise */
-  public boolean isSetRoleName() {
-    return this.roleName != null;
-  }
-
-  public void setRoleNameIsSet(boolean value) {
-    if (!value) {
-      this.roleName = null;
-    }
-  }
-
-  public String getPrincipalName() {
-    return this.principalName;
-  }
-
-  public void setPrincipalName(String principalName) {
-    this.principalName = principalName;
-  }
-
-  public void unsetPrincipalName() {
-    this.principalName = null;
-  }
-
-  /** Returns true if field principalName is set (has been assigned a value) and false otherwise */
-  public boolean isSetPrincipalName() {
-    return this.principalName != null;
-  }
-
-  public void setPrincipalNameIsSet(boolean value) {
-    if (!value) {
-      this.principalName = null;
-    }
-  }
-
-  /**
-   * 
-   * @see PrincipalType
-   */
-  public PrincipalType getPrincipalType() {
-    return this.principalType;
-  }
-
-  /**
-   * 
-   * @see PrincipalType
-   */
-  public void setPrincipalType(PrincipalType principalType) {
-    this.principalType = principalType;
-  }
-
-  public void unsetPrincipalType() {
-    this.principalType = null;
-  }
-
-  /** Returns true if field principalType is set (has been assigned a value) and false otherwise */
-  public boolean isSetPrincipalType() {
-    return this.principalType != null;
-  }
-
-  public void setPrincipalTypeIsSet(boolean value) {
-    if (!value) {
-      this.principalType = null;
-    }
-  }
-
-  public boolean isGrantOption() {
-    return this.grantOption;
-  }
-
-  public void setGrantOption(boolean grantOption) {
-    this.grantOption = grantOption;
-    setGrantOptionIsSet(true);
-  }
-
-  public void unsetGrantOption() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __GRANTOPTION_ISSET_ID);
-  }
-
-  /** Returns true if field grantOption is set (has been assigned a value) and false otherwise */
-  public boolean isSetGrantOption() {
-    return EncodingUtils.testBit(__isset_bitfield, __GRANTOPTION_ISSET_ID);
-  }
-
-  public void setGrantOptionIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __GRANTOPTION_ISSET_ID, value);
-  }
-
-  public int getGrantTime() {
-    return this.grantTime;
-  }
-
-  public void setGrantTime(int grantTime) {
-    this.grantTime = grantTime;
-    setGrantTimeIsSet(true);
-  }
-
-  public void unsetGrantTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __GRANTTIME_ISSET_ID);
-  }
-
-  /** Returns true if field grantTime is set (has been assigned a value) and false otherwise */
-  public boolean isSetGrantTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __GRANTTIME_ISSET_ID);
-  }
-
-  public void setGrantTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __GRANTTIME_ISSET_ID, value);
-  }
-
-  public String getGrantorName() {
-    return this.grantorName;
-  }
-
-  public void setGrantorName(String grantorName) {
-    this.grantorName = grantorName;
-  }
-
-  public void unsetGrantorName() {
-    this.grantorName = null;
-  }
-
-  /** Returns true if field grantorName is set (has been assigned a value) and false otherwise */
-  public boolean isSetGrantorName() {
-    return this.grantorName != null;
-  }
-
-  public void setGrantorNameIsSet(boolean value) {
-    if (!value) {
-      this.grantorName = null;
-    }
-  }
-
-  /**
-   * 
-   * @see PrincipalType
-   */
-  public PrincipalType getGrantorPrincipalType() {
-    return this.grantorPrincipalType;
-  }
-
-  /**
-   * 
-   * @see PrincipalType
-   */
-  public void setGrantorPrincipalType(PrincipalType grantorPrincipalType) {
-    this.grantorPrincipalType = grantorPrincipalType;
-  }
-
-  public void unsetGrantorPrincipalType() {
-    this.grantorPrincipalType = null;
-  }
-
-  /** Returns true if field grantorPrincipalType is set (has been assigned a value) and false otherwise */
-  public boolean isSetGrantorPrincipalType() {
-    return this.grantorPrincipalType != null;
-  }
-
-  public void setGrantorPrincipalTypeIsSet(boolean value) {
-    if (!value) {
-      this.grantorPrincipalType = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case ROLE_NAME:
-      if (value == null) {
-        unsetRoleName();
-      } else {
-        setRoleName((String)value);
-      }
-      break;
-
-    case PRINCIPAL_NAME:
-      if (value == null) {
-        unsetPrincipalName();
-      } else {
-        setPrincipalName((String)value);
-      }
-      break;
-
-    case PRINCIPAL_TYPE:
-      if (value == null) {
-        unsetPrincipalType();
-      } else {
-        setPrincipalType((PrincipalType)value);
-      }
-      break;
-
-    case GRANT_OPTION:
-      if (value == null) {
-        unsetGrantOption();
-      } else {
-        setGrantOption((Boolean)value);
-      }
-      break;
-
-    case GRANT_TIME:
-      if (value == null) {
-        unsetGrantTime();
-      } else {
-        setGrantTime((Integer)value);
-      }
-      break;
-
-    case GRANTOR_NAME:
-      if (value == null) {
-        unsetGrantorName();
-      } else {
-        setGrantorName((String)value);
-      }
-      break;
-
-    case GRANTOR_PRINCIPAL_TYPE:
-      if (value == null) {
-        unsetGrantorPrincipalType();
-      } else {
-        setGrantorPrincipalType((PrincipalType)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case ROLE_NAME:
-      return getRoleName();
-
-    case PRINCIPAL_NAME:
-      return getPrincipalName();
-
-    case PRINCIPAL_TYPE:
-      return getPrincipalType();
-
-    case GRANT_OPTION:
-      return isGrantOption();
-
-    case GRANT_TIME:
-      return getGrantTime();
-
-    case GRANTOR_NAME:
-      return getGrantorName();
-
-    case GRANTOR_PRINCIPAL_TYPE:
-      return getGrantorPrincipalType();
-
-    }
-    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 ROLE_NAME:
-      return isSetRoleName();
-    case PRINCIPAL_NAME:
-      return isSetPrincipalName();
-    case PRINCIPAL_TYPE:
-      return isSetPrincipalType();
-    case GRANT_OPTION:
-      return isSetGrantOption();
-    case GRANT_TIME:
-      return isSetGrantTime();
-    case GRANTOR_NAME:
-      return isSetGrantorName();
-    case GRANTOR_PRINCIPAL_TYPE:
-      return isSetGrantorPrincipalType();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof RolePrincipalGrant)
-      return this.equals((RolePrincipalGrant)that);
-    return false;
-  }
-
-  public boolean equals(RolePrincipalGrant that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_roleName = true && this.isSetRoleName();
-    boolean that_present_roleName = true && that.isSetRoleName();
-    if (this_present_roleName || that_present_roleName) {
-      if (!(this_present_roleName && that_present_roleName))
-        return false;
-      if (!this.roleName.equals(that.roleName))
-        return false;
-    }
-
-    boolean this_present_principalName = true && this.isSetPrincipalName();
-    boolean that_present_principalName = true && that.isSetPrincipalName();
-    if (this_present_principalName || that_present_principalName) {
-      if (!(this_present_principalName && that_present_principalName))
-        return false;
-      if (!this.principalName.equals(that.principalName))
-        return false;
-    }
-
-    boolean this_present_principalType = true && this.isSetPrincipalType();
-    boolean that_present_principalType = true && that.isSetPrincipalType();
-    if (this_present_principalType || that_present_principalType) {
-      if (!(this_present_principalType && that_present_principalType))
-        return false;
-      if (!this.principalType.equals(that.principalType))
-        return false;
-    }
-
-    boolean this_present_grantOption = true;
-    boolean that_present_grantOption = true;
-    if (this_present_grantOption || that_present_grantOption) {
-      if (!(this_present_grantOption && that_present_grantOption))
-        return false;
-      if (this.grantOption != that.grantOption)
-        return false;
-    }
-
-    boolean this_present_grantTime = true;
-    boolean that_present_grantTime = true;
-    if (this_present_grantTime || that_present_grantTime) {
-      if (!(this_present_grantTime && that_present_grantTime))
-        return false;
-      if (this.grantTime != that.grantTime)
-        return false;
-    }
-
-    boolean this_present_grantorName = true && this.isSetGrantorName();
-    boolean that_present_grantorName = true && that.isSetGrantorName();
-    if (this_present_grantorName || that_present_grantorName) {
-      if (!(this_present_grantorName && that_present_grantorName))
-        return false;
-      if (!this.grantorName.equals(that.grantorName))
-        return false;
-    }
-
-    boolean this_present_grantorPrincipalType = true && this.isSetGrantorPrincipalType();
-    boolean that_present_grantorPrincipalType = true && that.isSetGrantorPrincipalType();
-    if (this_present_grantorPrincipalType || that_present_grantorPrincipalType) {
-      if (!(this_present_grantorPrincipalType && that_present_grantorPrincipalType))
-        return false;
-      if (!this.grantorPrincipalType.equals(that.grantorPrincipalType))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_roleName = true && (isSetRoleName());
-    list.add(present_roleName);
-    if (present_roleName)
-      list.add(roleName);
-
-    boolean present_principalName = true && (isSetPrincipalName());
-    list.add(present_principalName);
-    if (present_principalName)
-      list.add(principalName);
-
-    boolean present_principalType = true && (isSetPrincipalType());
-    list.add(present_principalType);
-    if (present_principalType)
-      list.add(principalType.getValue());
-
-    boolean present_grantOption = true;
-    list.add(present_grantOption);
-    if (present_grantOption)
-      list.add(grantOption);
-
-    boolean present_grantTime = true;
-    list.add(present_grantTime);
-    if (present_grantTime)
-      list.add(grantTime);
-
-    boolean present_grantorName = true && (isSetGrantorName());
-    list.add(present_grantorName);
-    if (present_grantorName)
-      list.add(grantorName);
-
-    boolean present_grantorPrincipalType = true && (isSetGrantorPrincipalType());
-    list.add(present_grantorPrincipalType);
-    if (present_grantorPrincipalType)
-      list.add(grantorPrincipalType.getValue());
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(RolePrincipalGrant other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetRoleName()).compareTo(other.isSetRoleName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRoleName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.roleName, other.roleName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetPrincipalName()).compareTo(other.isSetPrincipalName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPrincipalName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principalName, other.principalName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetPrincipalType()).compareTo(other.isSetPrincipalType());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPrincipalType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.principalType, other.principalType);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetGrantOption()).compareTo(other.isSetGrantOption());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGrantOption()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantOption, other.grantOption);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetGrantTime()).compareTo(other.isSetGrantTime());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGrantTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantTime, other.grantTime);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetGrantorName()).compareTo(other.isSetGrantorName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGrantorName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantorName, other.grantorName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetGrantorPrincipalType()).compareTo(other.isSetGrantorPrincipalType());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetGrantorPrincipalType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantorPrincipalType, other.grantorPrincipalType);
-      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("RolePrincipalGrant(");
-    boolean first = true;
-
-    sb.append("roleName:");
-    if (this.roleName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.roleName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("principalName:");
-    if (this.principalName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.principalName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("principalType:");
-    if (this.principalType == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.principalType);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("grantOption:");
-    sb.append(this.grantOption);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("grantTime:");
-    sb.append(this.grantTime);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("grantorName:");
-    if (this.grantorName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.grantorName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("grantorPrincipalType:");
-    if (this.grantorPrincipalType == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.grantorPrincipalType);
-    }
-    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 {
-      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bitfield = 0;
-      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 RolePrincipalGrantStandardSchemeFactory implements SchemeFactory {
-    public RolePrincipalGrantStandardScheme getScheme() {
-      return new RolePrincipalGrantStandardScheme();
-    }
-  }
-
-  private static class RolePrincipalGrantStandardScheme extends StandardScheme<RolePrincipalGrant> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, RolePrincipalGrant 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: // ROLE_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.roleName = iprot.readString();
-              struct.setRoleNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PRINCIPAL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.principalName = iprot.readString();
-              struct.setPrincipalNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // PRINCIPAL_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setPrincipalTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // GRANT_OPTION
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.grantOption = iprot.readBool();
-              struct.setGrantOptionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // GRANT_TIME
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.grantTime = iprot.readI32();
-              struct.setGrantTimeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 6: // GRANTOR_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.grantorName = iprot.readString();
-              struct.setGrantorNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 7: // GRANTOR_PRINCIPAL_TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.grantorPrincipalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-              struct.setGrantorPrincipalTypeIsSet(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, RolePrincipalGrant struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.roleName != null) {
-        oprot.writeFieldBegin(ROLE_NAME_FIELD_DESC);
-        oprot.writeString(struct.roleName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.principalName != null) {
-        oprot.writeFieldBegin(PRINCIPAL_NAME_FIELD_DESC);
-        oprot.writeString(struct.principalName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.principalType != null) {
-        oprot.writeFieldBegin(PRINCIPAL_TYPE_FIELD_DESC);
-        oprot.writeI32(struct.principalType.getValue());
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(GRANT_OPTION_FIELD_DESC);
-      oprot.writeBool(struct.grantOption);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(GRANT_TIME_FIELD_DESC);
-      oprot.writeI32(struct.grantTime);
-      oprot.writeFieldEnd();
-      if (struct.grantorName != null) {
-        oprot.writeFieldBegin(GRANTOR_NAME_FIELD_DESC);
-        oprot.writeString(struct.grantorName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.grantorPrincipalType != null) {
-        oprot.writeFieldBegin(GRANTOR_PRINCIPAL_TYPE_FIELD_DESC);
-        oprot.writeI32(struct.grantorPrincipalType.getValue());
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class RolePrincipalGrantTupleSchemeFactory implements SchemeFactory {
-    public RolePrincipalGrantTupleScheme getScheme() {
-      return new RolePrincipalGrantTupleScheme();
-    }
-  }
-
-  private static class RolePrincipalGrantTupleScheme extends TupleScheme<RolePrincipalGrant> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, RolePrincipalGrant struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetRoleName()) {
-        optionals.set(0);
-      }
-      if (struct.isSetPrincipalName()) {
-        optionals.set(1);
-      }
-      if (struct.isSetPrincipalType()) {
-        optionals.set(2);
-      }
-      if (struct.isSetGrantOption()) {
-        optionals.set(3);
-      }
-      if (struct.isSetGrantTime()) {
-        optionals.set(4);
-      }
-      if (struct.isSetGrantorName()) {
-        optionals.set(5);
-      }
-      if (struct.isSetGrantorPrincipalType()) {
-        optionals.set(6);
-      }
-      oprot.writeBitSet(optionals, 7);
-      if (struct.isSetRoleName()) {
-        oprot.writeString(struct.roleName);
-      }
-      if (struct.isSetPrincipalName()) {
-        oprot.writeString(struct.principalName);
-      }
-      if (struct.isSetPrincipalType()) {
-        oprot.writeI32(struct.principalType.getValue());
-      }
-      if (struct.isSetGrantOption()) {
-        oprot.writeBool(struct.grantOption);
-      }
-      if (struct.isSetGrantTime()) {
-        oprot.writeI32(struct.grantTime);
-      }
-      if (struct.isSetGrantorName()) {
-        oprot.writeString(struct.grantorName);
-      }
-      if (struct.isSetGrantorPrincipalType()) {
-        oprot.writeI32(struct.grantorPrincipalType.getValue());
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, RolePrincipalGrant struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(7);
-      if (incoming.get(0)) {
-        struct.roleName = iprot.readString();
-        struct.setRoleNameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.principalName = iprot.readString();
-        struct.setPrincipalNameIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.principalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setPrincipalTypeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.grantOption = iprot.readBool();
-        struct.setGrantOptionIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.grantTime = iprot.readI32();
-        struct.setGrantTimeIsSet(true);
-      }
-      if (incoming.get(5)) {
-        struct.grantorName = iprot.readString();
-        struct.setGrantorNameIsSet(true);
-      }
-      if (incoming.get(6)) {
-        struct.grantorPrincipalType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
-        struct.setGrantorPrincipalTypeIsSet(true);
-      }
-    }
-  }
-
-}
-


Mime
View raw message