accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [15/36] ACCUMULO-2773 Regenerate sources for Thrift 0.9.1
Date Thu, 19 Jun 2014 00:57:25 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
index 8c6c31e..f5be98c 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * 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/011c1760/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
index adeff6f..111cffa 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * 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/011c1760/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
index abd97ba..1b85d47 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsage._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<TDiskUsage> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDiskUsage");
 
   private static final org.apache.thrift.protocol.TField TABLES_FIELD_DESC = new org.apache.thrift.protocol.TField("tables", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -156,10 +158,7 @@ import org.slf4j.LoggerFactory;
   public TDiskUsage(TDiskUsage other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetTables()) {
-      List<String> __this__tables = new ArrayList<String>();
-      for (String other_element : other.tables) {
-        __this__tables.add(other_element);
-      }
+      List<String> __this__tables = new ArrayList<String>(other.tables);
       this.tables = __this__tables;
     }
     this.usage = other.usage;
@@ -325,30 +324,30 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(TDiskUsage other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TDiskUsage typedOther = (TDiskUsage)other;
 
-    lastComparison = Boolean.valueOf(isSetTables()).compareTo(typedOther.isSetTables());
+    lastComparison = Boolean.valueOf(isSetTables()).compareTo(other.isSetTables());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTables()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tables, typedOther.tables);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tables, other.tables);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUsage()).compareTo(typedOther.isSetUsage());
+    lastComparison = Boolean.valueOf(isSetUsage()).compareTo(other.isSetUsage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUsage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usage, typedOther.usage);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.usage, other.usage);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -436,7 +435,7 @@ import org.slf4j.LoggerFactory;
                 struct.tables = new ArrayList<String>(_list0.size);
                 for (int _i1 = 0; _i1 < _list0.size; ++_i1)
                 {
-                  String _elem2; // required
+                  String _elem2;
                   _elem2 = iprot.readString();
                   struct.tables.add(_elem2);
                 }
@@ -534,7 +533,7 @@ import org.slf4j.LoggerFactory;
           struct.tables = new ArrayList<String>(_list5.size);
           for (int _i6 = 0; _i6 < _list5.size; ++_i6)
           {
-            String _elem7; // required
+            String _elem7;
             _elem7 = iprot.readString();
             struct.tables.add(_elem7);
           }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
