You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ec...@apache.org on 2015/05/20 22:38:14 UTC

[1/3] hbase git commit: HBASE-13698 Add RegionLocator methods to Thrift2

Repository: hbase
Updated Branches:
  refs/heads/branch-1 49fc6c817 -> 81024a5b5


http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionInfo.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionInfo.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionInfo.java
new file mode 100644
index 0000000..e709612
--- /dev/null
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionInfo.java
@@ -0,0 +1,1038 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.hadoop.hbase.thrift2.generated;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+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 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THRegionInfo._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("THRegionInfo");
+
+  private static final org.apache.thrift.protocol.TField REGION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("regionId", org.apache.thrift.protocol.TType.I64, (short)1);
+  private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField START_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("startKey", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField END_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("endKey", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField OFFLINE_FIELD_DESC = new org.apache.thrift.protocol.TField("offline", org.apache.thrift.protocol.TType.BOOL, (short)5);
+  private static final org.apache.thrift.protocol.TField SPLIT_FIELD_DESC = new org.apache.thrift.protocol.TField("split", org.apache.thrift.protocol.TType.BOOL, (short)6);
+  private static final org.apache.thrift.protocol.TField REPLICA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("replicaId", org.apache.thrift.protocol.TType.I32, (short)7);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new THRegionInfoStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new THRegionInfoTupleSchemeFactory());
+  }
+
+  public long regionId; // required
+  public ByteBuffer tableName; // required
+  public ByteBuffer startKey; // optional
+  public ByteBuffer endKey; // optional
+  public boolean offline; // optional
+  public boolean split; // optional
+  public int replicaId; // 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 {
+    REGION_ID((short)1, "regionId"),
+    TABLE_NAME((short)2, "tableName"),
+    START_KEY((short)3, "startKey"),
+    END_KEY((short)4, "endKey"),
+    OFFLINE((short)5, "offline"),
+    SPLIT((short)6, "split"),
+    REPLICA_ID((short)7, "replicaId");
+
+    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: // REGION_ID
+          return REGION_ID;
+        case 2: // TABLE_NAME
+          return TABLE_NAME;
+        case 3: // START_KEY
+          return START_KEY;
+        case 4: // END_KEY
+          return END_KEY;
+        case 5: // OFFLINE
+          return OFFLINE;
+        case 6: // SPLIT
+          return SPLIT;
+        case 7: // REPLICA_ID
+          return REPLICA_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 __REGIONID_ISSET_ID = 0;
+  private static final int __OFFLINE_ISSET_ID = 1;
+  private static final int __SPLIT_ISSET_ID = 2;
+  private static final int __REPLICAID_ISSET_ID = 3;
+  private byte __isset_bitfield = 0;
+  private _Fields optionals[] = {_Fields.START_KEY,_Fields.END_KEY,_Fields.OFFLINE,_Fields.SPLIT,_Fields.REPLICA_ID};
+  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.REGION_ID, new org.apache.thrift.meta_data.FieldMetaData("regionId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.START_KEY, new org.apache.thrift.meta_data.FieldMetaData("startKey", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.END_KEY, new org.apache.thrift.meta_data.FieldMetaData("endKey", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
+    tmpMap.put(_Fields.OFFLINE, new org.apache.thrift.meta_data.FieldMetaData("offline", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.SPLIT, new org.apache.thrift.meta_data.FieldMetaData("split", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+    tmpMap.put(_Fields.REPLICA_ID, new org.apache.thrift.meta_data.FieldMetaData("replicaId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(THRegionInfo.class, metaDataMap);
+  }
+
+  public THRegionInfo() {
+  }
+
+  public THRegionInfo(
+    long regionId,
+    ByteBuffer tableName)
+  {
+    this();
+    this.regionId = regionId;
+    setRegionIdIsSet(true);
+    this.tableName = tableName;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public THRegionInfo(THRegionInfo other) {
+    __isset_bitfield = other.__isset_bitfield;
+    this.regionId = other.regionId;
+    if (other.isSetTableName()) {
+      this.tableName = org.apache.thrift.TBaseHelper.copyBinary(other.tableName);
+;
+    }
+    if (other.isSetStartKey()) {
+      this.startKey = org.apache.thrift.TBaseHelper.copyBinary(other.startKey);
+;
+    }
+    if (other.isSetEndKey()) {
+      this.endKey = org.apache.thrift.TBaseHelper.copyBinary(other.endKey);
+;
+    }
+    this.offline = other.offline;
+    this.split = other.split;
+    this.replicaId = other.replicaId;
+  }
+
+  public THRegionInfo deepCopy() {
+    return new THRegionInfo(this);
+  }
+
+  @Override
+  public void clear() {
+    setRegionIdIsSet(false);
+    this.regionId = 0;
+    this.tableName = null;
+    this.startKey = null;
+    this.endKey = null;
+    setOfflineIsSet(false);
+    this.offline = false;
+    setSplitIsSet(false);
+    this.split = false;
+    setReplicaIdIsSet(false);
+    this.replicaId = 0;
+  }
+
+  public long getRegionId() {
+    return this.regionId;
+  }
+
+  public THRegionInfo setRegionId(long regionId) {
+    this.regionId = regionId;
+    setRegionIdIsSet(true);
+    return this;
+  }
+
+  public void unsetRegionId() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REGIONID_ISSET_ID);
+  }
+
+  /** Returns true if field regionId is set (has been assigned a value) and false otherwise */
+  public boolean isSetRegionId() {
+    return EncodingUtils.testBit(__isset_bitfield, __REGIONID_ISSET_ID);
+  }
+
+  public void setRegionIdIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REGIONID_ISSET_ID, value);
+  }
+
+  public byte[] getTableName() {
+    setTableName(org.apache.thrift.TBaseHelper.rightSize(tableName));
+    return tableName == null ? null : tableName.array();
+  }
+
+  public ByteBuffer bufferForTableName() {
+    return tableName;
+  }
+
+  public THRegionInfo setTableName(byte[] tableName) {
+    setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName));
+    return this;
+  }
+
+  public THRegionInfo setTableName(ByteBuffer tableName) {
+    this.tableName = tableName;
+    return this;
+  }
+
+  public void unsetTableName() {
+    this.tableName = null;
+  }
+
+  /** Returns true if field tableName is set (has been assigned a value) and false otherwise */
+  public boolean isSetTableName() {
+    return this.tableName != null;
+  }
+
+  public void setTableNameIsSet(boolean value) {
+    if (!value) {
+      this.tableName = null;
+    }
+  }
+
+  public byte[] getStartKey() {
+    setStartKey(org.apache.thrift.TBaseHelper.rightSize(startKey));
+    return startKey == null ? null : startKey.array();
+  }
+
+  public ByteBuffer bufferForStartKey() {
+    return startKey;
+  }
+
+  public THRegionInfo setStartKey(byte[] startKey) {
+    setStartKey(startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(startKey));
+    return this;
+  }
+
+  public THRegionInfo setStartKey(ByteBuffer startKey) {
+    this.startKey = startKey;
+    return this;
+  }
+
+  public void unsetStartKey() {
+    this.startKey = null;
+  }
+
+  /** Returns true if field startKey is set (has been assigned a value) and false otherwise */
+  public boolean isSetStartKey() {
+    return this.startKey != null;
+  }
+
+  public void setStartKeyIsSet(boolean value) {
+    if (!value) {
+      this.startKey = null;
+    }
+  }
+
+  public byte[] getEndKey() {
+    setEndKey(org.apache.thrift.TBaseHelper.rightSize(endKey));
+    return endKey == null ? null : endKey.array();
+  }
+
+  public ByteBuffer bufferForEndKey() {
+    return endKey;
+  }
+
+  public THRegionInfo setEndKey(byte[] endKey) {
+    setEndKey(endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(endKey));
+    return this;
+  }
+
+  public THRegionInfo setEndKey(ByteBuffer endKey) {
+    this.endKey = endKey;
+    return this;
+  }
+
+  public void unsetEndKey() {
+    this.endKey = null;
+  }
+
+  /** Returns true if field endKey is set (has been assigned a value) and false otherwise */
+  public boolean isSetEndKey() {
+    return this.endKey != null;
+  }
+
+  public void setEndKeyIsSet(boolean value) {
+    if (!value) {
+      this.endKey = null;
+    }
+  }
+
+  public boolean isOffline() {
+    return this.offline;
+  }
+
+  public THRegionInfo setOffline(boolean offline) {
+    this.offline = offline;
+    setOfflineIsSet(true);
+    return this;
+  }
+
+  public void unsetOffline() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OFFLINE_ISSET_ID);
+  }
+
+  /** Returns true if field offline is set (has been assigned a value) and false otherwise */
+  public boolean isSetOffline() {
+    return EncodingUtils.testBit(__isset_bitfield, __OFFLINE_ISSET_ID);
+  }
+
+  public void setOfflineIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OFFLINE_ISSET_ID, value);
+  }
+
+  public boolean isSplit() {
+    return this.split;
+  }
+
+  public THRegionInfo setSplit(boolean split) {
+    this.split = split;
+    setSplitIsSet(true);
+    return this;
+  }
+
+  public void unsetSplit() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SPLIT_ISSET_ID);
+  }
+
+  /** Returns true if field split is set (has been assigned a value) and false otherwise */
+  public boolean isSetSplit() {
+    return EncodingUtils.testBit(__isset_bitfield, __SPLIT_ISSET_ID);
+  }
+
+  public void setSplitIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SPLIT_ISSET_ID, value);
+  }
+
+  public int getReplicaId() {
+    return this.replicaId;
+  }
+
+  public THRegionInfo setReplicaId(int replicaId) {
+    this.replicaId = replicaId;
+    setReplicaIdIsSet(true);
+    return this;
+  }
+
+  public void unsetReplicaId() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REPLICAID_ISSET_ID);
+  }
+
+  /** Returns true if field replicaId is set (has been assigned a value) and false otherwise */
+  public boolean isSetReplicaId() {
+    return EncodingUtils.testBit(__isset_bitfield, __REPLICAID_ISSET_ID);
+  }
+
+  public void setReplicaIdIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REPLICAID_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case REGION_ID:
+      if (value == null) {
+        unsetRegionId();
+      } else {
+        setRegionId((Long)value);
+      }
+      break;
+
+    case TABLE_NAME:
+      if (value == null) {
+        unsetTableName();
+      } else {
+        setTableName((ByteBuffer)value);
+      }
+      break;
+
+    case START_KEY:
+      if (value == null) {
+        unsetStartKey();
+      } else {
+        setStartKey((ByteBuffer)value);
+      }
+      break;
+
+    case END_KEY:
+      if (value == null) {
+        unsetEndKey();
+      } else {
+        setEndKey((ByteBuffer)value);
+      }
+      break;
+
+    case OFFLINE:
+      if (value == null) {
+        unsetOffline();
+      } else {
+        setOffline((Boolean)value);
+      }
+      break;
+
+    case SPLIT:
+      if (value == null) {
+        unsetSplit();
+      } else {
+        setSplit((Boolean)value);
+      }
+      break;
+
+    case REPLICA_ID:
+      if (value == null) {
+        unsetReplicaId();
+      } else {
+        setReplicaId((Integer)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case REGION_ID:
+      return Long.valueOf(getRegionId());
+
+    case TABLE_NAME:
+      return getTableName();
+
+    case START_KEY:
+      return getStartKey();
+
+    case END_KEY:
+      return getEndKey();
+
+    case OFFLINE:
+      return Boolean.valueOf(isOffline());
+
+    case SPLIT:
+      return Boolean.valueOf(isSplit());
+
+    case REPLICA_ID:
+      return Integer.valueOf(getReplicaId());
+
+    }
+    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 REGION_ID:
+      return isSetRegionId();
+    case TABLE_NAME:
+      return isSetTableName();
+    case START_KEY:
+      return isSetStartKey();
+    case END_KEY:
+      return isSetEndKey();
+    case OFFLINE:
+      return isSetOffline();
+    case SPLIT:
+      return isSetSplit();
+    case REPLICA_ID:
+      return isSetReplicaId();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof THRegionInfo)
+      return this.equals((THRegionInfo)that);
+    return false;
+  }
+
+  public boolean equals(THRegionInfo that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_regionId = true;
+    boolean that_present_regionId = true;
+    if (this_present_regionId || that_present_regionId) {
+      if (!(this_present_regionId && that_present_regionId))
+        return false;
+      if (this.regionId != that.regionId)
+        return false;
+    }
+
+    boolean this_present_tableName = true && this.isSetTableName();
+    boolean that_present_tableName = true && that.isSetTableName();
+    if (this_present_tableName || that_present_tableName) {
+      if (!(this_present_tableName && that_present_tableName))
+        return false;
+      if (!this.tableName.equals(that.tableName))
+        return false;
+    }
+
+    boolean this_present_startKey = true && this.isSetStartKey();
+    boolean that_present_startKey = true && that.isSetStartKey();
+    if (this_present_startKey || that_present_startKey) {
+      if (!(this_present_startKey && that_present_startKey))
+        return false;
+      if (!this.startKey.equals(that.startKey))
+        return false;
+    }
+
+    boolean this_present_endKey = true && this.isSetEndKey();
+    boolean that_present_endKey = true && that.isSetEndKey();
+    if (this_present_endKey || that_present_endKey) {
+      if (!(this_present_endKey && that_present_endKey))
+        return false;
+      if (!this.endKey.equals(that.endKey))
+        return false;
+    }
+
+    boolean this_present_offline = true && this.isSetOffline();
+    boolean that_present_offline = true && that.isSetOffline();
+    if (this_present_offline || that_present_offline) {
+      if (!(this_present_offline && that_present_offline))
+        return false;
+      if (this.offline != that.offline)
+        return false;
+    }
+
+    boolean this_present_split = true && this.isSetSplit();
+    boolean that_present_split = true && that.isSetSplit();
+    if (this_present_split || that_present_split) {
+      if (!(this_present_split && that_present_split))
+        return false;
+      if (this.split != that.split)
+        return false;
+    }
+
+    boolean this_present_replicaId = true && this.isSetReplicaId();
+    boolean that_present_replicaId = true && that.isSetReplicaId();
+    if (this_present_replicaId || that_present_replicaId) {
+      if (!(this_present_replicaId && that_present_replicaId))
+        return false;
+      if (this.replicaId != that.replicaId)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    boolean present_regionId = true;
+    builder.append(present_regionId);
+    if (present_regionId)
+      builder.append(regionId);
+
+    boolean present_tableName = true && (isSetTableName());
+    builder.append(present_tableName);
+    if (present_tableName)
+      builder.append(tableName);
+
+    boolean present_startKey = true && (isSetStartKey());
+    builder.append(present_startKey);
+    if (present_startKey)
+      builder.append(startKey);
+
+    boolean present_endKey = true && (isSetEndKey());
+    builder.append(present_endKey);
+    if (present_endKey)
+      builder.append(endKey);
+
+    boolean present_offline = true && (isSetOffline());
+    builder.append(present_offline);
+    if (present_offline)
+      builder.append(offline);
+
+    boolean present_split = true && (isSetSplit());
+    builder.append(present_split);
+    if (present_split)
+      builder.append(split);
+
+    boolean present_replicaId = true && (isSetReplicaId());
+    builder.append(present_replicaId);
+    if (present_replicaId)
+      builder.append(replicaId);
+
+    return builder.toHashCode();
+  }
+
+  public int compareTo(THRegionInfo other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    THRegionInfo typedOther = (THRegionInfo)other;
+
+    lastComparison = Boolean.valueOf(isSetRegionId()).compareTo(typedOther.isSetRegionId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetRegionId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionId, typedOther.regionId);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetTableName()).compareTo(typedOther.isSetTableName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetTableName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(typedOther.isSetStartKey());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetStartKey()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, typedOther.startKey);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(typedOther.isSetEndKey());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetEndKey()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, typedOther.endKey);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetOffline()).compareTo(typedOther.isSetOffline());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetOffline()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.offline, typedOther.offline);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetSplit()).compareTo(typedOther.isSetSplit());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetSplit()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.split, typedOther.split);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetReplicaId()).compareTo(typedOther.isSetReplicaId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetReplicaId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicaId, typedOther.replicaId);
+      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("THRegionInfo(");
+    boolean first = true;
+
+    sb.append("regionId:");
+    sb.append(this.regionId);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("tableName:");
+    if (this.tableName == null) {
+      sb.append("null");
+    } else {
+      org.apache.thrift.TBaseHelper.toString(this.tableName, sb);
+    }
+    first = false;
+    if (isSetStartKey()) {
+      if (!first) sb.append(", ");
+      sb.append("startKey:");
+      if (this.startKey == null) {
+        sb.append("null");
+      } else {
+        org.apache.thrift.TBaseHelper.toString(this.startKey, sb);
+      }
+      first = false;
+    }
+    if (isSetEndKey()) {
+      if (!first) sb.append(", ");
+      sb.append("endKey:");
+      if (this.endKey == null) {
+        sb.append("null");
+      } else {
+        org.apache.thrift.TBaseHelper.toString(this.endKey, sb);
+      }
+      first = false;
+    }
+    if (isSetOffline()) {
+      if (!first) sb.append(", ");
+      sb.append("offline:");
+      sb.append(this.offline);
+      first = false;
+    }
+    if (isSetSplit()) {
+      if (!first) sb.append(", ");
+      sb.append("split:");
+      sb.append(this.split);
+      first = false;
+    }
+    if (isSetReplicaId()) {
+      if (!first) sb.append(", ");
+      sb.append("replicaId:");
+      sb.append(this.replicaId);
+      first = false;
+    }
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // alas, we cannot check 'regionId' because it's a primitive and you chose the non-beans generator.
+    if (tableName == null) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'tableName' was not present! 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 THRegionInfoStandardSchemeFactory implements SchemeFactory {
+    public THRegionInfoStandardScheme getScheme() {
+      return new THRegionInfoStandardScheme();
+    }
+  }
+
+  private static class THRegionInfoStandardScheme extends StandardScheme<THRegionInfo> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, THRegionInfo 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: // REGION_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.regionId = iprot.readI64();
+              struct.setRegionIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // TABLE_NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.tableName = iprot.readBinary();
+              struct.setTableNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // START_KEY
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.startKey = iprot.readBinary();
+              struct.setStartKeyIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // END_KEY
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.endKey = iprot.readBinary();
+              struct.setEndKeyIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 5: // OFFLINE
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.offline = iprot.readBool();
+              struct.setOfflineIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 6: // SPLIT
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.split = iprot.readBool();
+              struct.setSplitIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 7: // REPLICA_ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.replicaId = iprot.readI32();
+              struct.setReplicaIdIsSet(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();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      if (!struct.isSetRegionId()) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required field 'regionId' was not found in serialized data! Struct: " + toString());
+      }
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, THRegionInfo struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(REGION_ID_FIELD_DESC);
+      oprot.writeI64(struct.regionId);
+      oprot.writeFieldEnd();
+      if (struct.tableName != null) {
+        oprot.writeFieldBegin(TABLE_NAME_FIELD_DESC);
+        oprot.writeBinary(struct.tableName);
+        oprot.writeFieldEnd();
+      }
+      if (struct.startKey != null) {
+        if (struct.isSetStartKey()) {
+          oprot.writeFieldBegin(START_KEY_FIELD_DESC);
+          oprot.writeBinary(struct.startKey);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.endKey != null) {
+        if (struct.isSetEndKey()) {
+          oprot.writeFieldBegin(END_KEY_FIELD_DESC);
+          oprot.writeBinary(struct.endKey);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.isSetOffline()) {
+        oprot.writeFieldBegin(OFFLINE_FIELD_DESC);
+        oprot.writeBool(struct.offline);
+        oprot.writeFieldEnd();
+      }
+      if (struct.isSetSplit()) {
+        oprot.writeFieldBegin(SPLIT_FIELD_DESC);
+        oprot.writeBool(struct.split);
+        oprot.writeFieldEnd();
+      }
+      if (struct.isSetReplicaId()) {
+        oprot.writeFieldBegin(REPLICA_ID_FIELD_DESC);
+        oprot.writeI32(struct.replicaId);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class THRegionInfoTupleSchemeFactory implements SchemeFactory {
+    public THRegionInfoTupleScheme getScheme() {
+      return new THRegionInfoTupleScheme();
+    }
+  }
+
+  private static class THRegionInfoTupleScheme extends TupleScheme<THRegionInfo> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, THRegionInfo struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      oprot.writeI64(struct.regionId);
+      oprot.writeBinary(struct.tableName);
+      BitSet optionals = new BitSet();
+      if (struct.isSetStartKey()) {
+        optionals.set(0);
+      }
+      if (struct.isSetEndKey()) {
+        optionals.set(1);
+      }
+      if (struct.isSetOffline()) {
+        optionals.set(2);
+      }
+      if (struct.isSetSplit()) {
+        optionals.set(3);
+      }
+      if (struct.isSetReplicaId()) {
+        optionals.set(4);
+      }
+      oprot.writeBitSet(optionals, 5);
+      if (struct.isSetStartKey()) {
+        oprot.writeBinary(struct.startKey);
+      }
+      if (struct.isSetEndKey()) {
+        oprot.writeBinary(struct.endKey);
+      }
+      if (struct.isSetOffline()) {
+        oprot.writeBool(struct.offline);
+      }
+      if (struct.isSetSplit()) {
+        oprot.writeBool(struct.split);
+      }
+      if (struct.isSetReplicaId()) {
+        oprot.writeI32(struct.replicaId);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, THRegionInfo struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      struct.regionId = iprot.readI64();
+      struct.setRegionIdIsSet(true);
+      struct.tableName = iprot.readBinary();
+      struct.setTableNameIsSet(true);
+      BitSet incoming = iprot.readBitSet(5);
+      if (incoming.get(0)) {
+        struct.startKey = iprot.readBinary();
+        struct.setStartKeyIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.endKey = iprot.readBinary();
+        struct.setEndKeyIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.offline = iprot.readBool();
+        struct.setOfflineIsSet(true);
+      }
+      if (incoming.get(3)) {
+        struct.split = iprot.readBool();
+        struct.setSplitIsSet(true);
+      }
+      if (incoming.get(4)) {
+        struct.replicaId = iprot.readI32();
+        struct.setReplicaIdIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionLocation.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionLocation.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionLocation.java
new file mode 100644
index 0000000..22d00fc
--- /dev/null
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THRegionLocation.java
@@ -0,0 +1,498 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.hadoop.hbase.thrift2.generated;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+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 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class THRegionLocation implements org.apache.thrift.TBase<THRegionLocation, THRegionLocation._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("THRegionLocation");
+
+  private static final org.apache.thrift.protocol.TField SERVER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("serverName", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+  private static final org.apache.thrift.protocol.TField REGION_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("regionInfo", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new THRegionLocationStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new THRegionLocationTupleSchemeFactory());
+  }
+
+  public TServerName serverName; // required
+  public THRegionInfo regionInfo; // 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 {
+    SERVER_NAME((short)1, "serverName"),
+    REGION_INFO((short)2, "regionInfo");
+
+    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: // SERVER_NAME
+          return SERVER_NAME;
+        case 2: // REGION_INFO
+          return REGION_INFO;
+        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.SERVER_NAME, new org.apache.thrift.meta_data.FieldMetaData("serverName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TServerName.class)));
+    tmpMap.put(_Fields.REGION_INFO, new org.apache.thrift.meta_data.FieldMetaData("regionInfo", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, THRegionInfo.class)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(THRegionLocation.class, metaDataMap);
+  }
+
+  public THRegionLocation() {
+  }
+
+  public THRegionLocation(
+    TServerName serverName,
+    THRegionInfo regionInfo)
+  {
+    this();
+    this.serverName = serverName;
+    this.regionInfo = regionInfo;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public THRegionLocation(THRegionLocation other) {
+    if (other.isSetServerName()) {
+      this.serverName = new TServerName(other.serverName);
+    }
+    if (other.isSetRegionInfo()) {
+      this.regionInfo = new THRegionInfo(other.regionInfo);
+    }
+  }
+
+  public THRegionLocation deepCopy() {
+    return new THRegionLocation(this);
+  }
+
+  @Override
+  public void clear() {
+    this.serverName = null;
+    this.regionInfo = null;
+  }
+
+  public TServerName getServerName() {
+    return this.serverName;
+  }
+
+  public THRegionLocation setServerName(TServerName serverName) {
+    this.serverName = serverName;
+    return this;
+  }
+
+  public void unsetServerName() {
+    this.serverName = null;
+  }
+
+  /** Returns true if field serverName is set (has been assigned a value) and false otherwise */
+  public boolean isSetServerName() {
+    return this.serverName != null;
+  }
+
+  public void setServerNameIsSet(boolean value) {
+    if (!value) {
+      this.serverName = null;
+    }
+  }
+
+  public THRegionInfo getRegionInfo() {
+    return this.regionInfo;
+  }
+
+  public THRegionLocation setRegionInfo(THRegionInfo regionInfo) {
+    this.regionInfo = regionInfo;
+    return this;
+  }
+
+  public void unsetRegionInfo() {
+    this.regionInfo = null;
+  }
+
+  /** Returns true if field regionInfo is set (has been assigned a value) and false otherwise */
+  public boolean isSetRegionInfo() {
+    return this.regionInfo != null;
+  }
+
+  public void setRegionInfoIsSet(boolean value) {
+    if (!value) {
+      this.regionInfo = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case SERVER_NAME:
+      if (value == null) {
+        unsetServerName();
+      } else {
+        setServerName((TServerName)value);
+      }
+      break;
+
+    case REGION_INFO:
+      if (value == null) {
+        unsetRegionInfo();
+      } else {
+        setRegionInfo((THRegionInfo)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case SERVER_NAME:
+      return getServerName();
+
+    case REGION_INFO:
+      return getRegionInfo();
+
+    }
+    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 SERVER_NAME:
+      return isSetServerName();
+    case REGION_INFO:
+      return isSetRegionInfo();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof THRegionLocation)
+      return this.equals((THRegionLocation)that);
+    return false;
+  }
+
+  public boolean equals(THRegionLocation that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_serverName = true && this.isSetServerName();
+    boolean that_present_serverName = true && that.isSetServerName();
+    if (this_present_serverName || that_present_serverName) {
+      if (!(this_present_serverName && that_present_serverName))
+        return false;
+      if (!this.serverName.equals(that.serverName))
+        return false;
+    }
+
+    boolean this_present_regionInfo = true && this.isSetRegionInfo();
+    boolean that_present_regionInfo = true && that.isSetRegionInfo();
+    if (this_present_regionInfo || that_present_regionInfo) {
+      if (!(this_present_regionInfo && that_present_regionInfo))
+        return false;
+      if (!this.regionInfo.equals(that.regionInfo))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    boolean present_serverName = true && (isSetServerName());
+    builder.append(present_serverName);
+    if (present_serverName)
+      builder.append(serverName);
+
+    boolean present_regionInfo = true && (isSetRegionInfo());
+    builder.append(present_regionInfo);
+    if (present_regionInfo)
+      builder.append(regionInfo);
+
+    return builder.toHashCode();
+  }
+
+  public int compareTo(THRegionLocation other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    THRegionLocation typedOther = (THRegionLocation)other;
+
+    lastComparison = Boolean.valueOf(isSetServerName()).compareTo(typedOther.isSetServerName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetServerName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, typedOther.serverName);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetRegionInfo()).compareTo(typedOther.isSetRegionInfo());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetRegionInfo()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionInfo, typedOther.regionInfo);
+      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("THRegionLocation(");
+    boolean first = true;
+
+    sb.append("serverName:");
+    if (this.serverName == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.serverName);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("regionInfo:");
+    if (this.regionInfo == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.regionInfo);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    if (serverName == null) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'serverName' was not present! Struct: " + toString());
+    }
+    if (regionInfo == null) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'regionInfo' was not present! Struct: " + toString());
+    }
+    // check for sub-struct validity
+    if (serverName != null) {
+      serverName.validate();
+    }
+    if (regionInfo != null) {
+      regionInfo.validate();
+    }
+  }
+
+  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 THRegionLocationStandardSchemeFactory implements SchemeFactory {
+    public THRegionLocationStandardScheme getScheme() {
+      return new THRegionLocationStandardScheme();
+    }
+  }
+
+  private static class THRegionLocationStandardScheme extends StandardScheme<THRegionLocation> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, THRegionLocation 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: // SERVER_NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.serverName = new TServerName();
+              struct.serverName.read(iprot);
+              struct.setServerNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // REGION_INFO
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.regionInfo = new THRegionInfo();
+              struct.regionInfo.read(iprot);
+              struct.setRegionInfoIsSet(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();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, THRegionLocation struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.serverName != null) {
+        oprot.writeFieldBegin(SERVER_NAME_FIELD_DESC);
+        struct.serverName.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (struct.regionInfo != null) {
+        oprot.writeFieldBegin(REGION_INFO_FIELD_DESC);
+        struct.regionInfo.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class THRegionLocationTupleSchemeFactory implements SchemeFactory {
+    public THRegionLocationTupleScheme getScheme() {
+      return new THRegionLocationTupleScheme();
+    }
+  }
+
+  private static class THRegionLocationTupleScheme extends TupleScheme<THRegionLocation> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, THRegionLocation struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      struct.serverName.write(oprot);
+      struct.regionInfo.write(oprot);
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, THRegionLocation struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      struct.serverName = new TServerName();
+      struct.serverName.read(iprot);
+      struct.setServerNameIsSet(true);
+      struct.regionInfo = new THRegionInfo();
+      struct.regionInfo.read(iprot);
+      struct.setRegionInfoIsSet(true);
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java
index b08a6af..8fb1567 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java
@@ -103,9 +103,9 @@ public class TMutation extends org.apache.thrift.TUnion<TMutation, TMutation._Fi
   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.PUT, new org.apache.thrift.meta_data.FieldMetaData("put", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.PUT, new org.apache.thrift.meta_data.FieldMetaData("put", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TPut.class)));
-    tmpMap.put(_Fields.DELETE_SINGLE, new org.apache.thrift.meta_data.FieldMetaData("deleteSingle", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+    tmpMap.put(_Fields.DELETE_SINGLE, new org.apache.thrift.meta_data.FieldMetaData("deleteSingle", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TDelete.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TMutation.class, metaDataMap);

http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
new file mode 100644
index 0000000..652fa3f
--- /dev/null
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
@@ -0,0 +1,595 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.hadoop.hbase.thrift2.generated;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+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 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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TServerName implements org.apache.thrift.TBase<TServerName, TServerName._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TServerName");
+
+  private static final org.apache.thrift.protocol.TField HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostName", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField START_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("startCode", 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 TServerNameStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new TServerNameTupleSchemeFactory());
+  }
+
+  public String hostName; // required
+  public int port; // optional
+  public long startCode; // 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 {
+    HOST_NAME((short)1, "hostName"),
+    PORT((short)2, "port"),
+    START_CODE((short)3, "startCode");
+
+    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: // HOST_NAME
+          return HOST_NAME;
+        case 2: // PORT
+          return PORT;
+        case 3: // START_CODE
+          return START_CODE;
+        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 __PORT_ISSET_ID = 0;
+  private static final int __STARTCODE_ISSET_ID = 1;
+  private byte __isset_bitfield = 0;
+  private _Fields optionals[] = {_Fields.PORT,_Fields.START_CODE};
+  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.HOST_NAME, new org.apache.thrift.meta_data.FieldMetaData("hostName", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.START_CODE, new org.apache.thrift.meta_data.FieldMetaData("startCode", 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(TServerName.class, metaDataMap);
+  }
+
+  public TServerName() {
+  }
+
+  public TServerName(
+    String hostName)
+  {
+    this();
+    this.hostName = hostName;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public TServerName(TServerName other) {
+    __isset_bitfield = other.__isset_bitfield;
+    if (other.isSetHostName()) {
+      this.hostName = other.hostName;
+    }
+    this.port = other.port;
+    this.startCode = other.startCode;
+  }
+
+  public TServerName deepCopy() {
+    return new TServerName(this);
+  }
+
+  @Override
+  public void clear() {
+    this.hostName = null;
+    setPortIsSet(false);
+    this.port = 0;
+    setStartCodeIsSet(false);
+    this.startCode = 0;
+  }
+
+  public String getHostName() {
+    return this.hostName;
+  }
+
+  public TServerName setHostName(String hostName) {
+    this.hostName = hostName;
+    return this;
+  }
+
+  public void unsetHostName() {
+    this.hostName = null;
+  }
+
+  /** Returns true if field hostName is set (has been assigned a value) and false otherwise */
+  public boolean isSetHostName() {
+    return this.hostName != null;
+  }
+
+  public void setHostNameIsSet(boolean value) {
+    if (!value) {
+      this.hostName = null;
+    }
+  }
+
+  public int getPort() {
+    return this.port;
+  }
+
+  public TServerName setPort(int port) {
+    this.port = port;
+    setPortIsSet(true);
+    return this;
+  }
+
+  public void unsetPort() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+  }
+
+  /** Returns true if field port is set (has been assigned a value) and false otherwise */
+  public boolean isSetPort() {
+    return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+  }
+
+  public void setPortIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+  }
+
+  public long getStartCode() {
+    return this.startCode;
+  }
+
+  public TServerName setStartCode(long startCode) {
+    this.startCode = startCode;
+    setStartCodeIsSet(true);
+    return this;
+  }
+
+  public void unsetStartCode() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTCODE_ISSET_ID);
+  }
+
+  /** Returns true if field startCode is set (has been assigned a value) and false otherwise */
+  public boolean isSetStartCode() {
+    return EncodingUtils.testBit(__isset_bitfield, __STARTCODE_ISSET_ID);
+  }
+
+  public void setStartCodeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTCODE_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case HOST_NAME:
+      if (value == null) {
+        unsetHostName();
+      } else {
+        setHostName((String)value);
+      }
+      break;
+
+    case PORT:
+      if (value == null) {
+        unsetPort();
+      } else {
+        setPort((Integer)value);
+      }
+      break;
+
+    case START_CODE:
+      if (value == null) {
+        unsetStartCode();
+      } else {
+        setStartCode((Long)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case HOST_NAME:
+      return getHostName();
+
+    case PORT:
+      return Integer.valueOf(getPort());
+
+    case START_CODE:
+      return Long.valueOf(getStartCode());
+
+    }
+    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 HOST_NAME:
+      return isSetHostName();
+    case PORT:
+      return isSetPort();
+    case START_CODE:
+      return isSetStartCode();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof TServerName)
+      return this.equals((TServerName)that);
+    return false;
+  }
+
+  public boolean equals(TServerName that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_hostName = true && this.isSetHostName();
+    boolean that_present_hostName = true && that.isSetHostName();
+    if (this_present_hostName || that_present_hostName) {
+      if (!(this_present_hostName && that_present_hostName))
+        return false;
+      if (!this.hostName.equals(that.hostName))
+        return false;
+    }
+
+    boolean this_present_port = true && this.isSetPort();
+    boolean that_present_port = true && that.isSetPort();
+    if (this_present_port || that_present_port) {
+      if (!(this_present_port && that_present_port))
+        return false;
+      if (this.port != that.port)
+        return false;
+    }
+
+    boolean this_present_startCode = true && this.isSetStartCode();
+    boolean that_present_startCode = true && that.isSetStartCode();
+    if (this_present_startCode || that_present_startCode) {
+      if (!(this_present_startCode && that_present_startCode))
+        return false;
+      if (this.startCode != that.startCode)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    boolean present_hostName = true && (isSetHostName());
+    builder.append(present_hostName);
+    if (present_hostName)
+      builder.append(hostName);
+
+    boolean present_port = true && (isSetPort());
+    builder.append(present_port);
+    if (present_port)
+      builder.append(port);
+
+    boolean present_startCode = true && (isSetStartCode());
+    builder.append(present_startCode);
+    if (present_startCode)
+      builder.append(startCode);
+
+    return builder.toHashCode();
+  }
+
+  public int compareTo(TServerName other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    TServerName typedOther = (TServerName)other;
+
+    lastComparison = Boolean.valueOf(isSetHostName()).compareTo(typedOther.isSetHostName());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetHostName()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostName, typedOther.hostName);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetPort()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetStartCode()).compareTo(typedOther.isSetStartCode());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetStartCode()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startCode, typedOther.startCode);
+      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("TServerName(");
+    boolean first = true;
+
+    sb.append("hostName:");
+    if (this.hostName == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.hostName);
+    }
+    first = false;
+    if (isSetPort()) {
+      if (!first) sb.append(", ");
+      sb.append("port:");
+      sb.append(this.port);
+      first = false;
+    }
+    if (isSetStartCode()) {
+      if (!first) sb.append(", ");
+      sb.append("startCode:");
+      sb.append(this.startCode);
+      first = false;
+    }
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    if (hostName == null) {
+      throw new org.apache.thrift.protocol.TProtocolException("Required field 'hostName' was not present! 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 TServerNameStandardSchemeFactory implements SchemeFactory {
+    public TServerNameStandardScheme getScheme() {
+      return new TServerNameStandardScheme();
+    }
+  }
+
+  private static class TServerNameStandardScheme extends StandardScheme<TServerName> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, TServerName 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: // HOST_NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.hostName = iprot.readString();
+              struct.setHostNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // PORT
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.port = iprot.readI32();
+              struct.setPortIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // START_CODE
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.startCode = iprot.readI64();
+              struct.setStartCodeIsSet(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();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, TServerName struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.hostName != null) {
+        oprot.writeFieldBegin(HOST_NAME_FIELD_DESC);
+        oprot.writeString(struct.hostName);
+        oprot.writeFieldEnd();
+      }
+      if (struct.isSetPort()) {
+        oprot.writeFieldBegin(PORT_FIELD_DESC);
+        oprot.writeI32(struct.port);
+        oprot.writeFieldEnd();
+      }
+      if (struct.isSetStartCode()) {
+        oprot.writeFieldBegin(START_CODE_FIELD_DESC);
+        oprot.writeI64(struct.startCode);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class TServerNameTupleSchemeFactory implements SchemeFactory {
+    public TServerNameTupleScheme getScheme() {
+      return new TServerNameTupleScheme();
+    }
+  }
+
+  private static class TServerNameTupleScheme extends TupleScheme<TServerName> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, TServerName struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      oprot.writeString(struct.hostName);
+      BitSet optionals = new BitSet();
+      if (struct.isSetPort()) {
+        optionals.set(0);
+      }
+      if (struct.isSetStartCode()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetPort()) {
+        oprot.writeI32(struct.port);
+      }
+      if (struct.isSetStartCode()) {
+        oprot.writeI64(struct.startCode);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, TServerName struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      struct.hostName = iprot.readString();
+      struct.setHostNameIsSet(true);
+      BitSet incoming = iprot.readBitSet(2);
+      if (incoming.get(0)) {
+        struct.port = iprot.readI32();
+        struct.setPortIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.startCode = iprot.readI64();
+        struct.setStartCodeIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift b/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift
index bc790e7..4ad4cdd 100644
--- a/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift
+++ b/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift
@@ -242,6 +242,27 @@ struct TRowMutations {
   2: required list<TMutation> mutations
 }
 
+struct THRegionInfo {
+  1: required i64 regionId
+  2: required binary tableName
+  3: optional binary startKey
+  4: optional binary endKey
+  5: optional bool offline
+  6: optional bool split
+  7: optional i32 replicaId
+}
+
+struct TServerName {
+  1: required string hostName
+  2: optional i32 port
+  3: optional i64 startCode
+}
+
+struct THRegionLocation {
+  1: required TServerName serverName
+  2: required THRegionInfo regionInfo
+}
+
 //
 // Exceptions
 //
@@ -512,4 +533,27 @@ service THBaseService {
     1: TIOError io
   )
 
+  /**
+   * Given a table and a row get the location of the region that
+   * would contain the given row key.
+   *
+   * reload = true means the cache will be cleared and the location
+   * will be fetched from meta.
+   */
+  THRegionLocation getRegionLocation(
+    1: required binary table,
+    2: required binary row,
+    3: bool reload,
+  ) throws (
+    1: TIOError io
+  )
+
+  /**
+   * Get all of the region locations for a given table.
+   **/
+  list<THRegionLocation> getAllRegionLocations(
+    1: required binary table,
+  ) throws (
+    1: TIOError io
+  )
 }


[3/3] hbase git commit: HBASE-13698 Add RegionLocator methods to Thrift2

Posted by ec...@apache.org.
HBASE-13698 Add RegionLocator methods to Thrift2


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/81024a5b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/81024a5b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/81024a5b

Branch: refs/heads/branch-1
Commit: 81024a5b565cef4328af9fd0f968f84060568896
Parents: 49fc6c8
Author: Elliott Clark <ec...@apache.org>
Authored: Mon May 18 15:57:28 2015 -0700
Committer: Elliott Clark <ec...@apache.org>
Committed: Wed May 20 13:35:04 2015 -0700

----------------------------------------------------------------------
 hbase-thrift/pom.xml                            |    2 +-
 .../thrift2/ThriftHBaseServiceHandler.java      |   58 +
 .../hadoop/hbase/thrift2/ThriftUtilities.java   |   40 +
 .../hbase/thrift2/generated/THBaseService.java  | 4248 +++++++++++++-----
 .../hbase/thrift2/generated/THRegionInfo.java   | 1038 +++++
 .../thrift2/generated/THRegionLocation.java     |  498 ++
 .../hbase/thrift2/generated/TMutation.java      |    4 +-
 .../hbase/thrift2/generated/TServerName.java    |  595 +++
 .../apache/hadoop/hbase/thrift2/hbase.thrift    |   44 +
 9 files changed, 5471 insertions(+), 1056 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index 1c2513a..a57f266 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -334,7 +334,7 @@
       Profile for regenerating the thrift java classes.
       The generated files are to be committed to version control.
       Activate using:
-       mvn compile -Dcompile-thrift
+       mvn compile -Pcompile-thrift
     -->
     <profile>
       <id>compile-thrift</id>

http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java
index 2a90765..3058bf3 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java
@@ -47,7 +47,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.client.RegionLocator;
 import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.security.UserProvider;
@@ -56,6 +58,7 @@ import org.apache.hadoop.hbase.thrift2.generated.TAppend;
 import org.apache.hadoop.hbase.thrift2.generated.TDelete;
 import org.apache.hadoop.hbase.thrift2.generated.TGet;
 import org.apache.hadoop.hbase.thrift2.generated.THBaseService;
+import org.apache.hadoop.hbase.thrift2.generated.THRegionLocation;
 import org.apache.hadoop.hbase.thrift2.generated.TIOError;
 import org.apache.hadoop.hbase.thrift2.generated.TIllegalArgument;
 import org.apache.hadoop.hbase.thrift2.generated.TIncrement;
@@ -140,6 +143,14 @@ public class ThriftHBaseServiceHandler implements THBaseService.Iface {
     }
   }
 
+  private RegionLocator getLocator(ByteBuffer tableName) {
+    try {
+      return connectionCache.getRegionLocator(byteBufferToByteArray(tableName));
+    } catch (IOException ie) {
+      throw new RuntimeException(ie);
+    }
+  }
+
   private void closeTable(Table table) throws TIOError {
     try {
       table.close();
@@ -384,6 +395,8 @@ public class ThriftHBaseServiceHandler implements THBaseService.Iface {
     return results;
   }
 
+
+
   @Override
   public void closeScanner(int scannerId) throws TIOError, TIllegalArgument, TException {
     LOG.debug("scannerClose: id=" + scannerId);
@@ -410,4 +423,49 @@ public class ThriftHBaseServiceHandler implements THBaseService.Iface {
       closeTable(htable);
     }
   }
+
+  @Override
+  public List<THRegionLocation> getAllRegionLocations(ByteBuffer table)
+      throws TIOError, TException {
+    RegionLocator locator = null;
+    try {
+      locator = getLocator(table);
+      return ThriftUtilities.regionLocationsFromHBase(locator.getAllRegionLocations());
+
+    } catch (IOException e) {
+      throw getTIOError(e);
+    } finally {
+      if (locator != null) {
+        try {
+          locator.close();
+        } catch (IOException e) {
+          LOG.warn("Couldn't close the locator.", e);
+        }
+      }
+    }
+  }
+
+  @Override
+  public THRegionLocation getRegionLocation(ByteBuffer table, ByteBuffer row, boolean reload)
+      throws TIOError, TException {
+
+    RegionLocator locator = null;
+    try {
+      locator = getLocator(table);
+      byte[] rowBytes = byteBufferToByteArray(row);
+      HRegionLocation hrl = locator.getRegionLocation(rowBytes, reload);
+      return ThriftUtilities.regionLocationFromHBase(hrl);
+
+    } catch (IOException e) {
+      throw getTIOError(e);
+    } finally {
+      if (locator != null) {
+        try {
+          locator.close();
+        } catch (IOException e) {
+          LOG.warn("Couldn't close the locator.", e);
+        }
+      }
+    }
+  }
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java
index d2da993..3251d13 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java
@@ -26,6 +26,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HRegionLocation;
+import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
@@ -34,6 +37,7 @@ import org.apache.hadoop.hbase.client.Append;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Durability;
 import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.HRegionLocator;
 import org.apache.hadoop.hbase.client.Increment;
 import org.apache.hadoop.hbase.client.OperationWithAttributes;
 import org.apache.hadoop.hbase.client.Put;
@@ -51,12 +55,15 @@ import org.apache.hadoop.hbase.thrift2.generated.TDelete;
 import org.apache.hadoop.hbase.thrift2.generated.TDeleteType;
 import org.apache.hadoop.hbase.thrift2.generated.TDurability;
 import org.apache.hadoop.hbase.thrift2.generated.TGet;
+import org.apache.hadoop.hbase.thrift2.generated.THRegionInfo;
+import org.apache.hadoop.hbase.thrift2.generated.THRegionLocation;
 import org.apache.hadoop.hbase.thrift2.generated.TIncrement;
 import org.apache.hadoop.hbase.thrift2.generated.TMutation;
 import org.apache.hadoop.hbase.thrift2.generated.TPut;
 import org.apache.hadoop.hbase.thrift2.generated.TResult;
 import org.apache.hadoop.hbase.thrift2.generated.TRowMutations;
 import org.apache.hadoop.hbase.thrift2.generated.TScan;
+import org.apache.hadoop.hbase.thrift2.generated.TServerName;
 import org.apache.hadoop.hbase.thrift2.generated.TTimeRange;
 import org.apache.hadoop.hbase.util.Bytes;
 
@@ -467,6 +474,39 @@ public class ThriftUtilities {
     return out;
   }
 
+  public static THRegionLocation regionLocationFromHBase(HRegionLocation hrl) {
+    HRegionInfo hri = hrl.getRegionInfo();
+    ServerName serverName = hrl.getServerName();
+
+    THRegionInfo thRegionInfo = new THRegionInfo();
+    THRegionLocation thRegionLocation = new THRegionLocation();
+    TServerName tServerName = new TServerName();
+
+    tServerName.setHostName(serverName.getHostname());
+    tServerName.setPort(serverName.getPort());
+    tServerName.setStartCode(serverName.getStartcode());
+
+    thRegionInfo.setTableName(hri.getTable().getName());
+    thRegionInfo.setEndKey(hri.getEndKey());
+    thRegionInfo.setStartKey(hri.getStartKey());
+    thRegionInfo.setOffline(hri.isOffline());
+    thRegionInfo.setSplit(hri.isSplit());
+    thRegionInfo.setReplicaId(hri.getReplicaId());
+
+    thRegionLocation.setRegionInfo(thRegionInfo);
+    thRegionLocation.setServerName(tServerName);
+
+    return thRegionLocation;
+  }
+
+  public static List<THRegionLocation> regionLocationsFromHBase(List<HRegionLocation> locations) {
+    List<THRegionLocation> tlocations = new ArrayList<THRegionLocation>(locations.size());
+    for (HRegionLocation hrl:locations) {
+      tlocations.add(regionLocationFromHBase(hrl));
+    }
+    return tlocations;
+  }
+
   /**
    * Adds all the attributes into the Operation object
    */


[2/3] hbase git commit: HBASE-13698 Add RegionLocator methods to Thrift2

Posted by ec...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase/blob/81024a5b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java
index f2a5845..e37471a 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java
@@ -42,9 +42,9 @@ public class THBaseService {
      * 
      * @param table the table to check on
      * 
-     * @param get the TGet to check for
+     * @param tget the TGet to check for
      */
-    public boolean exists(ByteBuffer table, TGet get) throws TIOError, org.apache.thrift.TException;
+    public boolean exists(ByteBuffer table, TGet tget) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Method for getting data from a row.
@@ -56,9 +56,9 @@ public class THBaseService {
      * 
      * @param table the table to get from
      * 
-     * @param get the TGet to fetch
+     * @param tget the TGet to fetch
      */
-    public TResult get(ByteBuffer table, TGet get) throws TIOError, org.apache.thrift.TException;
+    public TResult get(ByteBuffer table, TGet tget) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Method for getting multiple rows.
@@ -71,20 +71,20 @@ public class THBaseService {
      * 
      * @param table the table to get from
      * 
-     * @param gets a list of TGets to fetch, the Result list
+     * @param tgets a list of TGets to fetch, the Result list
      * will have the Results at corresponding positions
      * or null if there was an error
      */
-    public List<TResult> getMultiple(ByteBuffer table, List<TGet> gets) throws TIOError, org.apache.thrift.TException;
+    public List<TResult> getMultiple(ByteBuffer table, List<TGet> tgets) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Commit a TPut to a table.
      * 
      * @param table the table to put data in
      * 
-     * @param put the TPut to put
+     * @param tput the TPut to put
      */
-    public void put(ByteBuffer table, TPut put) throws TIOError, org.apache.thrift.TException;
+    public void put(ByteBuffer table, TPut tput) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Atomically checks if a row/family/qualifier value matches the expected
@@ -104,18 +104,18 @@ public class THBaseService {
      * check is for the non-existence of the
      * column in question
      * 
-     * @param put the TPut to put if the check succeeds
+     * @param tput the TPut to put if the check succeeds
      */
-    public boolean checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut put) throws TIOError, org.apache.thrift.TException;
+    public boolean checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut tput) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Commit a List of Puts to the table.
      * 
      * @param table the table to put data in
      * 
-     * @param puts a list of TPuts to commit
+     * @param tputs a list of TPuts to commit
      */
-    public void putMultiple(ByteBuffer table, List<TPut> puts) throws TIOError, org.apache.thrift.TException;
+    public void putMultiple(ByteBuffer table, List<TPut> tputs) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Deletes as specified by the TDelete.
@@ -125,9 +125,9 @@ public class THBaseService {
      * 
      * @param table the table to delete from
      * 
-     * @param deleteSingle the TDelete to delete
+     * @param tdelete the TDelete to delete
      */
-    public void deleteSingle(ByteBuffer table, TDelete deleteSingle) throws TIOError, org.apache.thrift.TException;
+    public void deleteSingle(ByteBuffer table, TDelete tdelete) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Bulk commit a List of TDeletes to the table.
@@ -138,9 +138,9 @@ public class THBaseService {
      * 
      * @param table the table to delete from
      * 
-     * @param deletes list of TDeletes to delete
+     * @param tdeletes list of TDeletes to delete
      */
-    public List<TDelete> deleteMultiple(ByteBuffer table, List<TDelete> deletes) throws TIOError, org.apache.thrift.TException;
+    public List<TDelete> deleteMultiple(ByteBuffer table, List<TDelete> tdeletes) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Atomically checks if a row/family/qualifier value matches the expected
@@ -160,13 +160,13 @@ public class THBaseService {
      * check is for the non-existence of the
      * column in question
      * 
-     * @param deleteSingle the TDelete to execute if the check succeeds
+     * @param tdelete the TDelete to execute if the check succeeds
      */
-    public boolean checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete deleteSingle) throws TIOError, org.apache.thrift.TException;
+    public boolean checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete tdelete) throws TIOError, org.apache.thrift.TException;
 
-    public TResult increment(ByteBuffer table, TIncrement increment) throws TIOError, org.apache.thrift.TException;
+    public TResult increment(ByteBuffer table, TIncrement tincrement) throws TIOError, org.apache.thrift.TException;
 
-    public TResult append(ByteBuffer table, TAppend append) throws TIOError, org.apache.thrift.TException;
+    public TResult append(ByteBuffer table, TAppend tappend) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Get a Scanner for the provided TScan object.
@@ -175,9 +175,9 @@ public class THBaseService {
      * 
      * @param table the table to get the Scanner for
      * 
-     * @param scan the scan object to get a Scanner for
+     * @param tscan the scan object to get a Scanner for
      */
-    public int openScanner(ByteBuffer table, TScan scan) throws TIOError, org.apache.thrift.TException;
+    public int openScanner(ByteBuffer table, TScan tscan) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Grabs multiple rows from a Scanner.
@@ -204,9 +204,9 @@ public class THBaseService {
      * 
      * @param table table to apply the mutations
      * 
-     * @param rowMutations mutations to apply
+     * @param trowMutations mutations to apply
      */
-    public void mutateRow(ByteBuffer table, TRowMutations rowMutations) throws TIOError, org.apache.thrift.TException;
+    public void mutateRow(ByteBuffer table, TRowMutations trowMutations) throws TIOError, org.apache.thrift.TException;
 
     /**
      * Get results for the provided TScan object.
@@ -216,47 +216,72 @@ public class THBaseService {
      * 
      * @param table the table to get the Scanner for
      * 
-     * @param scan the scan object to get a Scanner for
+     * @param tscan the scan object to get a Scanner for
      * 
      * @param numRows number of rows to return
      */
-    public List<TResult> getScannerResults(ByteBuffer table, TScan scan, int numRows) throws TIOError, org.apache.thrift.TException;
+    public List<TResult> getScannerResults(ByteBuffer table, TScan tscan, int numRows) throws TIOError, org.apache.thrift.TException;
+
+    /**
+     * Given a table and a row get the location of the region that
+     * would contain the given row key.
+     * 
+     * reload = true means the cache will be cleared and the location
+     * will be fetched from meta.
+     * 
+     * @param table
+     * @param row
+     * @param reload
+     */
+    public THRegionLocation getRegionLocation(ByteBuffer table, ByteBuffer row, boolean reload) throws TIOError, org.apache.thrift.TException;
+
+    /**
+     * Get all of the region locations for a given table.
+     * 
+     * 
+     * @param table
+     */
+    public List<THRegionLocation> getAllRegionLocations(ByteBuffer table) throws TIOError, org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void exists(ByteBuffer table, TGet get, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.exists_call> resultHandler) throws org.apache.thrift.TException;
+    public void exists(ByteBuffer table, TGet tget, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.exists_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void get(ByteBuffer table, TGet get, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.get_call> resultHandler) throws org.apache.thrift.TException;
+    public void get(ByteBuffer table, TGet tget, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.get_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void getMultiple(ByteBuffer table, List<TGet> gets, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getMultiple_call> resultHandler) throws org.apache.thrift.TException;
+    public void getMultiple(ByteBuffer table, List<TGet> tgets, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getMultiple_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void put(ByteBuffer table, TPut put, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.put_call> resultHandler) throws org.apache.thrift.TException;
+    public void put(ByteBuffer table, TPut tput, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.put_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut put, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.checkAndPut_call> resultHandler) throws org.apache.thrift.TException;
+    public void checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut tput, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.checkAndPut_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void putMultiple(ByteBuffer table, List<TPut> puts, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.putMultiple_call> resultHandler) throws org.apache.thrift.TException;
+    public void putMultiple(ByteBuffer table, List<TPut> tputs, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.putMultiple_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void deleteSingle(ByteBuffer table, TDelete deleteSingle, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.deleteSingle_call> resultHandler) throws org.apache.thrift.TException;
+    public void deleteSingle(ByteBuffer table, TDelete tdelete, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.deleteSingle_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void deleteMultiple(ByteBuffer table, List<TDelete> deletes, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.deleteMultiple_call> resultHandler) throws org.apache.thrift.TException;
+    public void deleteMultiple(ByteBuffer table, List<TDelete> tdeletes, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.deleteMultiple_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete deleteSingle, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.checkAndDelete_call> resultHandler) throws org.apache.thrift.TException;
+    public void checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete tdelete, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.checkAndDelete_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void increment(ByteBuffer table, TIncrement increment, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.increment_call> resultHandler) throws org.apache.thrift.TException;
+    public void increment(ByteBuffer table, TIncrement tincrement, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.increment_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void append(ByteBuffer table, TAppend append, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.append_call> resultHandler) throws org.apache.thrift.TException;
+    public void append(ByteBuffer table, TAppend tappend, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.append_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void openScanner(ByteBuffer table, TScan scan, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.openScanner_call> resultHandler) throws org.apache.thrift.TException;
+    public void openScanner(ByteBuffer table, TScan tscan, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.openScanner_call> resultHandler) throws org.apache.thrift.TException;
 
     public void getScannerRows(int scannerId, int numRows, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getScannerRows_call> resultHandler) throws org.apache.thrift.TException;
 
     public void closeScanner(int scannerId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.closeScanner_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void mutateRow(ByteBuffer table, TRowMutations rowMutations, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.mutateRow_call> resultHandler) throws org.apache.thrift.TException;
+    public void mutateRow(ByteBuffer table, TRowMutations trowMutations, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.mutateRow_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void getScannerResults(ByteBuffer table, TScan tscan, int numRows, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getScannerResults_call> resultHandler) throws org.apache.thrift.TException;
+
+    public void getRegionLocation(ByteBuffer table, ByteBuffer row, boolean reload, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getRegionLocation_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void getScannerResults(ByteBuffer table, TScan scan, int numRows, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getScannerResults_call> resultHandler) throws org.apache.thrift.TException;
+    public void getAllRegionLocations(ByteBuffer table, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getAllRegionLocations_call> resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -280,17 +305,17 @@ public class THBaseService {
       super(iprot, oprot);
     }
 
-    public boolean exists(ByteBuffer table, TGet get) throws TIOError, org.apache.thrift.TException
+    public boolean exists(ByteBuffer table, TGet tget) throws TIOError, org.apache.thrift.TException
     {
-      send_exists(table, get);
+      send_exists(table, tget);
       return recv_exists();
     }
 
-    public void send_exists(ByteBuffer table, TGet get) throws org.apache.thrift.TException
+    public void send_exists(ByteBuffer table, TGet tget) throws org.apache.thrift.TException
     {
       exists_args args = new exists_args();
       args.setTable(table);
-      args.setGet(get);
+      args.setTget(tget);
       sendBase("exists", args);
     }
 
@@ -307,17 +332,17 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "exists failed: unknown result");
     }
 
-    public TResult get(ByteBuffer table, TGet get) throws TIOError, org.apache.thrift.TException
+    public TResult get(ByteBuffer table, TGet tget) throws TIOError, org.apache.thrift.TException
     {
-      send_get(table, get);
+      send_get(table, tget);
       return recv_get();
     }
 
-    public void send_get(ByteBuffer table, TGet get) throws org.apache.thrift.TException
+    public void send_get(ByteBuffer table, TGet tget) throws org.apache.thrift.TException
     {
       get_args args = new get_args();
       args.setTable(table);
-      args.setGet(get);
+      args.setTget(tget);
       sendBase("get", args);
     }
 
@@ -334,17 +359,17 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "get failed: unknown result");
     }
 
-    public List<TResult> getMultiple(ByteBuffer table, List<TGet> gets) throws TIOError, org.apache.thrift.TException
+    public List<TResult> getMultiple(ByteBuffer table, List<TGet> tgets) throws TIOError, org.apache.thrift.TException
     {
-      send_getMultiple(table, gets);
+      send_getMultiple(table, tgets);
       return recv_getMultiple();
     }
 
-    public void send_getMultiple(ByteBuffer table, List<TGet> gets) throws org.apache.thrift.TException
+    public void send_getMultiple(ByteBuffer table, List<TGet> tgets) throws org.apache.thrift.TException
     {
       getMultiple_args args = new getMultiple_args();
       args.setTable(table);
-      args.setGets(gets);
+      args.setTgets(tgets);
       sendBase("getMultiple", args);
     }
 
@@ -361,17 +386,17 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getMultiple failed: unknown result");
     }
 
-    public void put(ByteBuffer table, TPut put) throws TIOError, org.apache.thrift.TException
+    public void put(ByteBuffer table, TPut tput) throws TIOError, org.apache.thrift.TException
     {
-      send_put(table, put);
+      send_put(table, tput);
       recv_put();
     }
 
-    public void send_put(ByteBuffer table, TPut put) throws org.apache.thrift.TException
+    public void send_put(ByteBuffer table, TPut tput) throws org.apache.thrift.TException
     {
       put_args args = new put_args();
       args.setTable(table);
-      args.setPut(put);
+      args.setTput(tput);
       sendBase("put", args);
     }
 
@@ -385,13 +410,13 @@ public class THBaseService {
       return;
     }
 
-    public boolean checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut put) throws TIOError, org.apache.thrift.TException
+    public boolean checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut tput) throws TIOError, org.apache.thrift.TException
     {
-      send_checkAndPut(table, row, family, qualifier, value, put);
+      send_checkAndPut(table, row, family, qualifier, value, tput);
       return recv_checkAndPut();
     }
 
-    public void send_checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut put) throws org.apache.thrift.TException
+    public void send_checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut tput) throws org.apache.thrift.TException
     {
       checkAndPut_args args = new checkAndPut_args();
       args.setTable(table);
@@ -399,7 +424,7 @@ public class THBaseService {
       args.setFamily(family);
       args.setQualifier(qualifier);
       args.setValue(value);
-      args.setPut(put);
+      args.setTput(tput);
       sendBase("checkAndPut", args);
     }
 
@@ -416,17 +441,17 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "checkAndPut failed: unknown result");
     }
 
-    public void putMultiple(ByteBuffer table, List<TPut> puts) throws TIOError, org.apache.thrift.TException
+    public void putMultiple(ByteBuffer table, List<TPut> tputs) throws TIOError, org.apache.thrift.TException
     {
-      send_putMultiple(table, puts);
+      send_putMultiple(table, tputs);
       recv_putMultiple();
     }
 
-    public void send_putMultiple(ByteBuffer table, List<TPut> puts) throws org.apache.thrift.TException
+    public void send_putMultiple(ByteBuffer table, List<TPut> tputs) throws org.apache.thrift.TException
     {
       putMultiple_args args = new putMultiple_args();
       args.setTable(table);
-      args.setPuts(puts);
+      args.setTputs(tputs);
       sendBase("putMultiple", args);
     }
 
@@ -440,17 +465,17 @@ public class THBaseService {
       return;
     }
 
-    public void deleteSingle(ByteBuffer table, TDelete deleteSingle) throws TIOError, org.apache.thrift.TException
+    public void deleteSingle(ByteBuffer table, TDelete tdelete) throws TIOError, org.apache.thrift.TException
     {
-      send_deleteSingle(table, deleteSingle);
+      send_deleteSingle(table, tdelete);
       recv_deleteSingle();
     }
 
-    public void send_deleteSingle(ByteBuffer table, TDelete deleteSingle) throws org.apache.thrift.TException
+    public void send_deleteSingle(ByteBuffer table, TDelete tdelete) throws org.apache.thrift.TException
     {
       deleteSingle_args args = new deleteSingle_args();
       args.setTable(table);
-      args.setDeleteSingle(deleteSingle);
+      args.setTdelete(tdelete);
       sendBase("deleteSingle", args);
     }
 
@@ -464,17 +489,17 @@ public class THBaseService {
       return;
     }
 
-    public List<TDelete> deleteMultiple(ByteBuffer table, List<TDelete> deletes) throws TIOError, org.apache.thrift.TException
+    public List<TDelete> deleteMultiple(ByteBuffer table, List<TDelete> tdeletes) throws TIOError, org.apache.thrift.TException
     {
-      send_deleteMultiple(table, deletes);
+      send_deleteMultiple(table, tdeletes);
       return recv_deleteMultiple();
     }
 
-    public void send_deleteMultiple(ByteBuffer table, List<TDelete> deletes) throws org.apache.thrift.TException
+    public void send_deleteMultiple(ByteBuffer table, List<TDelete> tdeletes) throws org.apache.thrift.TException
     {
       deleteMultiple_args args = new deleteMultiple_args();
       args.setTable(table);
-      args.setDeletes(deletes);
+      args.setTdeletes(tdeletes);
       sendBase("deleteMultiple", args);
     }
 
@@ -491,13 +516,13 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "deleteMultiple failed: unknown result");
     }
 
-    public boolean checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete deleteSingle) throws TIOError, org.apache.thrift.TException
+    public boolean checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete tdelete) throws TIOError, org.apache.thrift.TException
     {
-      send_checkAndDelete(table, row, family, qualifier, value, deleteSingle);
+      send_checkAndDelete(table, row, family, qualifier, value, tdelete);
       return recv_checkAndDelete();
     }
 
-    public void send_checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete deleteSingle) throws org.apache.thrift.TException
+    public void send_checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete tdelete) throws org.apache.thrift.TException
     {
       checkAndDelete_args args = new checkAndDelete_args();
       args.setTable(table);
@@ -505,7 +530,7 @@ public class THBaseService {
       args.setFamily(family);
       args.setQualifier(qualifier);
       args.setValue(value);
-      args.setDeleteSingle(deleteSingle);
+      args.setTdelete(tdelete);
       sendBase("checkAndDelete", args);
     }
 
@@ -522,17 +547,17 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "checkAndDelete failed: unknown result");
     }
 
-    public TResult increment(ByteBuffer table, TIncrement increment) throws TIOError, org.apache.thrift.TException
+    public TResult increment(ByteBuffer table, TIncrement tincrement) throws TIOError, org.apache.thrift.TException
     {
-      send_increment(table, increment);
+      send_increment(table, tincrement);
       return recv_increment();
     }
 
-    public void send_increment(ByteBuffer table, TIncrement increment) throws org.apache.thrift.TException
+    public void send_increment(ByteBuffer table, TIncrement tincrement) throws org.apache.thrift.TException
     {
       increment_args args = new increment_args();
       args.setTable(table);
-      args.setIncrement(increment);
+      args.setTincrement(tincrement);
       sendBase("increment", args);
     }
 
@@ -549,17 +574,17 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "increment failed: unknown result");
     }
 
-    public TResult append(ByteBuffer table, TAppend append) throws TIOError, org.apache.thrift.TException
+    public TResult append(ByteBuffer table, TAppend tappend) throws TIOError, org.apache.thrift.TException
     {
-      send_append(table, append);
+      send_append(table, tappend);
       return recv_append();
     }
 
-    public void send_append(ByteBuffer table, TAppend append) throws org.apache.thrift.TException
+    public void send_append(ByteBuffer table, TAppend tappend) throws org.apache.thrift.TException
     {
       append_args args = new append_args();
       args.setTable(table);
-      args.setAppend(append);
+      args.setTappend(tappend);
       sendBase("append", args);
     }
 
@@ -576,17 +601,17 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "append failed: unknown result");
     }
 
-    public int openScanner(ByteBuffer table, TScan scan) throws TIOError, org.apache.thrift.TException
+    public int openScanner(ByteBuffer table, TScan tscan) throws TIOError, org.apache.thrift.TException
     {
-      send_openScanner(table, scan);
+      send_openScanner(table, tscan);
       return recv_openScanner();
     }
 
-    public void send_openScanner(ByteBuffer table, TScan scan) throws org.apache.thrift.TException
+    public void send_openScanner(ByteBuffer table, TScan tscan) throws org.apache.thrift.TException
     {
       openScanner_args args = new openScanner_args();
       args.setTable(table);
-      args.setScan(scan);
+      args.setTscan(tscan);
       sendBase("openScanner", args);
     }
 
@@ -659,17 +684,17 @@ public class THBaseService {
       return;
     }
 
-    public void mutateRow(ByteBuffer table, TRowMutations rowMutations) throws TIOError, org.apache.thrift.TException
+    public void mutateRow(ByteBuffer table, TRowMutations trowMutations) throws TIOError, org.apache.thrift.TException
     {
-      send_mutateRow(table, rowMutations);
+      send_mutateRow(table, trowMutations);
       recv_mutateRow();
     }
 
-    public void send_mutateRow(ByteBuffer table, TRowMutations rowMutations) throws org.apache.thrift.TException
+    public void send_mutateRow(ByteBuffer table, TRowMutations trowMutations) throws org.apache.thrift.TException
     {
       mutateRow_args args = new mutateRow_args();
       args.setTable(table);
-      args.setRowMutations(rowMutations);
+      args.setTrowMutations(trowMutations);
       sendBase("mutateRow", args);
     }
 
@@ -683,17 +708,17 @@ public class THBaseService {
       return;
     }
 
-    public List<TResult> getScannerResults(ByteBuffer table, TScan scan, int numRows) throws TIOError, org.apache.thrift.TException
+    public List<TResult> getScannerResults(ByteBuffer table, TScan tscan, int numRows) throws TIOError, org.apache.thrift.TException
     {
-      send_getScannerResults(table, scan, numRows);
+      send_getScannerResults(table, tscan, numRows);
       return recv_getScannerResults();
     }
 
-    public void send_getScannerResults(ByteBuffer table, TScan scan, int numRows) throws org.apache.thrift.TException
+    public void send_getScannerResults(ByteBuffer table, TScan tscan, int numRows) throws org.apache.thrift.TException
     {
       getScannerResults_args args = new getScannerResults_args();
       args.setTable(table);
-      args.setScan(scan);
+      args.setTscan(tscan);
       args.setNumRows(numRows);
       sendBase("getScannerResults", args);
     }
@@ -711,6 +736,60 @@ public class THBaseService {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getScannerResults failed: unknown result");
     }
 
+    public THRegionLocation getRegionLocation(ByteBuffer table, ByteBuffer row, boolean reload) throws TIOError, org.apache.thrift.TException
+    {
+      send_getRegionLocation(table, row, reload);
+      return recv_getRegionLocation();
+    }
+
+    public void send_getRegionLocation(ByteBuffer table, ByteBuffer row, boolean reload) throws org.apache.thrift.TException
+    {
+      getRegionLocation_args args = new getRegionLocation_args();
+      args.setTable(table);
+      args.setRow(row);
+      args.setReload(reload);
+      sendBase("getRegionLocation", args);
+    }
+
+    public THRegionLocation recv_getRegionLocation() throws TIOError, org.apache.thrift.TException
+    {
+      getRegionLocation_result result = new getRegionLocation_result();
+      receiveBase(result, "getRegionLocation");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.io != null) {
+        throw result.io;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getRegionLocation failed: unknown result");
+    }
+
+    public List<THRegionLocation> getAllRegionLocations(ByteBuffer table) throws TIOError, org.apache.thrift.TException
+    {
+      send_getAllRegionLocations(table);
+      return recv_getAllRegionLocations();
+    }
+
+    public void send_getAllRegionLocations(ByteBuffer table) throws org.apache.thrift.TException
+    {
+      getAllRegionLocations_args args = new getAllRegionLocations_args();
+      args.setTable(table);
+      sendBase("getAllRegionLocations", args);
+    }
+
+    public List<THRegionLocation> recv_getAllRegionLocations() throws TIOError, org.apache.thrift.TException
+    {
+      getAllRegionLocations_result result = new getAllRegionLocations_result();
+      receiveBase(result, "getAllRegionLocations");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.io != null) {
+        throw result.io;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllRegionLocations failed: unknown result");
+    }
+
   }
   public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
     public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
@@ -729,27 +808,27 @@ public class THBaseService {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void exists(ByteBuffer table, TGet get, org.apache.thrift.async.AsyncMethodCallback<exists_call> resultHandler) throws org.apache.thrift.TException {
+    public void exists(ByteBuffer table, TGet tget, org.apache.thrift.async.AsyncMethodCallback<exists_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      exists_call method_call = new exists_call(table, get, resultHandler, this, ___protocolFactory, ___transport);
+      exists_call method_call = new exists_call(table, tget, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class exists_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TGet get;
-      public exists_call(ByteBuffer table, TGet get, org.apache.thrift.async.AsyncMethodCallback<exists_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TGet tget;
+      public exists_call(ByteBuffer table, TGet tget, org.apache.thrift.async.AsyncMethodCallback<exists_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.get = get;
+        this.tget = tget;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("exists", org.apache.thrift.protocol.TMessageType.CALL, 0));
         exists_args args = new exists_args();
         args.setTable(table);
-        args.setGet(get);
+        args.setTget(tget);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -764,27 +843,27 @@ public class THBaseService {
       }
     }
 
-    public void get(ByteBuffer table, TGet get, org.apache.thrift.async.AsyncMethodCallback<get_call> resultHandler) throws org.apache.thrift.TException {
+    public void get(ByteBuffer table, TGet tget, org.apache.thrift.async.AsyncMethodCallback<get_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      get_call method_call = new get_call(table, get, resultHandler, this, ___protocolFactory, ___transport);
+      get_call method_call = new get_call(table, tget, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class get_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TGet get;
-      public get_call(ByteBuffer table, TGet get, org.apache.thrift.async.AsyncMethodCallback<get_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TGet tget;
+      public get_call(ByteBuffer table, TGet tget, org.apache.thrift.async.AsyncMethodCallback<get_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.get = get;
+        this.tget = tget;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("get", org.apache.thrift.protocol.TMessageType.CALL, 0));
         get_args args = new get_args();
         args.setTable(table);
-        args.setGet(get);
+        args.setTget(tget);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -799,27 +878,27 @@ public class THBaseService {
       }
     }
 
-    public void getMultiple(ByteBuffer table, List<TGet> gets, org.apache.thrift.async.AsyncMethodCallback<getMultiple_call> resultHandler) throws org.apache.thrift.TException {
+    public void getMultiple(ByteBuffer table, List<TGet> tgets, org.apache.thrift.async.AsyncMethodCallback<getMultiple_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getMultiple_call method_call = new getMultiple_call(table, gets, resultHandler, this, ___protocolFactory, ___transport);
+      getMultiple_call method_call = new getMultiple_call(table, tgets, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getMultiple_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private List<TGet> gets;
-      public getMultiple_call(ByteBuffer table, List<TGet> gets, org.apache.thrift.async.AsyncMethodCallback<getMultiple_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private List<TGet> tgets;
+      public getMultiple_call(ByteBuffer table, List<TGet> tgets, org.apache.thrift.async.AsyncMethodCallback<getMultiple_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.gets = gets;
+        this.tgets = tgets;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getMultiple", org.apache.thrift.protocol.TMessageType.CALL, 0));
         getMultiple_args args = new getMultiple_args();
         args.setTable(table);
-        args.setGets(gets);
+        args.setTgets(tgets);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -834,27 +913,27 @@ public class THBaseService {
       }
     }
 
-    public void put(ByteBuffer table, TPut put, org.apache.thrift.async.AsyncMethodCallback<put_call> resultHandler) throws org.apache.thrift.TException {
+    public void put(ByteBuffer table, TPut tput, org.apache.thrift.async.AsyncMethodCallback<put_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      put_call method_call = new put_call(table, put, resultHandler, this, ___protocolFactory, ___transport);
+      put_call method_call = new put_call(table, tput, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class put_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TPut put;
-      public put_call(ByteBuffer table, TPut put, org.apache.thrift.async.AsyncMethodCallback<put_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TPut tput;
+      public put_call(ByteBuffer table, TPut tput, org.apache.thrift.async.AsyncMethodCallback<put_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.put = put;
+        this.tput = tput;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("put", org.apache.thrift.protocol.TMessageType.CALL, 0));
         put_args args = new put_args();
         args.setTable(table);
-        args.setPut(put);
+        args.setTput(tput);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -869,9 +948,9 @@ public class THBaseService {
       }
     }
 
-    public void checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut put, org.apache.thrift.async.AsyncMethodCallback<checkAndPut_call> resultHandler) throws org.apache.thrift.TException {
+    public void checkAndPut(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut tput, org.apache.thrift.async.AsyncMethodCallback<checkAndPut_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      checkAndPut_call method_call = new checkAndPut_call(table, row, family, qualifier, value, put, resultHandler, this, ___protocolFactory, ___transport);
+      checkAndPut_call method_call = new checkAndPut_call(table, row, family, qualifier, value, tput, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -882,15 +961,15 @@ public class THBaseService {
       private ByteBuffer family;
       private ByteBuffer qualifier;
       private ByteBuffer value;
-      private TPut put;
-      public checkAndPut_call(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut put, org.apache.thrift.async.AsyncMethodCallback<checkAndPut_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TPut tput;
+      public checkAndPut_call(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TPut tput, org.apache.thrift.async.AsyncMethodCallback<checkAndPut_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
         this.row = row;
         this.family = family;
         this.qualifier = qualifier;
         this.value = value;
-        this.put = put;
+        this.tput = tput;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -901,7 +980,7 @@ public class THBaseService {
         args.setFamily(family);
         args.setQualifier(qualifier);
         args.setValue(value);
-        args.setPut(put);
+        args.setTput(tput);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -916,27 +995,27 @@ public class THBaseService {
       }
     }
 
-    public void putMultiple(ByteBuffer table, List<TPut> puts, org.apache.thrift.async.AsyncMethodCallback<putMultiple_call> resultHandler) throws org.apache.thrift.TException {
+    public void putMultiple(ByteBuffer table, List<TPut> tputs, org.apache.thrift.async.AsyncMethodCallback<putMultiple_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      putMultiple_call method_call = new putMultiple_call(table, puts, resultHandler, this, ___protocolFactory, ___transport);
+      putMultiple_call method_call = new putMultiple_call(table, tputs, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class putMultiple_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private List<TPut> puts;
-      public putMultiple_call(ByteBuffer table, List<TPut> puts, org.apache.thrift.async.AsyncMethodCallback<putMultiple_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private List<TPut> tputs;
+      public putMultiple_call(ByteBuffer table, List<TPut> tputs, org.apache.thrift.async.AsyncMethodCallback<putMultiple_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.puts = puts;
+        this.tputs = tputs;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("putMultiple", org.apache.thrift.protocol.TMessageType.CALL, 0));
         putMultiple_args args = new putMultiple_args();
         args.setTable(table);
-        args.setPuts(puts);
+        args.setTputs(tputs);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -951,27 +1030,27 @@ public class THBaseService {
       }
     }
 
-    public void deleteSingle(ByteBuffer table, TDelete deleteSingle, org.apache.thrift.async.AsyncMethodCallback<deleteSingle_call> resultHandler) throws org.apache.thrift.TException {
+    public void deleteSingle(ByteBuffer table, TDelete tdelete, org.apache.thrift.async.AsyncMethodCallback<deleteSingle_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      deleteSingle_call method_call = new deleteSingle_call(table, deleteSingle, resultHandler, this, ___protocolFactory, ___transport);
+      deleteSingle_call method_call = new deleteSingle_call(table, tdelete, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class deleteSingle_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TDelete deleteSingle;
-      public deleteSingle_call(ByteBuffer table, TDelete deleteSingle, org.apache.thrift.async.AsyncMethodCallback<deleteSingle_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TDelete tdelete;
+      public deleteSingle_call(ByteBuffer table, TDelete tdelete, org.apache.thrift.async.AsyncMethodCallback<deleteSingle_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.deleteSingle = deleteSingle;
+        this.tdelete = tdelete;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteSingle", org.apache.thrift.protocol.TMessageType.CALL, 0));
         deleteSingle_args args = new deleteSingle_args();
         args.setTable(table);
-        args.setDeleteSingle(deleteSingle);
+        args.setTdelete(tdelete);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -986,27 +1065,27 @@ public class THBaseService {
       }
     }
 
-    public void deleteMultiple(ByteBuffer table, List<TDelete> deletes, org.apache.thrift.async.AsyncMethodCallback<deleteMultiple_call> resultHandler) throws org.apache.thrift.TException {
+    public void deleteMultiple(ByteBuffer table, List<TDelete> tdeletes, org.apache.thrift.async.AsyncMethodCallback<deleteMultiple_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      deleteMultiple_call method_call = new deleteMultiple_call(table, deletes, resultHandler, this, ___protocolFactory, ___transport);
+      deleteMultiple_call method_call = new deleteMultiple_call(table, tdeletes, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class deleteMultiple_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private List<TDelete> deletes;
-      public deleteMultiple_call(ByteBuffer table, List<TDelete> deletes, org.apache.thrift.async.AsyncMethodCallback<deleteMultiple_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private List<TDelete> tdeletes;
+      public deleteMultiple_call(ByteBuffer table, List<TDelete> tdeletes, org.apache.thrift.async.AsyncMethodCallback<deleteMultiple_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.deletes = deletes;
+        this.tdeletes = tdeletes;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("deleteMultiple", org.apache.thrift.protocol.TMessageType.CALL, 0));
         deleteMultiple_args args = new deleteMultiple_args();
         args.setTable(table);
-        args.setDeletes(deletes);
+        args.setTdeletes(tdeletes);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -1021,9 +1100,9 @@ public class THBaseService {
       }
     }
 
-    public void checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete deleteSingle, org.apache.thrift.async.AsyncMethodCallback<checkAndDelete_call> resultHandler) throws org.apache.thrift.TException {
+    public void checkAndDelete(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete tdelete, org.apache.thrift.async.AsyncMethodCallback<checkAndDelete_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      checkAndDelete_call method_call = new checkAndDelete_call(table, row, family, qualifier, value, deleteSingle, resultHandler, this, ___protocolFactory, ___transport);
+      checkAndDelete_call method_call = new checkAndDelete_call(table, row, family, qualifier, value, tdelete, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -1034,15 +1113,15 @@ public class THBaseService {
       private ByteBuffer family;
       private ByteBuffer qualifier;
       private ByteBuffer value;
-      private TDelete deleteSingle;
-      public checkAndDelete_call(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete deleteSingle, org.apache.thrift.async.AsyncMethodCallback<checkAndDelete_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TDelete tdelete;
+      public checkAndDelete_call(ByteBuffer table, ByteBuffer row, ByteBuffer family, ByteBuffer qualifier, ByteBuffer value, TDelete tdelete, org.apache.thrift.async.AsyncMethodCallback<checkAndDelete_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
         this.row = row;
         this.family = family;
         this.qualifier = qualifier;
         this.value = value;
-        this.deleteSingle = deleteSingle;
+        this.tdelete = tdelete;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -1053,7 +1132,7 @@ public class THBaseService {
         args.setFamily(family);
         args.setQualifier(qualifier);
         args.setValue(value);
-        args.setDeleteSingle(deleteSingle);
+        args.setTdelete(tdelete);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -1068,27 +1147,27 @@ public class THBaseService {
       }
     }
 
-    public void increment(ByteBuffer table, TIncrement increment, org.apache.thrift.async.AsyncMethodCallback<increment_call> resultHandler) throws org.apache.thrift.TException {
+    public void increment(ByteBuffer table, TIncrement tincrement, org.apache.thrift.async.AsyncMethodCallback<increment_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      increment_call method_call = new increment_call(table, increment, resultHandler, this, ___protocolFactory, ___transport);
+      increment_call method_call = new increment_call(table, tincrement, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class increment_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TIncrement increment;
-      public increment_call(ByteBuffer table, TIncrement increment, org.apache.thrift.async.AsyncMethodCallback<increment_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TIncrement tincrement;
+      public increment_call(ByteBuffer table, TIncrement tincrement, org.apache.thrift.async.AsyncMethodCallback<increment_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.increment = increment;
+        this.tincrement = tincrement;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("increment", org.apache.thrift.protocol.TMessageType.CALL, 0));
         increment_args args = new increment_args();
         args.setTable(table);
-        args.setIncrement(increment);
+        args.setTincrement(tincrement);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -1103,27 +1182,27 @@ public class THBaseService {
       }
     }
 
-    public void append(ByteBuffer table, TAppend append, org.apache.thrift.async.AsyncMethodCallback<append_call> resultHandler) throws org.apache.thrift.TException {
+    public void append(ByteBuffer table, TAppend tappend, org.apache.thrift.async.AsyncMethodCallback<append_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      append_call method_call = new append_call(table, append, resultHandler, this, ___protocolFactory, ___transport);
+      append_call method_call = new append_call(table, tappend, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class append_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TAppend append;
-      public append_call(ByteBuffer table, TAppend append, org.apache.thrift.async.AsyncMethodCallback<append_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TAppend tappend;
+      public append_call(ByteBuffer table, TAppend tappend, org.apache.thrift.async.AsyncMethodCallback<append_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.append = append;
+        this.tappend = tappend;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("append", org.apache.thrift.protocol.TMessageType.CALL, 0));
         append_args args = new append_args();
         args.setTable(table);
-        args.setAppend(append);
+        args.setTappend(tappend);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -1138,27 +1217,27 @@ public class THBaseService {
       }
     }
 
-    public void openScanner(ByteBuffer table, TScan scan, org.apache.thrift.async.AsyncMethodCallback<openScanner_call> resultHandler) throws org.apache.thrift.TException {
+    public void openScanner(ByteBuffer table, TScan tscan, org.apache.thrift.async.AsyncMethodCallback<openScanner_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      openScanner_call method_call = new openScanner_call(table, scan, resultHandler, this, ___protocolFactory, ___transport);
+      openScanner_call method_call = new openScanner_call(table, tscan, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class openScanner_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TScan scan;
-      public openScanner_call(ByteBuffer table, TScan scan, org.apache.thrift.async.AsyncMethodCallback<openScanner_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TScan tscan;
+      public openScanner_call(ByteBuffer table, TScan tscan, org.apache.thrift.async.AsyncMethodCallback<openScanner_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.scan = scan;
+        this.tscan = tscan;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("openScanner", org.apache.thrift.protocol.TMessageType.CALL, 0));
         openScanner_args args = new openScanner_args();
         args.setTable(table);
-        args.setScan(scan);
+        args.setTscan(tscan);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -1240,27 +1319,27 @@ public class THBaseService {
       }
     }
 
-    public void mutateRow(ByteBuffer table, TRowMutations rowMutations, org.apache.thrift.async.AsyncMethodCallback<mutateRow_call> resultHandler) throws org.apache.thrift.TException {
+    public void mutateRow(ByteBuffer table, TRowMutations trowMutations, org.apache.thrift.async.AsyncMethodCallback<mutateRow_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      mutateRow_call method_call = new mutateRow_call(table, rowMutations, resultHandler, this, ___protocolFactory, ___transport);
+      mutateRow_call method_call = new mutateRow_call(table, trowMutations, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class mutateRow_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TRowMutations rowMutations;
-      public mutateRow_call(ByteBuffer table, TRowMutations rowMutations, org.apache.thrift.async.AsyncMethodCallback<mutateRow_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private TRowMutations trowMutations;
+      public mutateRow_call(ByteBuffer table, TRowMutations trowMutations, org.apache.thrift.async.AsyncMethodCallback<mutateRow_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.rowMutations = rowMutations;
+        this.trowMutations = trowMutations;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("mutateRow", org.apache.thrift.protocol.TMessageType.CALL, 0));
         mutateRow_args args = new mutateRow_args();
         args.setTable(table);
-        args.setRowMutations(rowMutations);
+        args.setTrowMutations(trowMutations);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -1275,21 +1354,21 @@ public class THBaseService {
       }
     }
 
-    public void getScannerResults(ByteBuffer table, TScan scan, int numRows, org.apache.thrift.async.AsyncMethodCallback<getScannerResults_call> resultHandler) throws org.apache.thrift.TException {
+    public void getScannerResults(ByteBuffer table, TScan tscan, int numRows, org.apache.thrift.async.AsyncMethodCallback<getScannerResults_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getScannerResults_call method_call = new getScannerResults_call(table, scan, numRows, resultHandler, this, ___protocolFactory, ___transport);
+      getScannerResults_call method_call = new getScannerResults_call(table, tscan, numRows, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getScannerResults_call extends org.apache.thrift.async.TAsyncMethodCall {
       private ByteBuffer table;
-      private TScan scan;
+      private TScan tscan;
       private int numRows;
-      public getScannerResults_call(ByteBuffer table, TScan scan, int numRows, org.apache.thrift.async.AsyncMethodCallback<getScannerResults_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getScannerResults_call(ByteBuffer table, TScan tscan, int numRows, org.apache.thrift.async.AsyncMethodCallback<getScannerResults_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.scan = scan;
+        this.tscan = tscan;
         this.numRows = numRows;
       }
 
@@ -1297,7 +1376,7 @@ public class THBaseService {
         prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getScannerResults", org.apache.thrift.protocol.TMessageType.CALL, 0));
         getScannerResults_args args = new getScannerResults_args();
         args.setTable(table);
-        args.setScan(scan);
+        args.setTscan(tscan);
         args.setNumRows(numRows);
         args.write(prot);
         prot.writeMessageEnd();
@@ -1313,6 +1392,76 @@ public class THBaseService {
       }
     }
 
+    public void getRegionLocation(ByteBuffer table, ByteBuffer row, boolean reload, org.apache.thrift.async.AsyncMethodCallback<getRegionLocation_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getRegionLocation_call method_call = new getRegionLocation_call(table, row, reload, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getRegionLocation_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private ByteBuffer table;
+      private ByteBuffer row;
+      private boolean reload;
+      public getRegionLocation_call(ByteBuffer table, ByteBuffer row, boolean reload, org.apache.thrift.async.AsyncMethodCallback<getRegionLocation_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.table = table;
+        this.row = row;
+        this.reload = reload;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getRegionLocation", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getRegionLocation_args args = new getRegionLocation_args();
+        args.setTable(table);
+        args.setRow(row);
+        args.setReload(reload);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public THRegionLocation getResult() throws TIOError, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getRegionLocation();
+      }
+    }
+
+    public void getAllRegionLocations(ByteBuffer table, org.apache.thrift.async.AsyncMethodCallback<getAllRegionLocations_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getAllRegionLocations_call method_call = new getAllRegionLocations_call(table, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getAllRegionLocations_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private ByteBuffer table;
+      public getAllRegionLocations_call(ByteBuffer table, org.apache.thrift.async.AsyncMethodCallback<getAllRegionLocations_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.table = table;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getAllRegionLocations", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getAllRegionLocations_args args = new getAllRegionLocations_args();
+        args.setTable(table);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public List<THRegionLocation> getResult() throws TIOError, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getAllRegionLocations();
+      }
+    }
+
   }
 
   public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
@@ -1342,6 +1491,8 @@ public class THBaseService {
       processMap.put("closeScanner", new closeScanner());
       processMap.put("mutateRow", new mutateRow());
       processMap.put("getScannerResults", new getScannerResults());
+      processMap.put("getRegionLocation", new getRegionLocation());
+      processMap.put("getAllRegionLocations", new getAllRegionLocations());
       return processMap;
     }
 
@@ -1361,7 +1512,7 @@ public class THBaseService {
       public exists_result getResult(I iface, exists_args args) throws org.apache.thrift.TException {
         exists_result result = new exists_result();
         try {
-          result.success = iface.exists(args.table, args.get);
+          result.success = iface.exists(args.table, args.tget);
           result.setSuccessIsSet(true);
         } catch (TIOError io) {
           result.io = io;
@@ -1386,7 +1537,7 @@ public class THBaseService {
       public get_result getResult(I iface, get_args args) throws org.apache.thrift.TException {
         get_result result = new get_result();
         try {
-          result.success = iface.get(args.table, args.get);
+          result.success = iface.get(args.table, args.tget);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1410,7 +1561,7 @@ public class THBaseService {
       public getMultiple_result getResult(I iface, getMultiple_args args) throws org.apache.thrift.TException {
         getMultiple_result result = new getMultiple_result();
         try {
-          result.success = iface.getMultiple(args.table, args.gets);
+          result.success = iface.getMultiple(args.table, args.tgets);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1434,7 +1585,7 @@ public class THBaseService {
       public put_result getResult(I iface, put_args args) throws org.apache.thrift.TException {
         put_result result = new put_result();
         try {
-          iface.put(args.table, args.put);
+          iface.put(args.table, args.tput);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1458,7 +1609,7 @@ public class THBaseService {
       public checkAndPut_result getResult(I iface, checkAndPut_args args) throws org.apache.thrift.TException {
         checkAndPut_result result = new checkAndPut_result();
         try {
-          result.success = iface.checkAndPut(args.table, args.row, args.family, args.qualifier, args.value, args.put);
+          result.success = iface.checkAndPut(args.table, args.row, args.family, args.qualifier, args.value, args.tput);
           result.setSuccessIsSet(true);
         } catch (TIOError io) {
           result.io = io;
@@ -1483,7 +1634,7 @@ public class THBaseService {
       public putMultiple_result getResult(I iface, putMultiple_args args) throws org.apache.thrift.TException {
         putMultiple_result result = new putMultiple_result();
         try {
-          iface.putMultiple(args.table, args.puts);
+          iface.putMultiple(args.table, args.tputs);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1507,7 +1658,7 @@ public class THBaseService {
       public deleteSingle_result getResult(I iface, deleteSingle_args args) throws org.apache.thrift.TException {
         deleteSingle_result result = new deleteSingle_result();
         try {
-          iface.deleteSingle(args.table, args.deleteSingle);
+          iface.deleteSingle(args.table, args.tdelete);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1531,7 +1682,7 @@ public class THBaseService {
       public deleteMultiple_result getResult(I iface, deleteMultiple_args args) throws org.apache.thrift.TException {
         deleteMultiple_result result = new deleteMultiple_result();
         try {
-          result.success = iface.deleteMultiple(args.table, args.deletes);
+          result.success = iface.deleteMultiple(args.table, args.tdeletes);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1555,7 +1706,7 @@ public class THBaseService {
       public checkAndDelete_result getResult(I iface, checkAndDelete_args args) throws org.apache.thrift.TException {
         checkAndDelete_result result = new checkAndDelete_result();
         try {
-          result.success = iface.checkAndDelete(args.table, args.row, args.family, args.qualifier, args.value, args.deleteSingle);
+          result.success = iface.checkAndDelete(args.table, args.row, args.family, args.qualifier, args.value, args.tdelete);
           result.setSuccessIsSet(true);
         } catch (TIOError io) {
           result.io = io;
@@ -1580,7 +1731,7 @@ public class THBaseService {
       public increment_result getResult(I iface, increment_args args) throws org.apache.thrift.TException {
         increment_result result = new increment_result();
         try {
-          result.success = iface.increment(args.table, args.increment);
+          result.success = iface.increment(args.table, args.tincrement);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1604,7 +1755,7 @@ public class THBaseService {
       public append_result getResult(I iface, append_args args) throws org.apache.thrift.TException {
         append_result result = new append_result();
         try {
-          result.success = iface.append(args.table, args.append);
+          result.success = iface.append(args.table, args.tappend);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1628,7 +1779,7 @@ public class THBaseService {
       public openScanner_result getResult(I iface, openScanner_args args) throws org.apache.thrift.TException {
         openScanner_result result = new openScanner_result();
         try {
-          result.success = iface.openScanner(args.table, args.scan);
+          result.success = iface.openScanner(args.table, args.tscan);
           result.setSuccessIsSet(true);
         } catch (TIOError io) {
           result.io = io;
@@ -1705,7 +1856,7 @@ public class THBaseService {
       public mutateRow_result getResult(I iface, mutateRow_args args) throws org.apache.thrift.TException {
         mutateRow_result result = new mutateRow_result();
         try {
-          iface.mutateRow(args.table, args.rowMutations);
+          iface.mutateRow(args.table, args.trowMutations);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1729,7 +1880,55 @@ public class THBaseService {
       public getScannerResults_result getResult(I iface, getScannerResults_args args) throws org.apache.thrift.TException {
         getScannerResults_result result = new getScannerResults_result();
         try {
-          result.success = iface.getScannerResults(args.table, args.scan, args.numRows);
+          result.success = iface.getScannerResults(args.table, args.tscan, args.numRows);
+        } catch (TIOError io) {
+          result.io = io;
+        }
+        return result;
+      }
+    }
+
+    public static class getRegionLocation<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getRegionLocation_args> {
+      public getRegionLocation() {
+        super("getRegionLocation");
+      }
+
+      public getRegionLocation_args getEmptyArgsInstance() {
+        return new getRegionLocation_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public getRegionLocation_result getResult(I iface, getRegionLocation_args args) throws org.apache.thrift.TException {
+        getRegionLocation_result result = new getRegionLocation_result();
+        try {
+          result.success = iface.getRegionLocation(args.table, args.row, args.reload);
+        } catch (TIOError io) {
+          result.io = io;
+        }
+        return result;
+      }
+    }
+
+    public static class getAllRegionLocations<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getAllRegionLocations_args> {
+      public getAllRegionLocations() {
+        super("getAllRegionLocations");
+      }
+
+      public getAllRegionLocations_args getEmptyArgsInstance() {
+        return new getAllRegionLocations_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public getAllRegionLocations_result getResult(I iface, getAllRegionLocations_args args) throws org.apache.thrift.TException {
+        getAllRegionLocations_result result = new getAllRegionLocations_result();
+        try {
+          result.success = iface.getAllRegionLocations(args.table);
         } catch (TIOError io) {
           result.io = io;
         }
@@ -1743,7 +1942,7 @@ public class THBaseService {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("exists_args");
 
     private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField GET_FIELD_DESC = new org.apache.thrift.protocol.TField("get", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField TGET_FIELD_DESC = new org.apache.thrift.protocol.TField("tget", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -1758,7 +1957,7 @@ public class THBaseService {
     /**
      * the TGet to check for
      */
-    public TGet get; // required
+    public TGet tget; // 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 {
@@ -1769,7 +1968,7 @@ public class THBaseService {
       /**
        * the TGet to check for
        */
-      GET((short)2, "get");
+      TGET((short)2, "tget");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -1786,8 +1985,8 @@ public class THBaseService {
         switch(fieldId) {
           case 1: // TABLE
             return TABLE;
-          case 2: // GET
-            return GET;
+          case 2: // TGET
+            return TGET;
           default:
             return null;
         }
@@ -1833,7 +2032,7 @@ public class THBaseService {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.TABLE, new org.apache.thrift.meta_data.FieldMetaData("table", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
-      tmpMap.put(_Fields.GET, new org.apache.thrift.meta_data.FieldMetaData("get", org.apache.thrift.TFieldRequirementType.REQUIRED, 
+      tmpMap.put(_Fields.TGET, new org.apache.thrift.meta_data.FieldMetaData("tget", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TGet.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(exists_args.class, metaDataMap);
@@ -1844,11 +2043,11 @@ public class THBaseService {
 
     public exists_args(
       ByteBuffer table,
-      TGet get)
+      TGet tget)
     {
       this();
       this.table = table;
-      this.get = get;
+      this.tget = tget;
     }
 
     /**
@@ -1859,8 +2058,8 @@ public class THBaseService {
         this.table = org.apache.thrift.TBaseHelper.copyBinary(other.table);
 ;
       }
-      if (other.isSetGet()) {
-        this.get = new TGet(other.get);
+      if (other.isSetTget()) {
+        this.tget = new TGet(other.tget);
       }
     }
 
@@ -1871,7 +2070,7 @@ public class THBaseService {
     @Override
     public void clear() {
       this.table = null;
-      this.get = null;
+      this.tget = null;
     }
 
     /**
@@ -1917,30 +2116,30 @@ public class THBaseService {
     /**
      * the TGet to check for
      */
-    public TGet getGet() {
-      return this.get;
+    public TGet getTget() {
+      return this.tget;
     }
 
     /**
      * the TGet to check for
      */
-    public exists_args setGet(TGet get) {
-      this.get = get;
+    public exists_args setTget(TGet tget) {
+      this.tget = tget;
       return this;
     }
 
-    public void unsetGet() {
-      this.get = null;
+    public void unsetTget() {
+      this.tget = null;
     }
 
-    /** Returns true if field get is set (has been assigned a value) and false otherwise */
-    public boolean isSetGet() {
-      return this.get != null;
+    /** Returns true if field tget is set (has been assigned a value) and false otherwise */
+    public boolean isSetTget() {
+      return this.tget != null;
     }
 
-    public void setGetIsSet(boolean value) {
+    public void setTgetIsSet(boolean value) {
       if (!value) {
-        this.get = null;
+        this.tget = null;
       }
     }
 
@@ -1954,11 +2153,11 @@ public class THBaseService {
         }
         break;
 
-      case GET:
+      case TGET:
         if (value == null) {
-          unsetGet();
+          unsetTget();
         } else {
-          setGet((TGet)value);
+          setTget((TGet)value);
         }
         break;
 
@@ -1970,8 +2169,8 @@ public class THBaseService {
       case TABLE:
         return getTable();
 
-      case GET:
-        return getGet();
+      case TGET:
+        return getTget();
 
       }
       throw new IllegalStateException();
@@ -1986,8 +2185,8 @@ public class THBaseService {
       switch (field) {
       case TABLE:
         return isSetTable();
-      case GET:
-        return isSetGet();
+      case TGET:
+        return isSetTget();
       }
       throw new IllegalStateException();
     }
@@ -2014,12 +2213,12 @@ public class THBaseService {
           return false;
       }
 
-      boolean this_present_get = true && this.isSetGet();
-      boolean that_present_get = true && that.isSetGet();
-      if (this_present_get || that_present_get) {
-        if (!(this_present_get && that_present_get))
+      boolean this_present_tget = true && this.isSetTget();
+      boolean that_present_tget = true && that.isSetTget();
+      if (this_present_tget || that_present_tget) {
+        if (!(this_present_tget && that_present_tget))
           return false;
-        if (!this.get.equals(that.get))
+        if (!this.tget.equals(that.tget))
           return false;
       }
 
@@ -2035,10 +2234,10 @@ public class THBaseService {
       if (present_table)
         builder.append(table);
 
-      boolean present_get = true && (isSetGet());
-      builder.append(present_get);
-      if (present_get)
-        builder.append(get);
+      boolean present_tget = true && (isSetTget());
+      builder.append(present_tget);
+      if (present_tget)
+        builder.append(tget);
 
       return builder.toHashCode();
     }
@@ -2061,12 +2260,12 @@ public class THBaseService {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetGet()).compareTo(typedOther.isSetGet());
+      lastComparison = Boolean.valueOf(isSetTget()).compareTo(typedOther.isSetTget());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetGet()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.get, typedOther.get);
+      if (isSetTget()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tget, typedOther.tget);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2099,11 +2298,11 @@ public class THBaseService {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("get:");
-      if (this.get == null) {
+      sb.append("tget:");
+      if (this.tget == null) {
         sb.append("null");
       } else {
-        sb.append(this.get);
+        sb.append(this.tget);
       }
       first = false;
       sb.append(")");
@@ -2115,12 +2314,12 @@ public class THBaseService {
       if (table == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'table' was not present! Struct: " + toString());
       }
-      if (get == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'get' was not present! Struct: " + toString());
+      if (tget == null) {
+        throw new org.apache.thrift.protocol.TProtocolException("Required field 'tget' was not present! Struct: " + toString());
       }
       // check for sub-struct validity
-      if (get != null) {
-        get.validate();
+      if (tget != null) {
+        tget.validate();
       }
     }
 
@@ -2166,11 +2365,11 @@ public class THBaseService {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // GET
+            case 2: // TGET
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.get = new TGet();
-                struct.get.read(iprot);
-                struct.setGetIsSet(true);
+                struct.tget = new TGet();
+                struct.tget.read(iprot);
+                struct.setTgetIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -2195,9 +2394,9 @@ public class THBaseService {
           oprot.writeBinary(struct.table);
           oprot.writeFieldEnd();
         }
-        if (struct.get != null) {
-          oprot.writeFieldBegin(GET_FIELD_DESC);
-          struct.get.write(oprot);
+        if (struct.tget != null) {
+          oprot.writeFieldBegin(TGET_FIELD_DESC);
+          struct.tget.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -2218,7 +2417,7 @@ public class THBaseService {
       public void write(org.apache.thrift.protocol.TProtocol prot, exists_args struct) throws org.apache.thrift.TException {
         TTupleProtocol oprot = (TTupleProtocol) prot;
         oprot.writeBinary(struct.table);
-        struct.get.write(oprot);
+        struct.tget.write(oprot);
       }
 
       @Override
@@ -2226,9 +2425,9 @@ public class THBaseService {
         TTupleProtocol iprot = (TTupleProtocol) prot;
         struct.table = iprot.readBinary();
         struct.setTableIsSet(true);
-        struct.get = new TGet();
-        struct.get.read(iprot);
-        struct.setGetIsSet(true);
+        struct.tget = new TGet();
+        struct.tget.read(iprot);
+        struct.setTgetIsSet(true);
       }
     }
 
@@ -2706,7 +2905,7 @@ public class THBaseService {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("get_args");
 
     private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1);
-    private static final org.apache.thrift.protocol.TField GET_FIELD_DESC = new org.apache.thrift.protocol.TField("get", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.thrift.protocol.TField TGET_FIELD_DESC = new org.apache.thrift.protocol.TField("tget", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -2721,7 +2920,7 @@ public class THBaseService {
     /**
      * the TGet to fetch
      */
-    public TGet get; // required
+    public TGet tget; // 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 {
@@ -2732,7 +2931,7 @@ public class THBaseService {
       /**
        * the TGet to fetch
        */
-      GET((short)2, "get");
+      TGET((short)2, "tget");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -2749,8 +2948,8 @@ public class T

<TRUNCATED>