hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject [2/8] hbase git commit: HBASE-14172 Upgrade existing thrift binding using thrift 0.9.3 compiler. (Josh Elser)
Date Mon, 23 Nov 2015 21:40:48 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/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
index e709612..16f7116 100644
--- 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
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THRegionInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-22")
+public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THRegionInfo._Fields>, java.io.Serializable, Cloneable, Comparable<THRegionInfo> {
   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);
@@ -138,7 +142,7 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
   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};
+  private static final _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);
@@ -170,7 +174,7 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
     this();
     this.regionId = regionId;
     setRegionIdIsSet(true);
-    this.tableName = tableName;
+    this.tableName = org.apache.thrift.TBaseHelper.copyBinary(tableName);
   }
 
   /**
@@ -181,15 +185,12 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
     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;
@@ -244,16 +245,16 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
   }
 
   public ByteBuffer bufferForTableName() {
-    return tableName;
+    return org.apache.thrift.TBaseHelper.copyBinary(tableName);
   }
 
   public THRegionInfo setTableName(byte[] tableName) {
-    setTableName(tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(tableName));
+    this.tableName = tableName == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(tableName, tableName.length));
     return this;
   }
 
   public THRegionInfo setTableName(ByteBuffer tableName) {
-    this.tableName = tableName;
+    this.tableName = org.apache.thrift.TBaseHelper.copyBinary(tableName);
     return this;
   }
 
@@ -278,16 +279,16 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
   }
 
   public ByteBuffer bufferForStartKey() {
-    return startKey;
+    return org.apache.thrift.TBaseHelper.copyBinary(startKey);
   }
 
   public THRegionInfo setStartKey(byte[] startKey) {
-    setStartKey(startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(startKey));
+    this.startKey = startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(startKey, startKey.length));
     return this;
   }
 
   public THRegionInfo setStartKey(ByteBuffer startKey) {
-    this.startKey = startKey;
+    this.startKey = org.apache.thrift.TBaseHelper.copyBinary(startKey);
     return this;
   }
 
@@ -312,16 +313,16 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
   }
 
   public ByteBuffer bufferForEndKey() {
-    return endKey;
+    return org.apache.thrift.TBaseHelper.copyBinary(endKey);
   }
 
   public THRegionInfo setEndKey(byte[] endKey) {
-    setEndKey(endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(endKey));
+    this.endKey = endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(endKey, endKey.length));
     return this;
   }
 
   public THRegionInfo setEndKey(ByteBuffer endKey) {
-    this.endKey = endKey;
+    this.endKey = org.apache.thrift.TBaseHelper.copyBinary(endKey);
     return this;
   }
 
@@ -473,7 +474,7 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case REGION_ID:
-      return Long.valueOf(getRegionId());
+      return getRegionId();
 
     case TABLE_NAME:
       return getTableName();
@@ -485,13 +486,13 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
       return getEndKey();
 
     case OFFLINE:
-      return Boolean.valueOf(isOffline());
+      return isOffline();
 
     case SPLIT:
-      return Boolean.valueOf(isSplit());
+      return isSplit();
 
     case REPLICA_ID:
-      return Integer.valueOf(getReplicaId());
+      return getReplicaId();
 
     }
     throw new IllegalStateException();
@@ -603,120 +604,120 @@ public class THRegionInfo implements org.apache.thrift.TBase<THRegionInfo, THReg
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_regionId = true;
-    builder.append(present_regionId);
+    list.add(present_regionId);
     if (present_regionId)
-      builder.append(regionId);
+      list.add(regionId);
 
     boolean present_tableName = true && (isSetTableName());
-    builder.append(present_tableName);
+    list.add(present_tableName);
     if (present_tableName)
-      builder.append(tableName);
+      list.add(tableName);
 
     boolean present_startKey = true && (isSetStartKey());
-    builder.append(present_startKey);
+    list.add(present_startKey);
     if (present_startKey)
-      builder.append(startKey);
+      list.add(startKey);
 
     boolean present_endKey = true && (isSetEndKey());
-    builder.append(present_endKey);
+    list.add(present_endKey);
     if (present_endKey)
-      builder.append(endKey);
+      list.add(endKey);
 
     boolean present_offline = true && (isSetOffline());
-    builder.append(present_offline);
+    list.add(present_offline);
     if (present_offline)
-      builder.append(offline);
+      list.add(offline);
 
     boolean present_split = true && (isSetSplit());
-    builder.append(present_split);
+    list.add(present_split);
     if (present_split)
-      builder.append(split);
+      list.add(split);
 
     boolean present_replicaId = true && (isSetReplicaId());
-    builder.append(present_replicaId);
+    list.add(present_replicaId);
     if (present_replicaId)
-      builder.append(replicaId);
+      list.add(replicaId);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   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());
+    lastComparison = Boolean.valueOf(isSetRegionId()).compareTo(other.isSetRegionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRegionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionId, typedOther.regionId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionId, other.regionId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTableName()).compareTo(typedOther.isSetTableName());
+    lastComparison = Boolean.valueOf(isSetTableName()).compareTo(other.isSetTableName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTableName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, other.tableName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(typedOther.isSetStartKey());
+    lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(other.isSetStartKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStartKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, typedOther.startKey);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, other.startKey);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(typedOther.isSetEndKey());
+    lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(other.isSetEndKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetEndKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, typedOther.endKey);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, other.endKey);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOffline()).compareTo(typedOther.isSetOffline());
+    lastComparison = Boolean.valueOf(isSetOffline()).compareTo(other.isSetOffline());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOffline()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.offline, typedOther.offline);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.offline, other.offline);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSplit()).compareTo(typedOther.isSetSplit());
+    lastComparison = Boolean.valueOf(isSetSplit()).compareTo(other.isSetSplit());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSplit()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.split, typedOther.split);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.split, other.split);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetReplicaId()).compareTo(typedOther.isSetReplicaId());
+    lastComparison = Boolean.valueOf(isSetReplicaId()).compareTo(other.isSetReplicaId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetReplicaId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicaId, typedOther.replicaId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.replicaId, other.replicaId);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/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
index 22d00fc..43a3c76 100644
--- 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
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class THRegionLocation implements org.apache.thrift.TBase<THRegionLocation, THRegionLocation._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-22")
+public class THRegionLocation implements org.apache.thrift.TBase<THRegionLocation, THRegionLocation._Fields>, java.io.Serializable, Cloneable, Comparable<THRegionLocation> {
   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);
@@ -285,45 +289,45 @@ public class THRegionLocation implements org.apache.thrift.TBase<THRegionLocatio
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_serverName = true && (isSetServerName());
-    builder.append(present_serverName);
+    list.add(present_serverName);
     if (present_serverName)
-      builder.append(serverName);
+      list.add(serverName);
 
     boolean present_regionInfo = true && (isSetRegionInfo());
-    builder.append(present_regionInfo);
+    list.add(present_regionInfo);
     if (present_regionInfo)
-      builder.append(regionInfo);
+      list.add(regionInfo);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   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());
+    lastComparison = Boolean.valueOf(isSetServerName()).compareTo(other.isSetServerName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetServerName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, typedOther.serverName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, other.serverName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRegionInfo()).compareTo(typedOther.isSetRegionInfo());
+    lastComparison = Boolean.valueOf(isSetRegionInfo()).compareTo(other.isSetRegionInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRegionInfo()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionInfo, typedOther.regionInfo);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.regionInfo, other.regionInfo);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java
index d79eb3f..6fbacf9 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,15 +29,18 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 /**
  * A TIOError exception signals that an error occurred communicating
  * to the HBase master or a HBase region server. Also used to return
  * more general HBase error conditions.
  */