index e6760f1..7716823 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * 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/011c1760/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
index 6222f8e..baea21e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * 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/011c1760/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java
index 968a646..a6500e5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class ThriftSecurityException extends TException implements org.apache.thrift.TBase<ThriftSecurityException, ThriftSecurityException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class ThriftSecurityException extends TException implements org.apache.thrift.TBase<ThriftSecurityException, ThriftSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftSecurityException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftSecurityException");
 
   private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -319,30 +321,30 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(ThriftSecurityException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ThriftSecurityException typedOther = (ThriftSecurityException)other;
 
-    lastComparison = Boolean.valueOf(isSetUser()).compareTo(typedOther.isSetUser());
+    lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUser()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, typedOther.user);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCode()).compareTo(typedOther.isSetCode());
+    lastComparison = Boolean.valueOf(isSetCode()).compareTo(other.isSetCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCode()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, typedOther.code);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, other.code);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
index 3863e75..0c8ab4b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class ThriftTableOperationException extends TException implements org.apache.thrift.TBase<ThriftTableOperationException, ThriftTableOperationException._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") public class ThriftTableOperationException extends TException implements org.apache.thrift.TBase<ThriftTableOperationException, ThriftTableOperationException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftTableOperationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftTableOperationException");
 
   private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -512,60 +514,60 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(ThriftTableOperationException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ThriftTableOperationException typedOther = (ThriftTableOperationException)other;
 
-    lastComparison = Boolean.valueOf(isSetTableId()).compareTo(typedOther.isSetTableId());
+    lastComparison = Boolean.valueOf(isSetTableId()).compareTo(other.isSetTableId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTableId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, typedOther.tableId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableId, other.tableId);
       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(isSetOp()).compareTo(typedOther.isSetOp());
+    lastComparison = Boolean.valueOf(isSetOp()).compareTo(other.isSetOp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, typedOther.op);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.op, other.op);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
+    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(typedOther.isSetDescription());
+    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, typedOther.description);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 f07abcf..5f785ff 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -60,11 +62,11 @@ import org.slf4j.LoggerFactory;
 
   public interface AsyncIface {
 
-    public void success(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.success_call> resultHandler) throws org.apache.thrift.TException;
+    public void success(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void fails(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.fails_call> resultHandler) throws org.apache.thrift.TException;
+    public void fails(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void throwsError(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.throwsError_call> resultHandler) throws org.apache.thrift.TException;
+    public void throwsError(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -175,7 +177,7 @@ import org.slf4j.LoggerFactory;
       super(protocolFactory, clientManager, transport);
     }
 
-    public void success(org.apache.thrift.async.AsyncMethodCallback<success_call> resultHandler) throws org.apache.thrift.TException {
+    public void success(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       success_call method_call = new success_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -183,7 +185,7 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class success_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public success_call(org.apache.thrift.async.AsyncMethodCallback<success_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public success_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -204,7 +206,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void fails(org.apache.thrift.async.AsyncMethodCallback<fails_call> resultHandler) throws org.apache.thrift.TException {
+    public void fails(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       fails_call method_call = new fails_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -212,7 +214,7 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class fails_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public fails_call(org.apache.thrift.async.AsyncMethodCallback<fails_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public fails_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -233,7 +235,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void throwsError(org.apache.thrift.async.AsyncMethodCallback<throwsError_call> resultHandler) throws org.apache.thrift.TException {
+    public void throwsError(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       throwsError_call method_call = new throwsError_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -241,7 +243,7 @@ import org.slf4j.LoggerFactory;
     }
 
     public static class throwsError_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public throwsError_call(org.apache.thrift.async.AsyncMethodCallback<throwsError_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public throwsError_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -350,7 +352,188 @@ import org.slf4j.LoggerFactory;
 
   }
 
-  public static class success_args implements org.apache.thrift.TBase<success_args, success_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
+    public AsyncProcessor(I iface) {
+      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+    }
+
+    protected AsyncProcessor(I iface, Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+      super(iface, getProcessMap(processMap));
+    }
+
+    private static <I extends AsyncIface> Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+      processMap.put("success", new success());
+      processMap.put("fails", new fails());
+      processMap.put("throwsError", new throwsError());
+      return processMap;
+    }
+
+    public static class success<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, success_args, Boolean> {
+      public success() {
+        super("success");
+      }
+
+      public success_args getEmptyArgsInstance() {
+        return new success_args();
+      }
+
+      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(Boolean o) {
+            success_result result = new success_result();
+            result.success = o;
+            result.setSuccessIsSet(true);
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            success_result result = new success_result();
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, success_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.success(resultHandler);
+      }
+    }
+
+    public static class fails<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, fails_args, Boolean> {
+      public fails() {
+        super("fails");
+      }
+
+      public fails_args getEmptyArgsInstance() {
+        return new fails_args();
+      }
+
+      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(Boolean o) {
+            fails_result result = new fails_result();
+            result.success = o;
+            result.setSuccessIsSet(true);
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            fails_result result = new fails_result();
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, fails_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.fails(resultHandler);
+      }
+    }
+
+    public static class throwsError<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, throwsError_args, Boolean> {
+      public throwsError() {
+        super("throwsError");
+      }
+
+      public throwsError_args getEmptyArgsInstance() {
+        return new throwsError_args();
+      }
+
+      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(Boolean o) {
+            throwsError_result result = new throwsError_result();
+            result.success = o;
+            result.setSuccessIsSet(true);
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            throwsError_result result = new throwsError_result();
+            if (e instanceof ThriftSecurityException) {
+                        result.ex = (ThriftSecurityException) e;
+                        result.setExIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, throwsError_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.throwsError(resultHandler);
+      }
+    }
+
+  }
+
+  public static class success_args implements org.apache.thrift.TBase<success_args, success_args._Fields>, java.io.Serializable, Cloneable, Comparable<success_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("success_args");
 
 
@@ -483,13 +666,13 @@ import org.slf4j.LoggerFactory;
       return 0;
     }
 
+    @Override
     public int compareTo(success_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      success_args typedOther = (success_args)other;
 
       return 0;
     }
@@ -596,7 +779,7 @@ import org.slf4j.LoggerFactory;
 
   }
 
-  public static class success_result implements org.apache.thrift.TBase<success_result, success_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class success_result implements org.apache.thrift.TBase<success_result, success_result._Fields>, java.io.Serializable, Cloneable, Comparable<success_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("success_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
@@ -796,20 +979,20 @@ import org.slf4j.LoggerFactory;
       return 0;
     }
 
+    @Override
     public int compareTo(success_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      success_result typedOther = (success_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -950,7 +1133,7 @@ import org.slf4j.LoggerFactory;
 
   }
 
-  public static class fails_args implements org.apache.thrift.TBase<fails_args, fails_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class fails_args implements org.apache.thrift.TBase<fails_args, fails_args._Fields>, java.io.Serializable, Cloneable, Comparable<fails_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fails_args");
 
 
@@ -1083,13 +1266,13 @@ import org.slf4j.LoggerFactory;
       return 0;
     }
 
+    @Override
     public int compareTo(fails_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      fails_args typedOther = (fails_args)other;
 
       return 0;
     }
@@ -1196,7 +1379,7 @@ import org.slf4j.LoggerFactory;
 
   }
 
-  public static class fails_result implements org.apache.thrift.TBase<fails_result, fails_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class fails_result implements org.apache.thrift.TBase<fails_result, fails_result._Fields>, java.io.Serializable, Cloneable, Comparable<fails_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("fails_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
@@ -1396,20 +1579,20 @@ import org.slf4j.LoggerFactory;
       return 0;
     }
 
+    @Override
     public int compareTo(fails_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      fails_result typedOther = (fails_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1550,7 +1733,7 @@ import org.slf4j.LoggerFactory;
 
   }
 
-  public static class throwsError_args implements org.apache.thrift.TBase<throwsError_args, throwsError_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class throwsError_args implements org.apache.thrift.TBase<throwsError_args, throwsError_args._Fields>, java.io.Serializable, Cloneable, Comparable<throwsError_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("throwsError_args");
 
 
@@ -1683,13 +1866,13 @@ import org.slf4j.LoggerFactory;
       return 0;
     }
 
+    @Override
     public int compareTo(throwsError_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      throwsError_args typedOther = (throwsError_args)other;
 
       return 0;
     }
@@ -1796,7 +1979,7 @@ import org.slf4j.LoggerFactory;
 
   }
 
-  public static class throwsError_result implements org.apache.thrift.TBase<throwsError_result, throwsError_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class throwsError_result implements org.apache.thrift.TBase<throwsError_result, throwsError_result._Fields>, java.io.Serializable, Cloneable, Comparable<throwsError_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("throwsError_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
@@ -2055,30 +2238,30 @@ import org.slf4j.LoggerFactory;
       return 0;
     }
 
+    @Override
     public int compareTo(throwsError_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      throwsError_result typedOther = (throwsError_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetEx()).compareTo(typedOther.isSetEx());
+      lastComparison = Boolean.valueOf(isSetEx()).compareTo(other.isSetEx());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetEx()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ex, typedOther.ex);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ex, other.ex);
         if (lastComparison != 0) {
           return lastComparison;
         }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 d8957f9..d4d5424 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class InitialMultiScan implements org.apache.thrift.TBase<InitialMultiScan, InitialMultiScan._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -305,30 +307,30 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(InitialMultiScan other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    InitialMultiScan typedOther = (InitialMultiScan)other;
 
-    lastComparison = Boolean.valueOf(isSetScanID()).compareTo(typedOther.isSetScanID());
+    lastComparison = Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetScanID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scanID, typedOther.scanID);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scanID, other.scanID);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetResult()).compareTo(typedOther.isSetResult());
+    lastComparison = Boolean.valueOf(isSetResult()).compareTo(other.isSetResult());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetResult()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.result, typedOther.result);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.result, other.result);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 f8f07d6..001bc51 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class InitialScan implements org.apache.thrift.TBase<InitialScan, InitialScan._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -305,30 +307,30 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(InitialScan other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    InitialScan typedOther = (InitialScan)other;
 
-    lastComparison = Boolean.valueOf(isSetScanID()).compareTo(typedOther.isSetScanID());
+    lastComparison = Boolean.valueOf(isSetScanID()).compareTo(other.isSetScanID());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetScanID()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scanID, typedOther.scanID);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.scanID, other.scanID);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetResult()).compareTo(typedOther.isSetResult());
+    lastComparison = Boolean.valueOf(isSetResult()).compareTo(other.isSetResult());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetResult()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.result, typedOther.result);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.result, other.result);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 802c40b..6135634 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class IterInfo implements org.apache.thrift.TBase<IterInfo, IterInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -364,40 +366,40 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(IterInfo other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    IterInfo typedOther = (IterInfo)other;
 
-    lastComparison = Boolean.valueOf(isSetPriority()).compareTo(typedOther.isSetPriority());
+    lastComparison = Boolean.valueOf(isSetPriority()).compareTo(other.isSetPriority());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPriority()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.priority, typedOther.priority);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.priority, other.priority);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetClassName()).compareTo(typedOther.isSetClassName());
+    lastComparison = Boolean.valueOf(isSetClassName()).compareTo(other.isSetClassName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetClassName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.className, typedOther.className);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.className, other.className);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIterName()).compareTo(typedOther.isSetIterName());
+    lastComparison = Boolean.valueOf(isSetIterName()).compareTo(other.isSetIterName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetIterName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterName, typedOther.iterName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterName, other.iterName);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 3e3021c..8598818 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class MapFileInfo implements org.apache.thrift.TBase<MapFileInfo, MapFileInfo._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -246,20 +248,20 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(MapFileInfo other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    MapFileInfo typedOther = (MapFileInfo)other;
 
-    lastComparison = Boolean.valueOf(isSetEstimatedSize()).compareTo(typedOther.isSetEstimatedSize());
+    lastComparison = Boolean.valueOf(isSetEstimatedSize()).compareTo(other.isSetEstimatedSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetEstimatedSize()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.estimatedSize, typedOther.estimatedSize);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.estimatedSize, other.estimatedSize);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 f0b8a87..d7c0374 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class MultiScanResult implements org.apache.thrift.TBase<MultiScanResult, MultiScanResult._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -204,7 +206,7 @@ import org.slf4j.LoggerFactory;
   public MultiScanResult(MultiScanResult other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetResults()) {
-      List<TKeyValue> __this__results = new ArrayList<TKeyValue>();
+      List<TKeyValue> __this__results = new ArrayList<TKeyValue>(other.results.size());
       for (TKeyValue other_element : other.results) {
         __this__results.add(new TKeyValue(other_element));
       }
@@ -214,7 +216,7 @@ import org.slf4j.LoggerFactory;
       this.failures = other.failures;
     }
     if (other.isSetFullScans()) {
-      List<TKeyExtent> __this__fullScans = new ArrayList<TKeyExtent>();
+      List<TKeyExtent> __this__fullScans = new ArrayList<TKeyExtent>(other.fullScans.size());
       for (TKeyExtent other_element : other.fullScans) {
         __this__fullScans.add(new TKeyExtent(other_element));
       }
@@ -651,80 +653,80 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(MultiScanResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    MultiScanResult typedOther = (MultiScanResult)other;
 
-    lastComparison = Boolean.valueOf(isSetResults()).compareTo(typedOther.isSetResults());
+    lastComparison = Boolean.valueOf(isSetResults()).compareTo(other.isSetResults());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetResults()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.results, typedOther.results);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.results, other.results);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFailures()).compareTo(typedOther.isSetFailures());
+    lastComparison = Boolean.valueOf(isSetFailures()).compareTo(other.isSetFailures());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFailures()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failures, typedOther.failures);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failures, other.failures);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFullScans()).compareTo(typedOther.isSetFullScans());
+    lastComparison = Boolean.valueOf(isSetFullScans()).compareTo(other.isSetFullScans());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFullScans()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fullScans, typedOther.fullScans);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fullScans, other.fullScans);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPartScan()).compareTo(typedOther.isSetPartScan());
+    lastComparison = Boolean.valueOf(isSetPartScan()).compareTo(other.isSetPartScan());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartScan()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partScan, typedOther.partScan);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partScan, other.partScan);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPartNextKey()).compareTo(typedOther.isSetPartNextKey());
+    lastComparison = Boolean.valueOf(isSetPartNextKey()).compareTo(other.isSetPartNextKey());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartNextKey()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partNextKey, typedOther.partNextKey);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partNextKey, other.partNextKey);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPartNextKeyInclusive()).compareTo(typedOther.isSetPartNextKeyInclusive());
+    lastComparison = Boolean.valueOf(isSetPartNextKeyInclusive()).compareTo(other.isSetPartNextKeyInclusive());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPartNextKeyInclusive()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partNextKeyInclusive, typedOther.partNextKeyInclusive);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.partNextKeyInclusive, other.partNextKeyInclusive);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMore()).compareTo(typedOther.isSetMore());
+    lastComparison = Boolean.valueOf(isSetMore()).compareTo(other.isSetMore());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMore()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.more, typedOther.more);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.more, other.more);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -854,7 +856,7 @@ import org.slf4j.LoggerFactory;
                 struct.results = new ArrayList<TKeyValue>(_list16.size);
                 for (int _i17 = 0; _i17 < _list16.size; ++_i17)
                 {
-                  TKeyValue _elem18; // required
+                  TKeyValue _elem18;
                   _elem18 = new TKeyValue();
                   _elem18.read(iprot);
                   struct.results.add(_elem18);
@@ -873,8 +875,8 @@ import org.slf4j.LoggerFactory;
                 struct.failures = new HashMap<TKeyExtent,List<TRange>>(2*_map19.size);
                 for (int _i20 = 0; _i20 < _map19.size; ++_i20)
                 {
-                  TKeyExtent _key21; // required
-                  List<TRange> _val22; // required
+                  TKeyExtent _key21;
+                  List<TRange> _val22;
                   _key21 = new TKeyExtent();
                   _key21.read(iprot);
                   {
@@ -882,7 +884,7 @@ import org.slf4j.LoggerFactory;
                     _val22 = new ArrayList<TRange>(_list23.size);
                     for (int _i24 = 0; _i24 < _list23.size; ++_i24)
                     {
-                      TRange _elem25; // required
+                      TRange _elem25;
                       _elem25 = new TRange();
                       _elem25.read(iprot);
                       _val22.add(_elem25);
@@ -905,7 +907,7 @@ import org.slf4j.LoggerFactory;
                 struct.fullScans = new ArrayList<TKeyExtent>(_list26.size);
                 for (int _i27 = 0; _i27 < _list26.size; ++_i27)
                 {
-                  TKeyExtent _elem28; // required
+                  TKeyExtent _elem28;
                   _elem28 = new TKeyExtent();
                   _elem28.read(iprot);
                   struct.fullScans.add(_elem28);
@@ -1124,7 +1126,7 @@ import org.slf4j.LoggerFactory;
           struct.results = new ArrayList<TKeyValue>(_list37.size);
           for (int _i38 = 0; _i38 < _list37.size; ++_i38)
           {
-            TKeyValue _elem39; // required
+            TKeyValue _elem39;
             _elem39 = new TKeyValue();
             _elem39.read(iprot);
             struct.results.add(_elem39);
@@ -1138,8 +1140,8 @@ import org.slf4j.LoggerFactory;
           struct.failures = new HashMap<TKeyExtent,List<TRange>>(2*_map40.size);
           for (int _i41 = 0; _i41 < _map40.size; ++_i41)
           {
-            TKeyExtent _key42; // required
-            List<TRange> _val43; // required
+            TKeyExtent _key42;
+            List<TRange> _val43;
             _key42 = new TKeyExtent();
             _key42.read(iprot);
             {
@@ -1147,7 +1149,7 @@ import org.slf4j.LoggerFactory;
               _val43 = new ArrayList<TRange>(_list44.size);
               for (int _i45 = 0; _i45 < _list44.size; ++_i45)
               {
-                TRange _elem46; // required
+                TRange _elem46;
                 _elem46 = new TRange();
                 _elem46.read(iprot);
                 _val43.add(_elem46);
@@ -1164,7 +1166,7 @@ import org.slf4j.LoggerFactory;
           struct.fullScans = new ArrayList<TKeyExtent>(_list47.size);
           for (int _i48 = 0; _i48 < _list47.size; ++_i48)
           {
-            TKeyExtent _elem49; // required
+            TKeyExtent _elem49;
             _elem49 = new TKeyExtent();
             _elem49.read(iprot);
             struct.fullScans.add(_elem49);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 6472587..ce418a6 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -156,7 +158,7 @@ import org.slf4j.LoggerFactory;
   public ScanResult(ScanResult other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetResults()) {
-      List<TKeyValue> __this__results = new ArrayList<TKeyValue>();
+      List<TKeyValue> __this__results = new ArrayList<TKeyValue>(other.results.size());
       for (TKeyValue other_element : other.results) {
         __this__results.add(new TKeyValue(other_element));
       }
@@ -325,30 +327,30 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(ScanResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ScanResult typedOther = (ScanResult)other;
 
-    lastComparison = Boolean.valueOf(isSetResults()).compareTo(typedOther.isSetResults());
+    lastComparison = Boolean.valueOf(isSetResults()).compareTo(other.isSetResults());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetResults()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.results, typedOther.results);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.results, other.results);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMore()).compareTo(typedOther.isSetMore());
+    lastComparison = Boolean.valueOf(isSetMore()).compareTo(other.isSetMore());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMore()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.more, typedOther.more);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.more, other.more);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -436,7 +438,7 @@ import org.slf4j.LoggerFactory;
                 struct.results = new ArrayList<TKeyValue>(_list8.size);
                 for (int _i9 = 0; _i9 < _list8.size; ++_i9)
                 {
-                  TKeyValue _elem10; // required
+                  TKeyValue _elem10;
                   _elem10 = new TKeyValue();
                   _elem10.read(iprot);
                   struct.results.add(_elem10);
@@ -535,7 +537,7 @@ import org.slf4j.LoggerFactory;
           struct.results = new ArrayList<TKeyValue>(_list13.size);
           for (int _i14 = 0; _i14 < _list13.size; ++_i14)
           {
-            TKeyValue _elem15; // required
+            TKeyValue _elem15;
             _elem15 = new TKeyValue();
             _elem15.read(iprot);
             struct.results.add(_elem15);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 fe72fd6..598bd48 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class TCMResult implements org.apache.thrift.TBase<TCMResult, TCMResult._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -321,30 +323,30 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(TCMResult other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TCMResult typedOther = (TCMResult)other;
 
-    lastComparison = Boolean.valueOf(isSetCmid()).compareTo(typedOther.isSetCmid());
+    lastComparison = Boolean.valueOf(isSetCmid()).compareTo(other.isSetCmid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCmid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cmid, typedOther.cmid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cmid, other.cmid);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus());
+    lastComparison = Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStatus()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 6ef94d5..ee4592c 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * 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/011c1760/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 7c19c96..125cece 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -395,40 +397,40 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(TColumn other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TColumn typedOther = (TColumn)other;
 
-    lastComparison = Boolean.valueOf(isSetColumnFamily()).compareTo(typedOther.isSetColumnFamily());
+    lastComparison = Boolean.valueOf(isSetColumnFamily()).compareTo(other.isSetColumnFamily());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumnFamily()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnFamily, typedOther.columnFamily);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnFamily, other.columnFamily);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumnQualifier()).compareTo(typedOther.isSetColumnQualifier());
+    lastComparison = Boolean.valueOf(isSetColumnQualifier()).compareTo(other.isSetColumnQualifier());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumnQualifier()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnQualifier, typedOther.columnQualifier);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnQualifier, other.columnQualifier);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumnVisibility()).compareTo(typedOther.isSetColumnVisibility());
+    lastComparison = Boolean.valueOf(isSetColumnVisibility()).compareTo(other.isSetColumnVisibility());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumnVisibility()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnVisibility, typedOther.columnVisibility);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnVisibility, other.columnVisibility);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 40a12be..9fc3968 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class TCondition implements org.apache.thrift.TBase<TCondition, TCondition._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -655,80 +657,80 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(TCondition other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TCondition typedOther = (TCondition)other;
 
-    lastComparison = Boolean.valueOf(isSetCf()).compareTo(typedOther.isSetCf());
+    lastComparison = Boolean.valueOf(isSetCf()).compareTo(other.isSetCf());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCf()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cf, typedOther.cf);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cf, other.cf);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCq()).compareTo(typedOther.isSetCq());
+    lastComparison = Boolean.valueOf(isSetCq()).compareTo(other.isSetCq());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCq()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cq, typedOther.cq);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cq, other.cq);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCv()).compareTo(typedOther.isSetCv());
+    lastComparison = Boolean.valueOf(isSetCv()).compareTo(other.isSetCv());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCv()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cv, typedOther.cv);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cv, other.cv);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTs()).compareTo(typedOther.isSetTs());
+    lastComparison = Boolean.valueOf(isSetTs()).compareTo(other.isSetTs());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTs()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ts, typedOther.ts);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ts, other.ts);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasTimestamp()).compareTo(typedOther.isSetHasTimestamp());
+    lastComparison = Boolean.valueOf(isSetHasTimestamp()).compareTo(other.isSetHasTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetHasTimestamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasTimestamp, typedOther.hasTimestamp);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasTimestamp, other.hasTimestamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVal()).compareTo(typedOther.isSetVal());
+    lastComparison = Boolean.valueOf(isSetVal()).compareTo(other.isSetVal());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetVal()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.val, typedOther.val);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.val, other.val);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIterators()).compareTo(typedOther.isSetIterators());
+    lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetIterators()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, typedOther.iterators);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.iterators, other.iterators);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/011c1760/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 3f9b3f7..3d49c45 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.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,6 +31,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;
@@ -46,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("all") public class TConditionalMutation implements org.apache.thrift.TBase<TConditionalMutation, TConditionalMutation._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings("all") 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);
@@ -165,7 +167,7 @@ import org.slf4j.LoggerFactory;
   public TConditionalMutation(TConditionalMutation other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetConditions()) {
-      List<TCondition> __this__conditions = new ArrayList<TCondition>();
+      List<TCondition> __this__conditions = new ArrayList<TCondition>(other.conditions.size());
       for (TCondition other_element : other.conditions) {
         __this__conditions.add(new TCondition(other_element));
       }
@@ -384,40 +386,40 @@ import org.slf4j.LoggerFactory;
     return 0;
   }
 
