Return-Path: 
 <commits-return-3748-apmail-accumulo-commits-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-commits-archive@www.apache.org
Delivered-To: apmail-accumulo-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B96681035A
	for <apmail-accumulo-commits-archive@www.apache.org>;
 Tue, 30 Apr 2013 18:33:35 +0000 (UTC)
Received: (qmail 39936 invoked by uid 500); 30 Apr 2013 18:33:35 -0000
Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org
Received: (qmail 39913 invoked by uid 500); 30 Apr 2013 18:33:35 -0000
Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@accumulo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@accumulo.apache.org>
List-Post: <mailto:commits@accumulo.apache.org>
List-Id: <commits.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list commits@accumulo.apache.org
Received: (qmail 39903 invoked by uid 99); 30 Apr 2013 18:33:35 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Apr 2013 18:33:35 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Apr 2013 18:33:31 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B89F223888FE;
	Tue, 30 Apr 2013 18:33:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1477758 [2/6] - in /accumulo/trunk:
 core/src/main/java/org/apache/accumulo/core/client/admin/
 core/src/main/java/org/apache/accumulo/core/client/mock/
 core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/
 core/src/main/java/org/...
Date: Tue, 30 Apr 2013 18:33:09 -0000
To: commits@accumulo.apache.org
From: ecn@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130430183311.B89F223888FE@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java?rev=1477758&r1=1477757&r2=1477758&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java Tue Apr 30 18:33:06 2013
@@ -100,6 +100,8 @@ import org.slf4j.LoggerFactory;
 
     public List<ActiveCompaction> getActiveCompactions(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException;
 
+    public List<DiskUsage> getDiskUsage(Set<String> tables, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException;
+
     public void removeLogs(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames) throws org.apache.thrift.TException;
 
   }
@@ -156,6 +158,8 @@ import org.slf4j.LoggerFactory;
 
     public void getActiveCompactions(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getActiveCompactions_call> resultHandler) throws org.apache.thrift.TException;
 
+    public void getDiskUsage(Set<String> tables, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getDiskUsage_call> resultHandler) throws org.apache.thrift.TException;
+
     public void removeLogs(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.removeLogs_call> resultHandler) throws org.apache.thrift.TException;
 
   }
@@ -782,6 +786,36 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getActiveCompactions failed: unknown result");
     }
 
+    public List<DiskUsage> getDiskUsage(Set<String> tables, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
+    {
+      send_getDiskUsage(tables, credentials);
+      return recv_getDiskUsage();
+    }
+
+    public void send_getDiskUsage(Set<String> tables, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.thrift.TException
+    {
+      getDiskUsage_args args = new getDiskUsage_args();
+      args.setTables(tables);
+      args.setCredentials(credentials);
+      sendBase("getDiskUsage", args);
+    }
+
+    public List<DiskUsage> recv_getDiskUsage() throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException
+    {
+      getDiskUsage_result result = new getDiskUsage_result();
+      receiveBase(result, "getDiskUsage");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.sec != null) {
+        throw result.sec;
+      }
+      if (result.toe != null) {
+        throw result.toe;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getDiskUsage failed: unknown result");
+    }
+
     public void removeLogs(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames) throws org.apache.thrift.TException
     {
       send_removeLogs(tinfo, credentials, filenames);
@@ -1812,6 +1846,41 @@ import org.slf4j.LoggerFactory;
       }
     }
 
+    public void getDiskUsage(Set<String> tables, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<getDiskUsage_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      getDiskUsage_call method_call = new getDiskUsage_call(tables, credentials, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class getDiskUsage_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private Set<String> tables;
+      private org.apache.accumulo.core.security.thrift.TCredentials credentials;
+      public getDiskUsage_call(Set<String> tables, org.apache.accumulo.core.security.thrift.TCredentials credentials, org.apache.thrift.async.AsyncMethodCallback<getDiskUsage_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.tables = tables;
+        this.credentials = credentials;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("getDiskUsage", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        getDiskUsage_args args = new getDiskUsage_args();
+        args.setTables(tables);
+        args.setCredentials(credentials);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public List<DiskUsage> getResult() throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_getDiskUsage();
+      }
+    }
+
     public void removeLogs(org.apache.accumulo.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, List<String> filenames, org.apache.thrift.async.AsyncMethodCallback<removeLogs_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       removeLogs_call method_call = new removeLogs_call(tinfo, credentials, filenames, resultHandler, this, ___protocolFactory, ___transport);
@@ -1887,6 +1956,7 @@ import org.slf4j.LoggerFactory;
       processMap.put("fastHalt", new fastHalt());
       processMap.put("getActiveScans", new getActiveScans());
       processMap.put("getActiveCompactions", new getActiveCompactions());
+      processMap.put("getDiskUsage", new getDiskUsage());
       processMap.put("removeLogs", new removeLogs());
       return processMap;
     }
@@ -2461,6 +2531,32 @@ import org.slf4j.LoggerFactory;
       }
     }
 
+    public static class getDiskUsage<I extends Iface> extends org.apache.thrift.ProcessFunction<I, getDiskUsage_args> {
+      public getDiskUsage() {
+        super("getDiskUsage");
+      }
+
+      public getDiskUsage_args getEmptyArgsInstance() {
+        return new getDiskUsage_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public getDiskUsage_result getResult(I iface, getDiskUsage_args args) throws org.apache.thrift.TException {
+        getDiskUsage_result result = new getDiskUsage_result();
+        try {
+          result.success = iface.getDiskUsage(args.tables, args.credentials);
+        } catch (org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException sec) {
+          result.sec = sec;
+        } catch (org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException toe) {
+          result.toe = toe;
+        }
+        return result;
+      }
+    }
+
     public static class removeLogs<I extends Iface> extends org.apache.thrift.ProcessFunction<I, removeLogs_args> {
       public removeLogs() {
         super("removeLogs");
@@ -3681,14 +3777,14 @@ import org.slf4j.LoggerFactory;
             case 4: // COLUMNS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list106 = iprot.readListBegin();
-                  struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list106.size);
-                  for (int _i107 = 0; _i107 < _list106.size; ++_i107)
+                  org.apache.thrift.protocol.TList _list114 = iprot.readListBegin();
+                  struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list114.size);
+                  for (int _i115 = 0; _i115 < _list114.size; ++_i115)
                   {
-                    org.apache.accumulo.core.data.thrift.TColumn _elem108; // required
-                    _elem108 = new org.apache.accumulo.core.data.thrift.TColumn();
-                    _elem108.read(iprot);
-                    struct.columns.add(_elem108);
+                    org.apache.accumulo.core.data.thrift.TColumn _elem116; // required
+                    _elem116 = new org.apache.accumulo.core.data.thrift.TColumn();
+                    _elem116.read(iprot);
+                    struct.columns.add(_elem116);
                   }
                   iprot.readListEnd();
                 }
@@ -3708,14 +3804,14 @@ import org.slf4j.LoggerFactory;
             case 6: // SSI_LIST
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list109 = iprot.readListBegin();
-                  struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list109.size);
-                  for (int _i110 = 0; _i110 < _list109.size; ++_i110)
+                  org.apache.thrift.protocol.TList _list117 = iprot.readListBegin();
+                  struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list117.size);
+                  for (int _i118 = 0; _i118 < _list117.size; ++_i118)
                   {
-                    org.apache.accumulo.core.data.thrift.IterInfo _elem111; // required
-                    _elem111 = new org.apache.accumulo.core.data.thrift.IterInfo();
-                    _elem111.read(iprot);
-                    struct.ssiList.add(_elem111);
+                    org.apache.accumulo.core.data.thrift.IterInfo _elem119; // required
+                    _elem119 = new org.apache.accumulo.core.data.thrift.IterInfo();
+                    _elem119.read(iprot);
+                    struct.ssiList.add(_elem119);
                   }
                   iprot.readListEnd();
                 }
