You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/05/16 22:53:18 UTC

[13/18] hive git commit: HIVE-14879 : integrate MM tables into ACID: replace MM metastore calls and structures with ACID ones (Wei Zheng)

http://git-wip-us.apache.org/repos/asf/hive/blob/77511070/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
deleted file mode 100644
index 90f103a..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsRequest.java
+++ /dev/null
@@ -1,490 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.hadoop.hive.metastore.api;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-public class GetValidWriteIdsRequest implements org.apache.thrift.TBase<GetValidWriteIdsRequest, GetValidWriteIdsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetValidWriteIdsRequest> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetValidWriteIdsRequest");
-
-  private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tblName", 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 GetValidWriteIdsRequestStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new GetValidWriteIdsRequestTupleSchemeFactory());
-  }
-
-  private String dbName; // required
-  private String tblName; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    DB_NAME((short)1, "dbName"),
-    TBL_NAME((short)2, "tblName");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // DB_NAME
-          return DB_NAME;
-        case 2: // TBL_NAME
-          return TBL_NAME;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("dbName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tblName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetValidWriteIdsRequest.class, metaDataMap);
-  }
-
-  public GetValidWriteIdsRequest() {
-  }
-
-  public GetValidWriteIdsRequest(
-    String dbName,
-    String tblName)
-  {
-    this();
-    this.dbName = dbName;
-    this.tblName = tblName;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public GetValidWriteIdsRequest(GetValidWriteIdsRequest other) {
-    if (other.isSetDbName()) {
-      this.dbName = other.dbName;
-    }
-    if (other.isSetTblName()) {
-      this.tblName = other.tblName;
-    }
-  }
-
-  public GetValidWriteIdsRequest deepCopy() {
-    return new GetValidWriteIdsRequest(this);
-  }
-
-  @Override
-  public void clear() {
-    this.dbName = null;
-    this.tblName = null;
-  }
-
-  public String getDbName() {
-    return this.dbName;
-  }
-
-  public void setDbName(String dbName) {
-    this.dbName = dbName;
-  }
-
-  public void unsetDbName() {
-    this.dbName = null;
-  }
-
-  /** Returns true if field dbName is set (has been assigned a value) and false otherwise */
-  public boolean isSetDbName() {
-    return this.dbName != null;
-  }
-
-  public void setDbNameIsSet(boolean value) {
-    if (!value) {
-      this.dbName = null;
-    }
-  }
-
-  public String getTblName() {
-    return this.tblName;
-  }
-
-  public void setTblName(String tblName) {
-    this.tblName = tblName;
-  }
-
-  public void unsetTblName() {
-    this.tblName = null;
-  }
-
-  /** Returns true if field tblName is set (has been assigned a value) and false otherwise */
-  public boolean isSetTblName() {
-    return this.tblName != null;
-  }
-
-  public void setTblNameIsSet(boolean value) {
-    if (!value) {
-      this.tblName = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DB_NAME:
-      if (value == null) {
-        unsetDbName();
-      } else {
-        setDbName((String)value);
-      }
-      break;
-
-    case TBL_NAME:
-      if (value == null) {
-        unsetTblName();
-      } else {
-        setTblName((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DB_NAME:
-      return getDbName();
-
-    case TBL_NAME:
-      return getTblName();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case DB_NAME:
-      return isSetDbName();
-    case TBL_NAME:
-      return isSetTblName();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof GetValidWriteIdsRequest)
-      return this.equals((GetValidWriteIdsRequest)that);
-    return false;
-  }
-
-  public boolean equals(GetValidWriteIdsRequest that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_dbName = true && this.isSetDbName();
-    boolean that_present_dbName = true && that.isSetDbName();
-    if (this_present_dbName || that_present_dbName) {
-      if (!(this_present_dbName && that_present_dbName))
-        return false;
-      if (!this.dbName.equals(that.dbName))
-        return false;
-    }
-
-    boolean this_present_tblName = true && this.isSetTblName();
-    boolean that_present_tblName = true && that.isSetTblName();
-    if (this_present_tblName || that_present_tblName) {
-      if (!(this_present_tblName && that_present_tblName))
-        return false;
-      if (!this.tblName.equals(that.tblName))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_dbName = true && (isSetDbName());
-    list.add(present_dbName);
-    if (present_dbName)
-      list.add(dbName);
-
-    boolean present_tblName = true && (isSetTblName());
-    list.add(present_tblName);
-    if (present_tblName)
-      list.add(tblName);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(GetValidWriteIdsRequest other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDbName()).compareTo(other.isSetDbName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDbName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, other.dbName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetTblName()).compareTo(other.isSetTblName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetTblName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tblName, other.tblName);
-      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("GetValidWriteIdsRequest(");
-    boolean first = true;
-
-    sb.append("dbName:");
-    if (this.dbName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.dbName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("tblName:");
-    if (this.tblName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.tblName);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDbName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'dbName' is unset! Struct:" + toString());
-    }
-
-    if (!isSetTblName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'tblName' 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 GetValidWriteIdsRequestStandardSchemeFactory implements SchemeFactory {
-    public GetValidWriteIdsRequestStandardScheme getScheme() {
-      return new GetValidWriteIdsRequestStandardScheme();
-    }
-  }
-
-  private static class GetValidWriteIdsRequestStandardScheme extends StandardScheme<GetValidWriteIdsRequest> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GetValidWriteIdsRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(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, GetValidWriteIdsRequest struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.dbName != null) {
-        oprot.writeFieldBegin(DB_NAME_FIELD_DESC);
-        oprot.writeString(struct.dbName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.tblName != null) {
-        oprot.writeFieldBegin(TBL_NAME_FIELD_DESC);
-        oprot.writeString(struct.tblName);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class GetValidWriteIdsRequestTupleSchemeFactory implements SchemeFactory {
-    public GetValidWriteIdsRequestTupleScheme getScheme() {
-      return new GetValidWriteIdsRequestTupleScheme();
-    }
-  }
-
-  private static class GetValidWriteIdsRequestTupleScheme extends TupleScheme<GetValidWriteIdsRequest> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GetValidWriteIdsRequest struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.dbName);
-      oprot.writeString(struct.tblName);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GetValidWriteIdsRequest struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/77511070/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResult.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResult.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResult.java
deleted file mode 100644
index 4a42e1a..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetValidWriteIdsResult.java
+++ /dev/null
@@ -1,740 +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 GetValidWriteIdsResult implements org.apache.thrift.TBase<GetValidWriteIdsResult, GetValidWriteIdsResult._Fields>, java.io.Serializable, Cloneable, Comparable<GetValidWriteIdsResult> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetValidWriteIdsResult");
-
-  private static final org.apache.thrift.protocol.TField LOW_WATERMARK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lowWatermarkId", org.apache.thrift.protocol.TType.I64, (short)1);
-  private static final org.apache.thrift.protocol.TField HIGH_WATERMARK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("highWatermarkId", org.apache.thrift.protocol.TType.I64, (short)2);
-  private static final org.apache.thrift.protocol.TField ARE_IDS_VALID_FIELD_DESC = new org.apache.thrift.protocol.TField("areIdsValid", org.apache.thrift.protocol.TType.BOOL, (short)3);
-  private static final org.apache.thrift.protocol.TField IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("ids", org.apache.thrift.protocol.TType.LIST, (short)4);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new GetValidWriteIdsResultStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new GetValidWriteIdsResultTupleSchemeFactory());
-  }
-
-  private long lowWatermarkId; // required
-  private long highWatermarkId; // required
-  private boolean areIdsValid; // optional
-  private List<Long> ids; // optional
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    LOW_WATERMARK_ID((short)1, "lowWatermarkId"),
-    HIGH_WATERMARK_ID((short)2, "highWatermarkId"),
-    ARE_IDS_VALID((short)3, "areIdsValid"),
-    IDS((short)4, "ids");
-
-    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: // LOW_WATERMARK_ID
-          return LOW_WATERMARK_ID;
-        case 2: // HIGH_WATERMARK_ID
-          return HIGH_WATERMARK_ID;
-        case 3: // ARE_IDS_VALID
-          return ARE_IDS_VALID;
-        case 4: // IDS
-          return IDS;
-        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 __LOWWATERMARKID_ISSET_ID = 0;
-  private static final int __HIGHWATERMARKID_ISSET_ID = 1;
-  private static final int __AREIDSVALID_ISSET_ID = 2;
-  private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.ARE_IDS_VALID,_Fields.IDS};
-  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.LOW_WATERMARK_ID, new org.apache.thrift.meta_data.FieldMetaData("lowWatermarkId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.HIGH_WATERMARK_ID, new org.apache.thrift.meta_data.FieldMetaData("highWatermarkId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.ARE_IDS_VALID, new org.apache.thrift.meta_data.FieldMetaData("areIdsValid", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.IDS, new org.apache.thrift.meta_data.FieldMetaData("ids", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        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.I64))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetValidWriteIdsResult.class, metaDataMap);
-  }
-
-  public GetValidWriteIdsResult() {
-  }
-
-  public GetValidWriteIdsResult(
-    long lowWatermarkId,
-    long highWatermarkId)
-  {
-    this();
-    this.lowWatermarkId = lowWatermarkId;
-    setLowWatermarkIdIsSet(true);
-    this.highWatermarkId = highWatermarkId;
-    setHighWatermarkIdIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public GetValidWriteIdsResult(GetValidWriteIdsResult other) {
-    __isset_bitfield = other.__isset_bitfield;
-    this.lowWatermarkId = other.lowWatermarkId;
-    this.highWatermarkId = other.highWatermarkId;
-    this.areIdsValid = other.areIdsValid;
-    if (other.isSetIds()) {
-      List<Long> __this__ids = new ArrayList<Long>(other.ids);
-      this.ids = __this__ids;
-    }
-  }
-
-  public GetValidWriteIdsResult deepCopy() {
-    return new GetValidWriteIdsResult(this);
-  }
-
-  @Override
-  public void clear() {
-    setLowWatermarkIdIsSet(false);
-    this.lowWatermarkId = 0;
-    setHighWatermarkIdIsSet(false);
-    this.highWatermarkId = 0;
-    setAreIdsValidIsSet(false);
-    this.areIdsValid = false;
-    this.ids = null;
-  }
-
-  public long getLowWatermarkId() {
-    return this.lowWatermarkId;
-  }
-
-  public void setLowWatermarkId(long lowWatermarkId) {
-    this.lowWatermarkId = lowWatermarkId;
-    setLowWatermarkIdIsSet(true);
-  }
-
-  public void unsetLowWatermarkId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOWWATERMARKID_ISSET_ID);
-  }
-
-  /** Returns true if field lowWatermarkId is set (has been assigned a value) and false otherwise */
-  public boolean isSetLowWatermarkId() {
-    return EncodingUtils.testBit(__isset_bitfield, __LOWWATERMARKID_ISSET_ID);
-  }
-
-  public void setLowWatermarkIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOWWATERMARKID_ISSET_ID, value);
-  }
-
-  public long getHighWatermarkId() {
-    return this.highWatermarkId;
-  }
-
-  public void setHighWatermarkId(long highWatermarkId) {
-    this.highWatermarkId = highWatermarkId;
-    setHighWatermarkIdIsSet(true);
-  }
-
-  public void unsetHighWatermarkId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HIGHWATERMARKID_ISSET_ID);
-  }
-
-  /** Returns true if field highWatermarkId is set (has been assigned a value) and false otherwise */
-  public boolean isSetHighWatermarkId() {
-    return EncodingUtils.testBit(__isset_bitfield, __HIGHWATERMARKID_ISSET_ID);
-  }
-
-  public void setHighWatermarkIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HIGHWATERMARKID_ISSET_ID, value);
-  }
-
-  public boolean isAreIdsValid() {
-    return this.areIdsValid;
-  }
-
-  public void setAreIdsValid(boolean areIdsValid) {
-    this.areIdsValid = areIdsValid;
-    setAreIdsValidIsSet(true);
-  }
-
-  public void unsetAreIdsValid() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AREIDSVALID_ISSET_ID);
-  }
-
-  /** Returns true if field areIdsValid is set (has been assigned a value) and false otherwise */
-  public boolean isSetAreIdsValid() {
-    return EncodingUtils.testBit(__isset_bitfield, __AREIDSVALID_ISSET_ID);
-  }
-
-  public void setAreIdsValidIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AREIDSVALID_ISSET_ID, value);
-  }
-
-  public int getIdsSize() {
-    return (this.ids == null) ? 0 : this.ids.size();
-  }
-
-  public java.util.Iterator<Long> getIdsIterator() {
-    return (this.ids == null) ? null : this.ids.iterator();
-  }
-
-  public void addToIds(long elem) {
-    if (this.ids == null) {
-      this.ids = new ArrayList<Long>();
-    }
-    this.ids.add(elem);
-  }
-
-  public List<Long> getIds() {
-    return this.ids;
-  }
-
-  public void setIds(List<Long> ids) {
-    this.ids = ids;
-  }
-
-  public void unsetIds() {
-    this.ids = null;
-  }
-
-  /** Returns true if field ids is set (has been assigned a value) and false otherwise */
-  public boolean isSetIds() {
-    return this.ids != null;
-  }
-
-  public void setIdsIsSet(boolean value) {
-    if (!value) {
-      this.ids = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case LOW_WATERMARK_ID:
-      if (value == null) {
-        unsetLowWatermarkId();
-      } else {
-        setLowWatermarkId((Long)value);
-      }
-      break;
-
-    case HIGH_WATERMARK_ID:
-      if (value == null) {
-        unsetHighWatermarkId();
-      } else {
-        setHighWatermarkId((Long)value);
-      }
-      break;
-
-    case ARE_IDS_VALID:
-      if (value == null) {
-        unsetAreIdsValid();
-      } else {
-        setAreIdsValid((Boolean)value);
-      }
-      break;
-
-    case IDS:
-      if (value == null) {
-        unsetIds();
-      } else {
-        setIds((List<Long>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case LOW_WATERMARK_ID:
-      return getLowWatermarkId();
-
-    case HIGH_WATERMARK_ID:
-      return getHighWatermarkId();
-
-    case ARE_IDS_VALID:
-      return isAreIdsValid();
-
-    case IDS:
-      return getIds();
-
-    }
-    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 LOW_WATERMARK_ID:
-      return isSetLowWatermarkId();
-    case HIGH_WATERMARK_ID:
-      return isSetHighWatermarkId();
-    case ARE_IDS_VALID:
-      return isSetAreIdsValid();
-    case IDS:
-      return isSetIds();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof GetValidWriteIdsResult)
-      return this.equals((GetValidWriteIdsResult)that);
-    return false;
-  }
-
-  public boolean equals(GetValidWriteIdsResult that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_lowWatermarkId = true;
-    boolean that_present_lowWatermarkId = true;
-    if (this_present_lowWatermarkId || that_present_lowWatermarkId) {
-      if (!(this_present_lowWatermarkId && that_present_lowWatermarkId))
-        return false;
-      if (this.lowWatermarkId != that.lowWatermarkId)
-        return false;
-    }
-
-    boolean this_present_highWatermarkId = true;
-    boolean that_present_highWatermarkId = true;
-    if (this_present_highWatermarkId || that_present_highWatermarkId) {
-      if (!(this_present_highWatermarkId && that_present_highWatermarkId))
-        return false;
-      if (this.highWatermarkId != that.highWatermarkId)
-        return false;
-    }
-
-    boolean this_present_areIdsValid = true && this.isSetAreIdsValid();
-    boolean that_present_areIdsValid = true && that.isSetAreIdsValid();
-    if (this_present_areIdsValid || that_present_areIdsValid) {
-      if (!(this_present_areIdsValid && that_present_areIdsValid))
-        return false;
-      if (this.areIdsValid != that.areIdsValid)
-        return false;
-    }
-
-    boolean this_present_ids = true && this.isSetIds();
-    boolean that_present_ids = true && that.isSetIds();
-    if (this_present_ids || that_present_ids) {
-      if (!(this_present_ids && that_present_ids))
-        return false;
-      if (!this.ids.equals(that.ids))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_lowWatermarkId = true;
-    list.add(present_lowWatermarkId);
-    if (present_lowWatermarkId)
-      list.add(lowWatermarkId);
-
-    boolean present_highWatermarkId = true;
-    list.add(present_highWatermarkId);
-    if (present_highWatermarkId)
-      list.add(highWatermarkId);
-
-    boolean present_areIdsValid = true && (isSetAreIdsValid());
-    list.add(present_areIdsValid);
-    if (present_areIdsValid)
-      list.add(areIdsValid);
-
-    boolean present_ids = true && (isSetIds());
-    list.add(present_ids);
-    if (present_ids)
-      list.add(ids);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(GetValidWriteIdsResult other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetLowWatermarkId()).compareTo(other.isSetLowWatermarkId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetLowWatermarkId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lowWatermarkId, other.lowWatermarkId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetHighWatermarkId()).compareTo(other.isSetHighWatermarkId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetHighWatermarkId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.highWatermarkId, other.highWatermarkId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetAreIdsValid()).compareTo(other.isSetAreIdsValid());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetAreIdsValid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.areIdsValid, other.areIdsValid);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetIds()).compareTo(other.isSetIds());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetIds()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ids, other.ids);
-      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("GetValidWriteIdsResult(");
-    boolean first = true;
-
-    sb.append("lowWatermarkId:");
-    sb.append(this.lowWatermarkId);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("highWatermarkId:");
-    sb.append(this.highWatermarkId);
-    first = false;
-    if (isSetAreIdsValid()) {
-      if (!first) sb.append(", ");
-      sb.append("areIdsValid:");
-      sb.append(this.areIdsValid);
-      first = false;
-    }
-    if (isSetIds()) {
-      if (!first) sb.append(", ");
-      sb.append("ids:");
-      if (this.ids == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.ids);
-      }
-      first = false;
-    }
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetLowWatermarkId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'lowWatermarkId' is unset! Struct:" + toString());
-    }
-
-    if (!isSetHighWatermarkId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'highWatermarkId' 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 {
-      // 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 GetValidWriteIdsResultStandardSchemeFactory implements SchemeFactory {
-    public GetValidWriteIdsResultStandardScheme getScheme() {
-      return new GetValidWriteIdsResultStandardScheme();
-    }
-  }
-
-  private static class GetValidWriteIdsResultStandardScheme extends StandardScheme<GetValidWriteIdsResult> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, GetValidWriteIdsResult 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: // LOW_WATERMARK_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.lowWatermarkId = iprot.readI64();
-              struct.setLowWatermarkIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // HIGH_WATERMARK_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.highWatermarkId = iprot.readI64();
-              struct.setHighWatermarkIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // ARE_IDS_VALID
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.areIdsValid = iprot.readBool();
-              struct.setAreIdsValidIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // IDS
-            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-              {
-                org.apache.thrift.protocol.TList _list642 = iprot.readListBegin();
-                struct.ids = new ArrayList<Long>(_list642.size);
-                long _elem643;
-                for (int _i644 = 0; _i644 < _list642.size; ++_i644)
-                {
-                  _elem643 = iprot.readI64();
-                  struct.ids.add(_elem643);
-                }
-                iprot.readListEnd();
-              }
-              struct.setIdsIsSet(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, GetValidWriteIdsResult struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldBegin(LOW_WATERMARK_ID_FIELD_DESC);
-      oprot.writeI64(struct.lowWatermarkId);
-      oprot.writeFieldEnd();
-      oprot.writeFieldBegin(HIGH_WATERMARK_ID_FIELD_DESC);
-      oprot.writeI64(struct.highWatermarkId);
-      oprot.writeFieldEnd();
-      if (struct.isSetAreIdsValid()) {
-        oprot.writeFieldBegin(ARE_IDS_VALID_FIELD_DESC);
-        oprot.writeBool(struct.areIdsValid);
-        oprot.writeFieldEnd();
-      }
-      if (struct.ids != null) {
-        if (struct.isSetIds()) {
-          oprot.writeFieldBegin(IDS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.ids.size()));
-            for (long _iter645 : struct.ids)
-            {
-              oprot.writeI64(_iter645);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class GetValidWriteIdsResultTupleSchemeFactory implements SchemeFactory {
-    public GetValidWriteIdsResultTupleScheme getScheme() {
-      return new GetValidWriteIdsResultTupleScheme();
-    }
-  }
-
-  private static class GetValidWriteIdsResultTupleScheme extends TupleScheme<GetValidWriteIdsResult> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, GetValidWriteIdsResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeI64(struct.lowWatermarkId);
-      oprot.writeI64(struct.highWatermarkId);
-      BitSet optionals = new BitSet();
-      if (struct.isSetAreIdsValid()) {
-        optionals.set(0);
-      }
-      if (struct.isSetIds()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetAreIdsValid()) {
-        oprot.writeBool(struct.areIdsValid);
-      }
-      if (struct.isSetIds()) {
-        {
-          oprot.writeI32(struct.ids.size());
-          for (long _iter646 : struct.ids)
-          {
-            oprot.writeI64(_iter646);
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, GetValidWriteIdsResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.lowWatermarkId = iprot.readI64();
-      struct.setLowWatermarkIdIsSet(true);
-      struct.highWatermarkId = iprot.readI64();
-      struct.setHighWatermarkIdIsSet(true);
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.areIdsValid = iprot.readBool();
-        struct.setAreIdsValidIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TList _list647 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
-          struct.ids = new ArrayList<Long>(_list647.size);
-          long _elem648;
-          for (int _i649 = 0; _i649 < _list647.size; ++_i649)
-          {
-            _elem648 = iprot.readI64();
-            struct.ids.add(_elem648);
-          }
-        }
-        struct.setIdsIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/77511070/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatWriteIdRequest.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatWriteIdRequest.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatWriteIdRequest.java
deleted file mode 100644
index 0c1849c..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatWriteIdRequest.java
+++ /dev/null
@@ -1,589 +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 HeartbeatWriteIdRequest implements org.apache.thrift.TBase<HeartbeatWriteIdRequest, HeartbeatWriteIdRequest._Fields>, java.io.Serializable, Cloneable, Comparable<HeartbeatWriteIdRequest> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HeartbeatWriteIdRequest");
-
-  private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tblName", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField WRITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("writeId", org.apache.thrift.protocol.TType.I64, (short)3);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new HeartbeatWriteIdRequestStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new HeartbeatWriteIdRequestTupleSchemeFactory());
-  }
-
-  private String dbName; // required
-  private String tblName; // required
-  private long writeId; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    DB_NAME((short)1, "dbName"),
-    TBL_NAME((short)2, "tblName"),
-    WRITE_ID((short)3, "writeId");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // DB_NAME
-          return DB_NAME;
-        case 2: // TBL_NAME
-          return TBL_NAME;
-        case 3: // WRITE_ID
-          return WRITE_ID;
-        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 __WRITEID_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.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("dbName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tblName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.WRITE_ID, new org.apache.thrift.meta_data.FieldMetaData("writeId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HeartbeatWriteIdRequest.class, metaDataMap);
-  }
-
-  public HeartbeatWriteIdRequest() {
-  }
-
-  public HeartbeatWriteIdRequest(
-    String dbName,
-    String tblName,
-    long writeId)
-  {
-    this();
-    this.dbName = dbName;
-    this.tblName = tblName;
-    this.writeId = writeId;
-    setWriteIdIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public HeartbeatWriteIdRequest(HeartbeatWriteIdRequest other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetDbName()) {
-      this.dbName = other.dbName;
-    }
-    if (other.isSetTblName()) {
-      this.tblName = other.tblName;
-    }
-    this.writeId = other.writeId;
-  }
-
-  public HeartbeatWriteIdRequest deepCopy() {
-    return new HeartbeatWriteIdRequest(this);
-  }
-
-  @Override
-  public void clear() {
-    this.dbName = null;
-    this.tblName = null;
-    setWriteIdIsSet(false);
-    this.writeId = 0;
-  }
-
-  public String getDbName() {
-    return this.dbName;
-  }
-
-  public void setDbName(String dbName) {
-    this.dbName = dbName;
-  }
-
-  public void unsetDbName() {
-    this.dbName = null;
-  }
-
-  /** Returns true if field dbName is set (has been assigned a value) and false otherwise */
-  public boolean isSetDbName() {
-    return this.dbName != null;
-  }
-
-  public void setDbNameIsSet(boolean value) {
-    if (!value) {
-      this.dbName = null;
-    }
-  }
-
-  public String getTblName() {
-    return this.tblName;
-  }
-
-  public void setTblName(String tblName) {
-    this.tblName = tblName;
-  }
-
-  public void unsetTblName() {
-    this.tblName = null;
-  }
-
-  /** Returns true if field tblName is set (has been assigned a value) and false otherwise */
-  public boolean isSetTblName() {
-    return this.tblName != null;
-  }
-
-  public void setTblNameIsSet(boolean value) {
-    if (!value) {
-      this.tblName = null;
-    }
-  }
-
-  public long getWriteId() {
-    return this.writeId;
-  }
-
-  public void setWriteId(long writeId) {
-    this.writeId = writeId;
-    setWriteIdIsSet(true);
-  }
-
-  public void unsetWriteId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __WRITEID_ISSET_ID);
-  }
-
-  /** Returns true if field writeId is set (has been assigned a value) and false otherwise */
-  public boolean isSetWriteId() {
-    return EncodingUtils.testBit(__isset_bitfield, __WRITEID_ISSET_ID);
-  }
-
-  public void setWriteIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WRITEID_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case DB_NAME:
-      if (value == null) {
-        unsetDbName();
-      } else {
-        setDbName((String)value);
-      }
-      break;
-
-    case TBL_NAME:
-      if (value == null) {
-        unsetTblName();
-      } else {
-        setTblName((String)value);
-      }
-      break;
-
-    case WRITE_ID:
-      if (value == null) {
-        unsetWriteId();
-      } else {
-        setWriteId((Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case DB_NAME:
-      return getDbName();
-
-    case TBL_NAME:
-      return getTblName();
-
-    case WRITE_ID:
-      return getWriteId();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case DB_NAME:
-      return isSetDbName();
-    case TBL_NAME:
-      return isSetTblName();
-    case WRITE_ID:
-      return isSetWriteId();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof HeartbeatWriteIdRequest)
-      return this.equals((HeartbeatWriteIdRequest)that);
-    return false;
-  }
-
-  public boolean equals(HeartbeatWriteIdRequest that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_dbName = true && this.isSetDbName();
-    boolean that_present_dbName = true && that.isSetDbName();
-    if (this_present_dbName || that_present_dbName) {
-      if (!(this_present_dbName && that_present_dbName))
-        return false;
-      if (!this.dbName.equals(that.dbName))
-        return false;
-    }
-
-    boolean this_present_tblName = true && this.isSetTblName();
-    boolean that_present_tblName = true && that.isSetTblName();
-    if (this_present_tblName || that_present_tblName) {
-      if (!(this_present_tblName && that_present_tblName))
-        return false;
-      if (!this.tblName.equals(that.tblName))
-        return false;
-    }
-
-    boolean this_present_writeId = true;
-    boolean that_present_writeId = true;
-    if (this_present_writeId || that_present_writeId) {
-      if (!(this_present_writeId && that_present_writeId))
-        return false;
-      if (this.writeId != that.writeId)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_dbName = true && (isSetDbName());
-    list.add(present_dbName);
-    if (present_dbName)
-      list.add(dbName);
-
-    boolean present_tblName = true && (isSetTblName());
-    list.add(present_tblName);
-    if (present_tblName)
-      list.add(tblName);
-
-    boolean present_writeId = true;
-    list.add(present_writeId);
-    if (present_writeId)
-      list.add(writeId);
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(HeartbeatWriteIdRequest other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    lastComparison = Boolean.valueOf(isSetDbName()).compareTo(other.isSetDbName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDbName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, other.dbName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetTblName()).compareTo(other.isSetTblName());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetTblName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tblName, other.tblName);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetWriteId()).compareTo(other.isSetWriteId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetWriteId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.writeId, other.writeId);
-      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("HeartbeatWriteIdRequest(");
-    boolean first = true;
-
-    sb.append("dbName:");
-    if (this.dbName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.dbName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("tblName:");
-    if (this.tblName == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.tblName);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("writeId:");
-    sb.append(this.writeId);
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    if (!isSetDbName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'dbName' is unset! Struct:" + toString());
-    }
-
-    if (!isSetTblName()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'tblName' is unset! Struct:" + toString());
-    }
-
-    if (!isSetWriteId()) {
-      throw new org.apache.thrift.protocol.TProtocolException("Required field 'writeId' 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 {
-      // 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 HeartbeatWriteIdRequestStandardSchemeFactory implements SchemeFactory {
-    public HeartbeatWriteIdRequestStandardScheme getScheme() {
-      return new HeartbeatWriteIdRequestStandardScheme();
-    }
-  }
-
-  private static class HeartbeatWriteIdRequestStandardScheme extends StandardScheme<HeartbeatWriteIdRequest> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HeartbeatWriteIdRequest struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // DB_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.dbName = iprot.readString();
-              struct.setDbNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // TBL_NAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.tblName = iprot.readString();
-              struct.setTblNameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.writeId = iprot.readI64();
-              struct.setWriteIdIsSet(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, HeartbeatWriteIdRequest struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.dbName != null) {
-        oprot.writeFieldBegin(DB_NAME_FIELD_DESC);
-        oprot.writeString(struct.dbName);
-        oprot.writeFieldEnd();
-      }
-      if (struct.tblName != null) {
-        oprot.writeFieldBegin(TBL_NAME_FIELD_DESC);
-        oprot.writeString(struct.tblName);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(WRITE_ID_FIELD_DESC);
-      oprot.writeI64(struct.writeId);
-      oprot.writeFieldEnd();
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class HeartbeatWriteIdRequestTupleSchemeFactory implements SchemeFactory {
-    public HeartbeatWriteIdRequestTupleScheme getScheme() {
-      return new HeartbeatWriteIdRequestTupleScheme();
-    }
-  }
-
-  private static class HeartbeatWriteIdRequestTupleScheme extends TupleScheme<HeartbeatWriteIdRequest> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HeartbeatWriteIdRequest struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      oprot.writeString(struct.dbName);
-      oprot.writeString(struct.tblName);
-      oprot.writeI64(struct.writeId);
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HeartbeatWriteIdRequest struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.dbName = iprot.readString();
-      struct.setDbNameIsSet(true);
-      struct.tblName = iprot.readString();
-      struct.setTblNameIsSet(true);
-      struct.writeId = iprot.readI64();
-      struct.setWriteIdIsSet(true);
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/77511070/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatWriteIdResult.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatWriteIdResult.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatWriteIdResult.java
deleted file mode 100644
index ae6f25e..0000000
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatWriteIdResult.java
+++ /dev/null
@@ -1,283 +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 HeartbeatWriteIdResult implements org.apache.thrift.TBase<HeartbeatWriteIdResult, HeartbeatWriteIdResult._Fields>, java.io.Serializable, Cloneable, Comparable<HeartbeatWriteIdResult> {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("HeartbeatWriteIdResult");
-
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new HeartbeatWriteIdResultStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new HeartbeatWriteIdResultTupleSchemeFactory());
-  }
-
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-;
-
-    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) {
-        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);
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(HeartbeatWriteIdResult.class, metaDataMap);
-  }
-
-  public HeartbeatWriteIdResult() {
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public HeartbeatWriteIdResult(HeartbeatWriteIdResult other) {
-  }
-
-  public HeartbeatWriteIdResult deepCopy() {
-    return new HeartbeatWriteIdResult(this);
-  }
-
-  @Override
-  public void clear() {
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    }
-    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) {
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof HeartbeatWriteIdResult)
-      return this.equals((HeartbeatWriteIdResult)that);
-    return false;
-  }
-
-  public boolean equals(HeartbeatWriteIdResult that) {
-    if (that == null)
-      return false;
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    return list.hashCode();
-  }
-
-  @Override
-  public int compareTo(HeartbeatWriteIdResult other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-
-    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("HeartbeatWriteIdResult(");
-    boolean first = true;
-
-    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 HeartbeatWriteIdResultStandardSchemeFactory implements SchemeFactory {
-    public HeartbeatWriteIdResultStandardScheme getScheme() {
-      return new HeartbeatWriteIdResultStandardScheme();
-    }
-  }
-
-  private static class HeartbeatWriteIdResultStandardScheme extends StandardScheme<HeartbeatWriteIdResult> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, HeartbeatWriteIdResult 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) {
-          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, HeartbeatWriteIdResult struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class HeartbeatWriteIdResultTupleSchemeFactory implements SchemeFactory {
-    public HeartbeatWriteIdResultTupleScheme getScheme() {
-      return new HeartbeatWriteIdResultTupleScheme();
-    }
-  }
-
-  private static class HeartbeatWriteIdResultTupleScheme extends TupleScheme<HeartbeatWriteIdResult> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, HeartbeatWriteIdResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, HeartbeatWriteIdResult struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/77511070/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
index dc6a5ad..800219f 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
@@ -53,8 +53,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
   private static final org.apache.thrift.protocol.TField PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("privileges", org.apache.thrift.protocol.TType.STRUCT, (short)13);
   private static final org.apache.thrift.protocol.TField TEMPORARY_FIELD_DESC = new org.apache.thrift.protocol.TField("temporary", org.apache.thrift.protocol.TType.BOOL, (short)14);
   private static final org.apache.thrift.protocol.TField REWRITE_ENABLED_FIELD_DESC = new org.apache.thrift.protocol.TField("rewriteEnabled", org.apache.thrift.protocol.TType.BOOL, (short)15);
-  private static final org.apache.thrift.protocol.TField MM_NEXT_WRITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("mmNextWriteId", org.apache.thrift.protocol.TType.I64, (short)16);
-  private static final org.apache.thrift.protocol.TField MM_WATERMARK_WRITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("mmWatermarkWriteId", org.apache.thrift.protocol.TType.I64, (short)17);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -77,8 +75,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
   private PrincipalPrivilegeSet privileges; // optional
   private boolean temporary; // optional
   private boolean rewriteEnabled; // optional
-  private long mmNextWriteId; // optional
-  private long mmWatermarkWriteId; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -96,9 +92,7 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
     TABLE_TYPE((short)12, "tableType"),
     PRIVILEGES((short)13, "privileges"),
     TEMPORARY((short)14, "temporary"),
-    REWRITE_ENABLED((short)15, "rewriteEnabled"),
-    MM_NEXT_WRITE_ID((short)16, "mmNextWriteId"),
-    MM_WATERMARK_WRITE_ID((short)17, "mmWatermarkWriteId");
+    REWRITE_ENABLED((short)15, "rewriteEnabled");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -143,10 +137,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
           return TEMPORARY;
         case 15: // REWRITE_ENABLED
           return REWRITE_ENABLED;
-        case 16: // MM_NEXT_WRITE_ID
-          return MM_NEXT_WRITE_ID;
-        case 17: // MM_WATERMARK_WRITE_ID
-          return MM_WATERMARK_WRITE_ID;
         default:
           return null;
       }
@@ -192,10 +182,8 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
   private static final int __RETENTION_ISSET_ID = 2;
   private static final int __TEMPORARY_ISSET_ID = 3;
   private static final int __REWRITEENABLED_ISSET_ID = 4;
-  private static final int __MMNEXTWRITEID_ISSET_ID = 5;
-  private static final int __MMWATERMARKWRITEID_ISSET_ID = 6;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.TEMPORARY,_Fields.REWRITE_ENABLED,_Fields.MM_NEXT_WRITE_ID,_Fields.MM_WATERMARK_WRITE_ID};
+  private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.TEMPORARY,_Fields.REWRITE_ENABLED};
   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);