-public class TIOError extends TException implements org.apache.thrift.TBase<TIOError, TIOError._Fields>, java.io.Serializable, Cloneable {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-22")
+public class TIOError extends TException implements org.apache.thrift.TBase<TIOError, TIOError._Fields>, java.io.Serializable, Cloneable, Comparable<TIOError> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIOError");
 
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -108,7 +112,7 @@ public class TIOError extends TException implements org.apache.thrift.TBase<TIOE
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.MESSAGE};
+  private static final _Fields optionals[] = {_Fields.MESSAGE};
   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);
@@ -225,30 +229,30 @@ public class TIOError extends TException implements org.apache.thrift.TBase<TIOE
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_message = true && (isSetMessage());
-    builder.append(present_message);
+    list.add(present_message);
     if (present_message)
-      builder.append(message);
+      list.add(message);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TIOError other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TIOError typedOther = (TIOError)other;
 
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
index b18ce43..f843641 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,14 +29,17 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 /**
  * A TIllegalArgument exception indicates an illegal or invalid
  * argument was passed into a procedure.
  */
-public class TIllegalArgument extends TException implements org.apache.thrift.TBase<TIllegalArgument, TIllegalArgument._Fields>, java.io.Serializable, Cloneable {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-22")
+public class TIllegalArgument extends TException implements org.apache.thrift.TBase<TIllegalArgument, TIllegalArgument._Fields>, java.io.Serializable, Cloneable, Comparable<TIllegalArgument> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIllegalArgument");
 
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -107,7 +111,7 @@ public class TIllegalArgument extends TException implements org.apache.thrift.TB
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.MESSAGE};
+  private static final _Fields optionals[] = {_Fields.MESSAGE};
   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);