@@ -3727,27 +3823,27 @@ import org.slf4j.LoggerFactory;
             case 7: // SSIO
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map112 = iprot.readMapBegin();
-                  struct.ssio = new HashMap<String,Map<String,String>>(2*_map112.size);
-                  for (int _i113 = 0; _i113 < _map112.size; ++_i113)
+                  org.apache.thrift.protocol.TMap _map120 = iprot.readMapBegin();
+                  struct.ssio = new HashMap<String,Map<String,String>>(2*_map120.size);
+                  for (int _i121 = 0; _i121 < _map120.size; ++_i121)
                   {
-                    String _key114; // required
-                    Map<String,String> _val115; // required
-                    _key114 = iprot.readString();
+                    String _key122; // required
+                    Map<String,String> _val123; // required
+                    _key122 = iprot.readString();
                     {
-                      org.apache.thrift.protocol.TMap _map116 = iprot.readMapBegin();
-                      _val115 = new HashMap<String,String>(2*_map116.size);
-                      for (int _i117 = 0; _i117 < _map116.size; ++_i117)
+                      org.apache.thrift.protocol.TMap _map124 = iprot.readMapBegin();
+                      _val123 = new HashMap<String,String>(2*_map124.size);
+                      for (int _i125 = 0; _i125 < _map124.size; ++_i125)
                       {
-                        String _key118; // required
-                        String _val119; // required
-                        _key118 = iprot.readString();
-                        _val119 = iprot.readString();
-                        _val115.put(_key118, _val119);
+                        String _key126; // required
+                        String _val127; // required
+                        _key126 = iprot.readString();
+                        _val127 = iprot.readString();
+                        _val123.put(_key126, _val127);
                       }
                       iprot.readMapEnd();
                     }
-                    struct.ssio.put(_key114, _val115);
+                    struct.ssio.put(_key122, _val123);
                   }
                   iprot.readMapEnd();
                 }
@@ -3759,13 +3855,13 @@ import org.slf4j.LoggerFactory;
             case 8: // AUTHORIZATIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list120 = iprot.readListBegin();
-                  struct.authorizations = new ArrayList<ByteBuffer>(_list120.size);
-                  for (int _i121 = 0; _i121 < _list120.size; ++_i121)
+                  org.apache.thrift.protocol.TList _list128 = iprot.readListBegin();
+                  struct.authorizations = new ArrayList<ByteBuffer>(_list128.size);
+                  for (int _i129 = 0; _i129 < _list128.size; ++_i129)
                   {
-                    ByteBuffer _elem122; // required
-                    _elem122 = iprot.readBinary();
-                    struct.authorizations.add(_elem122);
+                    ByteBuffer _elem130; // required
+                    _elem130 = iprot.readBinary();
+                    struct.authorizations.add(_elem130);
                   }
                   iprot.readListEnd();
                 }
@@ -3824,9 +3920,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
-            for (org.apache.accumulo.core.data.thrift.TColumn _iter123 : struct.columns)
+            for (org.apache.accumulo.core.data.thrift.TColumn _iter131 : struct.columns)
             {
-              _iter123.write(oprot);
+              _iter131.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -3839,9 +3935,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SSI_LIST_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ssiList.size()));
-            for (org.apache.accumulo.core.data.thrift.IterInfo _iter124 : struct.ssiList)
+            for (org.apache.accumulo.core.data.thrift.IterInfo _iter132 : struct.ssiList)
             {
-              _iter124.write(oprot);
+              _iter132.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -3851,15 +3947,15 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SSIO_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.ssio.size()));
-            for (Map.Entry<String, Map<String,String>> _iter125 : struct.ssio.entrySet())
+            for (Map.Entry<String, Map<String,String>> _iter133 : struct.ssio.entrySet())
             {
-              oprot.writeString(_iter125.getKey());
+              oprot.writeString(_iter133.getKey());
               {
-                oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter125.getValue().size()));
-                for (Map.Entry<String, String> _iter126 : _iter125.getValue().entrySet())
+                oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter133.getValue().size()));
+                for (Map.Entry<String, String> _iter134 : _iter133.getValue().entrySet())
                 {
-                  oprot.writeString(_iter126.getKey());
-                  oprot.writeString(_iter126.getValue());
+                  oprot.writeString(_iter134.getKey());
+                  oprot.writeString(_iter134.getValue());
                 }
                 oprot.writeMapEnd();
               }
@@ -3872,9 +3968,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size()));
-            for (ByteBuffer _iter127 : struct.authorizations)
+            for (ByteBuffer _iter135 : struct.authorizations)
             {
-              oprot.writeBinary(_iter127);
+              oprot.writeBinary(_iter135);
             }
             oprot.writeListEnd();
           }
@@ -3958,9 +4054,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetColumns()) {
           {
             oprot.writeI32(struct.columns.size());
-            for (org.apache.accumulo.core.data.thrift.TColumn _iter128 : struct.columns)
+            for (org.apache.accumulo.core.data.thrift.TColumn _iter136 : struct.columns)
             {
-              _iter128.write(oprot);
+              _iter136.write(oprot);
             }
           }
         }
@@ -3970,24 +4066,24 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSsiList()) {
           {
             oprot.writeI32(struct.ssiList.size());
-            for (org.apache.accumulo.core.data.thrift.IterInfo _iter129 : struct.ssiList)
+            for (org.apache.accumulo.core.data.thrift.IterInfo _iter137 : struct.ssiList)
             {
-              _iter129.write(oprot);
+              _iter137.write(oprot);
             }
           }
         }
         if (struct.isSetSsio()) {
           {
             oprot.writeI32(struct.ssio.size());
-            for (Map.Entry<String, Map<String,String>> _iter130 : struct.ssio.entrySet())
+            for (Map.Entry<String, Map<String,String>> _iter138 : struct.ssio.entrySet())
             {
-              oprot.writeString(_iter130.getKey());
+              oprot.writeString(_iter138.getKey());
               {
-                oprot.writeI32(_iter130.getValue().size());
-                for (Map.Entry<String, String> _iter131 : _iter130.getValue().entrySet())
+                oprot.writeI32(_iter138.getValue().size());
+                for (Map.Entry<String, String> _iter139 : _iter138.getValue().entrySet())
                 {
-                  oprot.writeString(_iter131.getKey());
-                  oprot.writeString(_iter131.getValue());
+                  oprot.writeString(_iter139.getKey());
+                  oprot.writeString(_iter139.getValue());
                 }
               }
             }
@@ -3996,9 +4092,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetAuthorizations()) {
           {
             oprot.writeI32(struct.authorizations.size());
-            for (ByteBuffer _iter132 : struct.authorizations)
+            for (ByteBuffer _iter140 : struct.authorizations)
             {
-              oprot.writeBinary(_iter132);
+              oprot.writeBinary(_iter140);
             }
           }
         }
@@ -4036,14 +4132,14 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TList _list133 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list133.size);
-            for (int _i134 = 0; _i134 < _list133.size; ++_i134)
+            org.apache.thrift.protocol.TList _list141 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list141.size);
+            for (int _i142 = 0; _i142 < _list141.size; ++_i142)
             {
-              org.apache.accumulo.core.data.thrift.TColumn _elem135; // required
-              _elem135 = new org.apache.accumulo.core.data.thrift.TColumn();
-              _elem135.read(iprot);
-              struct.columns.add(_elem135);
+              org.apache.accumulo.core.data.thrift.TColumn _elem143; // required
+              _elem143 = new org.apache.accumulo.core.data.thrift.TColumn();
+              _elem143.read(iprot);
+              struct.columns.add(_elem143);
             }
           }
           struct.setColumnsIsSet(true);