@@ -232,10 +220,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.REWRITE_ENABLED, new org.apache.thrift.meta_data.FieldMetaData("rewriteEnabled", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.MM_NEXT_WRITE_ID, new org.apache.thrift.meta_data.FieldMetaData("mmNextWriteId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.MM_WATERMARK_WRITE_ID, new org.apache.thrift.meta_data.FieldMetaData("mmWatermarkWriteId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Table.class, metaDataMap);
   }
@@ -322,8 +306,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
     }
     this.temporary = other.temporary;
     this.rewriteEnabled = other.rewriteEnabled;
-    this.mmNextWriteId = other.mmNextWriteId;
-    this.mmWatermarkWriteId = other.mmWatermarkWriteId;
   }
 
   public Table deepCopy() {
@@ -352,10 +334,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
 
     setRewriteEnabledIsSet(false);
     this.rewriteEnabled = false;
-    setMmNextWriteIdIsSet(false);
-    this.mmNextWriteId = 0;
-    setMmWatermarkWriteIdIsSet(false);
-    this.mmWatermarkWriteId = 0;
   }
 
   public String getTableName() {
@@ -724,50 +702,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REWRITEENABLED_ISSET_ID, value);
   }
 
-  public long getMmNextWriteId() {
-    return this.mmNextWriteId;
-  }
-
-  public void setMmNextWriteId(long mmNextWriteId) {
-    this.mmNextWriteId = mmNextWriteId;
-    setMmNextWriteIdIsSet(true);
-  }
-
-  public void unsetMmNextWriteId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MMNEXTWRITEID_ISSET_ID);
-  }
-
-  /** Returns true if field mmNextWriteId is set (has been assigned a value) and false otherwise */
-  public boolean isSetMmNextWriteId() {
-    return EncodingUtils.testBit(__isset_bitfield, __MMNEXTWRITEID_ISSET_ID);
-  }
-
-  public void setMmNextWriteIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MMNEXTWRITEID_ISSET_ID, value);
-  }
-
-  public long getMmWatermarkWriteId() {
-    return this.mmWatermarkWriteId;
-  }
-
-  public void setMmWatermarkWriteId(long mmWatermarkWriteId) {
-    this.mmWatermarkWriteId = mmWatermarkWriteId;
-    setMmWatermarkWriteIdIsSet(true);
-  }
-
-  public void unsetMmWatermarkWriteId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MMWATERMARKWRITEID_ISSET_ID);
-  }
-
-  /** Returns true if field mmWatermarkWriteId is set (has been assigned a value) and false otherwise */
-  public boolean isSetMmWatermarkWriteId() {
-    return EncodingUtils.testBit(__isset_bitfield, __MMWATERMARKWRITEID_ISSET_ID);
-  }
-
-  public void setMmWatermarkWriteIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MMWATERMARKWRITEID_ISSET_ID, value);
-  }
-
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TABLE_NAME:
@@ -890,22 +824,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
       }
       break;
 
