accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [16/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler
Date Wed, 16 Dec 2015 21:11:21 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
index c4af921..4848920 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ThriftTest {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class ThriftTest {
 
   public interface Iface {
 
@@ -663,7 +666,9 @@ import org.slf4j.LoggerFactory;
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -930,7 +935,7 @@ import org.slf4j.LoggerFactory;
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return Boolean.valueOf(isSuccess());
+        return isSuccess();
 
       }
       throw new IllegalStateException();
@@ -976,7 +981,14 @@ import org.slf4j.LoggerFactory;
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true;
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -1263,7 +1275,9 @@ import org.slf4j.LoggerFactory;
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -1530,7 +1544,7 @@ import org.slf4j.LoggerFactory;
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return Boolean.valueOf(isSuccess());
+        return isSuccess();
 
       }
       throw new IllegalStateException();
@@ -1576,7 +1590,14 @@ import org.slf4j.LoggerFactory;
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true;
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      return list.hashCode();
     }
 
     @Override
@@ -1863,7 +1884,9 @@ import org.slf4j.LoggerFactory;
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      return list.hashCode();
     }
 
     @Override
@@ -2175,7 +2198,7 @@ import org.slf4j.LoggerFactory;
     public Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
-        return Boolean.valueOf(isSuccess());
+        return isSuccess();
 
       case EX:
         return getEx();
@@ -2235,7 +2258,19 @@ import org.slf4j.LoggerFactory;
 
     @Override
     public int hashCode() {
-      return 0;
+      List<Object> list = new ArrayList<Object>();
+
+      boolean present_success = true;
+      list.add(present_success);
+      if (present_success)
+        list.add(success);
+
+      boolean present_ex = true && (isSetEx());
+      list.add(present_ex);
+      if (present_ex)
+        list.add(ex);
+
+      return list.hashCode();
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
index d124c14..558cc86 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiScan, InitialMultiScan._Fields>, java.io.Serializable, Cloneable, Comparable<InitialMultiScan> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiScan, InitialMultiScan._Fields>, java.io.Serializable, Cloneable, Comparable<InitialMultiScan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InitialMultiScan");
 
   private static final org.apache.thrift.protocol.TField SCAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("scanID", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -244,7 +247,7 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case SCAN_ID:
-      return Long.valueOf(getScanID());
+      return getScanID();
 
     case RESULT:
       return getResult();
@@ -304,7 +307,19 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_scanID = true;
+    list.add(present_scanID);
+    if (present_scanID)
+      list.add(scanID);
+
+    boolean present_result = true && (isSetResult());
+    list.add(present_result);
+    if (present_result)
+      list.add(result);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
index 38239d7..3266801 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class InitialScan implements org.apache.thrift.TBase<InitialScan, InitialScan._Fields>, java.io.Serializable, Cloneable, Comparable<InitialScan> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class InitialScan implements org.apache.thrift.TBase<InitialScan, InitialScan._Fields>, java.io.Serializable, Cloneable, Comparable<InitialScan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InitialScan");
 
   private static final org.apache.thrift.protocol.TField SCAN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("scanID", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -244,7 +247,7 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case SCAN_ID:
-      return Long.valueOf(getScanID());
+      return getScanID();
 
     case RESULT:
       return getResult();
@@ -304,7 +307,19 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_scanID = true;
+    list.add(present_scanID);
+    if (present_scanID)
+      list.add(scanID);
+
+    boolean present_result = true && (isSetResult());
+    list.add(present_result);
+    if (present_result)
+      list.add(result);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
index 890a6b8..c2a7d32 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fields>, java.io.Serializable, Cloneable, Comparable<IterInfo> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fields>, java.io.Serializable, Cloneable, Comparable<IterInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IterInfo");
 
   private static final org.apache.thrift.protocol.TField PRIORITY_FIELD_DESC = new org.apache.thrift.protocol.TField("priority", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -289,7 +292,7 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case PRIORITY:
-      return Integer.valueOf(getPriority());
+      return getPriority();
 
     case CLASS_NAME:
       return getClassName();
@@ -363,7 +366,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_priority = true;
+    list.add(present_priority);
+    if (present_priority)
+      list.add(priority);
+
+    boolean present_className = true && (isSetClassName());
+    list.add(present_className);
+    if (present_className)
+      list.add(className);
+
+    boolean present_iterName = true && (isSetIterName());
+    list.add(present_iterName);
+    if (present_iterName)
+      list.add(iterName);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
index 0fbf04f..d761373 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFileInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MapFileInfo> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFileInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MapFileInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MapFileInfo");
 
   private static final org.apache.thrift.protocol.TField ESTIMATED_SIZE_FIELD_DESC = new org.apache.thrift.protocol.TField("estimatedSize", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -199,7 +202,7 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case ESTIMATED_SIZE:
-      return Long.valueOf(getEstimatedSize());
+      return getEstimatedSize();
 
     }
     throw new IllegalStateException();
@@ -245,7 +248,14 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_estimatedSize = true;
+    list.add(present_estimatedSize);
+    if (present_estimatedSize)
+      list.add(estimatedSize);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
index f1d9e61..301d8d7 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult, MultiScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<MultiScanResult> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult, MultiScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<MultiScanResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MultiScanResult");
 
   private static final org.apache.thrift.protocol.TField RESULTS_FIELD_DESC = new org.apache.thrift.protocol.TField("results", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -535,10 +538,10 @@ import org.slf4j.LoggerFactory;
       return getPartNextKey();
 
     case PART_NEXT_KEY_INCLUSIVE:
-      return Boolean.valueOf(isPartNextKeyInclusive());
+      return isPartNextKeyInclusive();
 
     case MORE:
-      return Boolean.valueOf(isMore());
+      return isMore();
 
     }
     throw new IllegalStateException();
@@ -650,7 +653,44 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_results = true && (isSetResults());
+    list.add(present_results);
+    if (present_results)
+      list.add(results);
+
+    boolean present_failures = true && (isSetFailures());
+    list.add(present_failures);
+    if (present_failures)
+      list.add(failures);
+
+    boolean present_fullScans = true && (isSetFullScans());
+    list.add(present_fullScans);
+    if (present_fullScans)
+      list.add(fullScans);
+
+    boolean present_partScan = true && (isSetPartScan());
+    list.add(present_partScan);
+    if (present_partScan)
+      list.add(partScan);
+
+    boolean present_partNextKey = true && (isSetPartNextKey());
+    list.add(present_partNextKey);
+    if (present_partNextKey)
+      list.add(partNextKey);
+
+    boolean present_partNextKeyInclusive = true;
+    list.add(present_partNextKeyInclusive);
+    if (present_partNextKeyInclusive)
+      list.add(partNextKeyInclusive);
+
+    boolean present_more = true;
+    list.add(present_more);
+    if (present_more)
+      list.add(more);
+
+    return list.hashCode();
   }
 
   @Override
@@ -854,12 +894,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
                 struct.results = new ArrayList<TKeyValue>(_list24.size);
-                for (int _i25 = 0; _i25 < _list24.size; ++_i25)
+                TKeyValue _elem25;
+                for (int _i26 = 0; _i26 < _list24.size; ++_i26)
                 {
-                  TKeyValue _elem26;
-                  _elem26 = new TKeyValue();
-                  _elem26.read(iprot);
-                  struct.results.add(_elem26);
+                  _elem25 = new TKeyValue();
+                  _elem25.read(iprot);
+                  struct.results.add(_elem25);
                 }
                 iprot.readListEnd();
               }
@@ -873,25 +913,25 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TMap _map27 = iprot.readMapBegin();
                 struct.failures = new HashMap<TKeyExtent,List<TRange>>(2*_map27.size);
-                for (int _i28 = 0; _i28 < _map27.size; ++_i28)
+                TKeyExtent _key28;
+                List<TRange> _val29;
+                for (int _i30 = 0; _i30 < _map27.size; ++_i30)
                 {
-                  TKeyExtent _key29;
-                  List<TRange> _val30;
-                  _key29 = new TKeyExtent();
-                  _key29.read(iprot);
+                  _key28 = new TKeyExtent();
+                  _key28.read(iprot);
                   {
                     org.apache.thrift.protocol.TList _list31 = iprot.readListBegin();
-                    _val30 = new ArrayList<TRange>(_list31.size);
-                    for (int _i32 = 0; _i32 < _list31.size; ++_i32)
+                    _val29 = new ArrayList<TRange>(_list31.size);
+                    TRange _elem32;
+                    for (int _i33 = 0; _i33 < _list31.size; ++_i33)
                     {
-                      TRange _elem33;
-                      _elem33 = new TRange();
-                      _elem33.read(iprot);
-                      _val30.add(_elem33);
+                      _elem32 = new TRange();
+                      _elem32.read(iprot);
+                      _val29.add(_elem32);
                     }
                     iprot.readListEnd();
                   }
-                  struct.failures.put(_key29, _val30);
+                  struct.failures.put(_key28, _val29);
                 }
                 iprot.readMapEnd();
               }
@@ -905,12 +945,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
                 struct.fullScans = new ArrayList<TKeyExtent>(_list34.size);
-                for (int _i35 = 0; _i35 < _list34.size; ++_i35)
+                TKeyExtent _elem35;
+                for (int _i36 = 0; _i36 < _list34.size; ++_i36)
                 {
-                  TKeyExtent _elem36;
-                  _elem36 = new TKeyExtent();
-                  _elem36.read(iprot);
-                  struct.fullScans.add(_elem36);
+                  _elem35 = new TKeyExtent();
+                  _elem35.read(iprot);
+                  struct.fullScans.add(_elem35);
                 }
                 iprot.readListEnd();
               }