@@ -4054,53 +4150,53 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(6)) {
           {
-            org.apache.thrift.protocol.TList _list136 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list136.size);
-            for (int _i137 = 0; _i137 < _list136.size; ++_i137)
+            org.apache.thrift.protocol.TList _list144 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list144.size);
+            for (int _i145 = 0; _i145 < _list144.size; ++_i145)
             {
-              org.apache.accumulo.core.data.thrift.IterInfo _elem138; // required
-              _elem138 = new org.apache.accumulo.core.data.thrift.IterInfo();
-              _elem138.read(iprot);
-              struct.ssiList.add(_elem138);
+              org.apache.accumulo.core.data.thrift.IterInfo _elem146; // required
+              _elem146 = new org.apache.accumulo.core.data.thrift.IterInfo();
+              _elem146.read(iprot);
+              struct.ssiList.add(_elem146);
             }
           }
           struct.setSsiListIsSet(true);
         }
         if (incoming.get(7)) {
           {
-            org.apache.thrift.protocol.TMap _map139 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
-            struct.ssio = new HashMap<String,Map<String,String>>(2*_map139.size);
-            for (int _i140 = 0; _i140 < _map139.size; ++_i140)
+            org.apache.thrift.protocol.TMap _map147 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+            struct.ssio = new HashMap<String,Map<String,String>>(2*_map147.size);
+            for (int _i148 = 0; _i148 < _map147.size; ++_i148)
             {
-              String _key141; // required
-              Map<String,String> _val142; // required
-              _key141 = iprot.readString();
+              String _key149; // required
+              Map<String,String> _val150; // required
+              _key149 = iprot.readString();
               {
-                org.apache.thrift.protocol.TMap _map143 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-                _val142 = new HashMap<String,String>(2*_map143.size);
-                for (int _i144 = 0; _i144 < _map143.size; ++_i144)
+                org.apache.thrift.protocol.TMap _map151 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+                _val150 = new HashMap<String,String>(2*_map151.size);
+                for (int _i152 = 0; _i152 < _map151.size; ++_i152)
                 {
-                  String _key145; // required
-                  String _val146; // required
-                  _key145 = iprot.readString();
-                  _val146 = iprot.readString();
-                  _val142.put(_key145, _val146);
+                  String _key153; // required
+                  String _val154; // required
+                  _key153 = iprot.readString();
+                  _val154 = iprot.readString();
+                  _val150.put(_key153, _val154);
                 }
               }
-              struct.ssio.put(_key141, _val142);
+              struct.ssio.put(_key149, _val150);
             }
           }
           struct.setSsioIsSet(true);
         }
         if (incoming.get(8)) {
           {
-            org.apache.thrift.protocol.TList _list147 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.authorizations = new ArrayList<ByteBuffer>(_list147.size);
-            for (int _i148 = 0; _i148 < _list147.size; ++_i148)
+            org.apache.thrift.protocol.TList _list155 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.authorizations = new ArrayList<ByteBuffer>(_list155.size);
+            for (int _i156 = 0; _i156 < _list155.size; ++_i156)
             {
-              ByteBuffer _elem149; // required
-              _elem149 = iprot.readBinary();
-              struct.authorizations.add(_elem149);
+              ByteBuffer _elem157; // required
+              _elem157 = iprot.readBinary();
+              struct.authorizations.add(_elem157);
             }
           }
           struct.setAuthorizationsIsSet(true);
@@ -7325,27 +7421,27 @@ import org.slf4j.LoggerFactory;
             case 2: // BATCH
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map150 = iprot.readMapBegin();
-                  struct.batch = new HashMap<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>>(2*_map150.size);
-                  for (int _i151 = 0; _i151 < _map150.size; ++_i151)
+                  org.apache.thrift.protocol.TMap _map158 = iprot.readMapBegin();
+                  struct.batch = new HashMap<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>>(2*_map158.size);
+                  for (int _i159 = 0; _i159 < _map158.size; ++_i159)
                   {
-                    org.apache.accumulo.core.data.thrift.TKeyExtent _key152; // required
-                    List<org.apache.accumulo.core.data.thrift.TRange> _val153; // required
-                    _key152 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-                    _key152.read(iprot);
+                    org.apache.accumulo.core.data.thrift.TKeyExtent _key160; // required
+                    List<org.apache.accumulo.core.data.thrift.TRange> _val161; // required
+                    _key160 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
+                    _key160.read(iprot);
                     {
-                      org.apache.thrift.protocol.TList _list154 = iprot.readListBegin();
-                      _val153 = new ArrayList<org.apache.accumulo.core.data.thrift.TRange>(_list154.size);
-                      for (int _i155 = 0; _i155 < _list154.size; ++_i155)
+                      org.apache.thrift.protocol.TList _list162 = iprot.readListBegin();
+                      _val161 = new ArrayList<org.apache.accumulo.core.data.thrift.TRange>(_list162.size);
+                      for (int _i163 = 0; _i163 < _list162.size; ++_i163)
                       {
-                        org.apache.accumulo.core.data.thrift.TRange _elem156; // required
-                        _elem156 = new org.apache.accumulo.core.data.thrift.TRange();
-                        _elem156.read(iprot);
-                        _val153.add(_elem156);
+                        org.apache.accumulo.core.data.thrift.TRange _elem164; // required
+                        _elem164 = new org.apache.accumulo.core.data.thrift.TRange();
+                        _elem164.read(iprot);
+                        _val161.add(_elem164);
                       }
                       iprot.readListEnd();
                     }
-                    struct.batch.put(_key152, _val153);
+                    struct.batch.put(_key160, _val161);
                   }
                   iprot.readMapEnd();
                 }
@@ -7357,14 +7453,14 @@ import org.slf4j.LoggerFactory;
             case 3: // COLUMNS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list157 = iprot.readListBegin();
-                  struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list157.size);
-                  for (int _i158 = 0; _i158 < _list157.size; ++_i158)
+                  org.apache.thrift.protocol.TList _list165 = iprot.readListBegin();
+                  struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list165.size);
+                  for (int _i166 = 0; _i166 < _list165.size; ++_i166)
                   {
-                    org.apache.accumulo.core.data.thrift.TColumn _elem159; // required
-                    _elem159 = new org.apache.accumulo.core.data.thrift.TColumn();
-                    _elem159.read(iprot);
-                    struct.columns.add(_elem159);
+                    org.apache.accumulo.core.data.thrift.TColumn _elem167; // required
+                    _elem167 = new org.apache.accumulo.core.data.thrift.TColumn();
+                    _elem167.read(iprot);
+                    struct.columns.add(_elem167);
                   }
                   iprot.readListEnd();
                 }
@@ -7376,14 +7472,14 @@ import org.slf4j.LoggerFactory;
             case 4: // SSI_LIST
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list160 = iprot.readListBegin();
-                  struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list160.size);
-                  for (int _i161 = 0; _i161 < _list160.size; ++_i161)
+                  org.apache.thrift.protocol.TList _list168 = iprot.readListBegin();
+                  struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list168.size);
+                  for (int _i169 = 0; _i169 < _list168.size; ++_i169)
                   {
-                    org.apache.accumulo.core.data.thrift.IterInfo _elem162; // required
-                    _elem162 = new org.apache.accumulo.core.data.thrift.IterInfo();
-                    _elem162.read(iprot);
-                    struct.ssiList.add(_elem162);
+                    org.apache.accumulo.core.data.thrift.IterInfo _elem170; // required
+                    _elem170 = new org.apache.accumulo.core.data.thrift.IterInfo();
+                    _elem170.read(iprot);
+                    struct.ssiList.add(_elem170);
                   }
                   iprot.readListEnd();
                 }