-    case MM_NEXT_WRITE_ID:
-      if (value == null) {
-        unsetMmNextWriteId();
-      } else {
-        setMmNextWriteId((Long)value);
-      }
-      break;
-
-    case MM_WATERMARK_WRITE_ID:
-      if (value == null) {
-        unsetMmWatermarkWriteId();
-      } else {
-        setMmWatermarkWriteId((Long)value);
-      }
-      break;
-
     }
   }
 
@@ -956,12 +874,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
     case REWRITE_ENABLED:
       return isRewriteEnabled();
 
-    case MM_NEXT_WRITE_ID:
-      return getMmNextWriteId();
-
-    case MM_WATERMARK_WRITE_ID:
-      return getMmWatermarkWriteId();
-
     }
     throw new IllegalStateException();
   }
@@ -1003,10 +915,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
       return isSetTemporary();
     case REWRITE_ENABLED:
       return isSetRewriteEnabled();
-    case MM_NEXT_WRITE_ID:
-      return isSetMmNextWriteId();
-    case MM_WATERMARK_WRITE_ID:
-      return isSetMmWatermarkWriteId();
     }
     throw new IllegalStateException();
   }
@@ -1159,24 +1067,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
         return false;
     }
 
-    boolean this_present_mmNextWriteId = true && this.isSetMmNextWriteId();
-    boolean that_present_mmNextWriteId = true && that.isSetMmNextWriteId();
-    if (this_present_mmNextWriteId || that_present_mmNextWriteId) {
-      if (!(this_present_mmNextWriteId && that_present_mmNextWriteId))
-        return false;
-      if (this.mmNextWriteId != that.mmNextWriteId)
-        return false;
-    }
-
-    boolean this_present_mmWatermarkWriteId = true && this.isSetMmWatermarkWriteId();
-    boolean that_present_mmWatermarkWriteId = true && that.isSetMmWatermarkWriteId();
-    if (this_present_mmWatermarkWriteId || that_present_mmWatermarkWriteId) {
-      if (!(this_present_mmWatermarkWriteId && that_present_mmWatermarkWriteId))
-        return false;
-      if (this.mmWatermarkWriteId != that.mmWatermarkWriteId)
-        return false;
-    }
-
     return true;
   }
 