@@ -224,30 +228,30 @@ public class TIllegalArgument extends TException implements org.apache.thrift.TB
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_message = true && (isSetMessage());
-    builder.append(present_message);
+    list.add(present_message);
     if (present_message)
-      builder.append(message);
+      list.add(message);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TIllegalArgument other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TIllegalArgument typedOther = (TIllegalArgument)other;
 
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
index 358a9fc..f932db4 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,9 +29,11 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 /**
  * Used to perform Increment operations for a single row.
  * 
@@ -38,7 +41,8 @@ import org.slf4j.LoggerFactory;
  * by changing the durability. If you don't provide durability, it defaults to
  * column family's default setting for durability.
  */
-public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncrement._Fields>, java.io.Serializable, Cloneable {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-22")
+public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncrement._Fields>, java.io.Serializable, Cloneable, Comparable<TIncrement> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIncrement");
 
   private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -138,7 +142,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
+  private static final _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
   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);
@@ -167,7 +171,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
     List<TColumnIncrement> columns)
   {
     this();
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     this.columns = columns;
   }
 
@@ -177,30 +181,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
   public TIncrement(TIncrement other) {
     if (other.isSetRow()) {
       this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
-;
     }
     if (other.isSetColumns()) {
-      List<TColumnIncrement> __this__columns = new ArrayList<TColumnIncrement>();
+      List<TColumnIncrement> __this__columns = new ArrayList<TColumnIncrement>(other.columns.size());
       for (TColumnIncrement other_element : other.columns) {
         __this__columns.add(new TColumnIncrement(other_element));
       }
       this.columns = __this__columns;
     }
     if (other.isSetAttributes()) {
-      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>();
-      for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
-
-        ByteBuffer other_element_key = other_element.getKey();
-        ByteBuffer other_element_value = other_element.getValue();
-
-        ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
-;
-
-        ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
-;
-
-        __this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
-      }
+      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
       this.attributes = __this__attributes;
     }
     if (other.isSetDurability()) {
@@ -230,16 +220,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
   }
 
   public ByteBuffer bufferForRow() {
-    return row;
+    return org.apache.thrift.TBaseHelper.copyBinary(row);
   }
 
   public TIncrement setRow(byte[] row) {
-    setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row));
+    this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
     return this;
   }
 
   public TIncrement setRow(ByteBuffer row) {
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     return this;
   }
 
@@ -538,90 +528,90 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_row = true && (isSetRow());
-    builder.append(present_row);
+    list.add(present_row);
     if (present_row)