@@ -7395,27 +7491,27 @@ import org.slf4j.LoggerFactory;
             case 5: // SSIO
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map163 = iprot.readMapBegin();
-                  struct.ssio = new HashMap<String,Map<String,String>>(2*_map163.size);
-                  for (int _i164 = 0; _i164 < _map163.size; ++_i164)
+                  org.apache.thrift.protocol.TMap _map171 = iprot.readMapBegin();
+                  struct.ssio = new HashMap<String,Map<String,String>>(2*_map171.size);
+                  for (int _i172 = 0; _i172 < _map171.size; ++_i172)
                   {
-                    String _key165; // required
-                    Map<String,String> _val166; // required
-                    _key165 = iprot.readString();
+                    String _key173; // required
+                    Map<String,String> _val174; // required
+                    _key173 = iprot.readString();
                     {
-                      org.apache.thrift.protocol.TMap _map167 = iprot.readMapBegin();
-                      _val166 = new HashMap<String,String>(2*_map167.size);
-                      for (int _i168 = 0; _i168 < _map167.size; ++_i168)
+                      org.apache.thrift.protocol.TMap _map175 = iprot.readMapBegin();
+                      _val174 = new HashMap<String,String>(2*_map175.size);
+                      for (int _i176 = 0; _i176 < _map175.size; ++_i176)
                       {
-                        String _key169; // required
-                        String _val170; // required
-                        _key169 = iprot.readString();
-                        _val170 = iprot.readString();
-                        _val166.put(_key169, _val170);
+                        String _key177; // required
+                        String _val178; // required
+                        _key177 = iprot.readString();
+                        _val178 = iprot.readString();
+                        _val174.put(_key177, _val178);
                       }
                       iprot.readMapEnd();
                     }
-                    struct.ssio.put(_key165, _val166);
+                    struct.ssio.put(_key173, _val174);
                   }
                   iprot.readMapEnd();
                 }
@@ -7427,13 +7523,13 @@ import org.slf4j.LoggerFactory;
             case 6: // AUTHORIZATIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list171 = iprot.readListBegin();
-                  struct.authorizations = new ArrayList<ByteBuffer>(_list171.size);
-                  for (int _i172 = 0; _i172 < _list171.size; ++_i172)
+                  org.apache.thrift.protocol.TList _list179 = iprot.readListBegin();
+                  struct.authorizations = new ArrayList<ByteBuffer>(_list179.size);
+                  for (int _i180 = 0; _i180 < _list179.size; ++_i180)
                   {
-                    ByteBuffer _elem173; // required
-                    _elem173 = iprot.readBinary();
-                    struct.authorizations.add(_elem173);
+                    ByteBuffer _elem181; // required
+                    _elem181 = iprot.readBinary();
+                    struct.authorizations.add(_elem181);
                   }
                   iprot.readListEnd();
                 }
@@ -7474,14 +7570,14 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(BATCH_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, struct.batch.size()));
-            for (Map.Entry<org.apache.accumulo.core.data.thrift.TKeyExtent, List<org.apache.accumulo.core.data.thrift.TRange>> _iter174 : struct.batch.entrySet())
+            for (Map.Entry<org.apache.accumulo.core.data.thrift.TKeyExtent, List<org.apache.accumulo.core.data.thrift.TRange>> _iter182 : struct.batch.entrySet())
             {
-              _iter174.getKey().write(oprot);
+              _iter182.getKey().write(oprot);
               {
-                oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter174.getValue().size()));
-                for (org.apache.accumulo.core.data.thrift.TRange _iter175 : _iter174.getValue())
+                oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter182.getValue().size()));
+                for (org.apache.accumulo.core.data.thrift.TRange _iter183 : _iter182.getValue())
                 {
-                  _iter175.write(oprot);
+                  _iter183.write(oprot);
                 }
                 oprot.writeListEnd();
               }
@@ -7494,9 +7590,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
-            for (org.apache.accumulo.core.data.thrift.TColumn _iter176 : struct.columns)
+            for (org.apache.accumulo.core.data.thrift.TColumn _iter184 : struct.columns)
             {
-              _iter176.write(oprot);
+              _iter184.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -7506,9 +7602,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SSI_LIST_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ssiList.size()));
-            for (org.apache.accumulo.core.data.thrift.IterInfo _iter177 : struct.ssiList)
+            for (org.apache.accumulo.core.data.thrift.IterInfo _iter185 : struct.ssiList)
             {
-              _iter177.write(oprot);
+              _iter185.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -7518,15 +7614,15 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SSIO_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, struct.ssio.size()));
-            for (Map.Entry<String, Map<String,String>> _iter178 : struct.ssio.entrySet())
+            for (Map.Entry<String, Map<String,String>> _iter186 : struct.ssio.entrySet())
             {
-              oprot.writeString(_iter178.getKey());
+              oprot.writeString(_iter186.getKey());
               {
-                oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter178.getValue().size()));
-                for (Map.Entry<String, String> _iter179 : _iter178.getValue().entrySet())
+                oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, _iter186.getValue().size()));
+                for (Map.Entry<String, String> _iter187 : _iter186.getValue().entrySet())
                 {
-                  oprot.writeString(_iter179.getKey());
-                  oprot.writeString(_iter179.getValue());
+                  oprot.writeString(_iter187.getKey());
+                  oprot.writeString(_iter187.getValue());
                 }
                 oprot.writeMapEnd();
               }
@@ -7539,9 +7635,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size()));
-            for (ByteBuffer _iter180 : struct.authorizations)
+            for (ByteBuffer _iter188 : struct.authorizations)
             {
-              oprot.writeBinary(_iter180);
+              oprot.writeBinary(_iter188);
             }
             oprot.writeListEnd();
           }
