You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/03/20 15:08:10 UTC

svn commit: r1458839 [2/3] - in /accumulo/trunk: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/src/main/java/org/apache/accumulo/proxy/thrift/ proxy/src/main/thrif...

Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java?rev=1458839&r1=1458838&r2=1458839&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java Wed Mar 20 14:08:09 2013
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
 
     public int addConstraint(ByteBuffer login, String tableName, String constraintClassName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-    public void addSplits(ByteBuffer login, String tableName, Set<ByteBuffer> splits) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public void addSplits(ByteBuffer login, String tableName, Set<ByteBuffer> splits) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public void attachIterator(ByteBuffer login, String tableName, IteratorSetting setting, Set<IteratorScope> scopes) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException;
 
@@ -74,15 +74,15 @@ import org.slf4j.LoggerFactory;
 
     public void deleteRows(ByteBuffer login, String tableName, ByteBuffer startRow, ByteBuffer endRow) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-    public void exportTable(ByteBuffer login, String tableName, String exportDir) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public void exportTable(ByteBuffer login, String tableName, String exportDir) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public void flushTable(ByteBuffer login, String tableName, ByteBuffer startRow, ByteBuffer endRow, boolean wait) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
     public Map<String,Set<String>> getLocalityGroups(ByteBuffer login, String tableName) throws AccumuloException, TableNotFoundException, org.apache.thrift.TException;
 
-    public IteratorSetting getIteratorSetting(ByteBuffer login, String tableName, String iteratorName, IteratorScope scope) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException;
+    public IteratorSetting getIteratorSetting(ByteBuffer login, String tableName, String iteratorName, IteratorScope scope) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-    public ByteBuffer getMaxRow(ByteBuffer login, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public ByteBuffer getMaxRow(ByteBuffer login, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public Map<String,String> getTableProperties(ByteBuffer login, String tableName) throws AccumuloException, TableNotFoundException, org.apache.thrift.TException;
 
@@ -90,27 +90,27 @@ import org.slf4j.LoggerFactory;
 
     public void importTable(ByteBuffer login, String tableName, String importDir) throws TableExistsException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public List<ByteBuffer> listSplits(ByteBuffer login, String tableName, int maxSplits) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public List<ByteBuffer> listSplits(ByteBuffer login, String tableName, int maxSplits) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public Set<String> listTables(ByteBuffer login) throws org.apache.thrift.TException;
 
-    public Map<String,Set<IteratorScope>> listIterators(ByteBuffer login, String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException;
+    public Map<String,Set<IteratorScope>> listIterators(ByteBuffer login, String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public Map<String,Integer> listConstraints(ByteBuffer login, String tableName) throws AccumuloException, TableNotFoundException, org.apache.thrift.TException;
 
     public void mergeTablets(ByteBuffer login, String tableName, ByteBuffer startRow, ByteBuffer endRow) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-    public void offlineTable(ByteBuffer login, String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException;
+    public void offlineTable(ByteBuffer login, String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-    public void onlineTable(ByteBuffer login, String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException;
+    public void onlineTable(ByteBuffer login, String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public void removeConstraint(ByteBuffer login, String tableName, int constraint) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public void removeIterator(ByteBuffer login, String tableName, String iterName, Set<IteratorScope> scopes) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException;
+    public void removeIterator(ByteBuffer login, String tableName, String iterName, Set<IteratorScope> scopes) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public void removeTableProperty(ByteBuffer login, String tableName, String property) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public void renameTable(ByteBuffer login, String oldTableName, String newTableName) throws AccumuloSecurityException, TableNotFoundException, AccumuloException, TableExistsException, org.apache.thrift.TException;
+    public void renameTable(ByteBuffer login, String oldTableName, String newTableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, TableExistsException, org.apache.thrift.TException;
 
     public void setLocalityGroups(ByteBuffer login, String tableName, Map<String,Set<String>> groups) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
@@ -154,21 +154,21 @@ import org.slf4j.LoggerFactory;
 
     public void grantSystemPermission(ByteBuffer login, String user, SystemPermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public void grantTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public void grantTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public boolean hasSystemPermission(ByteBuffer login, String user, SystemPermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
     public boolean hasTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public Set<String> listLocalUsers(ByteBuffer login) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public Set<String> listLocalUsers(ByteBuffer login) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public void revokeSystemPermission(ByteBuffer login, String user, SystemPermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public void revokeTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public void revokeTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-    public String createBatchScanner(ByteBuffer login, String tableName, BatchScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public String createBatchScanner(ByteBuffer login, String tableName, BatchScanOptions options) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-    public String createScanner(ByteBuffer login, String tableName, ScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public String createScanner(ByteBuffer login, String tableName, ScanOptions options) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public boolean hasNext(String scanner) throws UnknownScanner, org.apache.thrift.TException;
 
@@ -178,15 +178,15 @@ import org.slf4j.LoggerFactory;
 
     public void closeScanner(String scanner) throws UnknownScanner, org.apache.thrift.TException;
 
-    public void updateAndFlush(ByteBuffer login, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public void updateAndFlush(ByteBuffer login, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-    public String createWriter(ByteBuffer login, String tableName, WriterOptions opts) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public String createWriter(ByteBuffer login, String tableName, WriterOptions opts) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
     public void update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells) throws org.apache.thrift.TException;
 
     public void flush(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public void closeWriter(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException;
+    public void closeWriter(String writer) throws UnknownWriter, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
     public Range getRowRange(ByteBuffer row) throws org.apache.thrift.TException;
 
@@ -421,7 +421,7 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addConstraint failed: unknown result");
     }
 
-    public void addSplits(ByteBuffer login, String tableName, Set<ByteBuffer> splits) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void addSplits(ByteBuffer login, String tableName, Set<ByteBuffer> splits) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_addSplits(login, tableName, splits);
       recv_addSplits();
@@ -436,7 +436,7 @@ import org.slf4j.LoggerFactory;
       sendBase("addSplits", args);
     }
 
-    public void recv_addSplits() throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void recv_addSplits() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       addSplits_result result = new addSplits_result();
       receiveBase(result, "addSplits");
@@ -733,7 +733,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void exportTable(ByteBuffer login, String tableName, String exportDir) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void exportTable(ByteBuffer login, String tableName, String exportDir) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_exportTable(login, tableName, exportDir);
       recv_exportTable();
@@ -748,7 +748,7 @@ import org.slf4j.LoggerFactory;
       sendBase("exportTable", args);
     }
 
-    public void recv_exportTable() throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void recv_exportTable() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       exportTable_result result = new exportTable_result();
       receiveBase(result, "exportTable");
@@ -824,7 +824,7 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLocalityGroups failed: unknown result");
     }
 
-    public IteratorSetting getIteratorSetting(ByteBuffer login, String tableName, String iteratorName, IteratorScope scope) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public IteratorSetting getIteratorSetting(ByteBuffer login, String tableName, String iteratorName, IteratorScope scope) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_getIteratorSetting(login, tableName, iteratorName, scope);
       return recv_getIteratorSetting();
@@ -840,7 +840,7 @@ import org.slf4j.LoggerFactory;
       sendBase("getIteratorSetting", args);
     }
 
-    public IteratorSetting recv_getIteratorSetting() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public IteratorSetting recv_getIteratorSetting() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       getIteratorSetting_result result = new getIteratorSetting_result();
       receiveBase(result, "getIteratorSetting");
@@ -859,7 +859,7 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getIteratorSetting failed: unknown result");
     }
 
-    public ByteBuffer getMaxRow(ByteBuffer login, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public ByteBuffer getMaxRow(ByteBuffer login, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_getMaxRow(login, tableName, auths, startRow, startInclusive, endRow, endInclusive);
       return recv_getMaxRow();
@@ -878,7 +878,7 @@ import org.slf4j.LoggerFactory;
       sendBase("getMaxRow", args);
     }
 
-    public ByteBuffer recv_getMaxRow() throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public ByteBuffer recv_getMaxRow() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       getMaxRow_result result = new getMaxRow_result();
       receiveBase(result, "getMaxRow");
@@ -991,7 +991,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public List<ByteBuffer> listSplits(ByteBuffer login, String tableName, int maxSplits) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public List<ByteBuffer> listSplits(ByteBuffer login, String tableName, int maxSplits) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_listSplits(login, tableName, maxSplits);
       return recv_listSplits();
@@ -1006,7 +1006,7 @@ import org.slf4j.LoggerFactory;
       sendBase("listSplits", args);
     }
 
-    public List<ByteBuffer> recv_listSplits() throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public List<ByteBuffer> recv_listSplits() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       listSplits_result result = new listSplits_result();
       receiveBase(result, "listSplits");
@@ -1048,7 +1048,7 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listTables failed: unknown result");
     }
 
-    public Map<String,Set<IteratorScope>> listIterators(ByteBuffer login, String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public Map<String,Set<IteratorScope>> listIterators(ByteBuffer login, String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_listIterators(login, tableName);
       return recv_listIterators();
@@ -1062,7 +1062,7 @@ import org.slf4j.LoggerFactory;
       sendBase("listIterators", args);
     }
 
-    public Map<String,Set<IteratorScope>> recv_listIterators() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public Map<String,Set<IteratorScope>> recv_listIterators() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       listIterators_result result = new listIterators_result();
       receiveBase(result, "listIterators");
@@ -1143,7 +1143,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void offlineTable(ByteBuffer login, String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public void offlineTable(ByteBuffer login, String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_offlineTable(login, tableName);
       recv_offlineTable();
@@ -1157,7 +1157,7 @@ import org.slf4j.LoggerFactory;
       sendBase("offlineTable", args);
     }
 
-    public void recv_offlineTable() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public void recv_offlineTable() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       offlineTable_result result = new offlineTable_result();
       receiveBase(result, "offlineTable");
@@ -1173,7 +1173,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void onlineTable(ByteBuffer login, String tableName) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public void onlineTable(ByteBuffer login, String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_onlineTable(login, tableName);
       recv_onlineTable();
@@ -1187,7 +1187,7 @@ import org.slf4j.LoggerFactory;
       sendBase("onlineTable", args);
     }
 
-    public void recv_onlineTable() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public void recv_onlineTable() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       onlineTable_result result = new onlineTable_result();
       receiveBase(result, "onlineTable");
@@ -1231,7 +1231,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void removeIterator(ByteBuffer login, String tableName, String iterName, Set<IteratorScope> scopes) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public void removeIterator(ByteBuffer login, String tableName, String iterName, Set<IteratorScope> scopes) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_removeIterator(login, tableName, iterName, scopes);
       recv_removeIterator();
@@ -1247,7 +1247,7 @@ import org.slf4j.LoggerFactory;
       sendBase("removeIterator", args);
     }
 
-    public void recv_removeIterator() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException
+    public void recv_removeIterator() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       removeIterator_result result = new removeIterator_result();
       receiveBase(result, "removeIterator");
@@ -1291,7 +1291,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void renameTable(ByteBuffer login, String oldTableName, String newTableName) throws AccumuloSecurityException, TableNotFoundException, AccumuloException, TableExistsException, org.apache.thrift.TException
+    public void renameTable(ByteBuffer login, String oldTableName, String newTableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, TableExistsException, org.apache.thrift.TException
     {
       send_renameTable(login, oldTableName, newTableName);
       recv_renameTable();
@@ -1306,7 +1306,7 @@ import org.slf4j.LoggerFactory;
       sendBase("renameTable", args);
     }
 
-    public void recv_renameTable() throws AccumuloSecurityException, TableNotFoundException, AccumuloException, TableExistsException, org.apache.thrift.TException
+    public void recv_renameTable() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, TableExistsException, org.apache.thrift.TException
     {
       renameTable_result result = new renameTable_result();
       receiveBase(result, "renameTable");
@@ -1921,7 +1921,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void grantTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void grantTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_grantTablePermission(login, user, table, perm);
       recv_grantTablePermission();
@@ -1937,7 +1937,7 @@ import org.slf4j.LoggerFactory;
       sendBase("grantTablePermission", args);
     }
 
-    public void recv_grantTablePermission() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void recv_grantTablePermission() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       grantTablePermission_result result = new grantTablePermission_result();
       receiveBase(result, "grantTablePermission");
@@ -1947,6 +1947,9 @@ import org.slf4j.LoggerFactory;
       if (result.ouch2 != null) {
         throw result.ouch2;
       }
+      if (result.ouch3 != null) {
+        throw result.ouch3;
+      }
       return;
     }
 
@@ -2013,7 +2016,7 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "hasTablePermission failed: unknown result");
     }
 
-    public Set<String> listLocalUsers(ByteBuffer login) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public Set<String> listLocalUsers(ByteBuffer login) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_listLocalUsers(login);
       return recv_listLocalUsers();
@@ -2026,7 +2029,7 @@ import org.slf4j.LoggerFactory;
       sendBase("listLocalUsers", args);
     }
 
-    public Set<String> recv_listLocalUsers() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public Set<String> recv_listLocalUsers() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       listLocalUsers_result result = new listLocalUsers_result();
       receiveBase(result, "listLocalUsers");
@@ -2039,6 +2042,9 @@ import org.slf4j.LoggerFactory;
       if (result.ouch2 != null) {
         throw result.ouch2;
       }
+      if (result.ouch3 != null) {
+        throw result.ouch3;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "listLocalUsers failed: unknown result");
     }
 
@@ -2070,7 +2076,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void revokeTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void revokeTablePermission(ByteBuffer login, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_revokeTablePermission(login, user, table, perm);
       recv_revokeTablePermission();
@@ -2086,7 +2092,7 @@ import org.slf4j.LoggerFactory;
       sendBase("revokeTablePermission", args);
     }
 
-    public void recv_revokeTablePermission() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void recv_revokeTablePermission() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       revokeTablePermission_result result = new revokeTablePermission_result();
       receiveBase(result, "revokeTablePermission");
@@ -2096,10 +2102,13 @@ import org.slf4j.LoggerFactory;
       if (result.ouch2 != null) {
         throw result.ouch2;
       }
+      if (result.ouch3 != null) {
+        throw result.ouch3;
+      }
       return;
     }
 
-    public String createBatchScanner(ByteBuffer login, String tableName, BatchScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public String createBatchScanner(ByteBuffer login, String tableName, BatchScanOptions options) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_createBatchScanner(login, tableName, options);
       return recv_createBatchScanner();
@@ -2114,7 +2123,7 @@ import org.slf4j.LoggerFactory;
       sendBase("createBatchScanner", args);
     }
 
-    public String recv_createBatchScanner() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public String recv_createBatchScanner() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       createBatchScanner_result result = new createBatchScanner_result();
       receiveBase(result, "createBatchScanner");
@@ -2127,10 +2136,13 @@ import org.slf4j.LoggerFactory;
       if (result.ouch2 != null) {
         throw result.ouch2;
       }
+      if (result.ouch3 != null) {
+        throw result.ouch3;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createBatchScanner failed: unknown result");
     }
 
-    public String createScanner(ByteBuffer login, String tableName, ScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public String createScanner(ByteBuffer login, String tableName, ScanOptions options) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_createScanner(login, tableName, options);
       return recv_createScanner();
@@ -2145,7 +2157,7 @@ import org.slf4j.LoggerFactory;
       sendBase("createScanner", args);
     }
 
-    public String recv_createScanner() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public String recv_createScanner() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       createScanner_result result = new createScanner_result();
       receiveBase(result, "createScanner");
@@ -2158,6 +2170,9 @@ import org.slf4j.LoggerFactory;
       if (result.ouch2 != null) {
         throw result.ouch2;
       }
+      if (result.ouch3 != null) {
+        throw result.ouch3;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createScanner failed: unknown result");
     }
 
@@ -2275,7 +2290,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void updateAndFlush(ByteBuffer login, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void updateAndFlush(ByteBuffer login, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_updateAndFlush(login, tableName, cells);
       recv_updateAndFlush();
@@ -2290,7 +2305,7 @@ import org.slf4j.LoggerFactory;
       sendBase("updateAndFlush", args);
     }
 
-    public void recv_updateAndFlush() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public void recv_updateAndFlush() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       updateAndFlush_result result = new updateAndFlush_result();
       receiveBase(result, "updateAndFlush");
@@ -2300,10 +2315,13 @@ import org.slf4j.LoggerFactory;
       if (result.ouch2 != null) {
         throw result.ouch2;
       }
+      if (result.ouch3 != null) {
+        throw result.ouch3;
+      }
       return;
     }
 
-    public String createWriter(ByteBuffer login, String tableName, WriterOptions opts) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public String createWriter(ByteBuffer login, String tableName, WriterOptions opts) throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       send_createWriter(login, tableName, opts);
       return recv_createWriter();
@@ -2318,7 +2336,7 @@ import org.slf4j.LoggerFactory;
       sendBase("createWriter", args);
     }
 
-    public String recv_createWriter() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public String recv_createWriter() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException
     {
       createWriter_result result = new createWriter_result();
       receiveBase(result, "createWriter");
@@ -2331,6 +2349,9 @@ import org.slf4j.LoggerFactory;
       if (result.ouch2 != null) {
         throw result.ouch2;
       }
+      if (result.ouch3 != null) {
+        throw result.ouch3;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createWriter failed: unknown result");
     }
 
@@ -2373,7 +2394,7 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void closeWriter(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
+    public void closeWriter(String writer) throws UnknownWriter, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
       send_closeWriter(writer);
       recv_closeWriter();
@@ -2386,13 +2407,16 @@ import org.slf4j.LoggerFactory;
       sendBase("closeWriter", args);
     }
 
-    public void recv_closeWriter() throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
+    public void recv_closeWriter() throws UnknownWriter, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
       closeWriter_result result = new closeWriter_result();
       receiveBase(result, "closeWriter");
       if (result.ouch1 != null) {
         throw result.ouch1;
       }
+      if (result.outch1 != null) {
+        throw result.outch1;
+      }
       if (result.ouch2 != null) {
         throw result.ouch2;
       }
@@ -2565,7 +2589,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -2969,7 +2993,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3089,7 +3113,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public IteratorSetting getResult() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException {
+      public IteratorSetting getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3139,7 +3163,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public ByteBuffer getResult() throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public ByteBuffer getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3294,7 +3318,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public List<ByteBuffer> getResult() throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public List<ByteBuffer> getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3361,7 +3385,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public Map<String,Set<IteratorScope>> getResult() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException {
+      public Map<String,Set<IteratorScope>> getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3472,7 +3496,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3507,7 +3531,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3586,7 +3610,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -3662,7 +3686,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws AccumuloSecurityException, TableNotFoundException, AccumuloException, TableExistsException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, TableExistsException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4462,7 +4486,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4573,7 +4597,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public Set<String> getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public Set<String> getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4652,7 +4676,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4690,7 +4714,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public String getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4728,7 +4752,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public String getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4897,7 +4921,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4935,7 +4959,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
+      public String getResult() throws AccumuloException, AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -5033,7 +5057,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException {
+      public void getResult() throws UnknownWriter, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -5267,11 +5291,11 @@ import org.slf4j.LoggerFactory;
         addSplits_result result = new addSplits_result();
         try {
           iface.addSplits(args.login, args.tableName, args.splits);
-        } catch (TableNotFoundException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
-        } catch (AccumuloSecurityException ouch3) {
+        } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
         }
         return result;
@@ -5543,11 +5567,11 @@ import org.slf4j.LoggerFactory;
         exportTable_result result = new exportTable_result();
         try {
           iface.exportTable(args.login, args.tableName, args.exportDir);
-        } catch (TableNotFoundException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
-        } catch (AccumuloSecurityException ouch3) {
+        } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
         }
         return result;
@@ -5623,9 +5647,9 @@ import org.slf4j.LoggerFactory;
         getIteratorSetting_result result = new getIteratorSetting_result();
         try {
           result.success = iface.getIteratorSetting(args.login, args.tableName, args.iteratorName, args.scope);
-        } catch (AccumuloSecurityException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
         } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
@@ -5651,11 +5675,11 @@ import org.slf4j.LoggerFactory;
         getMaxRow_result result = new getMaxRow_result();
         try {
           result.success = iface.getMaxRow(args.login, args.tableName, args.auths, args.startRow, args.startInclusive, args.endRow, args.endInclusive);
-        } catch (TableNotFoundException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
-        } catch (AccumuloSecurityException ouch3) {
+        } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
         }
         return result;
@@ -5761,11 +5785,11 @@ import org.slf4j.LoggerFactory;
         listSplits_result result = new listSplits_result();
         try {
           result.success = iface.listSplits(args.login, args.tableName, args.maxSplits);
-        } catch (TableNotFoundException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
-        } catch (AccumuloSecurityException ouch3) {
+        } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
         }
         return result;
@@ -5809,9 +5833,9 @@ import org.slf4j.LoggerFactory;
         listIterators_result result = new listIterators_result();
         try {
           result.success = iface.listIterators(args.login, args.tableName);
-        } catch (AccumuloSecurityException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
         } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
@@ -5891,9 +5915,9 @@ import org.slf4j.LoggerFactory;
         offlineTable_result result = new offlineTable_result();
         try {
           iface.offlineTable(args.login, args.tableName);
-        } catch (AccumuloSecurityException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
         } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
@@ -5919,9 +5943,9 @@ import org.slf4j.LoggerFactory;
         onlineTable_result result = new onlineTable_result();
         try {
           iface.onlineTable(args.login, args.tableName);
-        } catch (AccumuloSecurityException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
         } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
@@ -5973,9 +5997,9 @@ import org.slf4j.LoggerFactory;
         removeIterator_result result = new removeIterator_result();
         try {
           iface.removeIterator(args.login, args.tableName, args.iterName, args.scopes);
-        } catch (AccumuloSecurityException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (AccumuloException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
         } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
@@ -6027,11 +6051,11 @@ import org.slf4j.LoggerFactory;
         renameTable_result result = new renameTable_result();
         try {
           iface.renameTable(args.login, args.oldTableName, args.newTableName);
-        } catch (AccumuloSecurityException ouch1) {
+        } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
-        } catch (TableNotFoundException ouch2) {
+        } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
-        } catch (AccumuloException ouch3) {
+        } catch (TableNotFoundException ouch3) {
           result.ouch3 = ouch3;
         } catch (TableExistsException ouch4) {
           result.ouch4 = ouch4;
@@ -6596,6 +6620,8 @@ import org.slf4j.LoggerFactory;
           result.ouch1 = ouch1;
         } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
+        } catch (TableNotFoundException ouch3) {
+          result.ouch3 = ouch3;
         }
         return result;
       }
@@ -6676,6 +6702,8 @@ import org.slf4j.LoggerFactory;
           result.ouch1 = ouch1;
         } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
+        } catch (TableNotFoundException ouch3) {
+          result.ouch3 = ouch3;
         }
         return result;
       }