-      builder.append(row);
+      list.add(row);
 
     boolean present_columns = true && (isSetColumns());
-    builder.append(present_columns);
+    list.add(present_columns);
     if (present_columns)
-      builder.append(columns);
+      list.add(columns);
 
     boolean present_attributes = true && (isSetAttributes());
-    builder.append(present_attributes);
+    list.add(present_attributes);
     if (present_attributes)
-      builder.append(attributes);
+      list.add(attributes);
 
     boolean present_durability = true && (isSetDurability());
-    builder.append(present_durability);
+    list.add(present_durability);
     if (present_durability)
-      builder.append(durability.getValue());
+      list.add(durability.getValue());
 
     boolean present_cellVisibility = true && (isSetCellVisibility());
-    builder.append(present_cellVisibility);
+    list.add(present_cellVisibility);
     if (present_cellVisibility)
-      builder.append(cellVisibility);
+      list.add(cellVisibility);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TIncrement other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TIncrement typedOther = (TIncrement)other;
 
-    lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow());
+    lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
+    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes());
+    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability());
+    lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDurability()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, other.durability);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(typedOther.isSetCellVisibility());
+    lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(other.isSetCellVisibility());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCellVisibility()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, typedOther.cellVisibility);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, other.cellVisibility);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -756,12 +746,12 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
               {
                 org.apache.thrift.protocol.TList _list70 = iprot.readListBegin();
                 struct.columns = new ArrayList<TColumnIncrement>(_list70.size);
-                for (int _i71 = 0; _i71 < _list70.size; ++_i71)
+                TColumnIncrement _elem71;
+                for (int _i72 = 0; _i72 < _list70.size; ++_i72)
                 {
-                  TColumnIncrement _elem72; // required
-                  _elem72 = new TColumnIncrement();
-                  _elem72.read(iprot);
-                  struct.columns.add(_elem72);
+                  _elem71 = new TColumnIncrement();
+                  _elem71.read(iprot);
+                  struct.columns.add(_elem71);
                 }
                 iprot.readListEnd();
               }
@@ -775,13 +765,13 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
               {
                 org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin();
                 struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map73.size);
-                for (int _i74 = 0; _i74 < _map73.size; ++_i74)
+                ByteBuffer _key74;
+                ByteBuffer _val75;
+                for (int _i76 = 0; _i76 < _map73.size; ++_i76)
                 {
-                  ByteBuffer _key75; // required
-                  ByteBuffer _val76; // required
-                  _key75 = iprot.readBinary();
-                  _val76 = iprot.readBinary();
-                  struct.attributes.put(_key75, _val76);
+                  _key74 = iprot.readBinary();
+                  _val75 = iprot.readBinary();
+                  struct.attributes.put(_key74, _val75);
                 }
                 iprot.readMapEnd();
               }
@@ -792,7 +782,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
             break;
           case 5: // DURABILITY
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.durability = TDurability.findByValue(iprot.readI32());
+              struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
               struct.setDurabilityIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -930,12 +920,12 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
       {
         org.apache.thrift.protocol.TList _list81 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.columns = new ArrayList<TColumnIncrement>(_list81.size);
-        for (int _i82 = 0; _i82 < _list81.size; ++_i82)
+        TColumnIncrement _elem82;
+        for (int _i83 = 0; _i83 < _list81.size; ++_i83)
         {
-          TColumnIncrement _elem83; // required
-          _elem83 = new TColumnIncrement();
-          _elem83.read(iprot);
-          struct.columns.add(_elem83);
+          _elem82 = new TColumnIncrement();
+          _elem82.read(iprot);
+          struct.columns.add(_elem82);
         }
       }
       struct.setColumnsIsSet(true);
@@ -944,19 +934,19 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
         {
           org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map84.size);