@@ -7607,14 +7703,14 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetBatch()) {
           {
             oprot.writeI32(struct.batch.size());
-            for (Map.Entry<org.apache.accumulo.core.data.thrift.TKeyExtent, List<org.apache.accumulo.core.data.thrift.TRange>> _iter181 : struct.batch.entrySet())
+            for (Map.Entry<org.apache.accumulo.core.data.thrift.TKeyExtent, List<org.apache.accumulo.core.data.thrift.TRange>> _iter189 : struct.batch.entrySet())
             {
-              _iter181.getKey().write(oprot);
+              _iter189.getKey().write(oprot);
               {
-                oprot.writeI32(_iter181.getValue().size());
-                for (org.apache.accumulo.core.data.thrift.TRange _iter182 : _iter181.getValue())
+                oprot.writeI32(_iter189.getValue().size());
+                for (org.apache.accumulo.core.data.thrift.TRange _iter190 : _iter189.getValue())
                 {
-                  _iter182.write(oprot);
+                  _iter190.write(oprot);
                 }
               }
             }
@@ -7623,33 +7719,33 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetColumns()) {
           {
             oprot.writeI32(struct.columns.size());
-            for (org.apache.accumulo.core.data.thrift.TColumn _iter183 : struct.columns)
+            for (org.apache.accumulo.core.data.thrift.TColumn _iter191 : struct.columns)
             {
-              _iter183.write(oprot);
+              _iter191.write(oprot);
             }
           }
         }
         if (struct.isSetSsiList()) {
           {
             oprot.writeI32(struct.ssiList.size());
-            for (org.apache.accumulo.core.data.thrift.IterInfo _iter184 : struct.ssiList)
+            for (org.apache.accumulo.core.data.thrift.IterInfo _iter192 : struct.ssiList)
             {
-              _iter184.write(oprot);
+              _iter192.write(oprot);
             }
           }
         }
         if (struct.isSetSsio()) {
           {
             oprot.writeI32(struct.ssio.size());
-            for (Map.Entry<String, Map<String,String>> _iter185 : struct.ssio.entrySet())
+            for (Map.Entry<String, Map<String,String>> _iter193 : struct.ssio.entrySet())
             {
-              oprot.writeString(_iter185.getKey());
+              oprot.writeString(_iter193.getKey());
               {
-                oprot.writeI32(_iter185.getValue().size());
-                for (Map.Entry<String, String> _iter186 : _iter185.getValue().entrySet())
+                oprot.writeI32(_iter193.getValue().size());
+                for (Map.Entry<String, String> _iter194 : _iter193.getValue().entrySet())
                 {
-                  oprot.writeString(_iter186.getKey());
-                  oprot.writeString(_iter186.getValue());
+                  oprot.writeString(_iter194.getKey());
+                  oprot.writeString(_iter194.getValue());
                 }
               }
             }
@@ -7658,9 +7754,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetAuthorizations()) {
           {
             oprot.writeI32(struct.authorizations.size());
-            for (ByteBuffer _iter187 : struct.authorizations)
+            for (ByteBuffer _iter195 : struct.authorizations)
             {
-              oprot.writeBinary(_iter187);
+              oprot.writeBinary(_iter195);
             }
           }
         }
@@ -7685,93 +7781,93 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map188 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
-            struct.batch = new HashMap<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>>(2*_map188.size);
-            for (int _i189 = 0; _i189 < _map188.size; ++_i189)
+            org.apache.thrift.protocol.TMap _map196 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+            struct.batch = new HashMap<org.apache.accumulo.core.data.thrift.TKeyExtent,List<org.apache.accumulo.core.data.thrift.TRange>>(2*_map196.size);
+            for (int _i197 = 0; _i197 < _map196.size; ++_i197)
             {
-              org.apache.accumulo.core.data.thrift.TKeyExtent _key190; // required
-              List<org.apache.accumulo.core.data.thrift.TRange> _val191; // required
-              _key190 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-              _key190.read(iprot);
+              org.apache.accumulo.core.data.thrift.TKeyExtent _key198; // required
+              List<org.apache.accumulo.core.data.thrift.TRange> _val199; // required
+              _key198 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
+              _key198.read(iprot);
               {
-                org.apache.thrift.protocol.TList _list192 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-                _val191 = new ArrayList<org.apache.accumulo.core.data.thrift.TRange>(_list192.size);
-                for (int _i193 = 0; _i193 < _list192.size; ++_i193)
+                org.apache.thrift.protocol.TList _list200 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+                _val199 = new ArrayList<org.apache.accumulo.core.data.thrift.TRange>(_list200.size);
+                for (int _i201 = 0; _i201 < _list200.size; ++_i201)
                 {
-                  org.apache.accumulo.core.data.thrift.TRange _elem194; // required
-                  _elem194 = new org.apache.accumulo.core.data.thrift.TRange();
-                  _elem194.read(iprot);
-                  _val191.add(_elem194);
+                  org.apache.accumulo.core.data.thrift.TRange _elem202; // required
+                  _elem202 = new org.apache.accumulo.core.data.thrift.TRange();
+                  _elem202.read(iprot);
+                  _val199.add(_elem202);
                 }
               }
-              struct.batch.put(_key190, _val191);
+              struct.batch.put(_key198, _val199);
             }
           }
           struct.setBatchIsSet(true);
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list195 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list195.size);
-            for (int _i196 = 0; _i196 < _list195.size; ++_i196)
+            org.apache.thrift.protocol.TList _list203 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list203.size);
+            for (int _i204 = 0; _i204 < _list203.size; ++_i204)
             {
-              org.apache.accumulo.core.data.thrift.TColumn _elem197; // required
-              _elem197 = new org.apache.accumulo.core.data.thrift.TColumn();
-              _elem197.read(iprot);
-              struct.columns.add(_elem197);
+              org.apache.accumulo.core.data.thrift.TColumn _elem205; // required
+              _elem205 = new org.apache.accumulo.core.data.thrift.TColumn();
+              _elem205.read(iprot);
+              struct.columns.add(_elem205);
             }
           }
           struct.setColumnsIsSet(true);
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TList _list198 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list198.size);
-            for (int _i199 = 0; _i199 < _list198.size; ++_i199)
+            org.apache.thrift.protocol.TList _list206 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list206.size);
+            for (int _i207 = 0; _i207 < _list206.size; ++_i207)
             {
-              org.apache.accumulo.core.data.thrift.IterInfo _elem200; // required
-              _elem200 = new org.apache.accumulo.core.data.thrift.IterInfo();
-              _elem200.read(iprot);
-              struct.ssiList.add(_elem200);
+              org.apache.accumulo.core.data.thrift.IterInfo _elem208; // required
+              _elem208 = new org.apache.accumulo.core.data.thrift.IterInfo();
+              _elem208.read(iprot);
+              struct.ssiList.add(_elem208);
             }
           }
           struct.setSsiListIsSet(true);
         }
         if (incoming.get(5)) {
           {
-            org.apache.thrift.protocol.TMap _map201 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
-            struct.ssio = new HashMap<String,Map<String,String>>(2*_map201.size);
-            for (int _i202 = 0; _i202 < _map201.size; ++_i202)
+            org.apache.thrift.protocol.TMap _map209 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+            struct.ssio = new HashMap<String,Map<String,String>>(2*_map209.size);
+            for (int _i210 = 0; _i210 < _map209.size; ++_i210)
             {
-              String _key203; // required
-              Map<String,String> _val204; // required
-              _key203 = iprot.readString();
+              String _key211; // required
+              Map<String,String> _val212; // required
+              _key211 = iprot.readString();
               {
-                org.apache.thrift.protocol.TMap _map205 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-                _val204 = new HashMap<String,String>(2*_map205.size);
-                for (int _i206 = 0; _i206 < _map205.size; ++_i206)
+                org.apache.thrift.protocol.TMap _map213 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+                _val212 = new HashMap<String,String>(2*_map213.size);
+                for (int _i214 = 0; _i214 < _map213.size; ++_i214)
                 {
-                  String _key207; // required
-                  String _val208; // required
-                  _key207 = iprot.readString();
-                  _val208 = iprot.readString();
-                  _val204.put(_key207, _val208);
+                  String _key215; // required
+                  String _val216; // required
+                  _key215 = iprot.readString();
+                  _val216 = iprot.readString();
+                  _val212.put(_key215, _val216);
                 }
               }
-              struct.ssio.put(_key203, _val204);
+              struct.ssio.put(_key211, _val212);
             }
           }
           struct.setSsioIsSet(true);
         }
         if (incoming.get(6)) {
           {
-            org.apache.thrift.protocol.TList _list209 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.authorizations = new ArrayList<ByteBuffer>(_list209.size);
-            for (int _i210 = 0; _i210 < _list209.size; ++_i210)
+            org.apache.thrift.protocol.TList _list217 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.authorizations = new ArrayList<ByteBuffer>(_list217.size);
+            for (int _i218 = 0; _i218 < _list217.size; ++_i218)
             {
-              ByteBuffer _elem211; // required
-              _elem211 = iprot.readBinary();
-              struct.authorizations.add(_elem211);
+              ByteBuffer _elem219; // required
+              _elem219 = iprot.readBinary();
+              struct.authorizations.add(_elem219);
             }
           }
           struct.setAuthorizationsIsSet(true);
@@ -11469,14 +11565,14 @@ import org.slf4j.LoggerFactory;
             case 4: // MUTATIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list212 = iprot.readListBegin();
-                  struct.mutations = new ArrayList<org.apache.accumulo.core.data.thrift.TMutation>(_list212.size);
-                  for (int _i213 = 0; _i213 < _list212.size; ++_i213)
+                  org.apache.thrift.protocol.TList _list220 = iprot.readListBegin();
+                  struct.mutations = new ArrayList<org.apache.accumulo.core.data.thrift.TMutation>(_list220.size);
+                  for (int _i221 = 0; _i221 < _list220.size; ++_i221)
                   {
-                    org.apache.accumulo.core.data.thrift.TMutation _elem214; // required
-                    _elem214 = new org.apache.accumulo.core.data.thrift.TMutation();
-                    _elem214.read(iprot);
-                    struct.mutations.add(_elem214);
+                    org.apache.accumulo.core.data.thrift.TMutation _elem222; // required
+                    _elem222 = new org.apache.accumulo.core.data.thrift.TMutation();
+                    _elem222.read(iprot);
+                    struct.mutations.add(_elem222);
                   }
                   iprot.readListEnd();
                 }