@@ -1259,16 +1149,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
     if (present_rewriteEnabled)
       list.add(rewriteEnabled);
 
-    boolean present_mmNextWriteId = true && (isSetMmNextWriteId());
-    list.add(present_mmNextWriteId);
-    if (present_mmNextWriteId)
-      list.add(mmNextWriteId);
-
-    boolean present_mmWatermarkWriteId = true && (isSetMmWatermarkWriteId());
-    list.add(present_mmWatermarkWriteId);
-    if (present_mmWatermarkWriteId)
-      list.add(mmWatermarkWriteId);
-
     return list.hashCode();
   }
 
@@ -1430,26 +1310,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMmNextWriteId()).compareTo(other.isSetMmNextWriteId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetMmNextWriteId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mmNextWriteId, other.mmNextWriteId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetMmWatermarkWriteId()).compareTo(other.isSetMmWatermarkWriteId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetMmWatermarkWriteId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mmWatermarkWriteId, other.mmWatermarkWriteId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     return 0;
   }
 
@@ -1575,18 +1435,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
       sb.append(this.rewriteEnabled);
       first = false;
     }
-    if (isSetMmNextWriteId()) {
-      if (!first) sb.append(", ");
-      sb.append("mmNextWriteId:");
-      sb.append(this.mmNextWriteId);
-      first = false;
-    }
-    if (isSetMmWatermarkWriteId()) {
-      if (!first) sb.append(", ");
-      sb.append("mmWatermarkWriteId:");
-      sb.append(this.mmWatermarkWriteId);
-      first = false;
-    }
     sb.append(")");
     return sb.toString();
   }