-          for (int _i85 = 0; _i85 < _map84.size; ++_i85)
+          ByteBuffer _key85;
+          ByteBuffer _val86;
+          for (int _i87 = 0; _i87 < _map84.size; ++_i87)
           {
-            ByteBuffer _key86; // required
-            ByteBuffer _val87; // required
-            _key86 = iprot.readBinary();
-            _val87 = iprot.readBinary();
-            struct.attributes.put(_key86, _val87);
+            _key85 = iprot.readBinary();
+            _val86 = iprot.readBinary();
+            struct.attributes.put(_key85, _val86);
           }
         }
         struct.setAttributesIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.durability = TDurability.findByValue(iprot.readI32());
+        struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
         struct.setDurabilityIsSet(true);
       }
       if (incoming.get(2)) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/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 8fb1567..39379d1 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
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,9 +29,11 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 /**
  * Atomic mutation for the specified row. It can be either Put or Delete.
  */
@@ -186,6 +189,7 @@ public class TMutation extends org.apache.thrift.TUnion<TMutation, TMutation._Fi
           throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!");
       }
     } else {
+      org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       return null;
     }
   }
@@ -334,19 +338,19 @@ public class TMutation extends org.apache.thrift.TUnion<TMutation, TMutation._Fi
 
   @Override
   public int hashCode() {
-    HashCodeBuilder hcb = new HashCodeBuilder();
-    hcb.append(this.getClass().getName());
+    List<Object> list = new ArrayList<Object>();
+    list.add(this.getClass().getName());
     org.apache.thrift.TFieldIdEnum setField = getSetField();
     if (setField != null) {
-      hcb.append(setField.getThriftFieldId());
+      list.add(setField.getThriftFieldId());
       Object value = getFieldValue();
       if (value instanceof org.apache.thrift.TEnum) {
-        hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+        list.add(((org.apache.thrift.TEnum)getFieldValue()).getValue());
       } else {
-        hcb.append(value);
+        list.add(value);
       }
     }
-    return hcb.toHashCode();
+    return list.hashCode();
   }
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
     try {

http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
index c9a122c..0e96ded 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,9 +29,11 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 /**
  * Used to perform Put operations for a single row.
  * 
@@ -43,7 +46,8 @@ import org.slf4j.LoggerFactory;
  * by changing the durability. If you don't provide durability, it defaults to
  * column family's default setting for durability.
  */
-public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.io.Serializable, Cloneable {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-22")
+public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.io.Serializable, Cloneable, Comparable<TPut> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TPut");
 
   private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -150,7 +154,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
   // isset id assignments
   private static final int __TIMESTAMP_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
+  private static final _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
   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);
@@ -181,7 +185,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
     List<TColumnValue> columnValues)
   {
     this();
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     this.columnValues = columnValues;
   }
 
@@ -192,10 +196,9 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetRow()) {
       this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
-;
     }
     if (other.isSetColumnValues()) {
-      List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>();
+      List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>(other.columnValues.size());
       for (TColumnValue other_element : other.columnValues) {
         __this__columnValues.add(new TColumnValue(other_element));
       }
@@ -203,20 +206,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
     }
     this.timestamp = other.timestamp;
     if (other.isSetAttributes()) {
-      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>();
-      for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
-
-        ByteBuffer other_element_key = other_element.getKey();
-        ByteBuffer other_element_value = other_element.getValue();
-
-        ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
-;
-
-        ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
-;
-
-        __this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
-      }
+      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
       this.attributes = __this__attributes;
     }
     if (other.isSetDurability()) {
@@ -248,16 +238,16 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
   }
 
   public ByteBuffer bufferForRow() {
-    return row;
+    return org.apache.thrift.TBaseHelper.copyBinary(row);
   }
 
   public TPut setRow(byte[] row) {
-    setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row));
+    this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
     return this;
   }
 
   public TPut setRow(ByteBuffer row) {
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     return this;
   }
 
@@ -491,7 +481,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
       return getColumnValues();
 
     case TIMESTAMP:
-      return Long.valueOf(getTimestamp());
+      return getTimestamp();
 
     case ATTRIBUTES:
       return getAttributes();