@@ -11517,9 +11613,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(MUTATIONS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.mutations.size()));
-            for (org.apache.accumulo.core.data.thrift.TMutation _iter215 : struct.mutations)
+            for (org.apache.accumulo.core.data.thrift.TMutation _iter223 : struct.mutations)
             {
-              _iter215.write(oprot);
+              _iter223.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -11568,9 +11664,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetMutations()) {
           {
             oprot.writeI32(struct.mutations.size());
-            for (org.apache.accumulo.core.data.thrift.TMutation _iter216 : struct.mutations)
+            for (org.apache.accumulo.core.data.thrift.TMutation _iter224 : struct.mutations)
             {
-              _iter216.write(oprot);
+              _iter224.write(oprot);
             }
           }
         }
@@ -11596,14 +11692,14 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list217 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.mutations = new ArrayList<org.apache.accumulo.core.data.thrift.TMutation>(_list217.size);
-            for (int _i218 = 0; _i218 < _list217.size; ++_i218)
+            org.apache.thrift.protocol.TList _list225 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.mutations = new ArrayList<org.apache.accumulo.core.data.thrift.TMutation>(_list225.size);
+            for (int _i226 = 0; _i226 < _list225.size; ++_i226)
             {
-              org.apache.accumulo.core.data.thrift.TMutation _elem219; // required
-              _elem219 = new org.apache.accumulo.core.data.thrift.TMutation();
-              _elem219.read(iprot);
-              struct.mutations.add(_elem219);
+              org.apache.accumulo.core.data.thrift.TMutation _elem227; // required
+              _elem227 = new org.apache.accumulo.core.data.thrift.TMutation();
+              _elem227.read(iprot);
+              struct.mutations.add(_elem227);
             }
           }
           struct.setMutationsIsSet(true);
@@ -14401,29 +14497,29 @@ import org.slf4j.LoggerFactory;
             case 2: // FILES
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map220 = iprot.readMapBegin();
-                  struct.files = new HashMap<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>>(2*_map220.size);
-                  for (int _i221 = 0; _i221 < _map220.size; ++_i221)
+                  org.apache.thrift.protocol.TMap _map228 = iprot.readMapBegin();
+                  struct.files = new HashMap<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>>(2*_map228.size);
+                  for (int _i229 = 0; _i229 < _map228.size; ++_i229)
                   {
-                    org.apache.accumulo.core.data.thrift.TKeyExtent _key222; // required
-                    Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo> _val223; // required
-                    _key222 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-                    _key222.read(iprot);
+                    org.apache.accumulo.core.data.thrift.TKeyExtent _key230; // required
+                    Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo> _val231; // required
+                    _key230 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
+                    _key230.read(iprot);
                     {
-                      org.apache.thrift.protocol.TMap _map224 = iprot.readMapBegin();
-                      _val223 = new HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo>(2*_map224.size);
-                      for (int _i225 = 0; _i225 < _map224.size; ++_i225)
+                      org.apache.thrift.protocol.TMap _map232 = iprot.readMapBegin();
+                      _val231 = new HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo>(2*_map232.size);
+                      for (int _i233 = 0; _i233 < _map232.size; ++_i233)
                       {
-                        String _key226; // required
-                        org.apache.accumulo.core.data.thrift.MapFileInfo _val227; // required
-                        _key226 = iprot.readString();
-                        _val227 = new org.apache.accumulo.core.data.thrift.MapFileInfo();
-                        _val227.read(iprot);
-                        _val223.put(_key226, _val227);
+                        String _key234; // required
+                        org.apache.accumulo.core.data.thrift.MapFileInfo _val235; // required
+                        _key234 = iprot.readString();
+                        _val235 = new org.apache.accumulo.core.data.thrift.MapFileInfo();
+                        _val235.read(iprot);
+                        _val231.put(_key234, _val235);
                       }
                       iprot.readMapEnd();
                     }
-                    struct.files.put(_key222, _val223);
+                    struct.files.put(_key230, _val231);
                   }
                   iprot.readMapEnd();
                 }
@@ -14464,15 +14560,15 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(FILES_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.MAP, struct.files.size()));
-            for (Map.Entry<org.apache.accumulo.core.data.thrift.TKeyExtent, Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> _iter228 : struct.files.entrySet())
+            for (Map.Entry<org.apache.accumulo.core.data.thrift.TKeyExtent, Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> _iter236 : struct.files.entrySet())
             {
-              _iter228.getKey().write(oprot);
+              _iter236.getKey().write(oprot);
               {
-                oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, _iter228.getValue().size()));
-                for (Map.Entry<String, org.apache.accumulo.core.data.thrift.MapFileInfo> _iter229 : _iter228.getValue().entrySet())
+                oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, _iter236.getValue().size()));
+                for (Map.Entry<String, org.apache.accumulo.core.data.thrift.MapFileInfo> _iter237 : _iter236.getValue().entrySet())
                 {
-                  oprot.writeString(_iter229.getKey());
-                  _iter229.getValue().write(oprot);
+                  oprot.writeString(_iter237.getKey());
+                  _iter237.getValue().write(oprot);
                 }
                 oprot.writeMapEnd();
               }
@@ -14538,15 +14634,15 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetFiles()) {
           {
             oprot.writeI32(struct.files.size());
-            for (Map.Entry<org.apache.accumulo.core.data.thrift.TKeyExtent, Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> _iter230 : struct.files.entrySet())
+            for (Map.Entry<org.apache.accumulo.core.data.thrift.TKeyExtent, Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>> _iter238 : struct.files.entrySet())
             {
-              _iter230.getKey().write(oprot);
+              _iter238.getKey().write(oprot);
               {
-                oprot.writeI32(_iter230.getValue().size());
-                for (Map.Entry<String, org.apache.accumulo.core.data.thrift.MapFileInfo> _iter231 : _iter230.getValue().entrySet())
+                oprot.writeI32(_iter238.getValue().size());
+                for (Map.Entry<String, org.apache.accumulo.core.data.thrift.MapFileInfo> _iter239 : _iter238.getValue().entrySet())
                 {
-                  oprot.writeString(_iter231.getKey());
-                  _iter231.getValue().write(oprot);
+                  oprot.writeString(_iter239.getKey());
+                  _iter239.getValue().write(oprot);
                 }
               }
             }
@@ -14577,28 +14673,28 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TMap _map232 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
-            struct.files = new HashMap<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>>(2*_map232.size);
-            for (int _i233 = 0; _i233 < _map232.size; ++_i233)
+            org.apache.thrift.protocol.TMap _map240 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
+            struct.files = new HashMap<org.apache.accumulo.core.data.thrift.TKeyExtent,Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo>>(2*_map240.size);
+            for (int _i241 = 0; _i241 < _map240.size; ++_i241)
             {
-              org.apache.accumulo.core.data.thrift.TKeyExtent _key234; // required
-              Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo> _val235; // required
-              _key234 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-              _key234.read(iprot);
+              org.apache.accumulo.core.data.thrift.TKeyExtent _key242; // required
+              Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo> _val243; // required
+              _key242 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
+              _key242.read(iprot);
               {
-                org.apache.thrift.protocol.TMap _map236 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-                _val235 = new HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo>(2*_map236.size);
-                for (int _i237 = 0; _i237 < _map236.size; ++_i237)
+                org.apache.thrift.protocol.TMap _map244 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+                _val243 = new HashMap<String,org.apache.accumulo.core.data.thrift.MapFileInfo>(2*_map244.size);
+                for (int _i245 = 0; _i245 < _map244.size; ++_i245)
                 {
-                  String _key238; // required
-                  org.apache.accumulo.core.data.thrift.MapFileInfo _val239; // required
-                  _key238 = iprot.readString();
-                  _val239 = new org.apache.accumulo.core.data.thrift.MapFileInfo();
-                  _val239.read(iprot);
-                  _val235.put(_key238, _val239);
+                  String _key246; // required
+                  org.apache.accumulo.core.data.thrift.MapFileInfo _val247; // required
+                  _key246 = iprot.readString();
+                  _val247 = new org.apache.accumulo.core.data.thrift.MapFileInfo();
+                  _val247.read(iprot);
+                  _val243.put(_key246, _val247);
                 }
               }
-              struct.files.put(_key234, _val235);
+              struct.files.put(_key242, _val243);
             }
           }
           struct.setFilesIsSet(true);
@@ -14998,14 +15094,14 @@ import org.slf4j.LoggerFactory;
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list240 = iprot.readListBegin();
-                  struct.success = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list240.size);
-                  for (int _i241 = 0; _i241 < _list240.size; ++_i241)
+                  org.apache.thrift.protocol.TList _list248 = iprot.readListBegin();
+                  struct.success = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list248.size);
+                  for (int _i249 = 0; _i249 < _list248.size; ++_i249)
                   {
-                    org.apache.accumulo.core.data.thrift.TKeyExtent _elem242; // required
-                    _elem242 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-                    _elem242.read(iprot);
-                    struct.success.add(_elem242);
+                    org.apache.accumulo.core.data.thrift.TKeyExtent _elem250; // required
+                    _elem250 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
+                    _elem250.read(iprot);
+                    struct.success.add(_elem250);
                   }
                   iprot.readListEnd();
                 }