@@ -1124,12 +1164,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.results = new ArrayList<TKeyValue>(_list45.size);
-          for (int _i46 = 0; _i46 < _list45.size; ++_i46)
+          TKeyValue _elem46;
+          for (int _i47 = 0; _i47 < _list45.size; ++_i47)
           {
-            TKeyValue _elem47;
-            _elem47 = new TKeyValue();
-            _elem47.read(iprot);
-            struct.results.add(_elem47);
+            _elem46 = new TKeyValue();
+            _elem46.read(iprot);
+            struct.results.add(_elem46);
           }
         }
         struct.setResultsIsSet(true);
@@ -1138,24 +1178,24 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TMap _map48 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
           struct.failures = new HashMap<TKeyExtent,List<TRange>>(2*_map48.size);
-          for (int _i49 = 0; _i49 < _map48.size; ++_i49)
+          TKeyExtent _key49;
+          List<TRange> _val50;
+          for (int _i51 = 0; _i51 < _map48.size; ++_i51)
           {
-            TKeyExtent _key50;
-            List<TRange> _val51;
-            _key50 = new TKeyExtent();
-            _key50.read(iprot);
+            _key49 = new TKeyExtent();
+            _key49.read(iprot);
             {
               org.apache.thrift.protocol.TList _list52 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-              _val51 = new ArrayList<TRange>(_list52.size);
-              for (int _i53 = 0; _i53 < _list52.size; ++_i53)
+              _val50 = new ArrayList<TRange>(_list52.size);
+              TRange _elem53;
+              for (int _i54 = 0; _i54 < _list52.size; ++_i54)
               {
-                TRange _elem54;
-                _elem54 = new TRange();
-                _elem54.read(iprot);
-                _val51.add(_elem54);
+                _elem53 = new TRange();
+                _elem53.read(iprot);
+                _val50.add(_elem53);
               }
             }
-            struct.failures.put(_key50, _val51);
+            struct.failures.put(_key49, _val50);
           }
         }
         struct.setFailuresIsSet(true);
@@ -1164,12 +1204,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list55 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.fullScans = new ArrayList<TKeyExtent>(_list55.size);
-          for (int _i56 = 0; _i56 < _list55.size; ++_i56)
+          TKeyExtent _elem56;
+          for (int _i57 = 0; _i57 < _list55.size; ++_i57)
           {
-            TKeyExtent _elem57;
-            _elem57 = new TKeyExtent();
-            _elem57.read(iprot);
-            struct.fullScans.add(_elem57);
+            _elem56 = new TKeyExtent();
+            _elem56.read(iprot);
+            struct.fullScans.add(_elem56);
           }
         }
         struct.setFullScansIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