@@ -601,105 +591,105 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_row = true && (isSetRow());
-    builder.append(present_row);
+    list.add(present_row);
     if (present_row)
-      builder.append(row);
+      list.add(row);
 
     boolean present_columnValues = true && (isSetColumnValues());
-    builder.append(present_columnValues);
+    list.add(present_columnValues);
     if (present_columnValues)
-      builder.append(columnValues);
+      list.add(columnValues);
 
     boolean present_timestamp = true && (isSetTimestamp());
-    builder.append(present_timestamp);
+    list.add(present_timestamp);
     if (present_timestamp)
-      builder.append(timestamp);
+      list.add(timestamp);
 
     boolean present_attributes = true && (isSetAttributes());
-    builder.append(present_attributes);
+    list.add(present_attributes);
     if (present_attributes)
-      builder.append(attributes);
+      list.add(attributes);
 
     boolean present_durability = true && (isSetDurability());
-    builder.append(present_durability);
+    list.add(present_durability);
     if (present_durability)
-      builder.append(durability.getValue());
+      list.add(durability.getValue());
 
     boolean present_cellVisibility = true && (isSetCellVisibility());
-    builder.append(present_cellVisibility);
+    list.add(present_cellVisibility);
     if (present_cellVisibility)
-      builder.append(cellVisibility);
+      list.add(cellVisibility);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TPut other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TPut typedOther = (TPut)other;
 
-    lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow());
+    lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(typedOther.isSetColumnValues());
+    lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(other.isSetColumnValues());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumnValues()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, typedOther.columnValues);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, other.columnValues);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
+    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTimestamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes());
+    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability());
+    lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDurability()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, other.durability);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(typedOther.isSetCellVisibility());
+    lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(other.isSetCellVisibility());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCellVisibility()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, typedOther.cellVisibility);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, other.cellVisibility);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -842,12 +832,12 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
               {
                 org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
                 struct.columnValues = new ArrayList<TColumnValue>(_list34.size);
-                for (int _i35 = 0; _i35 < _list34.size; ++_i35)
+                TColumnValue _elem35;
+                for (int _i36 = 0; _i36 < _list34.size; ++_i36)
                 {
-                  TColumnValue _elem36; // required
-                  _elem36 = new TColumnValue();
-                  _elem36.read(iprot);
-                  struct.columnValues.add(_elem36);
+                  _elem35 = new TColumnValue();
+                  _elem35.read(iprot);
+                  struct.columnValues.add(_elem35);
                 }
                 iprot.readListEnd();
               }
@@ -869,13 +859,13 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
               {
                 org.apache.thrift.protocol.TMap _map37 = iprot.readMapBegin();
                 struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map37.size);
-                for (int _i38 = 0; _i38 < _map37.size; ++_i38)
+                ByteBuffer _key38;
+                ByteBuffer _val39;
+                for (int _i40 = 0; _i40 < _map37.size; ++_i40)
                 {
-                  ByteBuffer _key39; // required
-                  ByteBuffer _val40; // required
-                  _key39 = iprot.readBinary();
-                  _val40 = iprot.readBinary();
-                  struct.attributes.put(_key39, _val40);
+                  _key38 = iprot.readBinary();
+                  _val39 = iprot.readBinary();
+                  struct.attributes.put(_key38, _val39);
                 }
                 iprot.readMapEnd();
               }
@@ -886,7 +876,7 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
             break;
           case 6: // DURABILITY
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.durability = TDurability.findByValue(iprot.readI32());
+              struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
               struct.setDurabilityIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1035,12 +1025,12 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
       {
         org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.columnValues = new ArrayList<TColumnValue>(_list45.size);
-        for (int _i46 = 0; _i46 < _list45.size; ++_i46)
+        TColumnValue _elem46;
+        for (int _i47 = 0; _i47 < _list45.size; ++_i47)
         {
-          TColumnValue _elem47; // required
-          _elem47 = new TColumnValue();
-          _elem47.read(iprot);
-          struct.columnValues.add(_elem47);
+          _elem46 = new TColumnValue();
+          _elem46.read(iprot);
+          struct.columnValues.add(_elem46);
         }
       }
       struct.setColumnValuesIsSet(true);