@@ -15042,9 +15138,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter243 : struct.success)
+            for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter251 : struct.success)
             {
-              _iter243.write(oprot);
+              _iter251.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -15083,9 +15179,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter244 : struct.success)
+            for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter252 : struct.success)
             {
-              _iter244.write(oprot);
+              _iter252.write(oprot);
             }
           }
         }
@@ -15100,14 +15196,14 @@ import org.slf4j.LoggerFactory;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list245 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list245.size);
-            for (int _i246 = 0; _i246 < _list245.size; ++_i246)
+            org.apache.thrift.protocol.TList _list253 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list253.size);
+            for (int _i254 = 0; _i254 < _list253.size; ++_i254)
             {
-              org.apache.accumulo.core.data.thrift.TKeyExtent _elem247; // required
-              _elem247 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-              _elem247.read(iprot);
-              struct.success.add(_elem247);
+              org.apache.accumulo.core.data.thrift.TKeyExtent _elem255; // required
+              _elem255 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
+              _elem255.read(iprot);
+              struct.success.add(_elem255);
             }
           }
           struct.setSuccessIsSet(true);
@@ -22681,14 +22777,14 @@ import org.slf4j.LoggerFactory;
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list248 = iprot.readListBegin();
-                  struct.success = new ArrayList<TabletStats>(_list248.size);
-                  for (int _i249 = 0; _i249 < _list248.size; ++_i249)
+                  org.apache.thrift.protocol.TList _list256 = iprot.readListBegin();
+                  struct.success = new ArrayList<TabletStats>(_list256.size);
+                  for (int _i257 = 0; _i257 < _list256.size; ++_i257)
                   {
-                    TabletStats _elem250; // required
-                    _elem250 = new TabletStats();
-                    _elem250.read(iprot);
-                    struct.success.add(_elem250);
+                    TabletStats _elem258; // required
+                    _elem258 = new TabletStats();
+                    _elem258.read(iprot);
+                    struct.success.add(_elem258);
                   }
                   iprot.readListEnd();
                 }
@@ -22725,9 +22821,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (TabletStats _iter251 : struct.success)
+            for (TabletStats _iter259 : struct.success)
             {
-              _iter251.write(oprot);
+              _iter259.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -22766,9 +22862,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (TabletStats _iter252 : struct.success)
+            for (TabletStats _iter260 : struct.success)
             {
-              _iter252.write(oprot);
+              _iter260.write(oprot);
             }
           }
         }
@@ -22783,14 +22879,14 @@ import org.slf4j.LoggerFactory;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list253 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<TabletStats>(_list253.size);
-            for (int _i254 = 0; _i254 < _list253.size; ++_i254)
+            org.apache.thrift.protocol.TList _list261 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<TabletStats>(_list261.size);
+            for (int _i262 = 0; _i262 < _list261.size; ++_i262)
             {
-              TabletStats _elem255; // required
-              _elem255 = new TabletStats();
-              _elem255.read(iprot);
-              struct.success.add(_elem255);
+              TabletStats _elem263; // required
+              _elem263 = new TabletStats();
+              _elem263.read(iprot);
+              struct.success.add(_elem263);
             }
           }
           struct.setSuccessIsSet(true);
@@ -26064,14 +26160,14 @@ import org.slf4j.LoggerFactory;
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list256 = iprot.readListBegin();
-                  struct.success = new ArrayList<ActiveScan>(_list256.size);
-                  for (int _i257 = 0; _i257 < _list256.size; ++_i257)
+                  org.apache.thrift.protocol.TList _list264 = iprot.readListBegin();
+                  struct.success = new ArrayList<ActiveScan>(_list264.size);
+                  for (int _i265 = 0; _i265 < _list264.size; ++_i265)
                   {
-                    ActiveScan _elem258; // required
-                    _elem258 = new ActiveScan();
-                    _elem258.read(iprot);
-                    struct.success.add(_elem258);
+                    ActiveScan _elem266; // required
+                    _elem266 = new ActiveScan();
+                    _elem266.read(iprot);
+                    struct.success.add(_elem266);
                   }
                   iprot.readListEnd();
                 }
@@ -26108,9 +26204,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (ActiveScan _iter259 : struct.success)
+            for (ActiveScan _iter267 : struct.success)
             {
-              _iter259.write(oprot);
+              _iter267.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -26149,9 +26245,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ActiveScan _iter260 : struct.success)
+            for (ActiveScan _iter268 : struct.success)
             {
-              _iter260.write(oprot);
+              _iter268.write(oprot);
             }
           }
         }
@@ -26166,14 +26262,14 @@ import org.slf4j.LoggerFactory;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list261 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<ActiveScan>(_list261.size);
-            for (int _i262 = 0; _i262 < _list261.size; ++_i262)
+            org.apache.thrift.protocol.TList _list269 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<ActiveScan>(_list269.size);
+            for (int _i270 = 0; _i270 < _list269.size; ++_i270)
             {
-              ActiveScan _elem263; // required
-              _elem263 = new ActiveScan();
-              _elem263.read(iprot);
-              struct.success.add(_elem263);
+              ActiveScan _elem271; // required
+              _elem271 = new ActiveScan();
+              _elem271.read(iprot);
+              struct.success.add(_elem271);
             }
           }
           struct.setSuccessIsSet(true);
@@ -27038,14 +27134,14 @@ import org.slf4j.LoggerFactory;
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list264 = iprot.readListBegin();
-                  struct.success = new ArrayList<ActiveCompaction>(_list264.size);
-                  for (int _i265 = 0; _i265 < _list264.size; ++_i265)
+                  org.apache.thrift.protocol.TList _list272 = iprot.readListBegin();
+                  struct.success = new ArrayList<ActiveCompaction>(_list272.size);
+                  for (int _i273 = 0; _i273 < _list272.size; ++_i273)
                   {
-                    ActiveCompaction _elem266; // required
-                    _elem266 = new ActiveCompaction();
-                    _elem266.read(iprot);
-                    struct.success.add(_elem266);
+                    ActiveCompaction _elem274; // required
+                    _elem274 = new ActiveCompaction();
+                    _elem274.read(iprot);
+                    struct.success.add(_elem274);
                   }
                   iprot.readListEnd();
                 }
@@ -27082,9 +27178,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (ActiveCompaction _iter267 : struct.success)
+            for (ActiveCompaction _iter275 : struct.success)
             {
-              _iter267.write(oprot);
+              _iter275.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -27123,9 +27219,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ActiveCompaction _iter268 : struct.success)
+            for (ActiveCompaction _iter276 : struct.success)
             {
-              _iter268.write(oprot);
+              _iter276.write(oprot);
             }
           }
         }
@@ -27140,14 +27236,14 @@ import org.slf4j.LoggerFactory;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list269 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<ActiveCompaction>(_list269.size);
-            for (int _i270 = 0; _i270 < _list269.size; ++_i270)
+            org.apache.thrift.protocol.TList _list277 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.success = new ArrayList<ActiveCompaction>(_list277.size);
+            for (int _i278 = 0; _i278 < _list277.size; ++_i278)
             {
-              ActiveCompaction _elem271; // required
-              _elem271 = new ActiveCompaction();
-              _elem271.read(iprot);
-              struct.success.add(_elem271);
+              ActiveCompaction _elem279; // required
+              _elem279 = new ActiveCompaction();
+              _elem279.read(iprot);
+              struct.success.add(_elem279);
             }
           }
           struct.setSuccessIsSet(true);