@@ -6728,6 +6756,8 @@ import org.slf4j.LoggerFactory;
           result.ouch1 = ouch1;
         } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
+        } catch (TableNotFoundException ouch3) {
+          result.ouch3 = ouch3;
         }
         return result;
       }
@@ -6754,6 +6784,8 @@ import org.slf4j.LoggerFactory;
           result.ouch1 = ouch1;
         } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
+        } catch (TableNotFoundException ouch3) {
+          result.ouch3 = ouch3;
         }
         return result;
       }
@@ -6780,6 +6812,8 @@ import org.slf4j.LoggerFactory;
           result.ouch1 = ouch1;
         } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
+        } catch (TableNotFoundException ouch3) {
+          result.ouch3 = ouch3;
         }
         return result;
       }
@@ -6911,6 +6945,8 @@ import org.slf4j.LoggerFactory;
           result.outch1 = outch1;
         } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
+        } catch (TableNotFoundException ouch3) {
+          result.ouch3 = ouch3;
         }
         return result;
       }
@@ -6937,6 +6973,8 @@ import org.slf4j.LoggerFactory;
           result.outch1 = outch1;
         } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
+        } catch (TableNotFoundException ouch3) {
+          result.ouch3 = ouch3;
         }
         return result;
       }
@@ -7006,6 +7044,8 @@ import org.slf4j.LoggerFactory;
           iface.closeWriter(args.writer);
         } catch (UnknownWriter ouch1) {
           result.ouch1 = ouch1;
+        } catch (AccumuloException outch1) {
+          result.outch1 = outch1;
         } catch (AccumuloSecurityException ouch2) {
           result.ouch2 = ouch2;
         }