+  @Override
   public int compareTo(TConditionalMutation other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TConditionalMutation typedOther = (TConditionalMutation)other;
 
-    lastComparison = Boolean.valueOf(isSetConditions()).compareTo(typedOther.isSetConditions());
+    lastComparison = Boolean.valueOf(isSetConditions()).compareTo(other.isSetConditions());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetConditions()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.conditions, typedOther.conditions);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.conditions, other.conditions);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMutation()).compareTo(typedOther.isSetMutation());
+    lastComparison = Boolean.valueOf(isSetMutation()).compareTo(other.isSetMutation());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMutation()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutation, typedOther.mutation);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mutation, other.mutation);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetId()).compareTo(typedOther.isSetId());
+    lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -516,7 +518,7 @@ import org.slf4j.LoggerFactory;
                 struct.conditions = new ArrayList<TCondition>(_list78.size);
                 for (int _i79 = 0; _i79 < _list78.size; ++_i79)
                 {
-                  TCondition _elem80; // required
+                  TCondition _elem80;
                   _elem80 = new TCondition();
                   _elem80.read(iprot);
                   struct.conditions.add(_elem80);
@@ -635,7 +637,7 @@ import org.slf4j.LoggerFactory;
           struct.conditions = new ArrayList<TCondition>(_list83.size);
           for (int _i84 = 0; _i84 < _list83.size; ++_i84)
           {
-            TCondition _elem85; // required
+            TCondition _elem85;
             _elem85 = new TCondition();
             _elem85.read(iprot);
             struct.conditions.add(_elem85);


Mime
View raw message