@@ -27162,28 +27258,25 @@ import org.slf4j.LoggerFactory;
 
   }
 
-  public static class removeLogs_args implements org.apache.thrift.TBase<removeLogs_args, removeLogs_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("removeLogs_args");
+  public static class getDiskUsage_args implements org.apache.thrift.TBase<getDiskUsage_args, getDiskUsage_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getDiskUsage_args");
 
-    private static final org.apache.thrift.protocol.TField TINFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tinfo", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-    private static final org.apache.thrift.protocol.TField FILENAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("filenames", org.apache.thrift.protocol.TType.LIST, (short)3);
+    private static final org.apache.thrift.protocol.TField TABLES_FIELD_DESC = new org.apache.thrift.protocol.TField("tables", org.apache.thrift.protocol.TType.SET, (short)2);
+    private static final org.apache.thrift.protocol.TField CREDENTIALS_FIELD_DESC = new org.apache.thrift.protocol.TField("credentials", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
-      schemes.put(StandardScheme.class, new removeLogs_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new removeLogs_argsTupleSchemeFactory());
+      schemes.put(StandardScheme.class, new getDiskUsage_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new getDiskUsage_argsTupleSchemeFactory());
     }
 
-    public org.apache.accumulo.trace.thrift.TInfo tinfo; // required
+    public Set<String> tables; // required
     public org.apache.accumulo.core.security.thrift.TCredentials credentials; // required
-    public List<String> filenames; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-      TINFO((short)1, "tinfo"),
-      CREDENTIALS((short)2, "credentials"),
-      FILENAMES((short)3, "filenames");
+      TABLES((short)2, "tables"),
+      CREDENTIALS((short)1, "credentials");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -27198,12 +27291,10 @@ import org.slf4j.LoggerFactory;
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // TINFO
-            return TINFO;
-          case 2: // CREDENTIALS
+          case 2: // TABLES
+            return TABLES;
+          case 1: // CREDENTIALS
             return CREDENTIALS;
-          case 3: // FILENAMES
-            return FILENAMES;
           default:
             return null;
         }
@@ -27247,82 +27338,89 @@ import org.slf4j.LoggerFactory;
     public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
       Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.TINFO, new org.apache.thrift.meta_data.FieldMetaData("tinfo", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.trace.thrift.TInfo.class)));
+      tmpMap.put(_Fields.TABLES, new org.apache.thrift.meta_data.FieldMetaData("tables", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
+              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
       tmpMap.put(_Fields.CREDENTIALS, new org.apache.thrift.meta_data.FieldMetaData("credentials", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.security.thrift.TCredentials.class)));
-      tmpMap.put(_Fields.FILENAMES, new org.apache.thrift.meta_data.FieldMetaData("filenames", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(removeLogs_args.class, metaDataMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getDiskUsage_args.class, metaDataMap);
     }
 
-    public removeLogs_args() {
+    public getDiskUsage_args() {
     }
 
-    public removeLogs_args(
-      org.apache.accumulo.trace.thrift.TInfo tinfo,
-      org.apache.accumulo.core.security.thrift.TCredentials credentials,
-      List<String> filenames)
+    public getDiskUsage_args(
+      Set<String> tables,
+      org.apache.accumulo.core.security.thrift.TCredentials credentials)
     {
       this();
-      this.tinfo = tinfo;
+      this.tables = tables;
       this.credentials = credentials;
-      this.filenames = filenames;
     }
 
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public removeLogs_args(removeLogs_args other) {
-      if (other.isSetTinfo()) {
-        this.tinfo = new org.apache.accumulo.trace.thrift.TInfo(other.tinfo);
+    public getDiskUsage_args(getDiskUsage_args other) {
+      if (other.isSetTables()) {
+        Set<String> __this__tables = new HashSet<String>();
+        for (String other_element : other.tables) {
+          __this__tables.add(other_element);
+        }
+        this.tables = __this__tables;
       }
       if (other.isSetCredentials()) {
         this.credentials = new org.apache.accumulo.core.security.thrift.TCredentials(other.credentials);
       }
-      if (other.isSetFilenames()) {
-        List<String> __this__filenames = new ArrayList<String>();
-        for (String other_element : other.filenames) {
-          __this__filenames.add(other_element);
-        }
-        this.filenames = __this__filenames;
-      }
     }
 
-    public removeLogs_args deepCopy() {
-      return new removeLogs_args(this);
+    public getDiskUsage_args deepCopy() {
+      return new getDiskUsage_args(this);
     }
 
     @Override
     public void clear() {
-      this.tinfo = null;
+      this.tables = null;
       this.credentials = null;
-      this.filenames = null;
     }
 
-    public org.apache.accumulo.trace.thrift.TInfo getTinfo() {
-      return this.tinfo;
+    public int getTablesSize() {
+      return (this.tables == null) ? 0 : this.tables.size();
     }
 
-    public removeLogs_args setTinfo(org.apache.accumulo.trace.thrift.TInfo tinfo) {
-      this.tinfo = tinfo;
+    public java.util.Iterator<String> getTablesIterator() {
+      return (this.tables == null) ? null : this.tables.iterator();
+    }
+
+    public void addToTables(String elem) {
+      if (this.tables == null) {
+        this.tables = new HashSet<String>();
+      }
+      this.tables.add(elem);
+    }
+
+    public Set<String> getTables() {
+      return this.tables;
+    }
+
+    public getDiskUsage_args setTables(Set<String> tables) {
+      this.tables = tables;
       return this;
     }
 
-    public void unsetTinfo() {
-      this.tinfo = null;
+    public void unsetTables() {
+      this.tables = null;
     }
 
-    /** Returns true if field tinfo is set (has been assigned a value) and false otherwise */
-    public boolean isSetTinfo() {
-      return this.tinfo != null;
+    /** Returns true if field tables is set (has been assigned a value) and false otherwise */
+    public boolean isSetTables() {
+      return this.tables != null;
     }
 
-    public void setTinfoIsSet(boolean value) {
+    public void setTablesIsSet(boolean value) {
       if (!value) {
-        this.tinfo = null;
+        this.tables = null;
       }
     }
 
@@ -27330,7 +27428,7 @@ import org.slf4j.LoggerFactory;
       return this.credentials;
     }
 
-    public removeLogs_args setCredentials(org.apache.accumulo.core.security.thrift.TCredentials credentials) {
+    public getDiskUsage_args setCredentials(org.apache.accumulo.core.security.thrift.TCredentials credentials) {
       this.credentials = credentials;
       return this;
     }
@@ -27350,52 +27448,13 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public int getFilenamesSize() {
-      return (this.filenames == null) ? 0 : this.filenames.size();
-    }
-
-    public java.util.Iterator<String> getFilenamesIterator() {
-      return (this.filenames == null) ? null : this.filenames.iterator();
-    }
-
-    public void addToFilenames(String elem) {
-      if (this.filenames == null) {
-        this.filenames = new ArrayList<String>();
-      }
-      this.filenames.add(elem);
-    }
-
-    public List<String> getFilenames() {
-      return this.filenames;
-    }
-
-    public removeLogs_args setFilenames(List<String> filenames) {
-      this.filenames = filenames;
-      return this;
-    }
-
-    public void unsetFilenames() {
-      this.filenames = null;
-    }
-
-    /** Returns true if field filenames is set (has been assigned a value) and false otherwise */
-    public boolean isSetFilenames() {
-      return this.filenames != null;
-    }
-
-    public void setFilenamesIsSet(boolean value) {
-      if (!value) {
-        this.filenames = null;
-      }
-    }
-

[... 1308 lines stripped ...]