index 3035db2..59758fd 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<ScanResult> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<ScanResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanResult");
 
   private static final org.apache.thrift.protocol.TField RESULTS_FIELD_DESC = new org.apache.thrift.protocol.TField("results", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -267,7 +270,7 @@ import org.slf4j.LoggerFactory;
       return getResults();
 
     case MORE:
-      return Boolean.valueOf(isMore());
+      return isMore();
 
     }
     throw new IllegalStateException();
@@ -324,7 +327,19 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_results = true && (isSetResults());
+    list.add(present_results);
+    if (present_results)
+      list.add(results);
+
+    boolean present_more = true;
+    list.add(present_more);
+    if (present_more)
+      list.add(more);
+
+    return list.hashCode();
   }
 
   @Override
@@ -436,12 +451,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
                 struct.results = new ArrayList<TKeyValue>(_list16.size);
-                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
+                TKeyValue _elem17;
+                for (int _i18 = 0; _i18 < _list16.size; ++_i18)
                 {
-                  TKeyValue _elem18;
-                  _elem18 = new TKeyValue();
-                  _elem18.read(iprot);
-                  struct.results.add(_elem18);
+                  _elem17 = new TKeyValue();
+                  _elem17.read(iprot);
+                  struct.results.add(_elem17);
                 }
                 iprot.readListEnd();
               }
@@ -535,12 +550,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.results = new ArrayList<TKeyValue>(_list21.size);
-          for (int _i22 = 0; _i22 < _list21.size; ++_i22)
+          TKeyValue _elem22;
+          for (int _i23 = 0; _i23 < _list21.size; ++_i23)
           {
-            TKeyValue _elem23;
-            _elem23 = new TKeyValue();
-            _elem23.read(iprot);
-            struct.results.add(_elem23);
+            _elem22 = new TKeyValue();
+            _elem22.read(iprot);
+            struct.results.add(_elem22);
           }
         }
         struct.setResultsIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java
index 7c60cd1..13c8a9c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMResult.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TCMResult implements org.apache.thrift.TBase<TCMResult, TCMResult._Fields>, java.io.Serializable, Cloneable, Comparable<TCMResult> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TCMResult implements org.apache.thrift.TBase<TCMResult, TCMResult._Fields>, java.io.Serializable, Cloneable, Comparable<TCMResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCMResult");
 
   private static final org.apache.thrift.protocol.TField CMID_FIELD_DESC = new org.apache.thrift.protocol.TField("cmid", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -260,7 +263,7 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case CMID:
-      return Long.valueOf(getCmid());
+      return getCmid();
 
     case STATUS:
       return getStatus();
@@ -320,7 +323,19 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_cmid = true;
+    list.add(present_cmid);
+    if (present_cmid)
+      list.add(cmid);
+
+    boolean present_status = true && (isSetStatus());
+    list.add(present_status);
+    if (present_status)
+      list.add(status.getValue());
+
+    return list.hashCode();
   }
 
   @Override
@@ -437,7 +452,7 @@ import org.slf4j.LoggerFactory;
             break;
           case 2: // STATUS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.status = TCMStatus.findByValue(iprot.readI32());
+              struct.status = org.apache.accumulo.core.data.thrift.TCMStatus.findByValue(iprot.readI32());
               struct.setStatusIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -508,7 +523,7 @@ import org.slf4j.LoggerFactory;
         struct.setCmidIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.status = TCMStatus.findByValue(iprot.readI32());
+        struct.status = org.apache.accumulo.core.data.thrift.TCMStatus.findByValue(iprot.readI32());
         struct.setStatusIsSet(true);
       }
     }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMStatus.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMStatus.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMStatus.java