@@ -1053,19 +1043,19 @@ public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.i
         {
           org.apache.thrift.protocol.TMap _map48 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map48.size);
-          for (int _i49 = 0; _i49 < _map48.size; ++_i49)
+          ByteBuffer _key49;
+          ByteBuffer _val50;
+          for (int _i51 = 0; _i51 < _map48.size; ++_i51)
           {
-            ByteBuffer _key50; // required
-            ByteBuffer _val51; // required
-            _key50 = iprot.readBinary();
-            _val51 = iprot.readBinary();
-            struct.attributes.put(_key50, _val51);
+            _key49 = iprot.readBinary();
+            _val50 = iprot.readBinary();
+            struct.attributes.put(_key49, _val50);
           }
         }
         struct.setAttributesIsSet(true);
       }
       if (incoming.get(2)) {
-        struct.durability = TDurability.findByValue(iprot.readI32());
+        struct.durability = org.apache.hadoop.hbase.thrift2.generated.TDurability.findByValue(iprot.readI32());
         struct.setDurabilityIsSet(true);
       }
       if (incoming.get(3)) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java
index 182f947..bac6f5e 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,13 +29,16 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 /**
  * if no Result is found, row and columnValues will not be set.
  */
-public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields>, java.io.Serializable, Cloneable {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-22")
+public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields>, java.io.Serializable, Cloneable, Comparable<TResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TResult");
 
   private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -111,7 +115,7 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.ROW};
+  private static final _Fields optionals[] = {_Fields.ROW};
   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);
@@ -140,10 +144,9 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
   public TResult(TResult other) {
     if (other.isSetRow()) {
       this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
-;
     }
     if (other.isSetColumnValues()) {
-      List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>();
+      List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>(other.columnValues.size());
       for (TColumnValue other_element : other.columnValues) {
         __this__columnValues.add(new TColumnValue(other_element));
       }
@@ -167,16 +170,16 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
   }
 
   public ByteBuffer bufferForRow() {
-    return row;
+    return org.apache.thrift.TBaseHelper.copyBinary(row);
   }
 
   public TResult setRow(byte[] row) {
-    setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row));
+    this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
     return this;
   }
 
   public TResult setRow(ByteBuffer row) {
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     return this;
   }
 
@@ -318,45 +321,45 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_row = true && (isSetRow());
-    builder.append(present_row);
+    list.add(present_row);
     if (present_row)
-      builder.append(row);
+      list.add(row);
 
     boolean present_columnValues = true && (isSetColumnValues());
-    builder.append(present_columnValues);
+    list.add(present_columnValues);
     if (present_columnValues)
-      builder.append(columnValues);
+      list.add(columnValues);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TResult typedOther = (TResult)other;
 
-    lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow());
+    lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(typedOther.isSetColumnValues());
+    lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(other.isSetColumnValues());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumnValues()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, typedOther.columnValues);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, other.columnValues);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -457,12 +460,12 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
                 struct.columnValues = new ArrayList<TColumnValue>(_list0.size);
-                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+                TColumnValue _elem1;
+                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
-                  TColumnValue _elem2; // required
-                  _elem2 = new TColumnValue();
-                  _elem2.read(iprot);
-                  struct.columnValues.add(_elem2);
+                  _elem1 = new TColumnValue();
+                  _elem1.read(iprot);
+                  struct.columnValues.add(_elem1);
                 }
                 iprot.readListEnd();
               }
@@ -545,12 +548,12 @@ public class TResult implements org.apache.thrift.TBase<TResult, TResult._Fields
       {
         org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.columnValues = new ArrayList<TColumnValue>(_list5.size);
-        for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+        TColumnValue _elem6;
+        for (int _i7 = 0; _i7 < _list5.size; ++_i7)
         {
-          TColumnValue _elem7; // required
-          _elem7 = new TColumnValue();
-          _elem7.read(iprot);
-          struct.columnValues.add(_elem7);
+          _elem6 = new TColumnValue();
+          _elem6.read(iprot);
+          struct.columnValues.add(_elem6);
         }
       }
       struct.setColumnValuesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hbase/blob/aeff2341/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TRowMutations.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TRowMutations.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TRowMutations.java