@@ -9896,9 +9936,9 @@ import org.slf4j.LoggerFactory;
       schemes.put(TupleScheme.class, new addSplits_resultTupleSchemeFactory());
     }
 
-    public TableNotFoundException ouch1; // required
-    public AccumuloException ouch2; // required
-    public AccumuloSecurityException ouch3; // required
+    public AccumuloException ouch1; // required
+    public AccumuloSecurityException ouch2; // required
+    public TableNotFoundException ouch3; // 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 {
@@ -9982,9 +10022,9 @@ import org.slf4j.LoggerFactory;
     }
 
     public addSplits_result(
-      TableNotFoundException ouch1,
-      AccumuloException ouch2,
-      AccumuloSecurityException ouch3)
+      AccumuloException ouch1,
+      AccumuloSecurityException ouch2,
+      TableNotFoundException ouch3)
     {
       this();
       this.ouch1 = ouch1;
@@ -9997,13 +10037,13 @@ import org.slf4j.LoggerFactory;
      */
     public addSplits_result(addSplits_result other) {
       if (other.isSetOuch1()) {
-        this.ouch1 = new TableNotFoundException(other.ouch1);
+        this.ouch1 = new AccumuloException(other.ouch1);
       }
       if (other.isSetOuch2()) {
-        this.ouch2 = new AccumuloException(other.ouch2);
+        this.ouch2 = new AccumuloSecurityException(other.ouch2);
       }
       if (other.isSetOuch3()) {
-        this.ouch3 = new AccumuloSecurityException(other.ouch3);
+        this.ouch3 = new TableNotFoundException(other.ouch3);
       }
     }
 
@@ -10018,11 +10058,11 @@ import org.slf4j.LoggerFactory;
       this.ouch3 = null;
     }
 