index 993e9e2..6cbe5af 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCMStatus.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
index 127f7c6..f5a0de7 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TColumn> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumn");
 
   private static final org.apache.thrift.protocol.TField COLUMN_FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("columnFamily", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -152,9 +155,9 @@ import org.slf4j.LoggerFactory;
     ByteBuffer columnVisibility)
   {
     this();
-    this.columnFamily = columnFamily;
-    this.columnQualifier = columnQualifier;
-    this.columnVisibility = columnVisibility;
+    this.columnFamily = org.apache.thrift.TBaseHelper.copyBinary(columnFamily);
+    this.columnQualifier = org.apache.thrift.TBaseHelper.copyBinary(columnQualifier);
+    this.columnVisibility = org.apache.thrift.TBaseHelper.copyBinary(columnVisibility);
   }
 
   /**
@@ -163,15 +166,12 @@ import org.slf4j.LoggerFactory;
   public TColumn(TColumn other) {
     if (other.isSetColumnFamily()) {
       this.columnFamily = org.apache.thrift.TBaseHelper.copyBinary(other.columnFamily);
-;
     }
     if (other.isSetColumnQualifier()) {
       this.columnQualifier = org.apache.thrift.TBaseHelper.copyBinary(other.columnQualifier);
-;
     }
     if (other.isSetColumnVisibility()) {
       this.columnVisibility = org.apache.thrift.TBaseHelper.copyBinary(other.columnVisibility);
-;
     }
   }
 
@@ -192,16 +192,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForColumnFamily() {
-    return columnFamily;
+    return org.apache.thrift.TBaseHelper.copyBinary(columnFamily);
   }
 
   public TColumn setColumnFamily(byte[] columnFamily) {
-    setColumnFamily(columnFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(columnFamily));
+    this.columnFamily = columnFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(columnFamily, columnFamily.length));
     return this;
   }
 
   public TColumn setColumnFamily(ByteBuffer columnFamily) {
-    this.columnFamily = columnFamily;
+    this.columnFamily = org.apache.thrift.TBaseHelper.copyBinary(columnFamily);
     return this;
   }
 
@@ -226,16 +226,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForColumnQualifier() {
-    return columnQualifier;
+    return org.apache.thrift.TBaseHelper.copyBinary(columnQualifier);
   }
 
   public TColumn setColumnQualifier(byte[] columnQualifier) {
-    setColumnQualifier(columnQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(columnQualifier));
+    this.columnQualifier = columnQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(columnQualifier, columnQualifier.length));
     return this;
   }
 
   public TColumn setColumnQualifier(ByteBuffer columnQualifier) {
-    this.columnQualifier = columnQualifier;
+    this.columnQualifier = org.apache.thrift.TBaseHelper.copyBinary(columnQualifier);
     return this;
   }
 
@@ -260,16 +260,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForColumnVisibility() {
-    return columnVisibility;
+    return org.apache.thrift.TBaseHelper.copyBinary(columnVisibility);
   }
 
   public TColumn setColumnVisibility(byte[] columnVisibility) {
-    setColumnVisibility(columnVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(columnVisibility));
+    this.columnVisibility = columnVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(columnVisibility, columnVisibility.length));
     return this;
   }
 
   public TColumn setColumnVisibility(ByteBuffer columnVisibility) {
-    this.columnVisibility = columnVisibility;
+    this.columnVisibility = org.apache.thrift.TBaseHelper.copyBinary(columnVisibility);
     return this;
   }
 
@@ -394,7 +394,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_columnFamily = true && (isSetColumnFamily());
+    list.add(present_columnFamily);
+    if (present_columnFamily)
+      list.add(columnFamily);
+
+    boolean present_columnQualifier = true && (isSetColumnQualifier());
+    list.add(present_columnQualifier);
+    if (present_columnQualifier)
+      list.add(columnQualifier);
+
+    boolean present_columnVisibility = true && (isSetColumnVisibility());
+    list.add(present_columnVisibility);
+    if (present_columnVisibility)
+      list.add(columnVisibility);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
index a4ae6df..eb5ccb9 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TCondition implements org.apache.thrift.TBase<TCondition, TCondition._Fields>, java.io.Serializable, Cloneable, Comparable<TCondition> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TCondition implements org.apache.thrift.TBase<TCondition, TCondition._Fields>, java.io.Serializable, Cloneable, Comparable<TCondition> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCondition");
 
   private static final org.apache.thrift.protocol.TField CF_FIELD_DESC = new org.apache.thrift.protocol.TField("cf", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -187,15 +190,15 @@ import org.slf4j.LoggerFactory;
     ByteBuffer iterators)
   {
     this();
-    this.cf = cf;
-    this.cq = cq;
-    this.cv = cv;
+    this.cf = org.apache.thrift.TBaseHelper.copyBinary(cf);
+    this.cq = org.apache.thrift.TBaseHelper.copyBinary(cq);
+    this.cv = org.apache.thrift.TBaseHelper.copyBinary(cv);
     this.ts = ts;
     setTsIsSet(true);
     this.hasTimestamp = hasTimestamp;
     setHasTimestampIsSet(true);
-    this.val = val;
-    this.iterators = iterators;
+    this.val = org.apache.thrift.TBaseHelper.copyBinary(val);
+    this.iterators = org.apache.thrift.TBaseHelper.copyBinary(iterators);
   }
 
   /**
@@ -205,25 +208,20 @@ import org.slf4j.LoggerFactory;
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetCf()) {
       this.cf = org.apache.thrift.TBaseHelper.copyBinary(other.cf);
-;
     }
     if (other.isSetCq()) {
       this.cq = org.apache.thrift.TBaseHelper.copyBinary(other.cq);
-;
     }
     if (other.isSetCv()) {
       this.cv = org.apache.thrift.TBaseHelper.copyBinary(other.cv);
-;
     }
     this.ts = other.ts;
     this.hasTimestamp = other.hasTimestamp;
     if (other.isSetVal()) {
       this.val = org.apache.thrift.TBaseHelper.copyBinary(other.val);
-;
     }
     if (other.isSetIterators()) {
       this.iterators = org.apache.thrift.TBaseHelper.copyBinary(other.iterators);
-;
     }
   }
 
@@ -250,16 +248,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForCf() {
-    return cf;
+    return org.apache.thrift.TBaseHelper.copyBinary(cf);
   }
 
   public TCondition setCf(byte[] cf) {
-    setCf(cf == null ? (ByteBuffer)null : ByteBuffer.wrap(cf));
+    this.cf = cf == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(cf, cf.length));
     return this;
   }
 
   public TCondition setCf(ByteBuffer cf) {
-    this.cf = cf;
+    this.cf = org.apache.thrift.TBaseHelper.copyBinary(cf);
     return this;
   }
 
@@ -284,16 +282,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForCq() {
-    return cq;
+    return org.apache.thrift.TBaseHelper.copyBinary(cq);
   }
 
   public TCondition setCq(byte[] cq) {
-    setCq(cq == null ? (ByteBuffer)null : ByteBuffer.wrap(cq));
+    this.cq = cq == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(cq, cq.length));
     return this;
   }
 
   public TCondition setCq(ByteBuffer cq) {
-    this.cq = cq;
+    this.cq = org.apache.thrift.TBaseHelper.copyBinary(cq);
     return this;
   }
 
@@ -318,16 +316,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForCv() {
-    return cv;
+    return org.apache.thrift.TBaseHelper.copyBinary(cv);
   }
 
   public TCondition setCv(byte[] cv) {
-    setCv(cv == null ? (ByteBuffer)null : ByteBuffer.wrap(cv));
+    this.cv = cv == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(cv, cv.length));
     return this;
   }
 
   public TCondition setCv(ByteBuffer cv) {
-    this.cv = cv;
+    this.cv = org.apache.thrift.TBaseHelper.copyBinary(cv);
     return this;
   }
 
@@ -398,16 +396,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForVal() {
-    return val;
+    return org.apache.thrift.TBaseHelper.copyBinary(val);
   }
 
   public TCondition setVal(byte[] val) {
-    setVal(val == null ? (ByteBuffer)null : ByteBuffer.wrap(val));
+    this.val = val == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(val, val.length));
     return this;
   }
 
   public TCondition setVal(ByteBuffer val) {
-    this.val = val;
+    this.val = org.apache.thrift.TBaseHelper.copyBinary(val);
     return this;
   }
 
@@ -432,16 +430,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForIterators() {
-    return iterators;
+    return org.apache.thrift.TBaseHelper.copyBinary(iterators);
   }
 
   public TCondition setIterators(byte[] iterators) {
-    setIterators(iterators == null ? (ByteBuffer)null : ByteBuffer.wrap(iterators));
+    this.iterators = iterators == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(iterators, iterators.length));
     return this;
   }
 
   public TCondition setIterators(ByteBuffer iterators) {
-    this.iterators = iterators;
+    this.iterators = org.apache.thrift.TBaseHelper.copyBinary(iterators);
     return this;
   }
 
@@ -533,10 +531,10 @@ import org.slf4j.LoggerFactory;
       return getCv();
 
     case TS:
-      return Long.valueOf(getTs());
+      return getTs();
 
     case HAS_TIMESTAMP:
-      return Boolean.valueOf(isHasTimestamp());
+      return isHasTimestamp();
 
     case VAL:
       return getVal();
@@ -654,7 +652,44 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_cf = true && (isSetCf());
+    list.add(present_cf);
+    if (present_cf)
+      list.add(cf);
+
+    boolean present_cq = true && (isSetCq());
+    list.add(present_cq);
+    if (present_cq)
+      list.add(cq);
+
+    boolean present_cv = true && (isSetCv());
+    list.add(present_cv);
+    if (present_cv)
+      list.add(cv);
+
+    boolean present_ts = true;
+    list.add(present_ts);
+    if (present_ts)
+      list.add(ts);
+
+    boolean present_hasTimestamp = true;
+    list.add(present_hasTimestamp);
+    if (present_hasTimestamp)
+      list.add(hasTimestamp);
+
+    boolean present_val = true && (isSetVal());
+    list.add(present_val);
+    if (present_val)
+      list.add(val);
+
+    boolean present_iterators = true && (isSetIterators());
+    list.add(present_iterators);
+    if (present_iterators)
+      list.add(iterators);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
index 431a81c..e43196c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TConditionalMutation implements org.apache.thrift.TBase<TConditionalMutation, TConditionalMutation._Fields>, java.io.Serializable, Cloneable, Comparable<TConditionalMutation> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TConditionalMutation implements org.apache.thrift.TBase<TConditionalMutation, TConditionalMutation._Fields>, java.io.Serializable, Cloneable, Comparable<TConditionalMutation> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConditionalMutation");
 
   private static final org.apache.thrift.protocol.TField CONDITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("conditions", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -315,7 +318,7 @@ import org.slf4j.LoggerFactory;
       return getMutation();
 
     case ID:
-      return Long.valueOf(getId());
+      return getId();
 
     }
     throw new IllegalStateException();
@@ -383,7 +386,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_conditions = true && (isSetConditions());
+    list.add(present_conditions);
+    if (present_conditions)
+      list.add(conditions);
+
+    boolean present_mutation = true && (isSetMutation());
+    list.add(present_mutation);
+    if (present_mutation)
+      list.add(mutation);
+
+    boolean present_id = true;
+    list.add(present_id);
+    if (present_id)
+      list.add(id);
+
+    return list.hashCode();
   }
 
   @Override
@@ -516,12 +536,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list86 = iprot.readListBegin();
                 struct.conditions = new ArrayList<TCondition>(_list86.size);
-                for (int _i87 = 0; _i87 < _list86.size; ++_i87)
+                TCondition _elem87;
+                for (int _i88 = 0; _i88 < _list86.size; ++_i88)
                 {
-                  TCondition _elem88;
-                  _elem88 = new TCondition();
-                  _elem88.read(iprot);
-                  struct.conditions.add(_elem88);
+                  _elem87 = new TCondition();
+                  _elem87.read(iprot);
+                  struct.conditions.add(_elem87);
                 }
                 iprot.readListEnd();
               }
@@ -635,12 +655,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list91 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.conditions = new ArrayList<TCondition>(_list91.size);
-          for (int _i92 = 0; _i92 < _list91.size; ++_i92)
+          TCondition _elem92;
+          for (int _i93 = 0; _i93 < _list91.size; ++_i93)
           {
-            TCondition _elem93;
-            _elem93 = new TCondition();
-            _elem93.read(iprot);
-            struct.conditions.add(_elem93);
+            _elem92 = new TCondition();
+            _elem92.read(iprot);
+            struct.conditions.add(_elem92);
           }
         }
         struct.setConditionsIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
index eb08623..7ec8230 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalSession.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TConditionalSession implements org.apache.thrift.TBase<TConditionalSession, TConditionalSession._Fields>, java.io.Serializable, Cloneable, Comparable<TConditionalSession> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TConditionalSession implements org.apache.thrift.TBase<TConditionalSession, TConditionalSession._Fields>, java.io.Serializable, Cloneable, Comparable<TConditionalSession> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConditionalSession");
 
   private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -289,13 +292,13 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_ID:
-      return Long.valueOf(getSessionId());
+      return getSessionId();
 
     case TSERVER_LOCK:
       return getTserverLock();
 
     case TTL:
-      return Long.valueOf(getTtl());
+      return getTtl();
 
     }
     throw new IllegalStateException();
@@ -363,7 +366,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_sessionId = true;
+    list.add(present_sessionId);
+    if (present_sessionId)
+      list.add(sessionId);
+
+    boolean present_tserverLock = true && (isSetTserverLock());
+    list.add(present_tserverLock);
+    if (present_tserverLock)
+      list.add(tserverLock);
+
+    boolean present_ttl = true;
+    list.add(present_ttl);
+    if (present_ttl)
+      list.add(ttl);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
index 1dc51e3..5085f57 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TConstraintViolationSummary implements org.apache.thrift.TBase<TConstraintViolationSummary, TConstraintViolationSummary._Fields>, java.io.Serializable, Cloneable, Comparable<TConstraintViolationSummary> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TConstraintViolationSummary implements org.apache.thrift.TBase<TConstraintViolationSummary, TConstraintViolationSummary._Fields>, java.io.Serializable, Cloneable, Comparable<TConstraintViolationSummary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TConstraintViolationSummary");
 
   private static final org.apache.thrift.protocol.TField CONSTRAIN_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("constrainClass", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -337,13 +340,13 @@ import org.slf4j.LoggerFactory;
       return getConstrainClass();
 
     case VIOLATION_CODE:
-      return Short.valueOf(getViolationCode());
+      return getViolationCode();
 
     case VIOLATION_DESCRIPTION:
       return getViolationDescription();
 
     case NUMBER_OF_VIOLATING_MUTATIONS:
-      return Long.valueOf(getNumberOfViolatingMutations());
+      return getNumberOfViolatingMutations();
 
     }
     throw new IllegalStateException();
@@ -422,7 +425,29 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_constrainClass = true && (isSetConstrainClass());
+    list.add(present_constrainClass);
+    if (present_constrainClass)
+      list.add(constrainClass);
+
+    boolean present_violationCode = true;
+    list.add(present_violationCode);
+    if (present_violationCode)
+      list.add(violationCode);
+
+    boolean present_violationDescription = true && (isSetViolationDescription());
+    list.add(present_violationDescription);
+    if (present_violationDescription)
+      list.add(violationDescription);
+
+    boolean present_numberOfViolatingMutations = true;
+    list.add(present_numberOfViolatingMutations);
+    if (present_numberOfViolatingMutations)
+      list.add(numberOfViolatingMutations);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
index 2b81651..1228edc 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.io.Serializable, Cloneable, Comparable<TKey> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TKey implements org.apache.thrift.TBase<TKey, TKey._Fields>, java.io.Serializable, Cloneable, Comparable<TKey> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TKey");
 
   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);
@@ -170,10 +173,10 @@ import org.slf4j.LoggerFactory;
     long timestamp)
   {
     this();
-    this.row = row;
-    this.colFamily = colFamily;
-    this.colQualifier = colQualifier;
-    this.colVisibility = colVisibility;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
+    this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily);
+    this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier);
+    this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility);
     this.timestamp = timestamp;
     setTimestampIsSet(true);
   }
@@ -185,19 +188,15 @@ import org.slf4j.LoggerFactory;
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetRow()) {
       this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
-;
     }
     if (other.isSetColFamily()) {
       this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(other.colFamily);
-;
     }
     if (other.isSetColQualifier()) {
       this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(other.colQualifier);
-;
     }
     if (other.isSetColVisibility()) {
       this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(other.colVisibility);
-;
     }
     this.timestamp = other.timestamp;
   }
@@ -222,16 +221,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForRow() {
-    return row;
+    return org.apache.thrift.TBaseHelper.copyBinary(row);
   }
 
   public TKey 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 TKey setRow(ByteBuffer row) {
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     return this;
   }
 
@@ -256,16 +255,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForColFamily() {
-    return colFamily;
+    return org.apache.thrift.TBaseHelper.copyBinary(colFamily);
   }
 
   public TKey setColFamily(byte[] colFamily) {
-    setColFamily(colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(colFamily));
+    this.colFamily = colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colFamily, colFamily.length));
     return this;
   }
 
   public TKey setColFamily(ByteBuffer colFamily) {
-    this.colFamily = colFamily;
+    this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily);
     return this;
   }
 
@@ -290,16 +289,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForColQualifier() {
-    return colQualifier;
+    return org.apache.thrift.TBaseHelper.copyBinary(colQualifier);
   }
 
   public TKey setColQualifier(byte[] colQualifier) {
-    setColQualifier(colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(colQualifier));
+    this.colQualifier = colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colQualifier, colQualifier.length));
     return this;
   }
 
   public TKey setColQualifier(ByteBuffer colQualifier) {
-    this.colQualifier = colQualifier;
+    this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier);
     return this;
   }
 
@@ -324,16 +323,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForColVisibility() {
-    return colVisibility;
+    return org.apache.thrift.TBaseHelper.copyBinary(colVisibility);
   }
 
   public TKey setColVisibility(byte[] colVisibility) {
-    setColVisibility(colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(colVisibility));
+    this.colVisibility = colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colVisibility, colVisibility.length));
     return this;
   }
 
   public TKey setColVisibility(ByteBuffer colVisibility) {
-    this.colVisibility = colVisibility;
+    this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility);
     return this;
   }
 
@@ -435,7 +434,7 @@ import org.slf4j.LoggerFactory;
       return getColVisibility();
 
     case TIMESTAMP:
-      return Long.valueOf(getTimestamp());
+      return getTimestamp();
 
     }
     throw new IllegalStateException();
@@ -525,7 +524,34 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_row = true && (isSetRow());
+    list.add(present_row);
+    if (present_row)
+      list.add(row);
+
+    boolean present_colFamily = true && (isSetColFamily());
+    list.add(present_colFamily);
+    if (present_colFamily)
+      list.add(colFamily);
+
+    boolean present_colQualifier = true && (isSetColQualifier());
+    list.add(present_colQualifier);
+    if (present_colQualifier)
+      list.add(colQualifier);
+
+    boolean present_colVisibility = true && (isSetColVisibility());
+    list.add(present_colVisibility);
+    if (present_colVisibility)
+      list.add(colVisibility);
+
+    boolean present_timestamp = true;
+    list.add(present_timestamp);
+    if (present_timestamp)
+      list.add(timestamp);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
index 20f1fea..725ae65 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TKeyExtent implements org.apache.thrift.TBase<TKeyExtent, TKeyExtent._Fields>, java.io.Serializable, Cloneable, Comparable<TKeyExtent> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TKeyExtent implements org.apache.thrift.TBase<TKeyExtent, TKeyExtent._Fields>, java.io.Serializable, Cloneable, Comparable<TKeyExtent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TKeyExtent");
 
   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);
@@ -152,9 +155,9 @@ import org.slf4j.LoggerFactory;
     ByteBuffer prevEndRow)
   {
     this();
-    this.table = table;
-    this.endRow = endRow;
-    this.prevEndRow = prevEndRow;
+    this.table = org.apache.thrift.TBaseHelper.copyBinary(table);
+    this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
+    this.prevEndRow = org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
   }
 
   /**
@@ -163,15 +166,12 @@ import org.slf4j.LoggerFactory;
   public TKeyExtent(TKeyExtent other) {
     if (other.isSetTable()) {
       this.table = org.apache.thrift.TBaseHelper.copyBinary(other.table);
-;
     }
     if (other.isSetEndRow()) {
       this.endRow = org.apache.thrift.TBaseHelper.copyBinary(other.endRow);
-;
     }
     if (other.isSetPrevEndRow()) {
       this.prevEndRow = org.apache.thrift.TBaseHelper.copyBinary(other.prevEndRow);
-;
     }
   }
 
@@ -192,16 +192,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForTable() {
-    return table;
+    return org.apache.thrift.TBaseHelper.copyBinary(table);
   }
 
   public TKeyExtent setTable(byte[] table) {
-    setTable(table == null ? (ByteBuffer)null : ByteBuffer.wrap(table));
+    this.table = table == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(table, table.length));
     return this;
   }
 
   public TKeyExtent setTable(ByteBuffer table) {
-    this.table = table;
+    this.table = org.apache.thrift.TBaseHelper.copyBinary(table);
     return this;
   }
 
@@ -226,16 +226,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForEndRow() {
-    return endRow;
+    return org.apache.thrift.TBaseHelper.copyBinary(endRow);
   }
 
   public TKeyExtent setEndRow(byte[] endRow) {
-    setEndRow(endRow == null ? (ByteBuffer)null : ByteBuffer.wrap(endRow));
+    this.endRow = endRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(endRow, endRow.length));
     return this;
   }
 
   public TKeyExtent setEndRow(ByteBuffer endRow) {
-    this.endRow = endRow;
+    this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
     return this;
   }
 
@@ -260,16 +260,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForPrevEndRow() {
-    return prevEndRow;
+    return org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
   }
 
   public TKeyExtent setPrevEndRow(byte[] prevEndRow) {
-    setPrevEndRow(prevEndRow == null ? (ByteBuffer)null : ByteBuffer.wrap(prevEndRow));
+    this.prevEndRow = prevEndRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(prevEndRow, prevEndRow.length));
     return this;
   }
 
   public TKeyExtent setPrevEndRow(ByteBuffer prevEndRow) {
-    this.prevEndRow = prevEndRow;
+    this.prevEndRow = org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
     return this;
   }
 
@@ -394,7 +394,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_table = true && (isSetTable());
+    list.add(present_table);
+    if (present_table)
+      list.add(table);
+
+    boolean present_endRow = true && (isSetEndRow());
+    list.add(present_endRow);
+    if (present_endRow)
+      list.add(endRow);
+
+    boolean present_prevEndRow = true && (isSetPrevEndRow());
+    list.add(present_prevEndRow);
+    if (present_prevEndRow)
+      list.add(prevEndRow);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
index 75161b0..6d01c0c 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TKeyValue implements org.apache.thrift.TBase<TKeyValue, TKeyValue._Fields>, java.io.Serializable, Cloneable, Comparable<TKeyValue> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TKeyValue implements org.apache.thrift.TBase<TKeyValue, TKeyValue._Fields>, java.io.Serializable, Cloneable, Comparable<TKeyValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TKeyValue");
 
   private static final org.apache.thrift.protocol.TField KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("key", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -145,7 +148,7 @@ import org.slf4j.LoggerFactory;
   {
     this();
     this.key = key;
-    this.value = value;
+    this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
   }
 
   /**
@@ -157,7 +160,6 @@ import org.slf4j.LoggerFactory;
     }
     if (other.isSetValue()) {
       this.value = org.apache.thrift.TBaseHelper.copyBinary(other.value);
-;
     }
   }
 
@@ -201,16 +203,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForValue() {
-    return value;
+    return org.apache.thrift.TBaseHelper.copyBinary(value);
   }
 
   public TKeyValue setValue(byte[] value) {
-    setValue(value == null ? (ByteBuffer)null : ByteBuffer.wrap(value));
+    this.value = value == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(value, value.length));
     return this;
   }
 
   public TKeyValue setValue(ByteBuffer value) {
-    this.value = value;
+    this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
     return this;
   }
 
@@ -313,7 +315,19 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_key = true && (isSetKey());
+    list.add(present_key);
+    if (present_key)
+      list.add(key);
+
+    boolean present_value = true && (isSetValue());
+    list.add(present_value);
+    if (present_value)
+      list.add(value);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
index c13e989..fb51c14 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._Fields>, java.io.Serializable, Cloneable, Comparable<TMutation> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TMutation implements org.apache.thrift.TBase<TMutation, TMutation._Fields>, java.io.Serializable, Cloneable, Comparable<TMutation> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TMutation");
 
   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);
@@ -142,7 +145,7 @@ import org.slf4j.LoggerFactory;
   // isset id assignments
   private static final int __ENTRIES_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SOURCES};
+  private static final _Fields optionals[] = {_Fields.SOURCES};
   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);
@@ -172,8 +175,8 @@ import org.slf4j.LoggerFactory;
     int entries)
   {
     this();
-    this.row = row;
-    this.data = data;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
+    this.data = org.apache.thrift.TBaseHelper.copyBinary(data);
     this.values = values;
     this.entries = entries;
     setEntriesIsSet(true);
@@ -186,11 +189,9 @@ import org.slf4j.LoggerFactory;
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetRow()) {
       this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
-;
     }
     if (other.isSetData()) {
       this.data = org.apache.thrift.TBaseHelper.copyBinary(other.data);
-;
     }
     if (other.isSetValues()) {
       List<ByteBuffer> __this__values = new ArrayList<ByteBuffer>(other.values);
@@ -223,16 +224,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForRow() {
-    return row;
+    return org.apache.thrift.TBaseHelper.copyBinary(row);
   }
 
   public TMutation 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 TMutation setRow(ByteBuffer row) {
-    this.row = row;
+    this.row = org.apache.thrift.TBaseHelper.copyBinary(row);
     return this;
   }
 
@@ -257,16 +258,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForData() {
-    return data;
+    return org.apache.thrift.TBaseHelper.copyBinary(data);
   }
 
   public TMutation setData(byte[] data) {
-    setData(data == null ? (ByteBuffer)null : ByteBuffer.wrap(data));
+    this.data = data == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(data, data.length));
     return this;
   }
 
   public TMutation setData(ByteBuffer data) {
-    this.data = data;
+    this.data = org.apache.thrift.TBaseHelper.copyBinary(data);
     return this;
   }
 
@@ -443,7 +444,7 @@ import org.slf4j.LoggerFactory;
       return getValues();
 
     case ENTRIES:
-      return Integer.valueOf(getEntries());
+      return getEntries();
 
     case SOURCES:
       return getSources();
@@ -536,7 +537,34 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_row = true && (isSetRow());
+    list.add(present_row);
+    if (present_row)
+      list.add(row);
+
+    boolean present_data = true && (isSetData());
+    list.add(present_data);
+    if (present_data)
+      list.add(data);
+
+    boolean present_values = true && (isSetValues());
+    list.add(present_values);
+    if (present_values)
+      list.add(values);
+
+    boolean present_entries = true;
+    list.add(present_entries);
+    if (present_entries)
+      list.add(entries);
+
+    boolean present_sources = true && (isSetSources());
+    list.add(present_sources);
+    if (present_sources)
+      list.add(sources);
+
+    return list.hashCode();
   }
 
   @Override
@@ -637,7 +665,7 @@ import org.slf4j.LoggerFactory;
     if (this.values == null) {
       sb.append("null");
     } else {
-      sb.append(this.values);
+      org.apache.thrift.TBaseHelper.toString(this.values, sb);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -720,11 +748,11 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
                 struct.values = new ArrayList<ByteBuffer>(_list0.size);
-                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+                ByteBuffer _elem1;
+                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
-                  ByteBuffer _elem2;
-                  _elem2 = iprot.readBinary();
-                  struct.values.add(_elem2);
+                  _elem1 = iprot.readBinary();
+                  struct.values.add(_elem1);
                 }
                 iprot.readListEnd();
               }
@@ -746,11 +774,11 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
                 struct.sources = new ArrayList<String>(_list3.size);
-                for (int _i4 = 0; _i4 < _list3.size; ++_i4)
+                String _elem4;
+                for (int _i5 = 0; _i5 < _list3.size; ++_i5)
                 {
-                  String _elem5;
-                  _elem5 = iprot.readString();
-                  struct.sources.add(_elem5);
+                  _elem4 = iprot.readString();
+                  struct.sources.add(_elem4);
                 }
                 iprot.readListEnd();
               }
@@ -892,11 +920,11 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.values = new ArrayList<ByteBuffer>(_list10.size);
-          for (int _i11 = 0; _i11 < _list10.size; ++_i11)
+          ByteBuffer _elem11;
+          for (int _i12 = 0; _i12 < _list10.size; ++_i12)
           {
-            ByteBuffer _elem12;
-            _elem12 = iprot.readBinary();
-            struct.values.add(_elem12);
+            _elem11 = iprot.readBinary();
+            struct.values.add(_elem11);
           }
         }
         struct.setValuesIsSet(true);
@@ -909,11 +937,11 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.sources = new ArrayList<String>(_list13.size);
-          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
+          String _elem14;
+          for (int _i15 = 0; _i15 < _list13.size; ++_i15)
           {
-            String _elem15;
-            _elem15 = iprot.readString();
-            struct.sources.add(_elem15);
+            _elem14 = iprot.readString();
+            struct.sources.add(_elem14);
           }
         }
         struct.setSourcesIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
index 0ad791c..a635039 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, java.io.Serializable, Cloneable, Comparable<TRange> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TRange implements org.apache.thrift.TBase<TRange, TRange._Fields>, java.io.Serializable, Cloneable, Comparable<TRange> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRange");
 
   private static final org.apache.thrift.protocol.TField START_FIELD_DESC = new org.apache.thrift.protocol.TField("start", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -430,16 +433,16 @@ import org.slf4j.LoggerFactory;
       return getStop();
 
     case START_KEY_INCLUSIVE:
-      return Boolean.valueOf(isStartKeyInclusive());
+      return isStartKeyInclusive();
 
     case STOP_KEY_INCLUSIVE:
-      return Boolean.valueOf(isStopKeyInclusive());
+      return isStopKeyInclusive();
 
     case INFINITE_START_KEY:
-      return Boolean.valueOf(isInfiniteStartKey());
+      return isInfiniteStartKey();
 
     case INFINITE_STOP_KEY:
-      return Boolean.valueOf(isInfiniteStopKey());
+      return isInfiniteStopKey();
 
     }
     throw new IllegalStateException();
@@ -540,7 +543,39 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_start = true && (isSetStart());
+    list.add(present_start);
+    if (present_start)
+      list.add(start);
+
+    boolean present_stop = true && (isSetStop());
+    list.add(present_stop);
+    if (present_stop)
+      list.add(stop);
+
+    boolean present_startKeyInclusive = true;
+    list.add(present_startKeyInclusive);
+    if (present_startKeyInclusive)
+      list.add(startKeyInclusive);
+
+    boolean present_stopKeyInclusive = true;
+    list.add(present_stopKeyInclusive);
+    if (present_stopKeyInclusive)
+      list.add(stopKeyInclusive);
+
+    boolean present_infiniteStartKey = true;
+    list.add(present_infiniteStartKey);
+    if (present_infiniteStartKey)
+      list.add(infiniteStartKey);
+
+    boolean present_infiniteStopKey = true;
+    list.add(present_infiniteStopKey);
+    if (present_infiniteStopKey)
+      list.add(infiniteStopKey);
+
+    return list.hashCode();
   }
 
   @Override


Mime
View raw message