@@ -1783,22 +1631,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 16: // MM_NEXT_WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.mmNextWriteId = iprot.readI64();
-              struct.setMmNextWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 17: // MM_WATERMARK_WRITE_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.mmWatermarkWriteId = iprot.readI64();
-              struct.setMmWatermarkWriteIdIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -1898,16 +1730,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
         oprot.writeBool(struct.rewriteEnabled);
         oprot.writeFieldEnd();
       }
-      if (struct.isSetMmNextWriteId()) {
-        oprot.writeFieldBegin(MM_NEXT_WRITE_ID_FIELD_DESC);
-        oprot.writeI64(struct.mmNextWriteId);
-        oprot.writeFieldEnd();
-      }
-      if (struct.isSetMmWatermarkWriteId()) {
-        oprot.writeFieldBegin(MM_WATERMARK_WRITE_ID_FIELD_DESC);
-        oprot.writeI64(struct.mmWatermarkWriteId);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1971,13 +1793,7 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
       if (struct.isSetRewriteEnabled()) {
         optionals.set(14);
       }
-      if (struct.isSetMmNextWriteId()) {
-        optionals.set(15);
-      }
-      if (struct.isSetMmWatermarkWriteId()) {
-        optionals.set(16);
-      }
-      oprot.writeBitSet(optionals, 17);
+      oprot.writeBitSet(optionals, 15);
       if (struct.isSetTableName()) {
         oprot.writeString(struct.tableName);
       }
@@ -2036,18 +1852,12 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
       if (struct.isSetRewriteEnabled()) {
         oprot.writeBool(struct.rewriteEnabled);
       }
-      if (struct.isSetMmNextWriteId()) {
-        oprot.writeI64(struct.mmNextWriteId);
-      }
-      if (struct.isSetMmWatermarkWriteId()) {
-        oprot.writeI64(struct.mmWatermarkWriteId);
-      }
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Table struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(17);
+      BitSet incoming = iprot.readBitSet(15);
       if (incoming.get(0)) {
         struct.tableName = iprot.readString();
         struct.setTableNameIsSet(true);
@@ -2131,14 +1941,6 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
         struct.rewriteEnabled = iprot.readBool();
         struct.setRewriteEnabledIsSet(true);
       }
-      if (incoming.get(15)) {
-        struct.mmNextWriteId = iprot.readI64();
-        struct.setMmNextWriteIdIsSet(true);
-      }
-      if (incoming.get(16)) {
-        struct.mmWatermarkWriteId = iprot.readI64();
-        struct.setMmWatermarkWriteIdIsSet(true);
-      }
     }
   }