-    public TableNotFoundException getOuch1() {
+    public AccumuloException getOuch1() {
       return this.ouch1;
     }
 
-    public addSplits_result setOuch1(TableNotFoundException ouch1) {
+    public addSplits_result setOuch1(AccumuloException ouch1) {
       this.ouch1 = ouch1;
       return this;
     }
@@ -10042,11 +10082,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloException getOuch2() {
+    public AccumuloSecurityException getOuch2() {
       return this.ouch2;
     }
 
-    public addSplits_result setOuch2(AccumuloException ouch2) {
+    public addSplits_result setOuch2(AccumuloSecurityException ouch2) {
       this.ouch2 = ouch2;
       return this;
     }
@@ -10066,11 +10106,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloSecurityException getOuch3() {
+    public TableNotFoundException getOuch3() {
       return this.ouch3;
     }
 
-    public addSplits_result setOuch3(AccumuloSecurityException ouch3) {
+    public addSplits_result setOuch3(TableNotFoundException ouch3) {
       this.ouch3 = ouch3;
       return this;
     }
@@ -10096,7 +10136,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch1();
         } else {
-          setOuch1((TableNotFoundException)value);
+          setOuch1((AccumuloException)value);
         }
         break;
 
@@ -10104,7 +10144,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch2();
         } else {
-          setOuch2((AccumuloException)value);
+          setOuch2((AccumuloSecurityException)value);
         }
         break;
 
@@ -10112,7 +10152,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch3();
         } else {
-          setOuch3((AccumuloSecurityException)value);
+          setOuch3((TableNotFoundException)value);
         }
         break;
 
@@ -10325,7 +10365,7 @@ import org.slf4j.LoggerFactory;
           switch (schemeField.id) {
             case 1: // OUCH1
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch1 = new TableNotFoundException();
+                struct.ouch1 = new AccumuloException();
                 struct.ouch1.read(iprot);
                 struct.setOuch1IsSet(true);
               } else { 
@@ -10334,7 +10374,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 2: // OUCH2
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch2 = new AccumuloException();
+                struct.ouch2 = new AccumuloSecurityException();
                 struct.ouch2.read(iprot);
                 struct.setOuch2IsSet(true);
               } else { 
@@ -10343,7 +10383,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 3: // OUCH3
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch3 = new AccumuloSecurityException();
+                struct.ouch3 = new TableNotFoundException();
                 struct.ouch3.read(iprot);
                 struct.setOuch3IsSet(true);
               } else { 
@@ -10424,17 +10464,17 @@ import org.slf4j.LoggerFactory;
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
-          struct.ouch1 = new TableNotFoundException();
+          struct.ouch1 = new AccumuloException();
           struct.ouch1.read(iprot);
           struct.setOuch1IsSet(true);
         }
         if (incoming.get(1)) {
-          struct.ouch2 = new AccumuloException();
+          struct.ouch2 = new AccumuloSecurityException();
           struct.ouch2.read(iprot);
           struct.setOuch2IsSet(true);
         }
         if (incoming.get(2)) {
-          struct.ouch3 = new AccumuloSecurityException();
+          struct.ouch3 = new TableNotFoundException();
           struct.ouch3.read(iprot);
           struct.setOuch3IsSet(true);
         }
@@ -22073,9 +22113,9 @@ import org.slf4j.LoggerFactory;
       schemes.put(TupleScheme.class, new exportTable_resultTupleSchemeFactory());
     }
 
-    public TableNotFoundException ouch1; // required
-    public AccumuloException ouch2; // required
-    public AccumuloSecurityException ouch3; // required
+    public AccumuloException ouch1; // required
+    public AccumuloSecurityException ouch2; // required
+    public TableNotFoundException ouch3; // 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 {
@@ -22159,9 +22199,9 @@ import org.slf4j.LoggerFactory;
     }
 
     public exportTable_result(
-      TableNotFoundException ouch1,
-      AccumuloException ouch2,
-      AccumuloSecurityException ouch3)
+      AccumuloException ouch1,
+      AccumuloSecurityException ouch2,
+      TableNotFoundException ouch3)
     {
       this();
       this.ouch1 = ouch1;
@@ -22174,13 +22214,13 @@ import org.slf4j.LoggerFactory;
      */
     public exportTable_result(exportTable_result other) {
       if (other.isSetOuch1()) {
-        this.ouch1 = new TableNotFoundException(other.ouch1);
+        this.ouch1 = new AccumuloException(other.ouch1);
       }
       if (other.isSetOuch2()) {
-        this.ouch2 = new AccumuloException(other.ouch2);
+        this.ouch2 = new AccumuloSecurityException(other.ouch2);
       }
       if (other.isSetOuch3()) {
-        this.ouch3 = new AccumuloSecurityException(other.ouch3);
+        this.ouch3 = new TableNotFoundException(other.ouch3);
       }
     }
 
@@ -22195,11 +22235,11 @@ import org.slf4j.LoggerFactory;
       this.ouch3 = null;
     }
 