index 94521c2..7246974 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TRowMutations.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TRowMutations.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,13 +29,16 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 /**
  * A TRowMutations object is used to apply a number of Mutations to a single row.
  */
-public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRowMutations._Fields>, java.io.Serializable, Cloneable {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-22")
+public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRowMutations._Fields>, java.io.Serializable, Cloneable, Comparable<TRowMutations> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowMutations");
 
   private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -131,7 +135,7 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
     List<TMutation> mutations)
   {
     this();
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     this.mutations = mutations;
   }
 
@@ -141,10 +145,9 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
   public TRowMutations(TRowMutations other) {
     if (other.isSetRow()) {
       this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
-;
     }
     if (other.isSetMutations()) {
-      List<TMutation> __this__mutations = new ArrayList<TMutation>();
+      List<TMutation> __this__mutations = new ArrayList<TMutation>(other.mutations.size());
       for (TMutation other_element : other.mutations) {
         __this__mutations.add(new TMutation(other_element));
       }
@@ -168,16 +171,16 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
   }
 
   public ByteBuffer bufferForRow() {
-    return row;
+    return org.apache.thrift.TBaseHelper.copyBinary(row);
   }
 
   public TRowMutations setRow(byte[] row) {
-    setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row));
+    this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length));
     return this;
   }
 
   public TRowMutations setRow(ByteBuffer row) {
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     return this;
   }
 
@@ -319,45 +322,45 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_row = true && (isSetRow());
-    builder.append(present_row);
+    list.add(present_row);
     if (present_row)
-      builder.append(row);
+      list.add(row);
 
     boolean present_mutations = true && (isSetMutations());
-    builder.append(present_mutations);
+    list.add(present_mutations);
     if (present_mutations)
-      builder.append(mutations);
+      list.add(mutations);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TRowMutations other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TRowMutations typedOther = (TRowMutations)other;
 
-    lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow());
+    lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMutations()).compareTo(typedOther.isSetMutations());
+    lastComparison = Boolean.valueOf(isSetMutations()).compareTo(other.isSetMutations());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMutations()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutations, typedOther.mutations);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutations, other.mutations);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -459,12 +462,12 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
               {
                 org.apache.thrift.protocol.TList _list124 = iprot.readListBegin();
                 struct.mutations = new ArrayList<TMutation>(_list124.size);
-                for (int _i125 = 0; _i125 < _list124.size; ++_i125)
+                TMutation _elem125;
+                for (int _i126 = 0; _i126 < _list124.size; ++_i126)
                 {
-                  TMutation _elem126; // required
-                  _elem126 = new TMutation();
-                  _elem126.read(iprot);
-                  struct.mutations.add(_elem126);
+                  _elem125 = new TMutation();
+                  _elem125.read(iprot);
+                  struct.mutations.add(_elem125);
                 }
                 iprot.readListEnd();
               }
@@ -540,12 +543,12 @@ public class TRowMutations implements org.apache.thrift.TBase<TRowMutations, TRo
       {
         org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.mutations = new ArrayList<TMutation>(_list129.size);
-        for (int _i130 = 0; _i130 < _list129.size; ++_i130)
+        TMutation _elem130;
+        for (int _i131 = 0; _i131 < _list129.size; ++_i131)
         {
-          TMutation _elem131; // required
-          _elem131 = new TMutation();
-          _elem131.read(iprot);
-          struct.mutations.add(_elem131);
+          _elem130 = new TMutation();
+          _elem130.read(iprot);
+          struct.mutations.add(_elem130);
         }
       }
       struct.setMutationsIsSet(true);


Mime
View raw message