[28/51] [partial] hive git commit: Revert "HIVE-12442: Refactor/repackage HiveServer2's Thrift code so that it can be used in the tasks (Rohit Dholakia reviewed by Vaibhav Gumashta)"

[vg...@apache.org]

http://git-wip-us.apache.org/repos/asf/hive/blob/a28f6cd8/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTableSchema.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTableSchema.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTableSchema.java
deleted file mode 100644
index 5b37130..0000000
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTableSchema.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.hive.service.rpc.thrift;
-
-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.2)", date = "2015-12-14")
-public class TTableSchema implements org.apache.thrift.TBase<TTableSchema, TTableSchema._Fields>, java.io.Serializable, Cloneable, Comparable<TTableSchema> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTableSchema");
-
-  private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", 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 TTableSchemaStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TTableSchemaTupleSchemeFactory());
-  }
-
-  private List<TColumnDesc> columns; // 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 {
-    COLUMNS((short)1, "columns");
-
-    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: // COLUMNS
-          return COLUMNS;
-        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.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", 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, TColumnDesc.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TTableSchema.class, metaDataMap);
-  }
-
-  public TTableSchema() {
-  }
-
-  public TTableSchema(
-    List<TColumnDesc> columns)
-  {
-    this();
-    this.columns = columns;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public TTableSchema(TTableSchema other) {
-    if (other.isSetColumns()) {
-      List<TColumnDesc> __this__columns = new ArrayList<TColumnDesc>(other.columns.size());
-      for (TColumnDesc other_element : other.columns) {
-        __this__columns.add(new TColumnDesc(other_element));
-      }
-      this.columns = __this__columns;
-    }
-  }
-
-  public TTableSchema deepCopy() {
-    return new TTableSchema(this);
-  }
-
-  @Override
-  public void clear() {
-    this.columns = null;
-  }
-
-  public int getColumnsSize() {
-    return (this.columns == null) ? 0 : this.columns.size();
-  }
-
-  public java.util.Iterator<TColumnDesc> getColumnsIterator() {
-    return (this.columns == null) ? null : this.columns.iterator();
-  }
-
-  public void addToColumns(TColumnDesc elem) {
-    if (this.columns == null) {
-      this.columns = new ArrayList<TColumnDesc>();
-    }
-    this.columns.add(elem);
-  }
-
-  public List<TColumnDesc> getColumns() {
-    return this.columns;
-  }
-
-  public void setColumns(List<TColumnDesc> columns) {
-    this.columns = columns;
-  }
-
-  public void unsetColumns() {
-    this.columns = null;
-  }
-
-  /** Returns true if field columns is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumns() {
-    return this.columns != null;
-  }
-
-  public void setColumnsIsSet(boolean value) {
-    if (!value) {
-      this.columns = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case COLUMNS:
-      if (value == null) {
-        unsetColumns();
-      } else {
-        setColumns((List<TColumnDesc>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case COLUMNS:
-      return getColumns();
-
-    }
-    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 COLUMNS:
-      return isSetColumns();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof TTableSchema)
-      return this.equals((TTableSchema)that);
-    return false;
-  }
-
-  public boolean equals(TTableSchema that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_columns = true && this.isSetColumns();
-    boolean that_present_columns = true && that.isSetColumns();
-    if (this_present_columns || that_present_columns) {
-      if (!(this_present_columns && that_present_columns))
-        return false;
-      if (!this.columns.equals(that.columns))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_columns = true && (isSetColumns());
-    list.add(present_columns);
-    if (present_columns)
-      list.add(columns);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(TTableSchema other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
-      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("TTableSchema(");
-    boolean first = true;
-
-    sb.append("columns:");
-    if (this.columns == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.columns);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetColumns()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'columns' 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 TTableSchemaStandardSchemeFactory implements SchemeFactory {
-    public TTableSchemaStandardScheme getScheme() {
-      return new TTableSchemaStandardScheme();
-    }
-  }
-
-  private static class TTableSchemaStandardScheme extends StandardScheme<TTableSchema> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, TTableSchema 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: // COLUMNS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list38 = iprot.readListBegin();
-                struct.columns = new ArrayList<TColumnDesc>(_list38.size);
-                TColumnDesc _elem39;
-                for (int _i40 = 0; _i40 < _list38.size; ++_i40)
-                {
-                  _elem39 = new TColumnDesc();
-                  _elem39.read(iprot);
-                  struct.columns.add(_elem39);
-                }
-                iprot.readListEnd();
-              }
-              struct.setColumnsIsSet(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, TTableSchema struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.columns != null) {
-        oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
-          for (TColumnDesc _iter41 : struct.columns)
-          {
-            _iter41.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class TTableSchemaTupleSchemeFactory implements SchemeFactory {
-    public TTableSchemaTupleScheme getScheme() {
-      return new TTableSchemaTupleScheme();
-    }
-  }
-
-  private static class TTableSchemaTupleScheme extends TupleScheme<TTableSchema> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, TTableSchema struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      {
-        oprot.writeI32(struct.columns.size());
-        for (TColumnDesc _iter42 : struct.columns)
-        {
-          _iter42.write(oprot);
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, TTableSchema struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list43 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.columns = new ArrayList<TColumnDesc>(_list43.size);
-        TColumnDesc _elem44;
-        for (int _i45 = 0; _i45 < _list43.size; ++_i45)
-        {
-          _elem44 = new TColumnDesc();
-          _elem44.read(iprot);
-          struct.columns.add(_elem44);
-        }
-      }
-      struct.setColumnsIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/a28f6cd8/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeDesc.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeDesc.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeDesc.java
deleted file mode 100644
index b062436..0000000
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeDesc.java
+++ /dev/null
@@ -1,443 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.hive.service.rpc.thrift;
-
-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.2)", date = "2015-12-14")
-public class TTypeDesc implements org.apache.thrift.TBase<TTypeDesc, TTypeDesc._Fields>, java.io.Serializable, Cloneable, Comparable<TTypeDesc> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTypeDesc");
-
-  private static final org.apache.thrift.protocol.TField TYPES_FIELD_DESC = new org.apache.thrift.protocol.TField("types", 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 TTypeDescStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TTypeDescTupleSchemeFactory());
-  }
-
-  private List<TTypeEntry> types; // 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 {
-    TYPES((short)1, "types");
-
-    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: // TYPES
-          return TYPES;
-        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.TYPES, new org.apache.thrift.meta_data.FieldMetaData("types", 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, TTypeEntry.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TTypeDesc.class, metaDataMap);
-  }
-
-  public TTypeDesc() {
-  }
-
-  public TTypeDesc(
-    List<TTypeEntry> types)
-  {
-    this();
-    this.types = types;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public TTypeDesc(TTypeDesc other) {
-    if (other.isSetTypes()) {
-      List<TTypeEntry> __this__types = new ArrayList<TTypeEntry>(other.types.size());
-      for (TTypeEntry other_element : other.types) {
-        __this__types.add(new TTypeEntry(other_element));
-      }
-      this.types = __this__types;
-    }
-  }
-
-  public TTypeDesc deepCopy() {
-    return new TTypeDesc(this);
-  }
-
-  @Override
-  public void clear() {
-    this.types = null;
-  }
-
-  public int getTypesSize() {
-    return (this.types == null) ? 0 : this.types.size();
-  }
-
-  public java.util.Iterator<TTypeEntry> getTypesIterator() {
-    return (this.types == null) ? null : this.types.iterator();
-  }
-
-  public void addToTypes(TTypeEntry elem) {
-    if (this.types == null) {
-      this.types = new ArrayList<TTypeEntry>();
-    }
-    this.types.add(elem);
-  }
-
-  public List<TTypeEntry> getTypes() {
-    return this.types;
-  }
-
-  public void setTypes(List<TTypeEntry> types) {
-    this.types = types;
-  }
-
-  public void unsetTypes() {
-    this.types = null;
-  }
-
-  /** Returns true if field types is set (has been assigned a value) and false otherwise */
-  public boolean isSetTypes() {
-    return this.types != null;
-  }
-
-  public void setTypesIsSet(boolean value) {
-    if (!value) {
-      this.types = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case TYPES:
-      if (value == null) {
-        unsetTypes();
-      } else {
-        setTypes((List<TTypeEntry>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case TYPES:
-      return getTypes();
-
-    }
-    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 TYPES:
-      return isSetTypes();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof TTypeDesc)
-      return this.equals((TTypeDesc)that);
-    return false;
-  }
-
-  public boolean equals(TTypeDesc that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_types = true && this.isSetTypes();
-    boolean that_present_types = true && that.isSetTypes();
-    if (this_present_types || that_present_types) {
-      if (!(this_present_types && that_present_types))
-        return false;
-      if (!this.types.equals(that.types))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_types = true && (isSetTypes());
-    list.add(present_types);
-    if (present_types)
-      list.add(types);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(TTypeDesc other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetTypes()).compareTo(other.isSetTypes());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetTypes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.types, other.types);
-      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("TTypeDesc(");
-    boolean first = true;
-
-    sb.append("types:");
-    if (this.types == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.types);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetTypes()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'types' 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 TTypeDescStandardSchemeFactory implements SchemeFactory {
-    public TTypeDescStandardScheme getScheme() {
-      return new TTypeDescStandardScheme();
-    }
-  }
-
-  private static class TTypeDescStandardScheme extends StandardScheme<TTypeDesc> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, TTypeDesc 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: // TYPES
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
-                struct.types = new ArrayList<TTypeEntry>(_list30.size);
-                TTypeEntry _elem31;
-                for (int _i32 = 0; _i32 < _list30.size; ++_i32)
-                {
-                  _elem31 = new TTypeEntry();
-                  _elem31.read(iprot);
-                  struct.types.add(_elem31);
-                }
-                iprot.readListEnd();
-              }
-              struct.setTypesIsSet(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, TTypeDesc struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.types != null) {
-        oprot.writeFieldBegin(TYPES_FIELD_DESC);
-        {
-          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.types.size()));
-          for (TTypeEntry _iter33 : struct.types)
-          {
-            _iter33.write(oprot);
-          }
-          oprot.writeListEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class TTypeDescTupleSchemeFactory implements SchemeFactory {
-    public TTypeDescTupleScheme getScheme() {
-      return new TTypeDescTupleScheme();
-    }
-  }
-
-  private static class TTypeDescTupleScheme extends TupleScheme<TTypeDesc> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, TTypeDesc struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      {
-        oprot.writeI32(struct.types.size());
-        for (TTypeEntry _iter34 : struct.types)
-        {
-          _iter34.write(oprot);
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, TTypeDesc struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TList _list35 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.types = new ArrayList<TTypeEntry>(_list35.size);
-        TTypeEntry _elem36;
-        for (int _i37 = 0; _i37 < _list35.size; ++_i37)
-        {
-          _elem36 = new TTypeEntry();
-          _elem36.read(iprot);
-          struct.types.add(_elem36);
-        }
-      }
-      struct.setTypesIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/a28f6cd8/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeEntry.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeEntry.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeEntry.java
deleted file mode 100644
index aeb9a59..0000000
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeEntry.java
+++ /dev/null
@@ -1,614 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.hive.service.rpc.thrift;
-
-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 TTypeEntry extends org.apache.thrift.TUnion<TTypeEntry, TTypeEntry._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTypeEntry");
-  private static final org.apache.thrift.protocol.TField PRIMITIVE_ENTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("primitiveEntry", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField ARRAY_ENTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("arrayEntry", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-  private static final org.apache.thrift.protocol.TField MAP_ENTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("mapEntry", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField STRUCT_ENTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("structEntry", org.apache.thrift.protocol.TType.STRUCT, (short)4);
-  private static final org.apache.thrift.protocol.TField UNION_ENTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("unionEntry", org.apache.thrift.protocol.TType.STRUCT, (short)5);
-  private static final org.apache.thrift.protocol.TField USER_DEFINED_TYPE_ENTRY_FIELD_DESC = new org.apache.thrift.protocol.TField("userDefinedTypeEntry", org.apache.thrift.protocol.TType.STRUCT, (short)6);
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    PRIMITIVE_ENTRY((short)1, "primitiveEntry"),
-    ARRAY_ENTRY((short)2, "arrayEntry"),
-    MAP_ENTRY((short)3, "mapEntry"),
-    STRUCT_ENTRY((short)4, "structEntry"),
-    UNION_ENTRY((short)5, "unionEntry"),
-    USER_DEFINED_TYPE_ENTRY((short)6, "userDefinedTypeEntry");
-
-    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: // PRIMITIVE_ENTRY
-          return PRIMITIVE_ENTRY;
-        case 2: // ARRAY_ENTRY
-          return ARRAY_ENTRY;
-        case 3: // MAP_ENTRY
-          return MAP_ENTRY;
-        case 4: // STRUCT_ENTRY
-          return STRUCT_ENTRY;
-        case 5: // UNION_ENTRY
-          return UNION_ENTRY;
-        case 6: // USER_DEFINED_TYPE_ENTRY
-          return USER_DEFINED_TYPE_ENTRY;
-        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.PRIMITIVE_ENTRY, new org.apache.thrift.meta_data.FieldMetaData("primitiveEntry", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TPrimitiveTypeEntry.class)));
-    tmpMap.put(_Fields.ARRAY_ENTRY, new org.apache.thrift.meta_data.FieldMetaData("arrayEntry", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TArrayTypeEntry.class)));
-    tmpMap.put(_Fields.MAP_ENTRY, new org.apache.thrift.meta_data.FieldMetaData("mapEntry", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TMapTypeEntry.class)));
-    tmpMap.put(_Fields.STRUCT_ENTRY, new org.apache.thrift.meta_data.FieldMetaData("structEntry", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TStructTypeEntry.class)));
-    tmpMap.put(_Fields.UNION_ENTRY, new org.apache.thrift.meta_data.FieldMetaData("unionEntry", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TUnionTypeEntry.class)));
-    tmpMap.put(_Fields.USER_DEFINED_TYPE_ENTRY, new org.apache.thrift.meta_data.FieldMetaData("userDefinedTypeEntry", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TUserDefinedTypeEntry.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TTypeEntry.class, metaDataMap);
-  }
-
-  public TTypeEntry() {
-    super();
-  }
-
-  public TTypeEntry(_Fields setField, Object value) {
-    super(setField, value);
-  }
-
-  public TTypeEntry(TTypeEntry other) {
-    super(other);
-  }
-  public TTypeEntry deepCopy() {
-    return new TTypeEntry(this);
-  }
-
-  public static TTypeEntry primitiveEntry(TPrimitiveTypeEntry value) {
-    TTypeEntry x = new TTypeEntry();
-    x.setPrimitiveEntry(value);
-    return x;
-  }
-
-  public static TTypeEntry arrayEntry(TArrayTypeEntry value) {
-    TTypeEntry x = new TTypeEntry();
-    x.setArrayEntry(value);
-    return x;
-  }
-
-  public static TTypeEntry mapEntry(TMapTypeEntry value) {
-    TTypeEntry x = new TTypeEntry();
-    x.setMapEntry(value);
-    return x;
-  }
-
-  public static TTypeEntry structEntry(TStructTypeEntry value) {
-    TTypeEntry x = new TTypeEntry();
-    x.setStructEntry(value);
-    return x;
-  }
-
-  public static TTypeEntry unionEntry(TUnionTypeEntry value) {
-    TTypeEntry x = new TTypeEntry();
-    x.setUnionEntry(value);
-    return x;
-  }
-
-  public static TTypeEntry userDefinedTypeEntry(TUserDefinedTypeEntry value) {
-    TTypeEntry x = new TTypeEntry();
-    x.setUserDefinedTypeEntry(value);
-    return x;
-  }
-
-
-  @Override
-  protected void checkType(_Fields setField, Object value) throws ClassCastException {
-    switch (setField) {
-      case PRIMITIVE_ENTRY:
-        if (value instanceof TPrimitiveTypeEntry) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type TPrimitiveTypeEntry for field 'primitiveEntry', but got " + value.getClass().getSimpleName());
-      case ARRAY_ENTRY:
-        if (value instanceof TArrayTypeEntry) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type TArrayTypeEntry for field 'arrayEntry', but got " + value.getClass().getSimpleName());
-      case MAP_ENTRY:
-        if (value instanceof TMapTypeEntry) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type TMapTypeEntry for field 'mapEntry', but got " + value.getClass().getSimpleName());
-      case STRUCT_ENTRY:
-        if (value instanceof TStructTypeEntry) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type TStructTypeEntry for field 'structEntry', but got " + value.getClass().getSimpleName());
-      case UNION_ENTRY:
-        if (value instanceof TUnionTypeEntry) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type TUnionTypeEntry for field 'unionEntry', but got " + value.getClass().getSimpleName());
-      case USER_DEFINED_TYPE_ENTRY:
-        if (value instanceof TUserDefinedTypeEntry) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type TUserDefinedTypeEntry for field 'userDefinedTypeEntry', 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 PRIMITIVE_ENTRY:
-          if (field.type == PRIMITIVE_ENTRY_FIELD_DESC.type) {
-            TPrimitiveTypeEntry primitiveEntry;
-            primitiveEntry = new TPrimitiveTypeEntry();
-            primitiveEntry.read(iprot);
-            return primitiveEntry;
-          } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case ARRAY_ENTRY:
-          if (field.type == ARRAY_ENTRY_FIELD_DESC.type) {
-            TArrayTypeEntry arrayEntry;
-            arrayEntry = new TArrayTypeEntry();
-            arrayEntry.read(iprot);
-            return arrayEntry;
-          } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case MAP_ENTRY:
-          if (field.type == MAP_ENTRY_FIELD_DESC.type) {
-            TMapTypeEntry mapEntry;
-            mapEntry = new TMapTypeEntry();
-            mapEntry.read(iprot);
-            return mapEntry;
-          } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case STRUCT_ENTRY:
-          if (field.type == STRUCT_ENTRY_FIELD_DESC.type) {
-            TStructTypeEntry structEntry;
-            structEntry = new TStructTypeEntry();
-            structEntry.read(iprot);
-            return structEntry;
-          } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case UNION_ENTRY:
-          if (field.type == UNION_ENTRY_FIELD_DESC.type) {
-            TUnionTypeEntry unionEntry;
-            unionEntry = new TUnionTypeEntry();
-            unionEntry.read(iprot);
-            return unionEntry;
-          } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case USER_DEFINED_TYPE_ENTRY:
-          if (field.type == USER_DEFINED_TYPE_ENTRY_FIELD_DESC.type) {
-            TUserDefinedTypeEntry userDefinedTypeEntry;
-            userDefinedTypeEntry = new TUserDefinedTypeEntry();
-            userDefinedTypeEntry.read(iprot);
-            return userDefinedTypeEntry;
-          } 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 PRIMITIVE_ENTRY:
-        TPrimitiveTypeEntry primitiveEntry = (TPrimitiveTypeEntry)value_;
-        primitiveEntry.write(oprot);
-        return;
-      case ARRAY_ENTRY:
-        TArrayTypeEntry arrayEntry = (TArrayTypeEntry)value_;
-        arrayEntry.write(oprot);
-        return;
-      case MAP_ENTRY:
-        TMapTypeEntry mapEntry = (TMapTypeEntry)value_;
-        mapEntry.write(oprot);
-        return;
-      case STRUCT_ENTRY:
-        TStructTypeEntry structEntry = (TStructTypeEntry)value_;
-        structEntry.write(oprot);
-        return;
-      case UNION_ENTRY:
-        TUnionTypeEntry unionEntry = (TUnionTypeEntry)value_;
-        unionEntry.write(oprot);
-        return;
-      case USER_DEFINED_TYPE_ENTRY:
-        TUserDefinedTypeEntry userDefinedTypeEntry = (TUserDefinedTypeEntry)value_;
-        userDefinedTypeEntry.write(oprot);
-        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 PRIMITIVE_ENTRY:
-          TPrimitiveTypeEntry primitiveEntry;
-          primitiveEntry = new TPrimitiveTypeEntry();
-          primitiveEntry.read(iprot);
-          return primitiveEntry;
-        case ARRAY_ENTRY:
-          TArrayTypeEntry arrayEntry;
-          arrayEntry = new TArrayTypeEntry();
-          arrayEntry.read(iprot);
-          return arrayEntry;
-        case MAP_ENTRY:
-          TMapTypeEntry mapEntry;
-          mapEntry = new TMapTypeEntry();
-          mapEntry.read(iprot);
-          return mapEntry;
-        case STRUCT_ENTRY:
-          TStructTypeEntry structEntry;
-          structEntry = new TStructTypeEntry();
-          structEntry.read(iprot);
-          return structEntry;
-        case UNION_ENTRY:
-          TUnionTypeEntry unionEntry;
-          unionEntry = new TUnionTypeEntry();
-          unionEntry.read(iprot);
-          return unionEntry;
-        case USER_DEFINED_TYPE_ENTRY:
-          TUserDefinedTypeEntry userDefinedTypeEntry;
-          userDefinedTypeEntry = new TUserDefinedTypeEntry();
-          userDefinedTypeEntry.read(iprot);
-          return userDefinedTypeEntry;
-        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 PRIMITIVE_ENTRY:
-        TPrimitiveTypeEntry primitiveEntry = (TPrimitiveTypeEntry)value_;
-        primitiveEntry.write(oprot);
-        return;
-      case ARRAY_ENTRY:
-        TArrayTypeEntry arrayEntry = (TArrayTypeEntry)value_;
-        arrayEntry.write(oprot);
-        return;
-      case MAP_ENTRY:
-        TMapTypeEntry mapEntry = (TMapTypeEntry)value_;
-        mapEntry.write(oprot);
-        return;
-      case STRUCT_ENTRY:
-        TStructTypeEntry structEntry = (TStructTypeEntry)value_;
-        structEntry.write(oprot);
-        return;
-      case UNION_ENTRY:
-        TUnionTypeEntry unionEntry = (TUnionTypeEntry)value_;
-        unionEntry.write(oprot);
-        return;
-      case USER_DEFINED_TYPE_ENTRY:
-        TUserDefinedTypeEntry userDefinedTypeEntry = (TUserDefinedTypeEntry)value_;
-        userDefinedTypeEntry.write(oprot);
-        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 PRIMITIVE_ENTRY:
-        return PRIMITIVE_ENTRY_FIELD_DESC;
-      case ARRAY_ENTRY:
-        return ARRAY_ENTRY_FIELD_DESC;
-      case MAP_ENTRY:
-        return MAP_ENTRY_FIELD_DESC;
-      case STRUCT_ENTRY:
-        return STRUCT_ENTRY_FIELD_DESC;
-      case UNION_ENTRY:
-        return UNION_ENTRY_FIELD_DESC;
-      case USER_DEFINED_TYPE_ENTRY:
-        return USER_DEFINED_TYPE_ENTRY_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 TPrimitiveTypeEntry getPrimitiveEntry() {
-    if (getSetField() == _Fields.PRIMITIVE_ENTRY) {
-      return (TPrimitiveTypeEntry)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'primitiveEntry' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setPrimitiveEntry(TPrimitiveTypeEntry value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.PRIMITIVE_ENTRY;
-    value_ = value;
-  }
-
-  public TArrayTypeEntry getArrayEntry() {
-    if (getSetField() == _Fields.ARRAY_ENTRY) {
-      return (TArrayTypeEntry)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'arrayEntry' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setArrayEntry(TArrayTypeEntry value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.ARRAY_ENTRY;
-    value_ = value;
-  }
-
-  public TMapTypeEntry getMapEntry() {
-    if (getSetField() == _Fields.MAP_ENTRY) {
-      return (TMapTypeEntry)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'mapEntry' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setMapEntry(TMapTypeEntry value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.MAP_ENTRY;
-    value_ = value;
-  }
-
-  public TStructTypeEntry getStructEntry() {
-    if (getSetField() == _Fields.STRUCT_ENTRY) {
-      return (TStructTypeEntry)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'structEntry' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setStructEntry(TStructTypeEntry value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.STRUCT_ENTRY;
-    value_ = value;
-  }
-
-  public TUnionTypeEntry getUnionEntry() {
-    if (getSetField() == _Fields.UNION_ENTRY) {
-      return (TUnionTypeEntry)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'unionEntry' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setUnionEntry(TUnionTypeEntry value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.UNION_ENTRY;
-    value_ = value;
-  }
-
-  public TUserDefinedTypeEntry getUserDefinedTypeEntry() {
-    if (getSetField() == _Fields.USER_DEFINED_TYPE_ENTRY) {
-      return (TUserDefinedTypeEntry)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'userDefinedTypeEntry' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setUserDefinedTypeEntry(TUserDefinedTypeEntry value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.USER_DEFINED_TYPE_ENTRY;
-    value_ = value;
-  }
-
-  public boolean isSetPrimitiveEntry() {
-    return setField_ == _Fields.PRIMITIVE_ENTRY;
-  }
-
-
-  public boolean isSetArrayEntry() {
-    return setField_ == _Fields.ARRAY_ENTRY;
-  }
-
-
-  public boolean isSetMapEntry() {
-    return setField_ == _Fields.MAP_ENTRY;
-  }
-
-
-  public boolean isSetStructEntry() {
-    return setField_ == _Fields.STRUCT_ENTRY;
-  }
-
-
-  public boolean isSetUnionEntry() {
-    return setField_ == _Fields.UNION_ENTRY;
-  }
-
-
-  public boolean isSetUserDefinedTypeEntry() {
-    return setField_ == _Fields.USER_DEFINED_TYPE_ENTRY;
-  }
-
-
-  public boolean equals(Object other) {
-    if (other instanceof TTypeEntry) {
-      return equals((TTypeEntry)other);
-    } else {
-      return false;
-    }
-  }
-
-  public boolean equals(TTypeEntry other) {
-    return other != null && getSetField() == other.getSetField() && getFieldValue().equals(other.getFieldValue());
-  }
-
-  @Override
-  public int compareTo(TTypeEntry 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/a28f6cd8/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeId.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeId.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeId.java
deleted file mode 100644
index ee9dce84..0000000
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeId.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.hive.service.rpc.thrift;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum TTypeId implements org.apache.thrift.TEnum {
-  BOOLEAN_TYPE(0),
-  TINYINT_TYPE(1),
-  SMALLINT_TYPE(2),
-  INT_TYPE(3),
-  BIGINT_TYPE(4),
-  FLOAT_TYPE(5),
-  DOUBLE_TYPE(6),
-  STRING_TYPE(7),
-  TIMESTAMP_TYPE(8),
-  BINARY_TYPE(9),
-  ARRAY_TYPE(10),
-  MAP_TYPE(11),
-  STRUCT_TYPE(12),
-  UNION_TYPE(13),
-  USER_DEFINED_TYPE(14),
-  DECIMAL_TYPE(15),
-  NULL_TYPE(16),
-  DATE_TYPE(17),
-  VARCHAR_TYPE(18),
-  CHAR_TYPE(19),
-  INTERVAL_YEAR_MONTH_TYPE(20),
-  INTERVAL_DAY_TIME_TYPE(21);
-
-  private final int value;
-
-  private TTypeId(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 TTypeId findByValue(int value) { 
-    switch (value) {
-      case 0:
-        return BOOLEAN_TYPE;
-      case 1:
-        return TINYINT_TYPE;
-      case 2:
-        return SMALLINT_TYPE;
-      case 3:
-        return INT_TYPE;
-      case 4:
-        return BIGINT_TYPE;
-      case 5:
-        return FLOAT_TYPE;
-      case 6:
-        return DOUBLE_TYPE;
-      case 7:
-        return STRING_TYPE;
-      case 8:
-        return TIMESTAMP_TYPE;
-      case 9:
-        return BINARY_TYPE;
-      case 10:
-        return ARRAY_TYPE;
-      case 11:
-        return MAP_TYPE;
-      case 12:
-        return STRUCT_TYPE;
-      case 13:
-        return UNION_TYPE;
-      case 14:
-        return USER_DEFINED_TYPE;
-      case 15:
-        return DECIMAL_TYPE;
-      case 16:
-        return NULL_TYPE;
-      case 17:
-        return DATE_TYPE;
-      case 18:
-        return VARCHAR_TYPE;
-      case 19:
-        return CHAR_TYPE;
-      case 20:
-        return INTERVAL_YEAR_MONTH_TYPE;
-      case 21:
-        return INTERVAL_DAY_TIME_TYPE;
-      default:
-        return null;
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/hive/blob/a28f6cd8/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifierValue.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifierValue.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifierValue.java
deleted file mode 100644
index 588f253..0000000
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifierValue.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.hive.service.rpc.thrift;
-
-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 TTypeQualifierValue extends org.apache.thrift.TUnion<TTypeQualifierValue, TTypeQualifierValue._Fields> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTypeQualifierValue");
-  private static final org.apache.thrift.protocol.TField I32_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("i32Value", org.apache.thrift.protocol.TType.I32, (short)1);
-  private static final org.apache.thrift.protocol.TField STRING_VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("stringValue", org.apache.thrift.protocol.TType.STRING, (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 {
-    I32_VALUE((short)1, "i32Value"),
-    STRING_VALUE((short)2, "stringValue");
-
-    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: // I32_VALUE
-          return I32_VALUE;
-        case 2: // STRING_VALUE
-          return STRING_VALUE;
-        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.I32_VALUE, new org.apache.thrift.meta_data.FieldMetaData("i32Value", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.STRING_VALUE, new org.apache.thrift.meta_data.FieldMetaData("stringValue", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TTypeQualifierValue.class, metaDataMap);
-  }
-
-  public TTypeQualifierValue() {
-    super();
-  }
-
-  public TTypeQualifierValue(_Fields setField, Object value) {
-    super(setField, value);
-  }
-
-  public TTypeQualifierValue(TTypeQualifierValue other) {
-    super(other);
-  }
-  public TTypeQualifierValue deepCopy() {
-    return new TTypeQualifierValue(this);
-  }
-
-  public static TTypeQualifierValue i32Value(int value) {
-    TTypeQualifierValue x = new TTypeQualifierValue();
-    x.setI32Value(value);
-    return x;
-  }
-
-  public static TTypeQualifierValue stringValue(String value) {
-    TTypeQualifierValue x = new TTypeQualifierValue();
-    x.setStringValue(value);
-    return x;
-  }
-
-
-  @Override
-  protected void checkType(_Fields setField, Object value) throws ClassCastException {
-    switch (setField) {
-      case I32_VALUE:
-        if (value instanceof Integer) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type Integer for field 'i32Value', but got " + value.getClass().getSimpleName());
-      case STRING_VALUE:
-        if (value instanceof String) {
-          break;
-        }
-        throw new ClassCastException("Was expecting value of type String for field 'stringValue', 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 I32_VALUE:
-          if (field.type == I32_VALUE_FIELD_DESC.type) {
-            Integer i32Value;
-            i32Value = iprot.readI32();
-            return i32Value;
-          } else {
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-            return null;
-          }
-        case STRING_VALUE:
-          if (field.type == STRING_VALUE_FIELD_DESC.type) {
-            String stringValue;
-            stringValue = iprot.readString();
-            return stringValue;
-          } 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 I32_VALUE:
-        Integer i32Value = (Integer)value_;
-        oprot.writeI32(i32Value);
-        return;
-      case STRING_VALUE:
-        String stringValue = (String)value_;
-        oprot.writeString(stringValue);
-        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 I32_VALUE:
-          Integer i32Value;
-          i32Value = iprot.readI32();
-          return i32Value;
-        case STRING_VALUE:
-          String stringValue;
-          stringValue = iprot.readString();
-          return stringValue;
-        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 I32_VALUE:
-        Integer i32Value = (Integer)value_;
-        oprot.writeI32(i32Value);
-        return;
-      case STRING_VALUE:
-        String stringValue = (String)value_;
-        oprot.writeString(stringValue);
-        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 I32_VALUE:
-        return I32_VALUE_FIELD_DESC;
-      case STRING_VALUE:
-        return STRING_VALUE_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 int getI32Value() {
-    if (getSetField() == _Fields.I32_VALUE) {
-      return (Integer)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'i32Value' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setI32Value(int value) {
-    setField_ = _Fields.I32_VALUE;
-    value_ = value;
-  }
-
-  public String getStringValue() {
-    if (getSetField() == _Fields.STRING_VALUE) {
-      return (String)getFieldValue();
-    } else {
-      throw new RuntimeException("Cannot get field 'stringValue' because union is currently set to " + getFieldDesc(getSetField()).name);
-    }
-  }
-
-  public void setStringValue(String value) {
-    if (value == null) throw new NullPointerException();
-    setField_ = _Fields.STRING_VALUE;
-    value_ = value;
-  }
-
-  public boolean isSetI32Value() {
-    return setField_ == _Fields.I32_VALUE;
-  }
-
-
-  public boolean isSetStringValue() {
-    return setField_ == _Fields.STRING_VALUE;
-  }
-
-
-  public boolean equals(Object other) {
-    if (other instanceof TTypeQualifierValue) {
-      return equals((TTypeQualifierValue)other);
-    } else {
-      return false;
-    }
-  }
-
-  public boolean equals(TTypeQualifierValue other) {
-    return other != null && getSetField() == other.getSetField() && getFieldValue().equals(other.getFieldValue());
-  }
-
-  @Override
-  public int compareTo(TTypeQualifierValue 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/a28f6cd8/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifiers.java
----------------------------------------------------------------------
diff --git a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifiers.java b/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifiers.java
deleted file mode 100644
index e199482..0000000
--- a/service-rpc/src/gen/thrift/gen-javabean/org/apache/hive/service/rpc/thrift/TTypeQualifiers.java
+++ /dev/null
@@ -1,454 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.2)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.hive.service.rpc.thrift;
-
-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.2)", date = "2015-12-14")
-public class TTypeQualifiers implements org.apache.thrift.TBase<TTypeQualifiers, TTypeQualifiers._Fields>, java.io.Serializable, Cloneable, Comparable<TTypeQualifiers> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTypeQualifiers");
-
-  private static final org.apache.thrift.protocol.TField QUALIFIERS_FIELD_DESC = new org.apache.thrift.protocol.TField("qualifiers", 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 TTypeQualifiersStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TTypeQualifiersTupleSchemeFactory());
-  }
-
-  private Map<String,TTypeQualifierValue> qualifiers; // 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 {
-    QUALIFIERS((short)1, "qualifiers");
-
-    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: // QUALIFIERS
-          return QUALIFIERS;
-        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.QUALIFIERS, new org.apache.thrift.meta_data.FieldMetaData("qualifiers", 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.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTypeQualifierValue.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TTypeQualifiers.class, metaDataMap);
-  }
-
-  public TTypeQualifiers() {
-  }
-
-  public TTypeQualifiers(
-    Map<String,TTypeQualifierValue> qualifiers)
-  {
-    this();
-    this.qualifiers = qualifiers;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public TTypeQualifiers(TTypeQualifiers other) {
-    if (other.isSetQualifiers()) {
-      Map<String,TTypeQualifierValue> __this__qualifiers = new HashMap<String,TTypeQualifierValue>(other.qualifiers.size());
-      for (Map.Entry<String, TTypeQualifierValue> other_element : other.qualifiers.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        TTypeQualifierValue other_element_value = other_element.getValue();
-
-        String __this__qualifiers_copy_key = other_element_key;
-
-        TTypeQualifierValue __this__qualifiers_copy_value = new TTypeQualifierValue(other_element_value);
-
-        __this__qualifiers.put(__this__qualifiers_copy_key, __this__qualifiers_copy_value);
-      }
-      this.qualifiers = __this__qualifiers;
-    }
-  }
-
-  public TTypeQualifiers deepCopy() {
-    return new TTypeQualifiers(this);
-  }
-
-  @Override
-  public void clear() {
-    this.qualifiers = null;
-  }
-
-  public int getQualifiersSize() {
-    return (this.qualifiers == null) ? 0 : this.qualifiers.size();
-  }
-
-  public void putToQualifiers(String key, TTypeQualifierValue val) {
-    if (this.qualifiers == null) {
-      this.qualifiers = new HashMap<String,TTypeQualifierValue>();
-    }
-    this.qualifiers.put(key, val);
-  }
-
-  public Map<String,TTypeQualifierValue> getQualifiers() {
-    return this.qualifiers;
-  }
-
-  public void setQualifiers(Map<String,TTypeQualifierValue> qualifiers) {
-    this.qualifiers = qualifiers;
-  }
-
-  public void unsetQualifiers() {
-    this.qualifiers = null;
-  }
-
-  /** Returns true if field qualifiers is set (has been assigned a value) and false otherwise */
-  public boolean isSetQualifiers() {
-    return this.qualifiers != null;
-  }
-
-  public void setQualifiersIsSet(boolean value) {
-    if (!value) {
-      this.qualifiers = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case QUALIFIERS:
-      if (value == null) {
-        unsetQualifiers();
-      } else {
-        setQualifiers((Map<String,TTypeQualifierValue>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case QUALIFIERS:
-      return getQualifiers();
-
-    }
-    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 QUALIFIERS:
-      return isSetQualifiers();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof TTypeQualifiers)
-      return this.equals((TTypeQualifiers)that);
-    return false;
-  }
-
-  public boolean equals(TTypeQualifiers that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_qualifiers = true && this.isSetQualifiers();
-    boolean that_present_qualifiers = true && that.isSetQualifiers();
-    if (this_present_qualifiers || that_present_qualifiers) {
-      if (!(this_present_qualifiers && that_present_qualifiers))
-        return false;
-      if (!this.qualifiers.equals(that.qualifiers))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_qualifiers = true && (isSetQualifiers());
-    list.add(present_qualifiers);
-    if (present_qualifiers)
-      list.add(qualifiers);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(TTypeQualifiers other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetQualifiers()).compareTo(other.isSetQualifiers());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQualifiers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.qualifiers, other.qualifiers);
-      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("TTypeQualifiers(");
-    boolean first = true;
-
-    sb.append("qualifiers:");
-    if (this.qualifiers == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.qualifiers);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetQualifiers()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'qualifiers' 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 TTypeQualifiersStandardSchemeFactory implements SchemeFactory {
-    public TTypeQualifiersStandardScheme getScheme() {
-      return new TTypeQualifiersStandardScheme();
-    }
-  }
-
-  private static class TTypeQualifiersStandardScheme extends StandardScheme<TTypeQualifiers> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, TTypeQualifiers 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: // QUALIFIERS
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
-                struct.qualifiers = new HashMap<String,TTypeQualifierValue>(2*_map0.size);
-                String _key1;
-                TTypeQualifierValue _val2;
-                for (int _i3 = 0; _i3 < _map0.size; ++_i3)
-                {
-                  _key1 = iprot.readString();
-                  _val2 = new TTypeQualifierValue();
-                  _val2.read(iprot);
-                  struct.qualifiers.put(_key1, _val2);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setQualifiersIsSet(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, TTypeQualifiers struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.qualifiers != null) {
-        oprot.writeFieldBegin(QUALIFIERS_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.qualifiers.size()));
-          for (Map.Entry<String, TTypeQualifierValue> _iter4 : struct.qualifiers.entrySet())
-          {
-            oprot.writeString(_iter4.getKey());
-            _iter4.getValue().write(oprot);
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class TTypeQualifiersTupleSchemeFactory implements SchemeFactory {
-    public TTypeQualifiersTupleScheme getScheme() {
-      return new TTypeQualifiersTupleScheme();
-    }
-  }
-
-  private static class TTypeQualifiersTupleScheme extends TupleScheme<TTypeQualifiers> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, TTypeQualifiers struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      {
-        oprot.writeI32(struct.qualifiers.size());
-        for (Map.Entry<String, TTypeQualifierValue> _iter5 : struct.qualifiers.entrySet())
-        {
-          oprot.writeString(_iter5.getKey());
-          _iter5.getValue().write(oprot);
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, TTypeQualifiers struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      {
-        org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.qualifiers = new HashMap<String,TTypeQualifierValue>(2*_map6.size);
-        String _key7;
-        TTypeQualifierValue _val8;
-        for (int _i9 = 0; _i9 < _map6.size; ++_i9)
-        {
-          _key7 = iprot.readString();
-          _val8 = new TTypeQualifierValue();
-          _val8.read(iprot);
-          struct.qualifiers.put(_key7, _val8);
-        }
-      }
-      struct.setQualifiersIsSet(true);
-    }
-  }
-
-}
-