-    public TableNotFoundException getOuch1() {
+    public AccumuloException getOuch1() {
       return this.ouch1;
     }
 
-    public exportTable_result setOuch1(TableNotFoundException ouch1) {
+    public exportTable_result setOuch1(AccumuloException ouch1) {
       this.ouch1 = ouch1;
       return this;
     }
@@ -22219,11 +22259,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloException getOuch2() {
+    public AccumuloSecurityException getOuch2() {
       return this.ouch2;
     }
 
-    public exportTable_result setOuch2(AccumuloException ouch2) {
+    public exportTable_result setOuch2(AccumuloSecurityException ouch2) {
       this.ouch2 = ouch2;
       return this;
     }
@@ -22243,11 +22283,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloSecurityException getOuch3() {
+    public TableNotFoundException getOuch3() {
       return this.ouch3;
     }
 
-    public exportTable_result setOuch3(AccumuloSecurityException ouch3) {
+    public exportTable_result setOuch3(TableNotFoundException ouch3) {
       this.ouch3 = ouch3;
       return this;
     }
@@ -22273,7 +22313,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch1();
         } else {
-          setOuch1((TableNotFoundException)value);
+          setOuch1((AccumuloException)value);
         }
         break;
 
@@ -22281,7 +22321,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch2();
         } else {
-          setOuch2((AccumuloException)value);
+          setOuch2((AccumuloSecurityException)value);
         }
         break;
 
@@ -22289,7 +22329,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch3();
         } else {
-          setOuch3((AccumuloSecurityException)value);
+          setOuch3((TableNotFoundException)value);
         }
         break;
 
@@ -22502,7 +22542,7 @@ import org.slf4j.LoggerFactory;
           switch (schemeField.id) {
             case 1: // OUCH1
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch1 = new TableNotFoundException();
+                struct.ouch1 = new AccumuloException();
                 struct.ouch1.read(iprot);
                 struct.setOuch1IsSet(true);
               } else { 
@@ -22511,7 +22551,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 2: // OUCH2
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch2 = new AccumuloException();
+                struct.ouch2 = new AccumuloSecurityException();
                 struct.ouch2.read(iprot);
                 struct.setOuch2IsSet(true);
               } else { 
@@ -22520,7 +22560,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 3: // OUCH3
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch3 = new AccumuloSecurityException();
+                struct.ouch3 = new TableNotFoundException();
                 struct.ouch3.read(iprot);
                 struct.setOuch3IsSet(true);
               } else { 
@@ -22601,17 +22641,17 @@ import org.slf4j.LoggerFactory;
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
-          struct.ouch1 = new TableNotFoundException();
+          struct.ouch1 = new AccumuloException();
           struct.ouch1.read(iprot);
           struct.setOuch1IsSet(true);
         }
         if (incoming.get(1)) {
-          struct.ouch2 = new AccumuloException();
+          struct.ouch2 = new AccumuloSecurityException();
           struct.ouch2.read(iprot);
           struct.setOuch2IsSet(true);
         }
         if (incoming.get(2)) {
-          struct.ouch3 = new AccumuloSecurityException();
+          struct.ouch3 = new TableNotFoundException();
           struct.ouch3.read(iprot);
           struct.setOuch3IsSet(true);
         }
@@ -25681,8 +25721,8 @@ import org.slf4j.LoggerFactory;
     }
 
     public IteratorSetting success; // required
-    public AccumuloSecurityException ouch1; // required
-    public AccumuloException ouch2; // required
+    public AccumuloException ouch1; // required
+    public AccumuloSecurityException ouch2; // required
     public TableNotFoundException ouch3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -25773,8 +25813,8 @@ import org.slf4j.LoggerFactory;
 
     public getIteratorSetting_result(
       IteratorSetting success,
-      AccumuloSecurityException ouch1,
-      AccumuloException ouch2,
+      AccumuloException ouch1,
+      AccumuloSecurityException ouch2,
       TableNotFoundException ouch3)
     {
       this();
@@ -25792,10 +25832,10 @@ import org.slf4j.LoggerFactory;
         this.success = new IteratorSetting(other.success);
       }
       if (other.isSetOuch1()) {
-        this.ouch1 = new AccumuloSecurityException(other.ouch1);
+        this.ouch1 = new AccumuloException(other.ouch1);
       }
       if (other.isSetOuch2()) {
-        this.ouch2 = new AccumuloException(other.ouch2);
+        this.ouch2 = new AccumuloSecurityException(other.ouch2);
       }
       if (other.isSetOuch3()) {
         this.ouch3 = new TableNotFoundException(other.ouch3);
@@ -25838,11 +25878,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloSecurityException getOuch1() {
+    public AccumuloException getOuch1() {
       return this.ouch1;
     }
 
-    public getIteratorSetting_result setOuch1(AccumuloSecurityException ouch1) {
+    public getIteratorSetting_result setOuch1(AccumuloException ouch1) {
       this.ouch1 = ouch1;
       return this;
     }
@@ -25862,11 +25902,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloException getOuch2() {
+    public AccumuloSecurityException getOuch2() {
       return this.ouch2;
     }
 
-    public getIteratorSetting_result setOuch2(AccumuloException ouch2) {
+    public getIteratorSetting_result setOuch2(AccumuloSecurityException ouch2) {
       this.ouch2 = ouch2;
       return this;
     }
@@ -25924,7 +25964,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch1();
         } else {
-          setOuch1((AccumuloSecurityException)value);
+          setOuch1((AccumuloException)value);
         }
         break;
 
@@ -25932,7 +25972,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch2();
         } else {
-          setOuch2((AccumuloException)value);
+          setOuch2((AccumuloSecurityException)value);
         }
         break;
 
@@ -26197,7 +26237,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 1: // OUCH1
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch1 = new AccumuloSecurityException();
+                struct.ouch1 = new AccumuloException();
                 struct.ouch1.read(iprot);
                 struct.setOuch1IsSet(true);
               } else { 
@@ -26206,7 +26246,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 2: // OUCH2
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch2 = new AccumuloException();
+                struct.ouch2 = new AccumuloSecurityException();
                 struct.ouch2.read(iprot);
                 struct.setOuch2IsSet(true);
               } else { 
@@ -26312,12 +26352,12 @@ import org.slf4j.LoggerFactory;
           struct.setSuccessIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.ouch1 = new AccumuloSecurityException();
+          struct.ouch1 = new AccumuloException();
           struct.ouch1.read(iprot);
           struct.setOuch1IsSet(true);
         }
         if (incoming.get(2)) {
-          struct.ouch2 = new AccumuloException();
+          struct.ouch2 = new AccumuloSecurityException();
           struct.ouch2.read(iprot);
           struct.setOuch2IsSet(true);
         }
@@ -27379,9 +27419,9 @@ import org.slf4j.LoggerFactory;
     }
 
     public ByteBuffer success; // required
-    public TableNotFoundException ouch1; // required
-    public AccumuloException ouch2; // required
-    public AccumuloSecurityException ouch3; // required
+    public AccumuloException ouch1; // required
+    public AccumuloSecurityException ouch2; // required
+    public TableNotFoundException ouch3; // 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 {
@@ -27471,9 +27511,9 @@ import org.slf4j.LoggerFactory;
 
     public getMaxRow_result(
       ByteBuffer success,
-      TableNotFoundException ouch1,
-      AccumuloException ouch2,
-      AccumuloSecurityException ouch3)
+      AccumuloException ouch1,
+      AccumuloSecurityException ouch2,
+      TableNotFoundException ouch3)
     {
       this();
       this.success = success;
@@ -27491,13 +27531,13 @@ import org.slf4j.LoggerFactory;
 ;
       }
       if (other.isSetOuch1()) {
-        this.ouch1 = new TableNotFoundException(other.ouch1);
+        this.ouch1 = new AccumuloException(other.ouch1);
       }
       if (other.isSetOuch2()) {
-        this.ouch2 = new AccumuloException(other.ouch2);
+        this.ouch2 = new AccumuloSecurityException(other.ouch2);
       }
       if (other.isSetOuch3()) {
-        this.ouch3 = new AccumuloSecurityException(other.ouch3);
+        this.ouch3 = new TableNotFoundException(other.ouch3);
       }
     }
 
@@ -27547,11 +27587,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public TableNotFoundException getOuch1() {
+    public AccumuloException getOuch1() {
       return this.ouch1;
     }
 
-    public getMaxRow_result setOuch1(TableNotFoundException ouch1) {
+    public getMaxRow_result setOuch1(AccumuloException ouch1) {
       this.ouch1 = ouch1;
       return this;
     }
@@ -27571,11 +27611,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloException getOuch2() {
+    public AccumuloSecurityException getOuch2() {
       return this.ouch2;
     }
 
-    public getMaxRow_result setOuch2(AccumuloException ouch2) {
+    public getMaxRow_result setOuch2(AccumuloSecurityException ouch2) {
       this.ouch2 = ouch2;
       return this;
     }
@@ -27595,11 +27635,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloSecurityException getOuch3() {
+    public TableNotFoundException getOuch3() {
       return this.ouch3;
     }
 
-    public getMaxRow_result setOuch3(AccumuloSecurityException ouch3) {
+    public getMaxRow_result setOuch3(TableNotFoundException ouch3) {
       this.ouch3 = ouch3;
       return this;
     }
@@ -27633,7 +27673,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch1();
         } else {
-          setOuch1((TableNotFoundException)value);
+          setOuch1((AccumuloException)value);
         }
         break;
 
@@ -27641,7 +27681,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch2();
         } else {
-          setOuch2((AccumuloException)value);
+          setOuch2((AccumuloSecurityException)value);
         }
         break;
 
@@ -27649,7 +27689,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch3();
         } else {
-          setOuch3((AccumuloSecurityException)value);
+          setOuch3((TableNotFoundException)value);
         }
         break;
 
@@ -27902,7 +27942,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 1: // OUCH1
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch1 = new TableNotFoundException();
+                struct.ouch1 = new AccumuloException();
                 struct.ouch1.read(iprot);
                 struct.setOuch1IsSet(true);
               } else { 
@@ -27911,7 +27951,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 2: // OUCH2
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch2 = new AccumuloException();
+                struct.ouch2 = new AccumuloSecurityException();
                 struct.ouch2.read(iprot);
                 struct.setOuch2IsSet(true);
               } else { 
@@ -27920,7 +27960,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 3: // OUCH3
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch3 = new AccumuloSecurityException();
+                struct.ouch3 = new TableNotFoundException();
                 struct.ouch3.read(iprot);
                 struct.setOuch3IsSet(true);
               } else { 
@@ -28016,17 +28056,17 @@ import org.slf4j.LoggerFactory;
           struct.setSuccessIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.ouch1 = new TableNotFoundException();
+          struct.ouch1 = new AccumuloException();
           struct.ouch1.read(iprot);
           struct.setOuch1IsSet(true);
         }
         if (incoming.get(2)) {
-          struct.ouch2 = new AccumuloException();
+          struct.ouch2 = new AccumuloSecurityException();
           struct.ouch2.read(iprot);
           struct.setOuch2IsSet(true);
         }
         if (incoming.get(3)) {
-          struct.ouch3 = new AccumuloSecurityException();
+          struct.ouch3 = new TableNotFoundException();
           struct.ouch3.read(iprot);
           struct.setOuch3IsSet(true);
         }
@@ -32147,9 +32187,9 @@ import org.slf4j.LoggerFactory;
     }
 
     public List<ByteBuffer> success; // required
-    public TableNotFoundException ouch1; // required
-    public AccumuloException ouch2; // required
-    public AccumuloSecurityException ouch3; // required
+    public AccumuloException ouch1; // required
+    public AccumuloSecurityException ouch2; // required
+    public TableNotFoundException ouch3; // 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 {
@@ -32240,9 +32280,9 @@ import org.slf4j.LoggerFactory;
 
     public listSplits_result(
       List<ByteBuffer> success,
-      TableNotFoundException ouch1,
-      AccumuloException ouch2,
-      AccumuloSecurityException ouch3)
+      AccumuloException ouch1,
+      AccumuloSecurityException ouch2,
+      TableNotFoundException ouch3)
     {
       this();
       this.success = success;
@@ -32265,13 +32305,13 @@ import org.slf4j.LoggerFactory;
         this.success = __this__success;
       }
       if (other.isSetOuch1()) {
-        this.ouch1 = new TableNotFoundException(other.ouch1);
+        this.ouch1 = new AccumuloException(other.ouch1);
       }
       if (other.isSetOuch2()) {
-        this.ouch2 = new AccumuloException(other.ouch2);
+        this.ouch2 = new AccumuloSecurityException(other.ouch2);
       }
       if (other.isSetOuch3()) {
-        this.ouch3 = new AccumuloSecurityException(other.ouch3);
+        this.ouch3 = new TableNotFoundException(other.ouch3);
       }
     }
 
@@ -32326,11 +32366,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public TableNotFoundException getOuch1() {
+    public AccumuloException getOuch1() {
       return this.ouch1;
     }
 
-    public listSplits_result setOuch1(TableNotFoundException ouch1) {
+    public listSplits_result setOuch1(AccumuloException ouch1) {
       this.ouch1 = ouch1;
       return this;
     }
@@ -32350,11 +32390,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloException getOuch2() {
+    public AccumuloSecurityException getOuch2() {
       return this.ouch2;
     }
 
-    public listSplits_result setOuch2(AccumuloException ouch2) {
+    public listSplits_result setOuch2(AccumuloSecurityException ouch2) {
       this.ouch2 = ouch2;
       return this;
     }
@@ -32374,11 +32414,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloSecurityException getOuch3() {
+    public TableNotFoundException getOuch3() {
       return this.ouch3;
     }
 
-    public listSplits_result setOuch3(AccumuloSecurityException ouch3) {
+    public listSplits_result setOuch3(TableNotFoundException ouch3) {
       this.ouch3 = ouch3;
       return this;
     }
@@ -32412,7 +32452,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch1();
         } else {
-          setOuch1((TableNotFoundException)value);
+          setOuch1((AccumuloException)value);
         }
         break;
 
@@ -32420,7 +32460,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch2();
         } else {
-          setOuch2((AccumuloException)value);
+          setOuch2((AccumuloSecurityException)value);
         }
         break;
 
@@ -32428,7 +32468,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch3();
         } else {
-          setOuch3((AccumuloSecurityException)value);
+          setOuch3((TableNotFoundException)value);
         }
         break;
 
@@ -32691,7 +32731,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 1: // OUCH1
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch1 = new TableNotFoundException();
+                struct.ouch1 = new AccumuloException();
                 struct.ouch1.read(iprot);
                 struct.setOuch1IsSet(true);
               } else { 
@@ -32700,7 +32740,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 2: // OUCH2
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch2 = new AccumuloException();
+                struct.ouch2 = new AccumuloSecurityException();
                 struct.ouch2.read(iprot);
                 struct.setOuch2IsSet(true);
               } else { 
@@ -32709,7 +32749,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 3: // OUCH3
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch3 = new AccumuloSecurityException();
+                struct.ouch3 = new TableNotFoundException();
                 struct.ouch3.read(iprot);
                 struct.setOuch3IsSet(true);
               } else { 
@@ -32827,17 +32867,17 @@ import org.slf4j.LoggerFactory;
           struct.setSuccessIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.ouch1 = new TableNotFoundException();
+          struct.ouch1 = new AccumuloException();
           struct.ouch1.read(iprot);
           struct.setOuch1IsSet(true);
         }
         if (incoming.get(2)) {
-          struct.ouch2 = new AccumuloException();
+          struct.ouch2 = new AccumuloSecurityException();
           struct.ouch2.read(iprot);
           struct.setOuch2IsSet(true);
         }
         if (incoming.get(3)) {
-          struct.ouch3 = new AccumuloSecurityException();
+          struct.ouch3 = new TableNotFoundException();
           struct.ouch3.read(iprot);
           struct.setOuch3IsSet(true);
         }
@@ -34097,8 +34137,8 @@ import org.slf4j.LoggerFactory;
     }
 
     public Map<String,Set<IteratorScope>> success; // required
-    public AccumuloSecurityException ouch1; // required
-    public AccumuloException ouch2; // required
+    public AccumuloException ouch1; // required
+    public AccumuloSecurityException ouch2; // required
     public TableNotFoundException ouch3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -34192,8 +34232,8 @@ import org.slf4j.LoggerFactory;
 
     public listIterators_result(
       Map<String,Set<IteratorScope>> success,
-      AccumuloSecurityException ouch1,
-      AccumuloException ouch2,
+      AccumuloException ouch1,
+      AccumuloSecurityException ouch2,
       TableNotFoundException ouch3)
     {
       this();
@@ -34226,10 +34266,10 @@ import org.slf4j.LoggerFactory;
         this.success = __this__success;
       }
       if (other.isSetOuch1()) {
-        this.ouch1 = new AccumuloSecurityException(other.ouch1);
+        this.ouch1 = new AccumuloException(other.ouch1);
       }
       if (other.isSetOuch2()) {
-        this.ouch2 = new AccumuloException(other.ouch2);
+        this.ouch2 = new AccumuloSecurityException(other.ouch2);
       }
       if (other.isSetOuch3()) {
         this.ouch3 = new TableNotFoundException(other.ouch3);
@@ -34283,11 +34323,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloSecurityException getOuch1() {
+    public AccumuloException getOuch1() {
       return this.ouch1;
     }
 
-    public listIterators_result setOuch1(AccumuloSecurityException ouch1) {
+    public listIterators_result setOuch1(AccumuloException ouch1) {
       this.ouch1 = ouch1;
       return this;
     }
@@ -34307,11 +34347,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloException getOuch2() {
+    public AccumuloSecurityException getOuch2() {
       return this.ouch2;
     }
 
-    public listIterators_result setOuch2(AccumuloException ouch2) {
+    public listIterators_result setOuch2(AccumuloSecurityException ouch2) {
       this.ouch2 = ouch2;
       return this;
     }
@@ -34369,7 +34409,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch1();
         } else {
-          setOuch1((AccumuloSecurityException)value);
+          setOuch1((AccumuloException)value);
         }
         break;
 
@@ -34377,7 +34417,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch2();
         } else {
-          setOuch2((AccumuloException)value);
+          setOuch2((AccumuloSecurityException)value);
         }
         break;
 
@@ -34660,7 +34700,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 1: // OUCH1
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch1 = new AccumuloSecurityException();
+                struct.ouch1 = new AccumuloException();
                 struct.ouch1.read(iprot);
                 struct.setOuch1IsSet(true);
               } else { 
@@ -34669,7 +34709,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 2: // OUCH2
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch2 = new AccumuloException();
+                struct.ouch2 = new AccumuloSecurityException();
                 struct.ouch2.read(iprot);
                 struct.setOuch2IsSet(true);
               } else { 
@@ -34822,12 +34862,12 @@ import org.slf4j.LoggerFactory;
           struct.setSuccessIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.ouch1 = new AccumuloSecurityException();
+          struct.ouch1 = new AccumuloException();
           struct.ouch1.read(iprot);
           struct.setOuch1IsSet(true);
         }
         if (incoming.get(2)) {
-          struct.ouch2 = new AccumuloException();
+          struct.ouch2 = new AccumuloSecurityException();
           struct.ouch2.read(iprot);
           struct.setOuch2IsSet(true);
         }
@@ -37652,8 +37692,8 @@ import org.slf4j.LoggerFactory;
       schemes.put(TupleScheme.class, new offlineTable_resultTupleSchemeFactory());
     }
 
-    public AccumuloSecurityException ouch1; // required
-    public AccumuloException ouch2; // required
+    public AccumuloException ouch1; // required
+    public AccumuloSecurityException ouch2; // required
     public TableNotFoundException ouch3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -37738,8 +37778,8 @@ import org.slf4j.LoggerFactory;
     }
 
     public offlineTable_result(
-      AccumuloSecurityException ouch1,
-      AccumuloException ouch2,
+      AccumuloException ouch1,
+      AccumuloSecurityException ouch2,
       TableNotFoundException ouch3)
     {
       this();
@@ -37753,10 +37793,10 @@ import org.slf4j.LoggerFactory;
      */
     public offlineTable_result(offlineTable_result other) {
       if (other.isSetOuch1()) {
-        this.ouch1 = new AccumuloSecurityException(other.ouch1);
+        this.ouch1 = new AccumuloException(other.ouch1);
       }
       if (other.isSetOuch2()) {
-        this.ouch2 = new AccumuloException(other.ouch2);
+        this.ouch2 = new AccumuloSecurityException(other.ouch2);
       }
       if (other.isSetOuch3()) {
         this.ouch3 = new TableNotFoundException(other.ouch3);
@@ -37774,11 +37814,11 @@ import org.slf4j.LoggerFactory;
       this.ouch3 = null;
     }
 
-    public AccumuloSecurityException getOuch1() {
+    public AccumuloException getOuch1() {
       return this.ouch1;
     }
 
-    public offlineTable_result setOuch1(AccumuloSecurityException ouch1) {
+    public offlineTable_result setOuch1(AccumuloException ouch1) {
       this.ouch1 = ouch1;
       return this;
     }
@@ -37798,11 +37838,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloException getOuch2() {
+    public AccumuloSecurityException getOuch2() {
       return this.ouch2;
     }
 
-    public offlineTable_result setOuch2(AccumuloException ouch2) {
+    public offlineTable_result setOuch2(AccumuloSecurityException ouch2) {
       this.ouch2 = ouch2;
       return this;
     }
@@ -37852,7 +37892,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch1();
         } else {
-          setOuch1((AccumuloSecurityException)value);
+          setOuch1((AccumuloException)value);
         }
         break;
 
@@ -37860,7 +37900,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {
           unsetOuch2();
         } else {
-          setOuch2((AccumuloException)value);
+          setOuch2((AccumuloSecurityException)value);
         }
         break;
 
@@ -38081,7 +38121,7 @@ import org.slf4j.LoggerFactory;
           switch (schemeField.id) {
             case 1: // OUCH1
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch1 = new AccumuloSecurityException();
+                struct.ouch1 = new AccumuloException();
                 struct.ouch1.read(iprot);
                 struct.setOuch1IsSet(true);
               } else { 
@@ -38090,7 +38130,7 @@ import org.slf4j.LoggerFactory;
               break;
             case 2: // OUCH2
               if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-                struct.ouch2 = new AccumuloException();
+                struct.ouch2 = new AccumuloSecurityException();
                 struct.ouch2.read(iprot);
                 struct.setOuch2IsSet(true);
               } else { 
@@ -38180,12 +38220,12 @@ import org.slf4j.LoggerFactory;
         TTupleProtocol iprot = (TTupleProtocol) prot;
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
-          struct.ouch1 = new AccumuloSecurityException();
+          struct.ouch1 = new AccumuloException();
           struct.ouch1.read(iprot);
           struct.setOuch1IsSet(true);
         }
         if (incoming.get(1)) {
-          struct.ouch2 = new AccumuloException();
+          struct.ouch2 = new AccumuloSecurityException();
           struct.ouch2.read(iprot);
           struct.setOuch2IsSet(true);
         }
@@ -38677,8 +38717,8 @@ import org.slf4j.LoggerFactory;
       schemes.put(TupleScheme.class, new onlineTable_resultTupleSchemeFactory());
     }
 
-    public AccumuloSecurityException ouch1; // required
-    public AccumuloException ouch2; // required
+    public AccumuloException ouch1; // required
+    public AccumuloSecurityException ouch2; // required
     public TableNotFoundException ouch3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -38763,8 +38803,8 @@ import org.slf4j.LoggerFactory;
     }
 
     public onlineTable_result(
-      AccumuloSecurityException ouch1,
-      AccumuloException ouch2,
+      AccumuloException ouch1,
+      AccumuloSecurityException ouch2,
       TableNotFoundException ouch3)
     {
       this();
@@ -38778,10 +38818,10 @@ import org.slf4j.LoggerFactory;
      */
     public onlineTable_result(onlineTable_result other) {
       if (other.isSetOuch1()) {
-        this.ouch1 = new AccumuloSecurityException(other.ouch1);
+        this.ouch1 = new AccumuloException(other.ouch1);
       }
       if (other.isSetOuch2()) {
-        this.ouch2 = new AccumuloException(other.ouch2);
+        this.ouch2 = new AccumuloSecurityException(other.ouch2);
       }
       if (other.isSetOuch3()) {
         this.ouch3 = new TableNotFoundException(other.ouch3);
@@ -38799,11 +38839,11 @@ import org.slf4j.LoggerFactory;
       this.ouch3 = null;
     }
 
-    public AccumuloSecurityException getOuch1() {
+    public AccumuloException getOuch1() {
       return this.ouch1;
     }
 
-    public onlineTable_result setOuch1(AccumuloSecurityException ouch1) {
+    public onlineTable_result setOuch1(AccumuloException ouch1) {
       this.ouch1 = ouch1;
       return this;
     }
@@ -38823,11 +38863,11 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public AccumuloException getOuch2() {
+    public AccumuloSecurityException getOuch2() {
       return this.ouch2;
     }
 
-    public onlineTable_result setOuch2(AccumuloException ouch2) {
+    public onlineTable_result setOuch2(AccumuloSecurityException ouch2) {
       this.ouch2 = ouch2;
       return this;
     }
@@ -38877,7 +38917,7 @@ import org.slf4j.LoggerFactory;
         if (value == null) {

[... 2385 lines stripped ...]