Google GitGoogle Git
Sign in
apache/accumulo-proxy/4c8ca1979907f361f36549f1a82aad8570a720ab^!/.
commit
4c8ca1979907f361f36549f1a82aad8570a720ab
[log]
author
Christopher Tubbs <ctubbsii@apache.org>
Wed May 16 18:40:01 2018 -0400
committer
Christopher Tubbs <ctubbsii@apache.org>
Wed May 16 18:40:01 2018 -0400
tree
aad2c736f946f08958096968780ea576a85c7736
parent
22e29efa3b6bd9367746b2d39383594af45bebe0 [diff]
Commit generated code from Thrift 0.11.0

diff --git a/src/main/cpp/AccumuloProxy.cpp b/src/main/cpp/AccumuloProxy.cpp
index dbd45dd..bdf09ef 100644
--- a/src/main/cpp/AccumuloProxy.cpp
+++ b/src/main/cpp/AccumuloProxy.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,7 +31,7 @@
 
 uint32_t AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -95,7 +95,7 @@
 
 uint32_t AccumuloProxy_login_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_login_args");
 
   xfer += oprot->writeFieldBegin("principal", ::apache::thrift::protocol::T_STRING, 1);
@@ -127,7 +127,7 @@
 
 uint32_t AccumuloProxy_login_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_login_pargs");
 
   xfer += oprot->writeFieldBegin("principal", ::apache::thrift::protocol::T_STRING, 1);
@@ -159,7 +159,7 @@
 
 uint32_t AccumuloProxy_login_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -233,7 +233,7 @@
 
 uint32_t AccumuloProxy_login_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -287,7 +287,7 @@
 
 uint32_t AccumuloProxy_addConstraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -344,7 +344,7 @@
 
 uint32_t AccumuloProxy_addConstraint_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addConstraint_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -371,7 +371,7 @@
 
 uint32_t AccumuloProxy_addConstraint_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addConstraint_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -398,7 +398,7 @@
 
 uint32_t AccumuloProxy_addConstraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -496,7 +496,7 @@
 
 uint32_t AccumuloProxy_addConstraint_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -566,7 +566,7 @@
 
 uint32_t AccumuloProxy_addSplits_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -636,7 +636,7 @@
 
 uint32_t AccumuloProxy_addSplits_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addSplits_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -671,7 +671,7 @@
 
 uint32_t AccumuloProxy_addSplits_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addSplits_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -706,7 +706,7 @@
 
 uint32_t AccumuloProxy_addSplits_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -792,7 +792,7 @@
 
 uint32_t AccumuloProxy_addSplits_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -854,7 +854,7 @@
 
 uint32_t AccumuloProxy_attachIterator_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -934,7 +934,7 @@
 
 uint32_t AccumuloProxy_attachIterator_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_attachIterator_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -973,7 +973,7 @@
 
 uint32_t AccumuloProxy_attachIterator_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_attachIterator_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1012,7 +1012,7 @@
 
 uint32_t AccumuloProxy_attachIterator_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1098,7 +1098,7 @@
 
 uint32_t AccumuloProxy_attachIterator_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1160,7 +1160,7 @@
 
 uint32_t AccumuloProxy_checkIteratorConflicts_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1240,7 +1240,7 @@
 
 uint32_t AccumuloProxy_checkIteratorConflicts_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_checkIteratorConflicts_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1279,7 +1279,7 @@
 
 uint32_t AccumuloProxy_checkIteratorConflicts_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_checkIteratorConflicts_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1318,7 +1318,7 @@
 
 uint32_t AccumuloProxy_checkIteratorConflicts_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1404,7 +1404,7 @@
 
 uint32_t AccumuloProxy_checkIteratorConflicts_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1466,7 +1466,7 @@
 
 uint32_t AccumuloProxy_clearLocatorCache_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1515,7 +1515,7 @@
 
 uint32_t AccumuloProxy_clearLocatorCache_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_clearLocatorCache_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1538,7 +1538,7 @@
 
 uint32_t AccumuloProxy_clearLocatorCache_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_clearLocatorCache_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1561,7 +1561,7 @@
 
 uint32_t AccumuloProxy_clearLocatorCache_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1623,7 +1623,7 @@
 
 uint32_t AccumuloProxy_clearLocatorCache_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1669,7 +1669,7 @@
 
 uint32_t AccumuloProxy_cloneTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1778,7 +1778,7 @@
 
 uint32_t AccumuloProxy_cloneTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_cloneTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1834,7 +1834,7 @@
 
 uint32_t AccumuloProxy_cloneTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_cloneTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -1890,7 +1890,7 @@
 
 uint32_t AccumuloProxy_cloneTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1988,7 +1988,7 @@
 
 uint32_t AccumuloProxy_cloneTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2058,7 +2058,7 @@
 
 uint32_t AccumuloProxy_compactTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2167,7 +2167,7 @@
 
 uint32_t AccumuloProxy_compactTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_compactTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2222,7 +2222,7 @@
 
 uint32_t AccumuloProxy_compactTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_compactTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2277,7 +2277,7 @@
 
 uint32_t AccumuloProxy_compactTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2363,7 +2363,7 @@
 
 uint32_t AccumuloProxy_compactTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2425,7 +2425,7 @@
 
 uint32_t AccumuloProxy_cancelCompaction_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2474,7 +2474,7 @@
 
 uint32_t AccumuloProxy_cancelCompaction_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_cancelCompaction_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2497,7 +2497,7 @@
 
 uint32_t AccumuloProxy_cancelCompaction_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_cancelCompaction_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2520,7 +2520,7 @@
 
 uint32_t AccumuloProxy_cancelCompaction_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2606,7 +2606,7 @@
 
 uint32_t AccumuloProxy_cancelCompaction_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2668,7 +2668,7 @@
 
 uint32_t AccumuloProxy_createTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2735,7 +2735,7 @@
 
 uint32_t AccumuloProxy_createTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2766,7 +2766,7 @@
 
 uint32_t AccumuloProxy_createTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -2797,7 +2797,7 @@
 
 uint32_t AccumuloProxy_createTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2883,7 +2883,7 @@
 
 uint32_t AccumuloProxy_createTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2945,7 +2945,7 @@
 
 uint32_t AccumuloProxy_deleteTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2994,7 +2994,7 @@
 
 uint32_t AccumuloProxy_deleteTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3017,7 +3017,7 @@
 
 uint32_t AccumuloProxy_deleteTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3040,7 +3040,7 @@
 
 uint32_t AccumuloProxy_deleteTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3126,7 +3126,7 @@
 
 uint32_t AccumuloProxy_deleteTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3188,7 +3188,7 @@
 
 uint32_t AccumuloProxy_deleteRows_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3253,7 +3253,7 @@
 
 uint32_t AccumuloProxy_deleteRows_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteRows_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3284,7 +3284,7 @@
 
 uint32_t AccumuloProxy_deleteRows_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteRows_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3315,7 +3315,7 @@
 
 uint32_t AccumuloProxy_deleteRows_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3401,7 +3401,7 @@
 
 uint32_t AccumuloProxy_deleteRows_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3463,7 +3463,7 @@
 
 uint32_t AccumuloProxy_exportTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3520,7 +3520,7 @@
 
 uint32_t AccumuloProxy_exportTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_exportTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3547,7 +3547,7 @@
 
 uint32_t AccumuloProxy_exportTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_exportTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3574,7 +3574,7 @@
 
 uint32_t AccumuloProxy_exportTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3660,7 +3660,7 @@
 
 uint32_t AccumuloProxy_exportTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3722,7 +3722,7 @@
 
 uint32_t AccumuloProxy_flushTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3795,7 +3795,7 @@
 
 uint32_t AccumuloProxy_flushTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_flushTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3830,7 +3830,7 @@
 
 uint32_t AccumuloProxy_flushTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_flushTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -3865,7 +3865,7 @@
 
 uint32_t AccumuloProxy_flushTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3951,7 +3951,7 @@
 
 uint32_t AccumuloProxy_flushTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4013,7 +4013,7 @@
 
 uint32_t AccumuloProxy_getDiskUsage_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4075,7 +4075,7 @@
 
 uint32_t AccumuloProxy_getDiskUsage_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getDiskUsage_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4106,7 +4106,7 @@
 
 uint32_t AccumuloProxy_getDiskUsage_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getDiskUsage_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4137,7 +4137,7 @@
 
 uint32_t AccumuloProxy_getDiskUsage_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4255,7 +4255,7 @@
 
 uint32_t AccumuloProxy_getDiskUsage_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4337,7 +4337,7 @@
 
 uint32_t AccumuloProxy_getLocalityGroups_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4386,7 +4386,7 @@
 
 uint32_t AccumuloProxy_getLocalityGroups_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getLocalityGroups_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4409,7 +4409,7 @@
 
 uint32_t AccumuloProxy_getLocalityGroups_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getLocalityGroups_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4432,7 +4432,7 @@
 
 uint32_t AccumuloProxy_getLocalityGroups_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4575,7 +4575,7 @@
 
 uint32_t AccumuloProxy_getLocalityGroups_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4673,7 +4673,7 @@
 
 uint32_t AccumuloProxy_getIteratorSetting_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4740,7 +4740,7 @@
 
 uint32_t AccumuloProxy_getIteratorSetting_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getIteratorSetting_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4771,7 +4771,7 @@
 
 uint32_t AccumuloProxy_getIteratorSetting_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getIteratorSetting_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -4802,7 +4802,7 @@
 
 uint32_t AccumuloProxy_getIteratorSetting_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4900,7 +4900,7 @@
 
 uint32_t AccumuloProxy_getIteratorSetting_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4970,7 +4970,7 @@
 
 uint32_t AccumuloProxy_getMaxRow_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5072,7 +5072,7 @@
 
 uint32_t AccumuloProxy_getMaxRow_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getMaxRow_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5123,7 +5123,7 @@
 
 uint32_t AccumuloProxy_getMaxRow_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getMaxRow_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5174,7 +5174,7 @@
 
 uint32_t AccumuloProxy_getMaxRow_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5272,7 +5272,7 @@
 
 uint32_t AccumuloProxy_getMaxRow_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5342,7 +5342,7 @@
 
 uint32_t AccumuloProxy_getTableProperties_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5391,7 +5391,7 @@
 
 uint32_t AccumuloProxy_getTableProperties_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getTableProperties_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5414,7 +5414,7 @@
 
 uint32_t AccumuloProxy_getTableProperties_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getTableProperties_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5437,7 +5437,7 @@
 
 uint32_t AccumuloProxy_getTableProperties_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5559,7 +5559,7 @@
 
 uint32_t AccumuloProxy_getTableProperties_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5644,7 +5644,7 @@
 
 uint32_t AccumuloProxy_importDirectory_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5717,7 +5717,7 @@
 
 uint32_t AccumuloProxy_importDirectory_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_importDirectory_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5752,7 +5752,7 @@
 
 uint32_t AccumuloProxy_importDirectory_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_importDirectory_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -5787,7 +5787,7 @@
 
 uint32_t AccumuloProxy_importDirectory_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5873,7 +5873,7 @@
 
 uint32_t AccumuloProxy_importDirectory_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5935,7 +5935,7 @@
 
 uint32_t AccumuloProxy_importTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -5992,7 +5992,7 @@
 
 uint32_t AccumuloProxy_importTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_importTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6019,7 +6019,7 @@
 
 uint32_t AccumuloProxy_importTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_importTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6046,7 +6046,7 @@
 
 uint32_t AccumuloProxy_importTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6132,7 +6132,7 @@
 
 uint32_t AccumuloProxy_importTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6194,7 +6194,7 @@
 
 uint32_t AccumuloProxy_listSplits_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6251,7 +6251,7 @@
 
 uint32_t AccumuloProxy_listSplits_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listSplits_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6278,7 +6278,7 @@
 
 uint32_t AccumuloProxy_listSplits_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listSplits_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6305,7 +6305,7 @@
 
 uint32_t AccumuloProxy_listSplits_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6423,7 +6423,7 @@
 
 uint32_t AccumuloProxy_listSplits_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6505,7 +6505,7 @@
 
 uint32_t AccumuloProxy_listTables_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6546,7 +6546,7 @@
 
 uint32_t AccumuloProxy_listTables_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listTables_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6565,7 +6565,7 @@
 
 uint32_t AccumuloProxy_listTables_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listTables_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6584,7 +6584,7 @@
 
 uint32_t AccumuloProxy_listTables_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6667,7 +6667,7 @@
 
 uint32_t AccumuloProxy_listTables_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6726,7 +6726,7 @@
 
 uint32_t AccumuloProxy_listIterators_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6775,7 +6775,7 @@
 
 uint32_t AccumuloProxy_listIterators_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listIterators_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6798,7 +6798,7 @@
 
 uint32_t AccumuloProxy_listIterators_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listIterators_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -6821,7 +6821,7 @@
 
 uint32_t AccumuloProxy_listIterators_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -6966,7 +6966,7 @@
 
 uint32_t AccumuloProxy_listIterators_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7066,7 +7066,7 @@
 
 uint32_t AccumuloProxy_listConstraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7115,7 +7115,7 @@
 
 uint32_t AccumuloProxy_listConstraints_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listConstraints_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7138,7 +7138,7 @@
 
 uint32_t AccumuloProxy_listConstraints_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listConstraints_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7161,7 +7161,7 @@
 
 uint32_t AccumuloProxy_listConstraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7283,7 +7283,7 @@
 
 uint32_t AccumuloProxy_listConstraints_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7368,7 +7368,7 @@
 
 uint32_t AccumuloProxy_mergeTablets_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7433,7 +7433,7 @@
 
 uint32_t AccumuloProxy_mergeTablets_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_mergeTablets_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7464,7 +7464,7 @@
 
 uint32_t AccumuloProxy_mergeTablets_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_mergeTablets_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7495,7 +7495,7 @@
 
 uint32_t AccumuloProxy_mergeTablets_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7581,7 +7581,7 @@
 
 uint32_t AccumuloProxy_mergeTablets_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7643,7 +7643,7 @@
 
 uint32_t AccumuloProxy_offlineTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7700,7 +7700,7 @@
 
 uint32_t AccumuloProxy_offlineTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_offlineTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7727,7 +7727,7 @@
 
 uint32_t AccumuloProxy_offlineTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_offlineTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7754,7 +7754,7 @@
 
 uint32_t AccumuloProxy_offlineTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7840,7 +7840,7 @@
 
 uint32_t AccumuloProxy_offlineTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7902,7 +7902,7 @@
 
 uint32_t AccumuloProxy_onlineTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -7959,7 +7959,7 @@
 
 uint32_t AccumuloProxy_onlineTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_onlineTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -7986,7 +7986,7 @@
 
 uint32_t AccumuloProxy_onlineTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_onlineTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8013,7 +8013,7 @@
 
 uint32_t AccumuloProxy_onlineTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8099,7 +8099,7 @@
 
 uint32_t AccumuloProxy_onlineTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8161,7 +8161,7 @@
 
 uint32_t AccumuloProxy_removeConstraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8218,7 +8218,7 @@
 
 uint32_t AccumuloProxy_removeConstraint_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeConstraint_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8245,7 +8245,7 @@
 
 uint32_t AccumuloProxy_removeConstraint_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeConstraint_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8272,7 +8272,7 @@
 
 uint32_t AccumuloProxy_removeConstraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8358,7 +8358,7 @@
 
 uint32_t AccumuloProxy_removeConstraint_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8420,7 +8420,7 @@
 
 uint32_t AccumuloProxy_removeIterator_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8500,7 +8500,7 @@
 
 uint32_t AccumuloProxy_removeIterator_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeIterator_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8539,7 +8539,7 @@
 
 uint32_t AccumuloProxy_removeIterator_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeIterator_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8578,7 +8578,7 @@
 
 uint32_t AccumuloProxy_removeIterator_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8664,7 +8664,7 @@
 
 uint32_t AccumuloProxy_removeIterator_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8726,7 +8726,7 @@
 
 uint32_t AccumuloProxy_removeTableProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8783,7 +8783,7 @@
 
 uint32_t AccumuloProxy_removeTableProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeTableProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8810,7 +8810,7 @@
 
 uint32_t AccumuloProxy_removeTableProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeTableProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -8837,7 +8837,7 @@
 
 uint32_t AccumuloProxy_removeTableProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8923,7 +8923,7 @@
 
 uint32_t AccumuloProxy_removeTableProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -8985,7 +8985,7 @@
 
 uint32_t AccumuloProxy_renameTable_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9042,7 +9042,7 @@
 
 uint32_t AccumuloProxy_renameTable_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_renameTable_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9069,7 +9069,7 @@
 
 uint32_t AccumuloProxy_renameTable_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_renameTable_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9096,7 +9096,7 @@
 
 uint32_t AccumuloProxy_renameTable_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9194,7 +9194,7 @@
 
 uint32_t AccumuloProxy_renameTable_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9264,7 +9264,7 @@
 
 uint32_t AccumuloProxy_setLocalityGroups_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9349,7 +9349,7 @@
 
 uint32_t AccumuloProxy_setLocalityGroups_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setLocalityGroups_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9393,7 +9393,7 @@
 
 uint32_t AccumuloProxy_setLocalityGroups_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setLocalityGroups_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9437,7 +9437,7 @@
 
 uint32_t AccumuloProxy_setLocalityGroups_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9523,7 +9523,7 @@
 
 uint32_t AccumuloProxy_setLocalityGroups_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9585,7 +9585,7 @@
 
 uint32_t AccumuloProxy_setTableProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9650,7 +9650,7 @@
 
 uint32_t AccumuloProxy_setTableProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setTableProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9681,7 +9681,7 @@
 
 uint32_t AccumuloProxy_setTableProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setTableProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9712,7 +9712,7 @@
 
 uint32_t AccumuloProxy_setTableProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9798,7 +9798,7 @@
 
 uint32_t AccumuloProxy_setTableProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9860,7 +9860,7 @@
 
 uint32_t AccumuloProxy_splitRangeByTablets_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -9925,7 +9925,7 @@
 
 uint32_t AccumuloProxy_splitRangeByTablets_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_splitRangeByTablets_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9956,7 +9956,7 @@
 
 uint32_t AccumuloProxy_splitRangeByTablets_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_splitRangeByTablets_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -9987,7 +9987,7 @@
 
 uint32_t AccumuloProxy_splitRangeByTablets_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10106,7 +10106,7 @@
 
 uint32_t AccumuloProxy_splitRangeByTablets_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10189,7 +10189,7 @@
 
 uint32_t AccumuloProxy_tableExists_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10238,7 +10238,7 @@
 
 uint32_t AccumuloProxy_tableExists_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_tableExists_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10261,7 +10261,7 @@
 
 uint32_t AccumuloProxy_tableExists_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_tableExists_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10284,7 +10284,7 @@
 
 uint32_t AccumuloProxy_tableExists_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10346,7 +10346,7 @@
 
 uint32_t AccumuloProxy_tableExists_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10392,7 +10392,7 @@
 
 uint32_t AccumuloProxy_tableIdMap_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10433,7 +10433,7 @@
 
 uint32_t AccumuloProxy_tableIdMap_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_tableIdMap_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10452,7 +10452,7 @@
 
 uint32_t AccumuloProxy_tableIdMap_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_tableIdMap_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10471,7 +10471,7 @@
 
 uint32_t AccumuloProxy_tableIdMap_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10557,7 +10557,7 @@
 
 uint32_t AccumuloProxy_tableIdMap_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10618,7 +10618,7 @@
 
 uint32_t AccumuloProxy_testTableClassLoad_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10683,7 +10683,7 @@
 
 uint32_t AccumuloProxy_testTableClassLoad_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testTableClassLoad_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10714,7 +10714,7 @@
 
 uint32_t AccumuloProxy_testTableClassLoad_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testTableClassLoad_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10745,7 +10745,7 @@
 
 uint32_t AccumuloProxy_testTableClassLoad_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10843,7 +10843,7 @@
 
 uint32_t AccumuloProxy_testTableClassLoad_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10913,7 +10913,7 @@
 
 uint32_t AccumuloProxy_pingTabletServer_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -10962,7 +10962,7 @@
 
 uint32_t AccumuloProxy_pingTabletServer_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_pingTabletServer_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -10985,7 +10985,7 @@
 
 uint32_t AccumuloProxy_pingTabletServer_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_pingTabletServer_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11008,7 +11008,7 @@
 
 uint32_t AccumuloProxy_pingTabletServer_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11082,7 +11082,7 @@
 
 uint32_t AccumuloProxy_pingTabletServer_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11136,7 +11136,7 @@
 
 uint32_t AccumuloProxy_getActiveScans_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11185,7 +11185,7 @@
 
 uint32_t AccumuloProxy_getActiveScans_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getActiveScans_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11208,7 +11208,7 @@
 
 uint32_t AccumuloProxy_getActiveScans_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getActiveScans_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11231,7 +11231,7 @@
 
 uint32_t AccumuloProxy_getActiveScans_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11337,7 +11337,7 @@
 
 uint32_t AccumuloProxy_getActiveScans_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11411,7 +11411,7 @@
 
 uint32_t AccumuloProxy_getActiveCompactions_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11460,7 +11460,7 @@
 
 uint32_t AccumuloProxy_getActiveCompactions_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getActiveCompactions_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11483,7 +11483,7 @@
 
 uint32_t AccumuloProxy_getActiveCompactions_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getActiveCompactions_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11506,7 +11506,7 @@
 
 uint32_t AccumuloProxy_getActiveCompactions_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11612,7 +11612,7 @@
 
 uint32_t AccumuloProxy_getActiveCompactions_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11686,7 +11686,7 @@
 
 uint32_t AccumuloProxy_getSiteConfiguration_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11727,7 +11727,7 @@
 
 uint32_t AccumuloProxy_getSiteConfiguration_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getSiteConfiguration_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11746,7 +11746,7 @@
 
 uint32_t AccumuloProxy_getSiteConfiguration_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getSiteConfiguration_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -11765,7 +11765,7 @@
 
 uint32_t AccumuloProxy_getSiteConfiguration_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11875,7 +11875,7 @@
 
 uint32_t AccumuloProxy_getSiteConfiguration_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11952,7 +11952,7 @@
 
 uint32_t AccumuloProxy_getSystemConfiguration_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -11993,7 +11993,7 @@
 
 uint32_t AccumuloProxy_getSystemConfiguration_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getSystemConfiguration_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12012,7 +12012,7 @@
 
 uint32_t AccumuloProxy_getSystemConfiguration_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getSystemConfiguration_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12031,7 +12031,7 @@
 
 uint32_t AccumuloProxy_getSystemConfiguration_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12141,7 +12141,7 @@
 
 uint32_t AccumuloProxy_getSystemConfiguration_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12218,7 +12218,7 @@
 
 uint32_t AccumuloProxy_getTabletServers_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12259,7 +12259,7 @@
 
 uint32_t AccumuloProxy_getTabletServers_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getTabletServers_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12278,7 +12278,7 @@
 
 uint32_t AccumuloProxy_getTabletServers_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getTabletServers_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12297,7 +12297,7 @@
 
 uint32_t AccumuloProxy_getTabletServers_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12379,7 +12379,7 @@
 
 uint32_t AccumuloProxy_getTabletServers_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12437,7 +12437,7 @@
 
 uint32_t AccumuloProxy_removeProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12486,7 +12486,7 @@
 
 uint32_t AccumuloProxy_removeProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12509,7 +12509,7 @@
 
 uint32_t AccumuloProxy_removeProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12532,7 +12532,7 @@
 
 uint32_t AccumuloProxy_removeProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12606,7 +12606,7 @@
 
 uint32_t AccumuloProxy_removeProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12660,7 +12660,7 @@
 
 uint32_t AccumuloProxy_setProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12717,7 +12717,7 @@
 
 uint32_t AccumuloProxy_setProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12744,7 +12744,7 @@
 
 uint32_t AccumuloProxy_setProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12771,7 +12771,7 @@
 
 uint32_t AccumuloProxy_setProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12845,7 +12845,7 @@
 
 uint32_t AccumuloProxy_setProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12899,7 +12899,7 @@
 
 uint32_t AccumuloProxy_testClassLoad_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -12956,7 +12956,7 @@
 
 uint32_t AccumuloProxy_testClassLoad_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testClassLoad_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -12983,7 +12983,7 @@
 
 uint32_t AccumuloProxy_testClassLoad_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testClassLoad_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13010,7 +13010,7 @@
 
 uint32_t AccumuloProxy_testClassLoad_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13096,7 +13096,7 @@
 
 uint32_t AccumuloProxy_testClassLoad_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13158,7 +13158,7 @@
 
 uint32_t AccumuloProxy_authenticateUser_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13230,7 +13230,7 @@
 
 uint32_t AccumuloProxy_authenticateUser_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_authenticateUser_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13266,7 +13266,7 @@
 
 uint32_t AccumuloProxy_authenticateUser_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_authenticateUser_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13302,7 +13302,7 @@
 
 uint32_t AccumuloProxy_authenticateUser_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13388,7 +13388,7 @@
 
 uint32_t AccumuloProxy_authenticateUser_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13450,7 +13450,7 @@
 
 uint32_t AccumuloProxy_changeUserAuthorizations_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13520,7 +13520,7 @@
 
 uint32_t AccumuloProxy_changeUserAuthorizations_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_changeUserAuthorizations_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13555,7 +13555,7 @@
 
 uint32_t AccumuloProxy_changeUserAuthorizations_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_changeUserAuthorizations_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13590,7 +13590,7 @@
 
 uint32_t AccumuloProxy_changeUserAuthorizations_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13664,7 +13664,7 @@
 
 uint32_t AccumuloProxy_changeUserAuthorizations_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13718,7 +13718,7 @@
 
 uint32_t AccumuloProxy_changeLocalUserPassword_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13775,7 +13775,7 @@
 
 uint32_t AccumuloProxy_changeLocalUserPassword_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_changeLocalUserPassword_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13802,7 +13802,7 @@
 
 uint32_t AccumuloProxy_changeLocalUserPassword_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_changeLocalUserPassword_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -13829,7 +13829,7 @@
 
 uint32_t AccumuloProxy_changeLocalUserPassword_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13903,7 +13903,7 @@
 
 uint32_t AccumuloProxy_changeLocalUserPassword_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -13957,7 +13957,7 @@
 
 uint32_t AccumuloProxy_createLocalUser_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14014,7 +14014,7 @@
 
 uint32_t AccumuloProxy_createLocalUser_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createLocalUser_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14041,7 +14041,7 @@
 
 uint32_t AccumuloProxy_createLocalUser_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createLocalUser_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14068,7 +14068,7 @@
 
 uint32_t AccumuloProxy_createLocalUser_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14142,7 +14142,7 @@
 
 uint32_t AccumuloProxy_createLocalUser_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14196,7 +14196,7 @@
 
 uint32_t AccumuloProxy_dropLocalUser_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14245,7 +14245,7 @@
 
 uint32_t AccumuloProxy_dropLocalUser_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_dropLocalUser_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14268,7 +14268,7 @@
 
 uint32_t AccumuloProxy_dropLocalUser_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_dropLocalUser_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14291,7 +14291,7 @@
 
 uint32_t AccumuloProxy_dropLocalUser_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14365,7 +14365,7 @@
 
 uint32_t AccumuloProxy_dropLocalUser_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14419,7 +14419,7 @@
 
 uint32_t AccumuloProxy_getUserAuthorizations_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14468,7 +14468,7 @@
 
 uint32_t AccumuloProxy_getUserAuthorizations_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getUserAuthorizations_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14491,7 +14491,7 @@
 
 uint32_t AccumuloProxy_getUserAuthorizations_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getUserAuthorizations_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14514,7 +14514,7 @@
 
 uint32_t AccumuloProxy_getUserAuthorizations_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14620,7 +14620,7 @@
 
 uint32_t AccumuloProxy_getUserAuthorizations_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14694,7 +14694,7 @@
 
 uint32_t AccumuloProxy_grantSystemPermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14753,7 +14753,7 @@
 
 uint32_t AccumuloProxy_grantSystemPermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantSystemPermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14780,7 +14780,7 @@
 
 uint32_t AccumuloProxy_grantSystemPermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantSystemPermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -14807,7 +14807,7 @@
 
 uint32_t AccumuloProxy_grantSystemPermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14881,7 +14881,7 @@
 
 uint32_t AccumuloProxy_grantSystemPermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -14935,7 +14935,7 @@
 
 uint32_t AccumuloProxy_grantTablePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15002,7 +15002,7 @@
 
 uint32_t AccumuloProxy_grantTablePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantTablePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15033,7 +15033,7 @@
 
 uint32_t AccumuloProxy_grantTablePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantTablePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15064,7 +15064,7 @@
 
 uint32_t AccumuloProxy_grantTablePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15150,7 +15150,7 @@
 
 uint32_t AccumuloProxy_grantTablePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15212,7 +15212,7 @@
 
 uint32_t AccumuloProxy_hasSystemPermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15271,7 +15271,7 @@
 
 uint32_t AccumuloProxy_hasSystemPermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasSystemPermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15298,7 +15298,7 @@
 
 uint32_t AccumuloProxy_hasSystemPermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasSystemPermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15325,7 +15325,7 @@
 
 uint32_t AccumuloProxy_hasSystemPermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15411,7 +15411,7 @@
 
 uint32_t AccumuloProxy_hasSystemPermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15473,7 +15473,7 @@
 
 uint32_t AccumuloProxy_hasTablePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15540,7 +15540,7 @@
 
 uint32_t AccumuloProxy_hasTablePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasTablePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15571,7 +15571,7 @@
 
 uint32_t AccumuloProxy_hasTablePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasTablePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15602,7 +15602,7 @@
 
 uint32_t AccumuloProxy_hasTablePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15700,7 +15700,7 @@
 
 uint32_t AccumuloProxy_hasTablePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15770,7 +15770,7 @@
 
 uint32_t AccumuloProxy_listLocalUsers_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15811,7 +15811,7 @@
 
 uint32_t AccumuloProxy_listLocalUsers_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listLocalUsers_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15830,7 +15830,7 @@
 
 uint32_t AccumuloProxy_listLocalUsers_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listLocalUsers_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -15849,7 +15849,7 @@
 
 uint32_t AccumuloProxy_listLocalUsers_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -15968,7 +15968,7 @@
 
 uint32_t AccumuloProxy_listLocalUsers_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16051,7 +16051,7 @@
 
 uint32_t AccumuloProxy_revokeSystemPermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16110,7 +16110,7 @@
 
 uint32_t AccumuloProxy_revokeSystemPermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeSystemPermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16137,7 +16137,7 @@
 
 uint32_t AccumuloProxy_revokeSystemPermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeSystemPermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16164,7 +16164,7 @@
 
 uint32_t AccumuloProxy_revokeSystemPermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16238,7 +16238,7 @@
 
 uint32_t AccumuloProxy_revokeSystemPermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16292,7 +16292,7 @@
 
 uint32_t AccumuloProxy_revokeTablePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16359,7 +16359,7 @@
 
 uint32_t AccumuloProxy_revokeTablePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeTablePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16390,7 +16390,7 @@
 
 uint32_t AccumuloProxy_revokeTablePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeTablePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16421,7 +16421,7 @@
 
 uint32_t AccumuloProxy_revokeTablePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16507,7 +16507,7 @@
 
 uint32_t AccumuloProxy_revokeTablePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16569,7 +16569,7 @@
 
 uint32_t AccumuloProxy_grantNamespacePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16636,7 +16636,7 @@
 
 uint32_t AccumuloProxy_grantNamespacePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantNamespacePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16667,7 +16667,7 @@
 
 uint32_t AccumuloProxy_grantNamespacePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_grantNamespacePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16698,7 +16698,7 @@
 
 uint32_t AccumuloProxy_grantNamespacePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16772,7 +16772,7 @@
 
 uint32_t AccumuloProxy_grantNamespacePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16826,7 +16826,7 @@
 
 uint32_t AccumuloProxy_hasNamespacePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -16893,7 +16893,7 @@
 
 uint32_t AccumuloProxy_hasNamespacePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasNamespacePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16924,7 +16924,7 @@
 
 uint32_t AccumuloProxy_hasNamespacePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasNamespacePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -16955,7 +16955,7 @@
 
 uint32_t AccumuloProxy_hasNamespacePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17041,7 +17041,7 @@
 
 uint32_t AccumuloProxy_hasNamespacePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17103,7 +17103,7 @@
 
 uint32_t AccumuloProxy_revokeNamespacePermission_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17170,7 +17170,7 @@
 
 uint32_t AccumuloProxy_revokeNamespacePermission_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeNamespacePermission_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17201,7 +17201,7 @@
 
 uint32_t AccumuloProxy_revokeNamespacePermission_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_revokeNamespacePermission_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17232,7 +17232,7 @@
 
 uint32_t AccumuloProxy_revokeNamespacePermission_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17306,7 +17306,7 @@
 
 uint32_t AccumuloProxy_revokeNamespacePermission_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17360,7 +17360,7 @@
 
 uint32_t AccumuloProxy_createBatchScanner_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17417,7 +17417,7 @@
 
 uint32_t AccumuloProxy_createBatchScanner_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createBatchScanner_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17444,7 +17444,7 @@
 
 uint32_t AccumuloProxy_createBatchScanner_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createBatchScanner_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17471,7 +17471,7 @@
 
 uint32_t AccumuloProxy_createBatchScanner_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17569,7 +17569,7 @@
 
 uint32_t AccumuloProxy_createBatchScanner_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17639,7 +17639,7 @@
 
 uint32_t AccumuloProxy_createScanner_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17696,7 +17696,7 @@
 
 uint32_t AccumuloProxy_createScanner_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createScanner_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17723,7 +17723,7 @@
 
 uint32_t AccumuloProxy_createScanner_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createScanner_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -17750,7 +17750,7 @@
 
 uint32_t AccumuloProxy_createScanner_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17848,7 +17848,7 @@
 
 uint32_t AccumuloProxy_createScanner_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17918,7 +17918,7 @@
 
 uint32_t AccumuloProxy_hasNext_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -17959,7 +17959,7 @@
 
 uint32_t AccumuloProxy_hasNext_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasNext_args");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -17978,7 +17978,7 @@
 
 uint32_t AccumuloProxy_hasNext_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_hasNext_pargs");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -17997,7 +17997,7 @@
 
 uint32_t AccumuloProxy_hasNext_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18071,7 +18071,7 @@
 
 uint32_t AccumuloProxy_hasNext_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18125,7 +18125,7 @@
 
 uint32_t AccumuloProxy_nextEntry_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18166,7 +18166,7 @@
 
 uint32_t AccumuloProxy_nextEntry_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_nextEntry_args");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18185,7 +18185,7 @@
 
 uint32_t AccumuloProxy_nextEntry_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_nextEntry_pargs");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18204,7 +18204,7 @@
 
 uint32_t AccumuloProxy_nextEntry_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18302,7 +18302,7 @@
 
 uint32_t AccumuloProxy_nextEntry_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18372,7 +18372,7 @@
 
 uint32_t AccumuloProxy_nextK_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18421,7 +18421,7 @@
 
 uint32_t AccumuloProxy_nextK_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_nextK_args");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18444,7 +18444,7 @@
 
 uint32_t AccumuloProxy_nextK_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_nextK_pargs");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18467,7 +18467,7 @@
 
 uint32_t AccumuloProxy_nextK_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18565,7 +18565,7 @@
 
 uint32_t AccumuloProxy_nextK_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18635,7 +18635,7 @@
 
 uint32_t AccumuloProxy_closeScanner_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18676,7 +18676,7 @@
 
 uint32_t AccumuloProxy_closeScanner_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeScanner_args");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18695,7 +18695,7 @@
 
 uint32_t AccumuloProxy_closeScanner_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeScanner_pargs");
 
   xfer += oprot->writeFieldBegin("scanner", ::apache::thrift::protocol::T_STRING, 1);
@@ -18714,7 +18714,7 @@
 
 uint32_t AccumuloProxy_closeScanner_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18776,7 +18776,7 @@
 
 uint32_t AccumuloProxy_closeScanner_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18822,7 +18822,7 @@
 
 uint32_t AccumuloProxy_updateAndFlush_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -18906,7 +18906,7 @@
 
 uint32_t AccumuloProxy_updateAndFlush_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateAndFlush_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -18950,7 +18950,7 @@
 
 uint32_t AccumuloProxy_updateAndFlush_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateAndFlush_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -18994,7 +18994,7 @@
 
 uint32_t AccumuloProxy_updateAndFlush_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19092,7 +19092,7 @@
 
 uint32_t AccumuloProxy_updateAndFlush_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19162,7 +19162,7 @@
 
 uint32_t AccumuloProxy_createWriter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19219,7 +19219,7 @@
 
 uint32_t AccumuloProxy_createWriter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createWriter_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -19246,7 +19246,7 @@
 
 uint32_t AccumuloProxy_createWriter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createWriter_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -19273,7 +19273,7 @@
 
 uint32_t AccumuloProxy_createWriter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19371,7 +19371,7 @@
 
 uint32_t AccumuloProxy_createWriter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19441,7 +19441,7 @@
 
 uint32_t AccumuloProxy_update_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19517,7 +19517,7 @@
 
 uint32_t AccumuloProxy_update_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_update_args");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19557,7 +19557,7 @@
 
 uint32_t AccumuloProxy_update_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_update_pargs");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19597,7 +19597,7 @@
 
 uint32_t AccumuloProxy_flush_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19638,7 +19638,7 @@
 
 uint32_t AccumuloProxy_flush_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_flush_args");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19657,7 +19657,7 @@
 
 uint32_t AccumuloProxy_flush_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_flush_pargs");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19676,7 +19676,7 @@
 
 uint32_t AccumuloProxy_flush_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19750,7 +19750,7 @@
 
 uint32_t AccumuloProxy_flush_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19804,7 +19804,7 @@
 
 uint32_t AccumuloProxy_closeWriter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19845,7 +19845,7 @@
 
 uint32_t AccumuloProxy_closeWriter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeWriter_args");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19864,7 +19864,7 @@
 
 uint32_t AccumuloProxy_closeWriter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeWriter_pargs");
 
   xfer += oprot->writeFieldBegin("writer", ::apache::thrift::protocol::T_STRING, 1);
@@ -19883,7 +19883,7 @@
 
 uint32_t AccumuloProxy_closeWriter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -19957,7 +19957,7 @@
 
 uint32_t AccumuloProxy_closeWriter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20011,7 +20011,7 @@
 
 uint32_t AccumuloProxy_updateRowConditionally_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20076,7 +20076,7 @@
 
 uint32_t AccumuloProxy_updateRowConditionally_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateRowConditionally_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -20107,7 +20107,7 @@
 
 uint32_t AccumuloProxy_updateRowConditionally_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateRowConditionally_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -20138,7 +20138,7 @@
 
 uint32_t AccumuloProxy_updateRowConditionally_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20238,7 +20238,7 @@
 
 uint32_t AccumuloProxy_updateRowConditionally_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20310,7 +20310,7 @@
 
 uint32_t AccumuloProxy_createConditionalWriter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20367,7 +20367,7 @@
 
 uint32_t AccumuloProxy_createConditionalWriter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createConditionalWriter_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -20394,7 +20394,7 @@
 
 uint32_t AccumuloProxy_createConditionalWriter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createConditionalWriter_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -20421,7 +20421,7 @@
 
 uint32_t AccumuloProxy_createConditionalWriter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20519,7 +20519,7 @@
 
 uint32_t AccumuloProxy_createConditionalWriter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20589,7 +20589,7 @@
 
 uint32_t AccumuloProxy_updateRowsConditionally_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20653,7 +20653,7 @@
 
 uint32_t AccumuloProxy_updateRowsConditionally_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateRowsConditionally_args");
 
   xfer += oprot->writeFieldBegin("conditionalWriter", ::apache::thrift::protocol::T_STRING, 1);
@@ -20685,7 +20685,7 @@
 
 uint32_t AccumuloProxy_updateRowsConditionally_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_updateRowsConditionally_pargs");
 
   xfer += oprot->writeFieldBegin("conditionalWriter", ::apache::thrift::protocol::T_STRING, 1);
@@ -20717,7 +20717,7 @@
 
 uint32_t AccumuloProxy_updateRowsConditionally_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20841,7 +20841,7 @@
 
 uint32_t AccumuloProxy_updateRowsConditionally_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20928,7 +20928,7 @@
 
 uint32_t AccumuloProxy_closeConditionalWriter_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -20969,7 +20969,7 @@
 
 uint32_t AccumuloProxy_closeConditionalWriter_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeConditionalWriter_args");
 
   xfer += oprot->writeFieldBegin("conditionalWriter", ::apache::thrift::protocol::T_STRING, 1);
@@ -20988,7 +20988,7 @@
 
 uint32_t AccumuloProxy_closeConditionalWriter_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_closeConditionalWriter_pargs");
 
   xfer += oprot->writeFieldBegin("conditionalWriter", ::apache::thrift::protocol::T_STRING, 1);
@@ -21007,7 +21007,7 @@
 
 uint32_t AccumuloProxy_closeConditionalWriter_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21051,7 +21051,7 @@
 
 uint32_t AccumuloProxy_closeConditionalWriter_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21084,7 +21084,7 @@
 
 uint32_t AccumuloProxy_getRowRange_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21125,7 +21125,7 @@
 
 uint32_t AccumuloProxy_getRowRange_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getRowRange_args");
 
   xfer += oprot->writeFieldBegin("row", ::apache::thrift::protocol::T_STRING, 1);
@@ -21144,7 +21144,7 @@
 
 uint32_t AccumuloProxy_getRowRange_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getRowRange_pargs");
 
   xfer += oprot->writeFieldBegin("row", ::apache::thrift::protocol::T_STRING, 1);
@@ -21163,7 +21163,7 @@
 
 uint32_t AccumuloProxy_getRowRange_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21225,7 +21225,7 @@
 
 uint32_t AccumuloProxy_getRowRange_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21271,7 +21271,7 @@
 
 uint32_t AccumuloProxy_getFollowing_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21322,7 +21322,7 @@
 
 uint32_t AccumuloProxy_getFollowing_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getFollowing_args");
 
   xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -21345,7 +21345,7 @@
 
 uint32_t AccumuloProxy_getFollowing_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getFollowing_pargs");
 
   xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -21368,7 +21368,7 @@
 
 uint32_t AccumuloProxy_getFollowing_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21430,7 +21430,7 @@
 
 uint32_t AccumuloProxy_getFollowing_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21476,7 +21476,7 @@
 
 uint32_t AccumuloProxy_systemNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21504,7 +21504,7 @@
 
 uint32_t AccumuloProxy_systemNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_systemNamespace_args");
 
   xfer += oprot->writeFieldStop();
@@ -21519,7 +21519,7 @@
 
 uint32_t AccumuloProxy_systemNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_systemNamespace_pargs");
 
   xfer += oprot->writeFieldStop();
@@ -21534,7 +21534,7 @@
 
 uint32_t AccumuloProxy_systemNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21596,7 +21596,7 @@
 
 uint32_t AccumuloProxy_systemNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21642,7 +21642,7 @@
 
 uint32_t AccumuloProxy_defaultNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21670,7 +21670,7 @@
 
 uint32_t AccumuloProxy_defaultNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_defaultNamespace_args");
 
   xfer += oprot->writeFieldStop();
@@ -21685,7 +21685,7 @@
 
 uint32_t AccumuloProxy_defaultNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_defaultNamespace_pargs");
 
   xfer += oprot->writeFieldStop();
@@ -21700,7 +21700,7 @@
 
 uint32_t AccumuloProxy_defaultNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21762,7 +21762,7 @@
 
 uint32_t AccumuloProxy_defaultNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21808,7 +21808,7 @@
 
 uint32_t AccumuloProxy_listNamespaces_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21849,7 +21849,7 @@
 
 uint32_t AccumuloProxy_listNamespaces_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaces_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -21868,7 +21868,7 @@
 
 uint32_t AccumuloProxy_listNamespaces_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaces_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -21887,7 +21887,7 @@
 
 uint32_t AccumuloProxy_listNamespaces_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -21993,7 +21993,7 @@
 
 uint32_t AccumuloProxy_listNamespaces_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22067,7 +22067,7 @@
 
 uint32_t AccumuloProxy_namespaceExists_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22116,7 +22116,7 @@
 
 uint32_t AccumuloProxy_namespaceExists_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_namespaceExists_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22139,7 +22139,7 @@
 
 uint32_t AccumuloProxy_namespaceExists_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_namespaceExists_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22162,7 +22162,7 @@
 
 uint32_t AccumuloProxy_namespaceExists_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22248,7 +22248,7 @@
 
 uint32_t AccumuloProxy_namespaceExists_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22310,7 +22310,7 @@
 
 uint32_t AccumuloProxy_createNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22359,7 +22359,7 @@
 
 uint32_t AccumuloProxy_createNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createNamespace_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22382,7 +22382,7 @@
 
 uint32_t AccumuloProxy_createNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_createNamespace_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22405,7 +22405,7 @@
 
 uint32_t AccumuloProxy_createNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22491,7 +22491,7 @@
 
 uint32_t AccumuloProxy_createNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22553,7 +22553,7 @@
 
 uint32_t AccumuloProxy_deleteNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22602,7 +22602,7 @@
 
 uint32_t AccumuloProxy_deleteNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteNamespace_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22625,7 +22625,7 @@
 
 uint32_t AccumuloProxy_deleteNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_deleteNamespace_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22648,7 +22648,7 @@
 
 uint32_t AccumuloProxy_deleteNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22746,7 +22746,7 @@
 
 uint32_t AccumuloProxy_deleteNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22816,7 +22816,7 @@
 
 uint32_t AccumuloProxy_renameNamespace_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -22873,7 +22873,7 @@
 
 uint32_t AccumuloProxy_renameNamespace_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_renameNamespace_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22900,7 +22900,7 @@
 
 uint32_t AccumuloProxy_renameNamespace_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_renameNamespace_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -22927,7 +22927,7 @@
 
 uint32_t AccumuloProxy_renameNamespace_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23025,7 +23025,7 @@
 
 uint32_t AccumuloProxy_renameNamespace_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23095,7 +23095,7 @@
 
 uint32_t AccumuloProxy_setNamespaceProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23160,7 +23160,7 @@
 
 uint32_t AccumuloProxy_setNamespaceProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setNamespaceProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23191,7 +23191,7 @@
 
 uint32_t AccumuloProxy_setNamespaceProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_setNamespaceProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23222,7 +23222,7 @@
 
 uint32_t AccumuloProxy_setNamespaceProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23308,7 +23308,7 @@
 
 uint32_t AccumuloProxy_setNamespaceProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23370,7 +23370,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceProperty_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23427,7 +23427,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceProperty_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceProperty_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23454,7 +23454,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceProperty_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceProperty_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23481,7 +23481,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceProperty_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23567,7 +23567,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceProperty_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23629,7 +23629,7 @@
 
 uint32_t AccumuloProxy_getNamespaceProperties_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23678,7 +23678,7 @@
 
 uint32_t AccumuloProxy_getNamespaceProperties_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getNamespaceProperties_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23701,7 +23701,7 @@
 
 uint32_t AccumuloProxy_getNamespaceProperties_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getNamespaceProperties_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23724,7 +23724,7 @@
 
 uint32_t AccumuloProxy_getNamespaceProperties_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23846,7 +23846,7 @@
 
 uint32_t AccumuloProxy_getNamespaceProperties_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23931,7 +23931,7 @@
 
 uint32_t AccumuloProxy_namespaceIdMap_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -23972,7 +23972,7 @@
 
 uint32_t AccumuloProxy_namespaceIdMap_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_namespaceIdMap_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -23991,7 +23991,7 @@
 
 uint32_t AccumuloProxy_namespaceIdMap_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_namespaceIdMap_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24010,7 +24010,7 @@
 
 uint32_t AccumuloProxy_namespaceIdMap_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24120,7 +24120,7 @@
 
 uint32_t AccumuloProxy_namespaceIdMap_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24197,7 +24197,7 @@
 
 uint32_t AccumuloProxy_attachNamespaceIterator_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24277,7 +24277,7 @@
 
 uint32_t AccumuloProxy_attachNamespaceIterator_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_attachNamespaceIterator_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24316,7 +24316,7 @@
 
 uint32_t AccumuloProxy_attachNamespaceIterator_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_attachNamespaceIterator_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24355,7 +24355,7 @@
 
 uint32_t AccumuloProxy_attachNamespaceIterator_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24441,7 +24441,7 @@
 
 uint32_t AccumuloProxy_attachNamespaceIterator_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24503,7 +24503,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceIterator_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24583,7 +24583,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceIterator_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceIterator_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24622,7 +24622,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceIterator_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceIterator_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24661,7 +24661,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceIterator_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24747,7 +24747,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceIterator_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24809,7 +24809,7 @@
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -24876,7 +24876,7 @@
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getNamespaceIteratorSetting_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24907,7 +24907,7 @@
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_getNamespaceIteratorSetting_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -24938,7 +24938,7 @@
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25036,7 +25036,7 @@
 
 uint32_t AccumuloProxy_getNamespaceIteratorSetting_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25106,7 +25106,7 @@
 
 uint32_t AccumuloProxy_listNamespaceIterators_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25155,7 +25155,7 @@
 
 uint32_t AccumuloProxy_listNamespaceIterators_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaceIterators_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25178,7 +25178,7 @@
 
 uint32_t AccumuloProxy_listNamespaceIterators_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaceIterators_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25201,7 +25201,7 @@
 
 uint32_t AccumuloProxy_listNamespaceIterators_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25346,7 +25346,7 @@
 
 uint32_t AccumuloProxy_listNamespaceIterators_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25446,7 +25446,7 @@
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25526,7 +25526,7 @@
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_checkNamespaceIteratorConflicts_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25565,7 +25565,7 @@
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_checkNamespaceIteratorConflicts_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25604,7 +25604,7 @@
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25690,7 +25690,7 @@
 
 uint32_t AccumuloProxy_checkNamespaceIteratorConflicts_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25752,7 +25752,7 @@
 
 uint32_t AccumuloProxy_addNamespaceConstraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25809,7 +25809,7 @@
 
 uint32_t AccumuloProxy_addNamespaceConstraint_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addNamespaceConstraint_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25836,7 +25836,7 @@
 
 uint32_t AccumuloProxy_addNamespaceConstraint_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_addNamespaceConstraint_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -25863,7 +25863,7 @@
 
 uint32_t AccumuloProxy_addNamespaceConstraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -25961,7 +25961,7 @@
 
 uint32_t AccumuloProxy_addNamespaceConstraint_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26031,7 +26031,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26088,7 +26088,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceConstraint_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26115,7 +26115,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_removeNamespaceConstraint_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26142,7 +26142,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26228,7 +26228,7 @@
 
 uint32_t AccumuloProxy_removeNamespaceConstraint_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26290,7 +26290,7 @@
 
 uint32_t AccumuloProxy_listNamespaceConstraints_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26339,7 +26339,7 @@
 
 uint32_t AccumuloProxy_listNamespaceConstraints_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaceConstraints_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26362,7 +26362,7 @@
 
 uint32_t AccumuloProxy_listNamespaceConstraints_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_listNamespaceConstraints_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26385,7 +26385,7 @@
 
 uint32_t AccumuloProxy_listNamespaceConstraints_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26507,7 +26507,7 @@
 
 uint32_t AccumuloProxy_listNamespaceConstraints_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26592,7 +26592,7 @@
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26657,7 +26657,7 @@
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testNamespaceClassLoad_args");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26688,7 +26688,7 @@
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_testNamespaceClassLoad_pargs");
 
   xfer += oprot->writeFieldBegin("login", ::apache::thrift::protocol::T_STRING, 1);
@@ -26719,7 +26719,7 @@
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_result::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -26817,7 +26817,7 @@
 
 uint32_t AccumuloProxy_testNamespaceClassLoad_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -39372,10 +39372,10 @@
   }
 }
 
-::boost::shared_ptr< ::apache::thrift::TProcessor > AccumuloProxyProcessorFactory::getProcessor(const ::apache::thrift::TConnectionInfo& connInfo) {
+::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > AccumuloProxyProcessorFactory::getProcessor(const ::apache::thrift::TConnectionInfo& connInfo) {
   ::apache::thrift::ReleaseHandler< AccumuloProxyIfFactory > cleanup(handlerFactory_);
-  ::boost::shared_ptr< AccumuloProxyIf > handler(handlerFactory_->getHandler(connInfo), cleanup);
-  ::boost::shared_ptr< ::apache::thrift::TProcessor > processor(new AccumuloProxyProcessor(handler));
+  ::apache::thrift::stdcxx::shared_ptr< AccumuloProxyIf > handler(handlerFactory_->getHandler(connInfo), cleanup);
+  ::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > processor(new AccumuloProxyProcessor(handler));
   return processor;
 }
 

diff --git a/src/main/cpp/AccumuloProxy.h b/src/main/cpp/AccumuloProxy.h
index 7dd477b..2254b43 100644
--- a/src/main/cpp/AccumuloProxy.h
+++ b/src/main/cpp/AccumuloProxy.h

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -29,7 +29,7 @@
 
 namespace accumulo {
 
-#ifdef _WIN32
+#ifdef _MSC_VER
   #pragma warning( push )
   #pragma warning (disable : 4250 ) //inheriting methods via dominance 
 #endif
@@ -151,7 +151,7 @@
 
 class AccumuloProxyIfSingletonFactory : virtual public AccumuloProxyIfFactory {
  public:
-  AccumuloProxyIfSingletonFactory(const boost::shared_ptr<AccumuloProxyIf>& iface) : iface_(iface) {}
+  AccumuloProxyIfSingletonFactory(const ::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf>& iface) : iface_(iface) {}
   virtual ~AccumuloProxyIfSingletonFactory() {}
 
   virtual AccumuloProxyIf* getHandler(const ::apache::thrift::TConnectionInfo&) {
@@ -160,7 +160,7 @@
   virtual void releaseHandler(AccumuloProxyIf* /* handler */) {}
 
  protected:
-  boost::shared_ptr<AccumuloProxyIf> iface_;
+  ::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> iface_;
 };
 
 class AccumuloProxyNull : virtual public AccumuloProxyIf {
@@ -13583,27 +13583,27 @@
 
 class AccumuloProxyClient : virtual public AccumuloProxyIf {
  public:
-  AccumuloProxyClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  AccumuloProxyClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
     setProtocol(prot);
   }
-  AccumuloProxyClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+  AccumuloProxyClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
     setProtocol(iprot,oprot);
   }
  private:
-  void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  void setProtocol(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
   setProtocol(prot,prot);
   }
-  void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+  void setProtocol(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
     piprot_=iprot;
     poprot_=oprot;
     iprot_ = iprot.get();
     oprot_ = oprot.get();
   }
  public:
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
     return piprot_;
   }
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
     return poprot_;
   }
   void login(std::string& _return, const std::string& principal, const std::map<std::string, std::string> & loginProperties);
@@ -13906,15 +13906,15 @@
   void send_testNamespaceClassLoad(const std::string& login, const std::string& namespaceName, const std::string& className, const std::string& asTypeName);
   bool recv_testNamespaceClassLoad();
  protected:
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
   ::apache::thrift::protocol::TProtocol* iprot_;
   ::apache::thrift::protocol::TProtocol* oprot_;
 };
 
 class AccumuloProxyProcessor : public ::apache::thrift::TDispatchProcessor {
  protected:
-  boost::shared_ptr<AccumuloProxyIf> iface_;
+  ::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> iface_;
   virtual bool dispatchCall(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, const std::string& fname, int32_t seqid, void* callContext);
  private:
   typedef  void (AccumuloProxyProcessor::*ProcessFunction)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*, void*);
@@ -14021,7 +14021,7 @@
   void process_listNamespaceConstraints(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
   void process_testNamespaceClassLoad(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, void* callContext);
  public:
-  AccumuloProxyProcessor(boost::shared_ptr<AccumuloProxyIf> iface) :
+  AccumuloProxyProcessor(::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> iface) :
     iface_(iface) {
     processMap_["login"] = &AccumuloProxyProcessor::process_login;
     processMap_["addConstraint"] = &AccumuloProxyProcessor::process_addConstraint;
@@ -14130,24 +14130,24 @@
 
 class AccumuloProxyProcessorFactory : public ::apache::thrift::TProcessorFactory {
  public:
-  AccumuloProxyProcessorFactory(const ::boost::shared_ptr< AccumuloProxyIfFactory >& handlerFactory) :
+  AccumuloProxyProcessorFactory(const ::apache::thrift::stdcxx::shared_ptr< AccumuloProxyIfFactory >& handlerFactory) :
       handlerFactory_(handlerFactory) {}
 
-  ::boost::shared_ptr< ::apache::thrift::TProcessor > getProcessor(const ::apache::thrift::TConnectionInfo& connInfo);
+  ::apache::thrift::stdcxx::shared_ptr< ::apache::thrift::TProcessor > getProcessor(const ::apache::thrift::TConnectionInfo& connInfo);
 
  protected:
-  ::boost::shared_ptr< AccumuloProxyIfFactory > handlerFactory_;
+  ::apache::thrift::stdcxx::shared_ptr< AccumuloProxyIfFactory > handlerFactory_;
 };
 
 class AccumuloProxyMultiface : virtual public AccumuloProxyIf {
  public:
-  AccumuloProxyMultiface(std::vector<boost::shared_ptr<AccumuloProxyIf> >& ifaces) : ifaces_(ifaces) {
+  AccumuloProxyMultiface(std::vector<apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> >& ifaces) : ifaces_(ifaces) {
   }
   virtual ~AccumuloProxyMultiface() {}
  protected:
-  std::vector<boost::shared_ptr<AccumuloProxyIf> > ifaces_;
+  std::vector<apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> > ifaces_;
   AccumuloProxyMultiface() {}
-  void add(boost::shared_ptr<AccumuloProxyIf> iface) {
+  void add(::apache::thrift::stdcxx::shared_ptr<AccumuloProxyIf> iface) {
     ifaces_.push_back(iface);
   }
  public:
@@ -15094,27 +15094,27 @@
 // only be used when you need to share a connection among multiple threads
 class AccumuloProxyConcurrentClient : virtual public AccumuloProxyIf {
  public:
-  AccumuloProxyConcurrentClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  AccumuloProxyConcurrentClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
     setProtocol(prot);
   }
-  AccumuloProxyConcurrentClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+  AccumuloProxyConcurrentClient(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
     setProtocol(iprot,oprot);
   }
  private:
-  void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
+  void setProtocol(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) {
   setProtocol(prot,prot);
   }
-  void setProtocol(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
+  void setProtocol(apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) {
     piprot_=iprot;
     poprot_=oprot;
     iprot_ = iprot.get();
     oprot_ = oprot.get();
   }
  public:
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
     return piprot_;
   }
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
     return poprot_;
   }
   void login(std::string& _return, const std::string& principal, const std::map<std::string, std::string> & loginProperties);
@@ -15417,14 +15417,14 @@
   int32_t send_testNamespaceClassLoad(const std::string& login, const std::string& namespaceName, const std::string& className, const std::string& asTypeName);
   bool recv_testNamespaceClassLoad(const int32_t seqid);
  protected:
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+  apache::thrift::stdcxx::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
   ::apache::thrift::protocol::TProtocol* iprot_;
   ::apache::thrift::protocol::TProtocol* oprot_;
   ::apache::thrift::async::TConcurrentClientSyncInfo sync_;
 };
 
-#ifdef _WIN32
+#ifdef _MSC_VER
   #pragma warning( pop )
 #endif
 

diff --git a/src/main/cpp/AccumuloProxy_server.skeleton.cpp b/src/main/cpp/AccumuloProxy_server.skeleton.cpp
index 6c2f52f..c208f68 100644
--- a/src/main/cpp/AccumuloProxy_server.skeleton.cpp
+++ b/src/main/cpp/AccumuloProxy_server.skeleton.cpp

@@ -28,8 +28,6 @@
 using namespace ::apache::thrift::transport;
 using namespace ::apache::thrift::server;
 
-using boost::shared_ptr;
-
 using namespace  ::accumulo;
 
 class AccumuloProxyHandler : virtual public AccumuloProxyIf {
@@ -542,11 +540,11 @@
 
 int main(int argc, char **argv) {
   int port = 9090;
-  shared_ptr<AccumuloProxyHandler> handler(new AccumuloProxyHandler());
-  shared_ptr<TProcessor> processor(new AccumuloProxyProcessor(handler));
-  shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
-  shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
-  shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
+  ::apache::thrift::stdcxx::shared_ptr<AccumuloProxyHandler> handler(new AccumuloProxyHandler());
+  ::apache::thrift::stdcxx::shared_ptr<TProcessor> processor(new AccumuloProxyProcessor(handler));
+  ::apache::thrift::stdcxx::shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
+  ::apache::thrift::stdcxx::shared_ptr<TTransportFactory> transportFactory(new TBufferedTransportFactory());
+  ::apache::thrift::stdcxx::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
 
   TSimpleServer server(processor, serverTransport, transportFactory, protocolFactory);
   server.serve();

diff --git a/src/main/cpp/proxy_constants.cpp b/src/main/cpp/proxy_constants.cpp
index 07fb1b8..d55dd82 100644
--- a/src/main/cpp/proxy_constants.cpp
+++ b/src/main/cpp/proxy_constants.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

diff --git a/src/main/cpp/proxy_constants.h b/src/main/cpp/proxy_constants.h
index 436a732..222c51b 100644
--- a/src/main/cpp/proxy_constants.h
+++ b/src/main/cpp/proxy_constants.h

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

diff --git a/src/main/cpp/proxy_types.cpp b/src/main/cpp/proxy_types.cpp
index f4f17fc..7a74599 100644
--- a/src/main/cpp/proxy_types.cpp
+++ b/src/main/cpp/proxy_types.cpp

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -47,6 +47,16 @@
 };
 const std::map<int, const char*> _PartialKey_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kPartialKeyValues, _kPartialKeyNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const PartialKey::type& val) {
+  std::map<int, const char*>::const_iterator it = _PartialKey_VALUES_TO_NAMES.find(val);
+  if (it != _PartialKey_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kTablePermissionValues[] = {
   TablePermission::READ,
   TablePermission::WRITE,
@@ -65,6 +75,16 @@
 };
 const std::map<int, const char*> _TablePermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(6, _kTablePermissionValues, _kTablePermissionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const TablePermission::type& val) {
+  std::map<int, const char*>::const_iterator it = _TablePermission_VALUES_TO_NAMES.find(val);
+  if (it != _TablePermission_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kSystemPermissionValues[] = {
   SystemPermission::GRANT,
   SystemPermission::CREATE_TABLE,
@@ -95,6 +115,16 @@
 };
 const std::map<int, const char*> _SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(12, _kSystemPermissionValues, _kSystemPermissionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const SystemPermission::type& val) {
+  std::map<int, const char*>::const_iterator it = _SystemPermission_VALUES_TO_NAMES.find(val);
+  if (it != _SystemPermission_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kNamespacePermissionValues[] = {
   NamespacePermission::READ,
   NamespacePermission::WRITE,
@@ -119,6 +149,16 @@
 };
 const std::map<int, const char*> _NamespacePermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(9, _kNamespacePermissionValues, _kNamespacePermissionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const NamespacePermission::type& val) {
+  std::map<int, const char*>::const_iterator it = _NamespacePermission_VALUES_TO_NAMES.find(val);
+  if (it != _NamespacePermission_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kScanTypeValues[] = {
   ScanType::SINGLE,
   ScanType::BATCH
@@ -129,6 +169,16 @@
 };
 const std::map<int, const char*> _ScanType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kScanTypeValues, _kScanTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const ScanType::type& val) {
+  std::map<int, const char*>::const_iterator it = _ScanType_VALUES_TO_NAMES.find(val);
+  if (it != _ScanType_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kScanStateValues[] = {
   ScanState::IDLE,
   ScanState::RUNNING,
@@ -141,6 +191,16 @@
 };
 const std::map<int, const char*> _ScanState_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kScanStateValues, _kScanStateNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const ScanState::type& val) {
+  std::map<int, const char*>::const_iterator it = _ScanState_VALUES_TO_NAMES.find(val);
+  if (it != _ScanState_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kConditionalStatusValues[] = {
   ConditionalStatus::ACCEPTED,
   ConditionalStatus::REJECTED,
@@ -157,6 +217,16 @@
 };
 const std::map<int, const char*> _ConditionalStatus_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kConditionalStatusValues, _kConditionalStatusNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const ConditionalStatus::type& val) {
+  std::map<int, const char*>::const_iterator it = _ConditionalStatus_VALUES_TO_NAMES.find(val);
+  if (it != _ConditionalStatus_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kDurabilityValues[] = {
   Durability::DEFAULT,
   Durability::NONE,
@@ -173,6 +243,16 @@
 };
 const std::map<int, const char*> _Durability_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kDurabilityValues, _kDurabilityNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const Durability::type& val) {
+  std::map<int, const char*>::const_iterator it = _Durability_VALUES_TO_NAMES.find(val);
+  if (it != _Durability_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kCompactionTypeValues[] = {
   CompactionType::MINOR,
   CompactionType::MERGE,
@@ -187,6 +267,16 @@
 };
 const std::map<int, const char*> _CompactionType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(4, _kCompactionTypeValues, _kCompactionTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const CompactionType::type& val) {
+  std::map<int, const char*>::const_iterator it = _CompactionType_VALUES_TO_NAMES.find(val);
+  if (it != _CompactionType_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kCompactionReasonValues[] = {
   CompactionReason::USER,
   CompactionReason::SYSTEM,
@@ -203,6 +293,16 @@
 };
 const std::map<int, const char*> _CompactionReason_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(5, _kCompactionReasonValues, _kCompactionReasonNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const CompactionReason::type& val) {
+  std::map<int, const char*>::const_iterator it = _CompactionReason_VALUES_TO_NAMES.find(val);
+  if (it != _CompactionReason_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kIteratorScopeValues[] = {
   IteratorScope::MINC,
   IteratorScope::MAJC,
@@ -215,6 +315,16 @@
 };
 const std::map<int, const char*> _IteratorScope_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kIteratorScopeValues, _kIteratorScopeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const IteratorScope::type& val) {
+  std::map<int, const char*>::const_iterator it = _IteratorScope_VALUES_TO_NAMES.find(val);
+  if (it != _IteratorScope_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 int _kTimeTypeValues[] = {
   TimeType::LOGICAL,
   TimeType::MILLIS
@@ -225,6 +335,16 @@
 };
 const std::map<int, const char*> _TimeType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kTimeTypeValues, _kTimeTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
+std::ostream& operator<<(std::ostream& out, const TimeType::type& val) {
+  std::map<int, const char*>::const_iterator it = _TimeType_VALUES_TO_NAMES.find(val);
+  if (it != _TimeType_VALUES_TO_NAMES.end()) {
+    out << it->second;
+  } else {
+    out << static_cast<int>(val);
+  }
+  return out;
+}
+
 
 Key::~Key() throw() {
 }
@@ -250,10 +370,16 @@
   this->timestamp = val;
 __isset.timestamp = true;
 }
+std::ostream& operator<<(std::ostream& out, const Key& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t Key::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -326,7 +452,7 @@
 
 uint32_t Key::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Key");
 
   xfer += oprot->writeFieldBegin("row", ::apache::thrift::protocol::T_STRING, 1);
@@ -425,10 +551,16 @@
   this->deleteCell = val;
 __isset.deleteCell = true;
 }
+std::ostream& operator<<(std::ostream& out, const ColumnUpdate& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ColumnUpdate::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -509,7 +641,7 @@
 
 uint32_t ColumnUpdate::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ColumnUpdate");
 
   xfer += oprot->writeFieldBegin("colFamily", ::apache::thrift::protocol::T_STRING, 1);
@@ -599,10 +731,16 @@
 void DiskUsage::__set_usage(const int64_t val) {
   this->usage = val;
 }
+std::ostream& operator<<(std::ostream& out, const DiskUsage& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t DiskUsage::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -663,7 +801,7 @@
 
 uint32_t DiskUsage::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("DiskUsage");
 
   xfer += oprot->writeFieldBegin("tables", ::apache::thrift::protocol::T_LIST, 1);
@@ -725,10 +863,16 @@
 void KeyValue::__set_value(const std::string& val) {
   this->value = val;
 }
+std::ostream& operator<<(std::ostream& out, const KeyValue& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t KeyValue::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -777,7 +921,7 @@
 
 uint32_t KeyValue::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("KeyValue");
 
   xfer += oprot->writeFieldBegin("key", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -831,10 +975,16 @@
 void ScanResult::__set_more(const bool val) {
   this->more = val;
 }
+std::ostream& operator<<(std::ostream& out, const ScanResult& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ScanResult::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -895,7 +1045,7 @@
 
 uint32_t ScanResult::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ScanResult");
 
   xfer += oprot->writeFieldBegin("results", ::apache::thrift::protocol::T_LIST, 1);
@@ -965,10 +1115,16 @@
 void Range::__set_stopInclusive(const bool val) {
   this->stopInclusive = val;
 }
+std::ostream& operator<<(std::ostream& out, const Range& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t Range::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1033,7 +1189,7 @@
 
 uint32_t Range::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Range");
 
   xfer += oprot->writeFieldBegin("start", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -1104,10 +1260,16 @@
   this->colQualifier = val;
 __isset.colQualifier = true;
 }
+std::ostream& operator<<(std::ostream& out, const ScanColumn& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ScanColumn::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1156,7 +1318,7 @@
 
 uint32_t ScanColumn::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ScanColumn");
 
   xfer += oprot->writeFieldBegin("colFamily", ::apache::thrift::protocol::T_STRING, 1);
@@ -1219,10 +1381,16 @@
 void IteratorSetting::__set_properties(const std::map<std::string, std::string> & val) {
   this->properties = val;
 }
+std::ostream& operator<<(std::ostream& out, const IteratorSetting& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t IteratorSetting::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1302,7 +1470,7 @@
 
 uint32_t IteratorSetting::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("IteratorSetting");
 
   xfer += oprot->writeFieldBegin("priority", ::apache::thrift::protocol::T_I32, 1);
@@ -1398,10 +1566,16 @@
   this->bufferSize = val;
 __isset.bufferSize = true;
 }
+std::ostream& operator<<(std::ostream& out, const ScanOptions& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ScanOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1511,7 +1685,7 @@
 
 uint32_t ScanOptions::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ScanOptions");
 
   if (this->__isset.authorizations) {
@@ -1635,10 +1809,16 @@
   this->threads = val;
 __isset.threads = true;
 }
+std::ostream& operator<<(std::ostream& out, const BatchScanOptions& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t BatchScanOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1760,7 +1940,7 @@
 
 uint32_t BatchScanOptions::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("BatchScanOptions");
 
   if (this->__isset.authorizations) {
@@ -1875,10 +2055,16 @@
 void KeyValueAndPeek::__set_hasNext(const bool val) {
   this->hasNext = val;
 }
+std::ostream& operator<<(std::ostream& out, const KeyValueAndPeek& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t KeyValueAndPeek::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -1927,7 +2113,7 @@
 
 uint32_t KeyValueAndPeek::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("KeyValueAndPeek");
 
   xfer += oprot->writeFieldBegin("keyValue", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -1985,10 +2171,16 @@
 void KeyExtent::__set_prevEndRow(const std::string& val) {
   this->prevEndRow = val;
 }
+std::ostream& operator<<(std::ostream& out, const KeyExtent& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t KeyExtent::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2045,7 +2237,7 @@
 
 uint32_t KeyExtent::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("KeyExtent");
 
   xfer += oprot->writeFieldBegin("tableId", ::apache::thrift::protocol::T_STRING, 1);
@@ -2111,10 +2303,16 @@
 void Column::__set_colVisibility(const std::string& val) {
   this->colVisibility = val;
 }
+std::ostream& operator<<(std::ostream& out, const Column& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t Column::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2171,7 +2369,7 @@
 
 uint32_t Column::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Column");
 
   xfer += oprot->writeFieldBegin("colFamily", ::apache::thrift::protocol::T_STRING, 1);
@@ -2244,10 +2442,16 @@
   this->iterators = val;
 __isset.iterators = true;
 }
+std::ostream& operator<<(std::ostream& out, const Condition& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t Condition::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2324,7 +2528,7 @@
 
 uint32_t Condition::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Condition");
 
   xfer += oprot->writeFieldBegin("column", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -2405,10 +2609,16 @@
 void ConditionalUpdates::__set_updates(const std::vector<ColumnUpdate> & val) {
   this->updates = val;
 }
+std::ostream& operator<<(std::ostream& out, const ConditionalUpdates& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ConditionalUpdates::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2481,7 +2691,7 @@
 
 uint32_t ConditionalUpdates::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ConditionalUpdates");
 
   xfer += oprot->writeFieldBegin("conditions", ::apache::thrift::protocol::T_LIST, 2);
@@ -2568,10 +2778,16 @@
   this->durability = val;
 __isset.durability = true;
 }
+std::ostream& operator<<(std::ostream& out, const ConditionalWriterOptions& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ConditionalWriterOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2659,7 +2875,7 @@
 
 uint32_t ConditionalWriterOptions::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ConditionalWriterOptions");
 
   if (this->__isset.maxMemory) {
@@ -2786,10 +3002,16 @@
 void ActiveScan::__set_authorizations(const std::vector<std::string> & val) {
   this->authorizations = val;
 }
+std::ostream& operator<<(std::ostream& out, const ActiveScan& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ActiveScan::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -2950,7 +3172,7 @@
 
 uint32_t ActiveScan::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ActiveScan");
 
   xfer += oprot->writeFieldBegin("client", ::apache::thrift::protocol::T_STRING, 1);
@@ -3132,10 +3354,16 @@
 void ActiveCompaction::__set_iterators(const std::vector<IteratorSetting> & val) {
   this->iterators = val;
 }
+std::ostream& operator<<(std::ostream& out, const ActiveCompaction& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t ActiveCompaction::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3276,7 +3504,7 @@
 
 uint32_t ActiveCompaction::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ActiveCompaction");
 
   xfer += oprot->writeFieldBegin("extent", ::apache::thrift::protocol::T_STRUCT, 1);
@@ -3423,10 +3651,16 @@
   this->durability = val;
 __isset.durability = true;
 }
+std::ostream& operator<<(std::ostream& out, const WriterOptions& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t WriterOptions::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3501,7 +3735,7 @@
 
 uint32_t WriterOptions::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("WriterOptions");
 
   xfer += oprot->writeFieldBegin("maxMemory", ::apache::thrift::protocol::T_I64, 1);
@@ -3580,10 +3814,16 @@
 void CompactionStrategyConfig::__set_options(const std::map<std::string, std::string> & val) {
   this->options = val;
 }
+std::ostream& operator<<(std::ostream& out, const CompactionStrategyConfig& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t CompactionStrategyConfig::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3647,7 +3887,7 @@
 
 uint32_t CompactionStrategyConfig::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("CompactionStrategyConfig");
 
   xfer += oprot->writeFieldBegin("className", ::apache::thrift::protocol::T_STRING, 1);
@@ -3706,10 +3946,16 @@
 void UnknownScanner::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const UnknownScanner& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t UnknownScanner::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3750,7 +3996,7 @@
 
 uint32_t UnknownScanner::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("UnknownScanner");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -3803,10 +4049,16 @@
 void UnknownWriter::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const UnknownWriter& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t UnknownWriter::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3847,7 +4099,7 @@
 
 uint32_t UnknownWriter::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("UnknownWriter");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -3900,10 +4152,16 @@
 void NoMoreEntriesException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const NoMoreEntriesException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t NoMoreEntriesException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -3944,7 +4202,7 @@
 
 uint32_t NoMoreEntriesException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("NoMoreEntriesException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -3997,10 +4255,16 @@
 void AccumuloException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const AccumuloException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t AccumuloException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4041,7 +4305,7 @@
 
 uint32_t AccumuloException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4094,10 +4358,16 @@
 void AccumuloSecurityException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const AccumuloSecurityException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t AccumuloSecurityException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4138,7 +4408,7 @@
 
 uint32_t AccumuloSecurityException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloSecurityException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4191,10 +4461,16 @@
 void TableNotFoundException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const TableNotFoundException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t TableNotFoundException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4235,7 +4511,7 @@
 
 uint32_t TableNotFoundException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("TableNotFoundException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4288,10 +4564,16 @@
 void TableExistsException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const TableExistsException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t TableExistsException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4332,7 +4614,7 @@
 
 uint32_t TableExistsException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("TableExistsException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4385,10 +4667,16 @@
 void MutationsRejectedException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const MutationsRejectedException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t MutationsRejectedException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4429,7 +4717,7 @@
 
 uint32_t MutationsRejectedException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("MutationsRejectedException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4482,10 +4770,16 @@
 void NamespaceExistsException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const NamespaceExistsException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t NamespaceExistsException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4526,7 +4820,7 @@
 
 uint32_t NamespaceExistsException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("NamespaceExistsException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4579,10 +4873,16 @@
 void NamespaceNotFoundException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const NamespaceNotFoundException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t NamespaceNotFoundException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4623,7 +4923,7 @@
 
 uint32_t NamespaceNotFoundException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("NamespaceNotFoundException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);
@@ -4676,10 +4976,16 @@
 void NamespaceNotEmptyException::__set_msg(const std::string& val) {
   this->msg = val;
 }
+std::ostream& operator<<(std::ostream& out, const NamespaceNotEmptyException& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 
 uint32_t NamespaceNotEmptyException::read(::apache::thrift::protocol::TProtocol* iprot) {
 
-  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
+  ::apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -4720,7 +5026,7 @@
 
 uint32_t NamespaceNotEmptyException::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
-  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
+  ::apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("NamespaceNotEmptyException");
 
   xfer += oprot->writeFieldBegin("msg", ::apache::thrift::protocol::T_STRING, 1);

diff --git a/src/main/cpp/proxy_types.h b/src/main/cpp/proxy_types.h
index f393d62..d2ef4fc 100644
--- a/src/main/cpp/proxy_types.h
+++ b/src/main/cpp/proxy_types.h

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -31,7 +31,7 @@
 #include <thrift/protocol/TProtocol.h>
 #include <thrift/transport/TTransport.h>
 
-#include <thrift/cxxfunctional.h>
+#include <thrift/stdcxx.h>
 
 
 namespace accumulo {
@@ -49,6 +49,8 @@
 
 extern const std::map<int, const char*> _PartialKey_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const PartialKey::type& val);
+
 struct TablePermission {
   enum type {
     READ = 2,
@@ -62,6 +64,8 @@
 
 extern const std::map<int, const char*> _TablePermission_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const TablePermission::type& val);
+
 struct SystemPermission {
   enum type {
     GRANT = 0,
@@ -81,6 +85,8 @@
 
 extern const std::map<int, const char*> _SystemPermission_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const SystemPermission::type& val);
+
 struct NamespacePermission {
   enum type {
     READ = 0,
@@ -97,6 +103,8 @@
 
 extern const std::map<int, const char*> _NamespacePermission_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const NamespacePermission::type& val);
+
 struct ScanType {
   enum type {
     SINGLE = 0,
@@ -106,6 +114,8 @@
 
 extern const std::map<int, const char*> _ScanType_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const ScanType::type& val);
+
 struct ScanState {
   enum type {
     IDLE = 0,
@@ -116,6 +126,8 @@
 
 extern const std::map<int, const char*> _ScanState_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const ScanState::type& val);
+
 struct ConditionalStatus {
   enum type {
     ACCEPTED = 0,
@@ -128,6 +140,8 @@
 
 extern const std::map<int, const char*> _ConditionalStatus_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const ConditionalStatus::type& val);
+
 struct Durability {
   enum type {
     DEFAULT = 0,
@@ -140,6 +154,8 @@
 
 extern const std::map<int, const char*> _Durability_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const Durability::type& val);
+
 struct CompactionType {
   enum type {
     MINOR = 0,
@@ -151,6 +167,8 @@
 
 extern const std::map<int, const char*> _CompactionType_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const CompactionType::type& val);
+
 struct CompactionReason {
   enum type {
     USER = 0,
@@ -163,6 +181,8 @@
 
 extern const std::map<int, const char*> _CompactionReason_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const CompactionReason::type& val);
+
 struct IteratorScope {
   enum type {
     MINC = 0,
@@ -173,6 +193,8 @@
 
 extern const std::map<int, const char*> _IteratorScope_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const IteratorScope::type& val);
+
 struct TimeType {
   enum type {
     LOGICAL = 0,
@@ -182,6 +204,8 @@
 
 extern const std::map<int, const char*> _TimeType_VALUES_TO_NAMES;
 
+std::ostream& operator<<(std::ostream& out, const TimeType::type& val);
+
 class Key;
 
 class ColumnUpdate;
@@ -310,11 +334,7 @@
 
 void swap(Key &a, Key &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Key& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const Key& obj);
 
 typedef struct _ColumnUpdate__isset {
   _ColumnUpdate__isset() : colFamily(false), colQualifier(false), colVisibility(false), timestamp(false), value(false), deleteCell(false) {}
@@ -394,11 +414,7 @@
 
 void swap(ColumnUpdate &a, ColumnUpdate &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ColumnUpdate& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ColumnUpdate& obj);
 
 typedef struct _DiskUsage__isset {
   _DiskUsage__isset() : tables(false), usage(false) {}
@@ -446,11 +462,7 @@
 
 void swap(DiskUsage &a, DiskUsage &b);
 
-inline std::ostream& operator<<(std::ostream& out, const DiskUsage& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const DiskUsage& obj);
 
 typedef struct _KeyValue__isset {
   _KeyValue__isset() : key(false), value(false) {}
@@ -498,11 +510,7 @@
 
 void swap(KeyValue &a, KeyValue &b);
 
-inline std::ostream& operator<<(std::ostream& out, const KeyValue& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const KeyValue& obj);
 
 typedef struct _ScanResult__isset {
   _ScanResult__isset() : results(false), more(false) {}
@@ -550,11 +558,7 @@
 
 void swap(ScanResult &a, ScanResult &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ScanResult& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ScanResult& obj);
 
 typedef struct _Range__isset {
   _Range__isset() : start(false), startInclusive(false), stop(false), stopInclusive(false) {}
@@ -614,11 +618,7 @@
 
 void swap(Range &a, Range &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Range& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const Range& obj);
 
 typedef struct _ScanColumn__isset {
   _ScanColumn__isset() : colFamily(false), colQualifier(false) {}
@@ -668,11 +668,7 @@
 
 void swap(ScanColumn &a, ScanColumn &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ScanColumn& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ScanColumn& obj);
 
 typedef struct _IteratorSetting__isset {
   _IteratorSetting__isset() : priority(false), name(false), iteratorClass(false), properties(false) {}
@@ -732,11 +728,7 @@
 
 void swap(IteratorSetting &a, IteratorSetting &b);
 
-inline std::ostream& operator<<(std::ostream& out, const IteratorSetting& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const IteratorSetting& obj);
 
 typedef struct _ScanOptions__isset {
   _ScanOptions__isset() : authorizations(false), range(false), columns(false), iterators(false), bufferSize(false) {}
@@ -812,11 +804,7 @@
 
 void swap(ScanOptions &a, ScanOptions &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ScanOptions& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ScanOptions& obj);
 
 typedef struct _BatchScanOptions__isset {
   _BatchScanOptions__isset() : authorizations(false), ranges(false), columns(false), iterators(false), threads(false) {}
@@ -892,11 +880,7 @@
 
 void swap(BatchScanOptions &a, BatchScanOptions &b);
 
-inline std::ostream& operator<<(std::ostream& out, const BatchScanOptions& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const BatchScanOptions& obj);
 
 typedef struct _KeyValueAndPeek__isset {
   _KeyValueAndPeek__isset() : keyValue(false), hasNext(false) {}
@@ -944,11 +928,7 @@
 
 void swap(KeyValueAndPeek &a, KeyValueAndPeek &b);
 
-inline std::ostream& operator<<(std::ostream& out, const KeyValueAndPeek& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const KeyValueAndPeek& obj);
 
 typedef struct _KeyExtent__isset {
   _KeyExtent__isset() : tableId(false), endRow(false), prevEndRow(false) {}
@@ -1002,11 +982,7 @@
 
 void swap(KeyExtent &a, KeyExtent &b);
 
-inline std::ostream& operator<<(std::ostream& out, const KeyExtent& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const KeyExtent& obj);
 
 typedef struct _Column__isset {
   _Column__isset() : colFamily(false), colQualifier(false), colVisibility(false) {}
@@ -1060,11 +1036,7 @@
 
 void swap(Column &a, Column &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Column& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const Column& obj);
 
 typedef struct _Condition__isset {
   _Condition__isset() : column(false), timestamp(false), value(false), iterators(false) {}
@@ -1130,11 +1102,7 @@
 
 void swap(Condition &a, Condition &b);
 
-inline std::ostream& operator<<(std::ostream& out, const Condition& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const Condition& obj);
 
 typedef struct _ConditionalUpdates__isset {
   _ConditionalUpdates__isset() : conditions(false), updates(false) {}
@@ -1182,11 +1150,7 @@
 
 void swap(ConditionalUpdates &a, ConditionalUpdates &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ConditionalUpdates& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ConditionalUpdates& obj);
 
 typedef struct _ConditionalWriterOptions__isset {
   _ConditionalWriterOptions__isset() : maxMemory(false), timeoutMs(false), threads(false), authorizations(false), durability(false) {}
@@ -1262,11 +1226,7 @@
 
 void swap(ConditionalWriterOptions &a, ConditionalWriterOptions &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ConditionalWriterOptions& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ConditionalWriterOptions& obj);
 
 typedef struct _ActiveScan__isset {
   _ActiveScan__isset() : client(false), user(false), table(false), age(false), idleTime(false), type(false), state(false), extent(false), columns(false), iterators(false), authorizations(false) {}
@@ -1368,11 +1328,7 @@
 
 void swap(ActiveScan &a, ActiveScan &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ActiveScan& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ActiveScan& obj);
 
 typedef struct _ActiveCompaction__isset {
   _ActiveCompaction__isset() : extent(false), age(false), inputFiles(false), outputFile(false), type(false), reason(false), localityGroup(false), entriesRead(false), entriesWritten(false), iterators(false) {}
@@ -1468,11 +1424,7 @@
 
 void swap(ActiveCompaction &a, ActiveCompaction &b);
 
-inline std::ostream& operator<<(std::ostream& out, const ActiveCompaction& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const ActiveCompaction& obj);
 
 typedef struct _WriterOptions__isset {
   _WriterOptions__isset() : maxMemory(false), latencyMs(false), timeoutMs(false), threads(false), durability(false) {}
@@ -1540,11 +1492,7 @@
 
 void swap(WriterOptions &a, WriterOptions &b);
 
-inline std::ostream& operator<<(std::ostream& out, const WriterOptions& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const WriterOptions& obj);
 
 typedef struct _CompactionStrategyConfig__isset {
   _CompactionStrategyConfig__isset() : className(false), options(false) {}
@@ -1592,11 +1540,7 @@
 
 void swap(CompactionStrategyConfig &a, CompactionStrategyConfig &b);
 
-inline std::ostream& operator<<(std::ostream& out, const CompactionStrategyConfig& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const CompactionStrategyConfig& obj);
 
 typedef struct _UnknownScanner__isset {
   _UnknownScanner__isset() : msg(false) {}
@@ -1640,11 +1584,7 @@
 
 void swap(UnknownScanner &a, UnknownScanner &b);
 
-inline std::ostream& operator<<(std::ostream& out, const UnknownScanner& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const UnknownScanner& obj);
 
 typedef struct _UnknownWriter__isset {
   _UnknownWriter__isset() : msg(false) {}
@@ -1688,11 +1628,7 @@
 
 void swap(UnknownWriter &a, UnknownWriter &b);
 
-inline std::ostream& operator<<(std::ostream& out, const UnknownWriter& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const UnknownWriter& obj);
 
 typedef struct _NoMoreEntriesException__isset {
   _NoMoreEntriesException__isset() : msg(false) {}
@@ -1736,11 +1672,7 @@
 
 void swap(NoMoreEntriesException &a, NoMoreEntriesException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const NoMoreEntriesException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const NoMoreEntriesException& obj);
 
 typedef struct _AccumuloException__isset {
   _AccumuloException__isset() : msg(false) {}
@@ -1784,11 +1716,7 @@
 
 void swap(AccumuloException &a, AccumuloException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const AccumuloException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const AccumuloException& obj);
 
 typedef struct _AccumuloSecurityException__isset {
   _AccumuloSecurityException__isset() : msg(false) {}
@@ -1832,11 +1760,7 @@
 
 void swap(AccumuloSecurityException &a, AccumuloSecurityException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const AccumuloSecurityException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const AccumuloSecurityException& obj);
 
 typedef struct _TableNotFoundException__isset {
   _TableNotFoundException__isset() : msg(false) {}
@@ -1880,11 +1804,7 @@
 
 void swap(TableNotFoundException &a, TableNotFoundException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const TableNotFoundException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const TableNotFoundException& obj);
 
 typedef struct _TableExistsException__isset {
   _TableExistsException__isset() : msg(false) {}
@@ -1928,11 +1848,7 @@
 
 void swap(TableExistsException &a, TableExistsException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const TableExistsException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const TableExistsException& obj);
 
 typedef struct _MutationsRejectedException__isset {
   _MutationsRejectedException__isset() : msg(false) {}
@@ -1976,11 +1892,7 @@
 
 void swap(MutationsRejectedException &a, MutationsRejectedException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const MutationsRejectedException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const MutationsRejectedException& obj);
 
 typedef struct _NamespaceExistsException__isset {
   _NamespaceExistsException__isset() : msg(false) {}
@@ -2024,11 +1936,7 @@
 
 void swap(NamespaceExistsException &a, NamespaceExistsException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const NamespaceExistsException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const NamespaceExistsException& obj);
 
 typedef struct _NamespaceNotFoundException__isset {
   _NamespaceNotFoundException__isset() : msg(false) {}
@@ -2072,11 +1980,7 @@
 
 void swap(NamespaceNotFoundException &a, NamespaceNotFoundException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const NamespaceNotFoundException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const NamespaceNotFoundException& obj);
 
 typedef struct _NamespaceNotEmptyException__isset {
   _NamespaceNotEmptyException__isset() : msg(false) {}
@@ -2120,11 +2024,7 @@
 
 void swap(NamespaceNotEmptyException &a, NamespaceNotEmptyException &b);
 
-inline std::ostream& operator<<(std::ostream& out, const NamespaceNotEmptyException& obj)
-{
-  obj.printTo(out);
-  return out;
-}
+std::ostream& operator<<(std::ostream& out, const NamespaceNotEmptyException& obj);
 
 } // namespace
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java b/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
index 2292638..997dc6d 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class AccumuloException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AccumuloException, AccumuloException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccumuloException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java b/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
index 518146b..23b5b9a 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class AccumuloProxy {
 
   public interface Iface {
@@ -434,7 +434,7 @@
 
   }
 
-  public static class Client extends org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
+  public static class Client extends org.apache.thrift.TServiceClient implements Iface {
     public static class Factory implements org.apache.thrift.TServiceClientFactory<Client> {
       public Factory() {}
       public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -7374,6 +7374,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public login_result getResult(I iface, login_args args) throws org.apache.thrift.TException {
         login_result result = new login_result();
         try {
@@ -7398,6 +7403,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public addConstraint_result getResult(I iface, addConstraint_args args) throws org.apache.thrift.TException {
         addConstraint_result result = new addConstraint_result();
         try {
@@ -7427,6 +7437,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public addSplits_result getResult(I iface, addSplits_args args) throws org.apache.thrift.TException {
         addSplits_result result = new addSplits_result();
         try {
@@ -7455,6 +7470,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public attachIterator_result getResult(I iface, attachIterator_args args) throws org.apache.thrift.TException {
         attachIterator_result result = new attachIterator_result();
         try {
@@ -7483,6 +7503,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public checkIteratorConflicts_result getResult(I iface, checkIteratorConflicts_args args) throws org.apache.thrift.TException {
         checkIteratorConflicts_result result = new checkIteratorConflicts_result();
         try {
@@ -7511,6 +7536,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public clearLocatorCache_result getResult(I iface, clearLocatorCache_args args) throws org.apache.thrift.TException {
         clearLocatorCache_result result = new clearLocatorCache_result();
         try {
@@ -7535,6 +7565,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public cloneTable_result getResult(I iface, cloneTable_args args) throws org.apache.thrift.TException {
         cloneTable_result result = new cloneTable_result();
         try {
@@ -7565,6 +7600,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public compactTable_result getResult(I iface, compactTable_args args) throws org.apache.thrift.TException {
         compactTable_result result = new compactTable_result();
         try {
@@ -7593,6 +7633,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public cancelCompaction_result getResult(I iface, cancelCompaction_args args) throws org.apache.thrift.TException {
         cancelCompaction_result result = new cancelCompaction_result();
         try {
@@ -7621,6 +7666,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createTable_result getResult(I iface, createTable_args args) throws org.apache.thrift.TException {
         createTable_result result = new createTable_result();
         try {
@@ -7649,6 +7699,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public deleteTable_result getResult(I iface, deleteTable_args args) throws org.apache.thrift.TException {
         deleteTable_result result = new deleteTable_result();
         try {
@@ -7677,6 +7732,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public deleteRows_result getResult(I iface, deleteRows_args args) throws org.apache.thrift.TException {
         deleteRows_result result = new deleteRows_result();
         try {
@@ -7705,6 +7765,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public exportTable_result getResult(I iface, exportTable_args args) throws org.apache.thrift.TException {
         exportTable_result result = new exportTable_result();
         try {
@@ -7733,6 +7798,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public flushTable_result getResult(I iface, flushTable_args args) throws org.apache.thrift.TException {
         flushTable_result result = new flushTable_result();
         try {
@@ -7761,6 +7831,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getDiskUsage_result getResult(I iface, getDiskUsage_args args) throws org.apache.thrift.TException {
         getDiskUsage_result result = new getDiskUsage_result();
         try {
@@ -7789,6 +7864,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getLocalityGroups_result getResult(I iface, getLocalityGroups_args args) throws org.apache.thrift.TException {
         getLocalityGroups_result result = new getLocalityGroups_result();
         try {
@@ -7817,6 +7897,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getIteratorSetting_result getResult(I iface, getIteratorSetting_args args) throws org.apache.thrift.TException {
         getIteratorSetting_result result = new getIteratorSetting_result();
         try {
@@ -7845,6 +7930,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getMaxRow_result getResult(I iface, getMaxRow_args args) throws org.apache.thrift.TException {
         getMaxRow_result result = new getMaxRow_result();
         try {
@@ -7873,6 +7963,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getTableProperties_result getResult(I iface, getTableProperties_args args) throws org.apache.thrift.TException {
         getTableProperties_result result = new getTableProperties_result();
         try {
@@ -7901,6 +7996,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public importDirectory_result getResult(I iface, importDirectory_args args) throws org.apache.thrift.TException {
         importDirectory_result result = new importDirectory_result();
         try {
@@ -7929,6 +8029,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public importTable_result getResult(I iface, importTable_args args) throws org.apache.thrift.TException {
         importTable_result result = new importTable_result();
         try {
@@ -7957,6 +8062,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listSplits_result getResult(I iface, listSplits_args args) throws org.apache.thrift.TException {
         listSplits_result result = new listSplits_result();
         try {
@@ -7985,6 +8095,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listTables_result getResult(I iface, listTables_args args) throws org.apache.thrift.TException {
         listTables_result result = new listTables_result();
         result.success = iface.listTables(args.login);
@@ -8005,6 +8120,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listIterators_result getResult(I iface, listIterators_args args) throws org.apache.thrift.TException {
         listIterators_result result = new listIterators_result();
         try {
@@ -8033,6 +8153,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listConstraints_result getResult(I iface, listConstraints_args args) throws org.apache.thrift.TException {
         listConstraints_result result = new listConstraints_result();
         try {
@@ -8061,6 +8186,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public mergeTablets_result getResult(I iface, mergeTablets_args args) throws org.apache.thrift.TException {
         mergeTablets_result result = new mergeTablets_result();
         try {
@@ -8089,6 +8219,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public offlineTable_result getResult(I iface, offlineTable_args args) throws org.apache.thrift.TException {
         offlineTable_result result = new offlineTable_result();
         try {
@@ -8117,6 +8252,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public onlineTable_result getResult(I iface, onlineTable_args args) throws org.apache.thrift.TException {
         onlineTable_result result = new onlineTable_result();
         try {
@@ -8145,6 +8285,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeConstraint_result getResult(I iface, removeConstraint_args args) throws org.apache.thrift.TException {
         removeConstraint_result result = new removeConstraint_result();
         try {
@@ -8173,6 +8318,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeIterator_result getResult(I iface, removeIterator_args args) throws org.apache.thrift.TException {
         removeIterator_result result = new removeIterator_result();
         try {
@@ -8201,6 +8351,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeTableProperty_result getResult(I iface, removeTableProperty_args args) throws org.apache.thrift.TException {
         removeTableProperty_result result = new removeTableProperty_result();
         try {
@@ -8229,6 +8384,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public renameTable_result getResult(I iface, renameTable_args args) throws org.apache.thrift.TException {
         renameTable_result result = new renameTable_result();
         try {
@@ -8259,6 +8419,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setLocalityGroups_result getResult(I iface, setLocalityGroups_args args) throws org.apache.thrift.TException {
         setLocalityGroups_result result = new setLocalityGroups_result();
         try {
@@ -8287,6 +8452,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setTableProperty_result getResult(I iface, setTableProperty_args args) throws org.apache.thrift.TException {
         setTableProperty_result result = new setTableProperty_result();
         try {
@@ -8315,6 +8485,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public splitRangeByTablets_result getResult(I iface, splitRangeByTablets_args args) throws org.apache.thrift.TException {
         splitRangeByTablets_result result = new splitRangeByTablets_result();
         try {
@@ -8343,6 +8518,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public tableExists_result getResult(I iface, tableExists_args args) throws org.apache.thrift.TException {
         tableExists_result result = new tableExists_result();
         result.success = iface.tableExists(args.login, args.tableName);
@@ -8364,6 +8544,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public tableIdMap_result getResult(I iface, tableIdMap_args args) throws org.apache.thrift.TException {
         tableIdMap_result result = new tableIdMap_result();
         result.success = iface.tableIdMap(args.login);
@@ -8384,6 +8569,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public testTableClassLoad_result getResult(I iface, testTableClassLoad_args args) throws org.apache.thrift.TException {
         testTableClassLoad_result result = new testTableClassLoad_result();
         try {
@@ -8413,6 +8603,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public pingTabletServer_result getResult(I iface, pingTabletServer_args args) throws org.apache.thrift.TException {
         pingTabletServer_result result = new pingTabletServer_result();
         try {
@@ -8439,6 +8634,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getActiveScans_result getResult(I iface, getActiveScans_args args) throws org.apache.thrift.TException {
         getActiveScans_result result = new getActiveScans_result();
         try {
@@ -8465,6 +8665,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getActiveCompactions_result getResult(I iface, getActiveCompactions_args args) throws org.apache.thrift.TException {
         getActiveCompactions_result result = new getActiveCompactions_result();
         try {
@@ -8491,6 +8696,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getSiteConfiguration_result getResult(I iface, getSiteConfiguration_args args) throws org.apache.thrift.TException {
         getSiteConfiguration_result result = new getSiteConfiguration_result();
         try {
@@ -8517,6 +8727,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getSystemConfiguration_result getResult(I iface, getSystemConfiguration_args args) throws org.apache.thrift.TException {
         getSystemConfiguration_result result = new getSystemConfiguration_result();
         try {
@@ -8543,6 +8758,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getTabletServers_result getResult(I iface, getTabletServers_args args) throws org.apache.thrift.TException {
         getTabletServers_result result = new getTabletServers_result();
         result.success = iface.getTabletServers(args.login);
@@ -8563,6 +8783,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeProperty_result getResult(I iface, removeProperty_args args) throws org.apache.thrift.TException {
         removeProperty_result result = new removeProperty_result();
         try {
@@ -8589,6 +8814,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setProperty_result getResult(I iface, setProperty_args args) throws org.apache.thrift.TException {
         setProperty_result result = new setProperty_result();
         try {
@@ -8615,6 +8845,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public testClassLoad_result getResult(I iface, testClassLoad_args args) throws org.apache.thrift.TException {
         testClassLoad_result result = new testClassLoad_result();
         try {
@@ -8642,6 +8877,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public authenticateUser_result getResult(I iface, authenticateUser_args args) throws org.apache.thrift.TException {
         authenticateUser_result result = new authenticateUser_result();
         try {
@@ -8669,6 +8909,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public changeUserAuthorizations_result getResult(I iface, changeUserAuthorizations_args args) throws org.apache.thrift.TException {
         changeUserAuthorizations_result result = new changeUserAuthorizations_result();
         try {
@@ -8695,6 +8940,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public changeLocalUserPassword_result getResult(I iface, changeLocalUserPassword_args args) throws org.apache.thrift.TException {
         changeLocalUserPassword_result result = new changeLocalUserPassword_result();
         try {
@@ -8721,6 +8971,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createLocalUser_result getResult(I iface, createLocalUser_args args) throws org.apache.thrift.TException {
         createLocalUser_result result = new createLocalUser_result();
         try {
@@ -8747,6 +9002,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public dropLocalUser_result getResult(I iface, dropLocalUser_args args) throws org.apache.thrift.TException {
         dropLocalUser_result result = new dropLocalUser_result();
         try {
@@ -8773,6 +9033,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getUserAuthorizations_result getResult(I iface, getUserAuthorizations_args args) throws org.apache.thrift.TException {
         getUserAuthorizations_result result = new getUserAuthorizations_result();
         try {
@@ -8799,6 +9064,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantSystemPermission_result getResult(I iface, grantSystemPermission_args args) throws org.apache.thrift.TException {
         grantSystemPermission_result result = new grantSystemPermission_result();
         try {
@@ -8825,6 +9095,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantTablePermission_result getResult(I iface, grantTablePermission_args args) throws org.apache.thrift.TException {
         grantTablePermission_result result = new grantTablePermission_result();
         try {
@@ -8853,6 +9128,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasSystemPermission_result getResult(I iface, hasSystemPermission_args args) throws org.apache.thrift.TException {
         hasSystemPermission_result result = new hasSystemPermission_result();
         try {
@@ -8880,6 +9160,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasTablePermission_result getResult(I iface, hasTablePermission_args args) throws org.apache.thrift.TException {
         hasTablePermission_result result = new hasTablePermission_result();
         try {
@@ -8909,6 +9194,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listLocalUsers_result getResult(I iface, listLocalUsers_args args) throws org.apache.thrift.TException {
         listLocalUsers_result result = new listLocalUsers_result();
         try {
@@ -8937,6 +9227,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeSystemPermission_result getResult(I iface, revokeSystemPermission_args args) throws org.apache.thrift.TException {
         revokeSystemPermission_result result = new revokeSystemPermission_result();
         try {
@@ -8963,6 +9258,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeTablePermission_result getResult(I iface, revokeTablePermission_args args) throws org.apache.thrift.TException {
         revokeTablePermission_result result = new revokeTablePermission_result();
         try {
@@ -8991,6 +9291,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public grantNamespacePermission_result getResult(I iface, grantNamespacePermission_args args) throws org.apache.thrift.TException {
         grantNamespacePermission_result result = new grantNamespacePermission_result();
         try {
@@ -9017,6 +9322,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasNamespacePermission_result getResult(I iface, hasNamespacePermission_args args) throws org.apache.thrift.TException {
         hasNamespacePermission_result result = new hasNamespacePermission_result();
         try {
@@ -9044,6 +9354,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public revokeNamespacePermission_result getResult(I iface, revokeNamespacePermission_args args) throws org.apache.thrift.TException {
         revokeNamespacePermission_result result = new revokeNamespacePermission_result();
         try {
@@ -9070,6 +9385,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createBatchScanner_result getResult(I iface, createBatchScanner_args args) throws org.apache.thrift.TException {
         createBatchScanner_result result = new createBatchScanner_result();
         try {
@@ -9098,6 +9418,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createScanner_result getResult(I iface, createScanner_args args) throws org.apache.thrift.TException {
         createScanner_result result = new createScanner_result();
         try {
@@ -9126,6 +9451,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public hasNext_result getResult(I iface, hasNext_args args) throws org.apache.thrift.TException {
         hasNext_result result = new hasNext_result();
         try {
@@ -9151,6 +9481,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public nextEntry_result getResult(I iface, nextEntry_args args) throws org.apache.thrift.TException {
         nextEntry_result result = new nextEntry_result();
         try {
@@ -9179,6 +9514,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public nextK_result getResult(I iface, nextK_args args) throws org.apache.thrift.TException {
         nextK_result result = new nextK_result();
         try {
@@ -9207,6 +9547,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public closeScanner_result getResult(I iface, closeScanner_args args) throws org.apache.thrift.TException {
         closeScanner_result result = new closeScanner_result();
         try {
@@ -9231,6 +9576,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public updateAndFlush_result getResult(I iface, updateAndFlush_args args) throws org.apache.thrift.TException {
         updateAndFlush_result result = new updateAndFlush_result();
         try {
@@ -9261,6 +9611,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createWriter_result getResult(I iface, createWriter_args args) throws org.apache.thrift.TException {
         createWriter_result result = new createWriter_result();
         try {
@@ -9289,6 +9644,11 @@
         return true;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public org.apache.thrift.TBase getResult(I iface, update_args args) throws org.apache.thrift.TException {
         iface.update(args.writer, args.cells);
         return null;
@@ -9308,6 +9668,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public flush_result getResult(I iface, flush_args args) throws org.apache.thrift.TException {
         flush_result result = new flush_result();
         try {
@@ -9334,6 +9699,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public closeWriter_result getResult(I iface, closeWriter_args args) throws org.apache.thrift.TException {
         closeWriter_result result = new closeWriter_result();
         try {
@@ -9360,6 +9730,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public updateRowConditionally_result getResult(I iface, updateRowConditionally_args args) throws org.apache.thrift.TException {
         updateRowConditionally_result result = new updateRowConditionally_result();
         try {
@@ -9388,6 +9763,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createConditionalWriter_result getResult(I iface, createConditionalWriter_args args) throws org.apache.thrift.TException {
         createConditionalWriter_result result = new createConditionalWriter_result();
         try {
@@ -9416,6 +9796,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public updateRowsConditionally_result getResult(I iface, updateRowsConditionally_args args) throws org.apache.thrift.TException {
         updateRowsConditionally_result result = new updateRowsConditionally_result();
         try {
@@ -9444,6 +9829,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public closeConditionalWriter_result getResult(I iface, closeConditionalWriter_args args) throws org.apache.thrift.TException {
         closeConditionalWriter_result result = new closeConditionalWriter_result();
         iface.closeConditionalWriter(args.conditionalWriter);
@@ -9464,6 +9854,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getRowRange_result getResult(I iface, getRowRange_args args) throws org.apache.thrift.TException {
         getRowRange_result result = new getRowRange_result();
         result.success = iface.getRowRange(args.row);
@@ -9484,6 +9879,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getFollowing_result getResult(I iface, getFollowing_args args) throws org.apache.thrift.TException {
         getFollowing_result result = new getFollowing_result();
         result.success = iface.getFollowing(args.key, args.part);
@@ -9504,6 +9904,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public systemNamespace_result getResult(I iface, systemNamespace_args args) throws org.apache.thrift.TException {
         systemNamespace_result result = new systemNamespace_result();
         result.success = iface.systemNamespace();
@@ -9524,6 +9929,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public defaultNamespace_result getResult(I iface, defaultNamespace_args args) throws org.apache.thrift.TException {
         defaultNamespace_result result = new defaultNamespace_result();
         result.success = iface.defaultNamespace();
@@ -9544,6 +9954,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listNamespaces_result getResult(I iface, listNamespaces_args args) throws org.apache.thrift.TException {
         listNamespaces_result result = new listNamespaces_result();
         try {
@@ -9570,6 +9985,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public namespaceExists_result getResult(I iface, namespaceExists_args args) throws org.apache.thrift.TException {
         namespaceExists_result result = new namespaceExists_result();
         try {
@@ -9597,6 +10017,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public createNamespace_result getResult(I iface, createNamespace_args args) throws org.apache.thrift.TException {
         createNamespace_result result = new createNamespace_result();
         try {
@@ -9625,6 +10050,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public deleteNamespace_result getResult(I iface, deleteNamespace_args args) throws org.apache.thrift.TException {
         deleteNamespace_result result = new deleteNamespace_result();
         try {
@@ -9655,6 +10085,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public renameNamespace_result getResult(I iface, renameNamespace_args args) throws org.apache.thrift.TException {
         renameNamespace_result result = new renameNamespace_result();
         try {
@@ -9685,6 +10120,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public setNamespaceProperty_result getResult(I iface, setNamespaceProperty_args args) throws org.apache.thrift.TException {
         setNamespaceProperty_result result = new setNamespaceProperty_result();
         try {
@@ -9713,6 +10153,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeNamespaceProperty_result getResult(I iface, removeNamespaceProperty_args args) throws org.apache.thrift.TException {
         removeNamespaceProperty_result result = new removeNamespaceProperty_result();
         try {
@@ -9741,6 +10186,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getNamespaceProperties_result getResult(I iface, getNamespaceProperties_args args) throws org.apache.thrift.TException {
         getNamespaceProperties_result result = new getNamespaceProperties_result();
         try {
@@ -9769,6 +10219,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public namespaceIdMap_result getResult(I iface, namespaceIdMap_args args) throws org.apache.thrift.TException {
         namespaceIdMap_result result = new namespaceIdMap_result();
         try {
@@ -9795,6 +10250,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public attachNamespaceIterator_result getResult(I iface, attachNamespaceIterator_args args) throws org.apache.thrift.TException {
         attachNamespaceIterator_result result = new attachNamespaceIterator_result();
         try {
@@ -9823,6 +10283,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeNamespaceIterator_result getResult(I iface, removeNamespaceIterator_args args) throws org.apache.thrift.TException {
         removeNamespaceIterator_result result = new removeNamespaceIterator_result();
         try {
@@ -9851,6 +10316,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public getNamespaceIteratorSetting_result getResult(I iface, getNamespaceIteratorSetting_args args) throws org.apache.thrift.TException {
         getNamespaceIteratorSetting_result result = new getNamespaceIteratorSetting_result();
         try {
@@ -9879,6 +10349,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listNamespaceIterators_result getResult(I iface, listNamespaceIterators_args args) throws org.apache.thrift.TException {
         listNamespaceIterators_result result = new listNamespaceIterators_result();
         try {
@@ -9907,6 +10382,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public checkNamespaceIteratorConflicts_result getResult(I iface, checkNamespaceIteratorConflicts_args args) throws org.apache.thrift.TException {
         checkNamespaceIteratorConflicts_result result = new checkNamespaceIteratorConflicts_result();
         try {
@@ -9935,6 +10415,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public addNamespaceConstraint_result getResult(I iface, addNamespaceConstraint_args args) throws org.apache.thrift.TException {
         addNamespaceConstraint_result result = new addNamespaceConstraint_result();
         try {
@@ -9964,6 +10449,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public removeNamespaceConstraint_result getResult(I iface, removeNamespaceConstraint_args args) throws org.apache.thrift.TException {
         removeNamespaceConstraint_result result = new removeNamespaceConstraint_result();
         try {
@@ -9992,6 +10482,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public listNamespaceConstraints_result getResult(I iface, listNamespaceConstraints_args args) throws org.apache.thrift.TException {
         listNamespaceConstraints_result result = new listNamespaceConstraints_result();
         try {
@@ -10020,6 +10515,11 @@
         return false;
       }
 
+      @Override
+      protected boolean handleRuntimeExceptions() {
+        return true;
+      }
+
       public testNamespaceClassLoad_result getResult(I iface, testNamespaceClassLoad_args args) throws org.apache.thrift.TException {
         testNamespaceClassLoad_result result = new testNamespaceClassLoad_result();
         try {
@@ -20758,7 +21258,7 @@
         this.setting = new IteratorSetting(other.setting);
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -20870,7 +21370,7 @@
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -21228,12 +21728,15 @@
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set182 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set182.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem183;
                   for (int _i184 = 0; _i184 < _set182.size; ++_i184)
                   {
                     _elem183 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem183);
+                    if (_elem183 != null)
+                    {
+                      struct.scopes.add(_elem183);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -21355,12 +21858,15 @@
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set187 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set187.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem188;
             for (int _i189 = 0; _i189 < _set187.size; ++_i189)
             {
               _elem188 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem188);
+              if (_elem188 != null)
+              {
+                struct.scopes.add(_elem188);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -22079,7 +22585,7 @@
         this.setting = new IteratorSetting(other.setting);
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -22191,7 +22697,7 @@
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -22549,12 +23055,15 @@
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set190 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set190.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem191;
                   for (int _i192 = 0; _i192 < _set190.size; ++_i192)
                   {
                     _elem191 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem191);
+                    if (_elem191 != null)
+                    {
+                      struct.scopes.add(_elem191);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -22676,12 +23185,15 @@
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set195 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set195.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem196;
             for (int _i197 = 0; _i197 < _set195.size; ++_i197)
             {
               _elem196 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem196);
+              if (_elem196 != null)
+              {
+                struct.scopes.add(_elem196);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -46886,7 +47398,7 @@
 
           java.lang.String __this__success_copy_key = other_element_key;
 
-          java.util.Set<IteratorScope> __this__success_copy_value = new java.util.HashSet<IteratorScope>(other_element_value.size());
+          java.util.Set<IteratorScope> __this__success_copy_value = java.util.EnumSet.noneOf(IteratorScope.class);
           for (IteratorScope other_element_value_element : other_element_value) {
             __this__success_copy_value.add(other_element_value_element);
           }
@@ -47330,12 +47842,15 @@
                     _key293 = iprot.readString();
                     {
                       org.apache.thrift.protocol.TSet _set296 = iprot.readSetBegin();
-                      _val294 = new java.util.HashSet<IteratorScope>(2*_set296.size);
+                      _val294 = java.util.EnumSet.noneOf(IteratorScope.class);
                       IteratorScope _elem297;
                       for (int _i298 = 0; _i298 < _set296.size; ++_i298)
                       {
                         _elem297 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                        _val294.add(_elem297);
+                        if (_elem297 != null)
+                        {
+                          _val294.add(_elem297);
+                        }
                       }
                       iprot.readSetEnd();
                     }
@@ -47498,12 +48013,15 @@
               _key304 = iprot.readString();
               {
                 org.apache.thrift.protocol.TSet _set307 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-                _val305 = new java.util.HashSet<IteratorScope>(2*_set307.size);
+                _val305 = java.util.EnumSet.noneOf(IteratorScope.class);
                 IteratorScope _elem308;
                 for (int _i309 = 0; _i309 < _set307.size; ++_i309)
                 {
                   _elem308 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                  _val305.add(_elem308);
+                  if (_elem308 != null)
+                  {
+                    _val305.add(_elem308);
+                  }
                 }
               }
               struct.success.put(_key304, _val305);
@@ -53640,7 +54158,7 @@
         this.iterName = other.iterName;
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -53752,7 +54270,7 @@
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -54106,12 +54624,15 @@
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set320 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set320.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem321;
                   for (int _i322 = 0; _i322 < _set320.size; ++_i322)
                   {
                     _elem321 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem321);
+                    if (_elem321 != null)
+                    {
+                      struct.scopes.add(_elem321);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -54232,12 +54753,15 @@
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set325 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set325.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem326;
             for (int _i327 = 0; _i327 < _set325.size; ++_i327)
             {
               _elem326 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem326);
+              if (_elem326 != null)
+              {
+                struct.scopes.add(_elem326);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -120626,7 +121150,7 @@
         this.setting = new IteratorSetting(other.setting);
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -120738,7 +121262,7 @@
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -121096,12 +121620,15 @@
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set526 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set526.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem527;
                   for (int _i528 = 0; _i528 < _set526.size; ++_i528)
                   {
                     _elem527 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem527);
+                    if (_elem527 != null)
+                    {
+                      struct.scopes.add(_elem527);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -121223,12 +121750,15 @@
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set531 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set531.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem532;
             for (int _i533 = 0; _i533 < _set531.size; ++_i533)
             {
               _elem532 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem532);
+              if (_elem532 != null)
+              {
+                struct.scopes.add(_elem532);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -121947,7 +122477,7 @@
         this.name = other.name;
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -122059,7 +122589,7 @@
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -122413,12 +122943,15 @@
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set534 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set534.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem535;
                   for (int _i536 = 0; _i536 < _set534.size; ++_i536)
                   {
                     _elem535 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem535);
+                    if (_elem535 != null)
+                    {
+                      struct.scopes.add(_elem535);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -122539,12 +123072,15 @@
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set539 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set539.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem540;
             for (int _i541 = 0; _i541 < _set539.size; ++_i541)
             {
               _elem540 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem540);
+              if (_elem540 != null)
+              {
+                struct.scopes.add(_elem540);
+              }
             }
           }
           struct.setScopesIsSet(true);
@@ -125133,7 +125669,7 @@
 
           java.lang.String __this__success_copy_key = other_element_key;
 
-          java.util.Set<IteratorScope> __this__success_copy_value = new java.util.HashSet<IteratorScope>(other_element_value.size());
+          java.util.Set<IteratorScope> __this__success_copy_value = java.util.EnumSet.noneOf(IteratorScope.class);
           for (IteratorScope other_element_value_element : other_element_value) {
             __this__success_copy_value.add(other_element_value_element);
           }
@@ -125577,12 +126113,15 @@
                     _key543 = iprot.readString();
                     {
                       org.apache.thrift.protocol.TSet _set546 = iprot.readSetBegin();
-                      _val544 = new java.util.HashSet<IteratorScope>(2*_set546.size);
+                      _val544 = java.util.EnumSet.noneOf(IteratorScope.class);
                       IteratorScope _elem547;
                       for (int _i548 = 0; _i548 < _set546.size; ++_i548)
                       {
                         _elem547 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                        _val544.add(_elem547);
+                        if (_elem547 != null)
+                        {
+                          _val544.add(_elem547);
+                        }
                       }
                       iprot.readSetEnd();
                     }
@@ -125745,12 +126284,15 @@
               _key554 = iprot.readString();
               {
                 org.apache.thrift.protocol.TSet _set557 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-                _val555 = new java.util.HashSet<IteratorScope>(2*_set557.size);
+                _val555 = java.util.EnumSet.noneOf(IteratorScope.class);
                 IteratorScope _elem558;
                 for (int _i559 = 0; _i559 < _set557.size; ++_i559)
                 {
                   _elem558 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                  _val555.add(_elem558);
+                  if (_elem558 != null)
+                  {
+                    _val555.add(_elem558);
+                  }
                 }
               }
               struct.success.put(_key554, _val555);
@@ -125911,7 +126453,7 @@
         this.setting = new IteratorSetting(other.setting);
       }
       if (other.isSetScopes()) {
-        java.util.Set<IteratorScope> __this__scopes = new java.util.HashSet<IteratorScope>(other.scopes.size());
+        java.util.Set<IteratorScope> __this__scopes = java.util.EnumSet.noneOf(IteratorScope.class);
         for (IteratorScope other_element : other.scopes) {
           __this__scopes.add(other_element);
         }
@@ -126023,7 +126565,7 @@
 
     public void addToScopes(IteratorScope elem) {
       if (this.scopes == null) {
-        this.scopes = new java.util.HashSet<IteratorScope>();
+        this.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
       }
       this.scopes.add(elem);
     }
@@ -126381,12 +126923,15 @@
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
                   org.apache.thrift.protocol.TSet _set560 = iprot.readSetBegin();
-                  struct.scopes = new java.util.HashSet<IteratorScope>(2*_set560.size);
+                  struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
                   IteratorScope _elem561;
                   for (int _i562 = 0; _i562 < _set560.size; ++_i562)
                   {
                     _elem561 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem561);
+                    if (_elem561 != null)
+                    {
+                      struct.scopes.add(_elem561);
+                    }
                   }
                   iprot.readSetEnd();
                 }
@@ -126508,12 +127053,15 @@
         if (incoming.get(3)) {
           {
             org.apache.thrift.protocol.TSet _set565 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new java.util.HashSet<IteratorScope>(2*_set565.size);
+            struct.scopes = java.util.EnumSet.noneOf(IteratorScope.class);
             IteratorScope _elem566;
             for (int _i567 = 0; _i567 < _set565.size; ++_i567)
             {
               _elem566 = org.apache.accumulo.proxy.thrift.IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem566);
+              if (_elem566 != null)
+              {
+                struct.scopes.add(_elem566);
+              }
             }
           }
           struct.setScopesIsSet(true);

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java b/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
index 7ac823d..79af0df 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class AccumuloSecurityException extends org.apache.thrift.TException implements org.apache.thrift.TBase<AccumuloSecurityException, AccumuloSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloSecurityException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccumuloSecurityException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java b/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
index 8ef3a9d..8017f32 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompaction, ActiveCompaction._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveCompaction> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveCompaction");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java b/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
index 66c8cc8..c7bb09e 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveScan");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java b/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
index 8b9e20f..655ff0b 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOptions, BatchScanOptions._Fields>, java.io.Serializable, Cloneable, Comparable<BatchScanOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchScanOptions");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/Column.java b/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
index 7220637..fe5848b 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/Column.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class Column implements org.apache.thrift.TBase<Column, Column._Fields>, java.io.Serializable, Cloneable, Comparable<Column> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Column");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java b/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
index f655f46..08e8d40 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, ColumnUpdate._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnUpdate> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnUpdate");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java b/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
index b4b3255..06c5812 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum CompactionReason implements org.apache.thrift.TEnum {
   USER(0),
   SYSTEM(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java b/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
index 03c0688..0260db0 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class CompactionStrategyConfig implements org.apache.thrift.TBase<CompactionStrategyConfig, CompactionStrategyConfig._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionStrategyConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionStrategyConfig");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java b/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
index da93702..d795c25 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum CompactionType implements org.apache.thrift.TEnum {
   MINOR(0),
   MERGE(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java b/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
index ac4aef4..d250574 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class Condition implements org.apache.thrift.TBase<Condition, Condition._Fields>, java.io.Serializable, Cloneable, Comparable<Condition> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Condition");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java b/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
index 6e5c1c3..d9e352a 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum ConditionalStatus implements org.apache.thrift.TEnum {
   ACCEPTED(0),
   REJECTED(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java b/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
index a573685..5a04964 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUpdates, ConditionalUpdates._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalUpdates> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConditionalUpdates");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java b/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
index cd3ce5d..9ef029f 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ConditionalWriterOptions implements org.apache.thrift.TBase<ConditionalWriterOptions, ConditionalWriterOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalWriterOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConditionalWriterOptions");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java b/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
index f66a93c..306df74 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<DiskUsage> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DiskUsage");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java b/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
index 8f685df..dedfcc0 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum Durability implements org.apache.thrift.TEnum {
   DEFAULT(0),
   NONE(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java b/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
index 8ab316f..1b151e1 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum IteratorScope implements org.apache.thrift.TEnum {
   MINC(0),
   MAJC(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java b/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
index dec8c0a..4061fbb 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting, IteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorSetting> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IteratorSetting");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/Key.java b/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
index d935c9a..c0963b5 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/Key.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class Key implements org.apache.thrift.TBase<Key, Key._Fields>, java.io.Serializable, Cloneable, Comparable<Key> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Key");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java b/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
index 8df1b9e..d34aef2 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class KeyExtent implements org.apache.thrift.TBase<KeyExtent, KeyExtent._Fields>, java.io.Serializable, Cloneable, Comparable<KeyExtent> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyExtent");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java b/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
index 0f87c09..3cd8776 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class KeyValue implements org.apache.thrift.TBase<KeyValue, KeyValue._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValue> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyValue");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java b/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
index 2d121da..c5bd169 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/KeyValueAndPeek.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class KeyValueAndPeek implements org.apache.thrift.TBase<KeyValueAndPeek, KeyValueAndPeek._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValueAndPeek> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyValueAndPeek");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java b/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java
index c1532ba..b534c10 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/MutationsRejectedException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class MutationsRejectedException extends org.apache.thrift.TException implements org.apache.thrift.TBase<MutationsRejectedException, MutationsRejectedException._Fields>, java.io.Serializable, Cloneable, Comparable<MutationsRejectedException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MutationsRejectedException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java b/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
index a8148d2..eade4b9 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class NamespaceExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceExistsException, NamespaceExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceExistsException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceExistsException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java b/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java
index 1927347..478dd92 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotEmptyException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class NamespaceNotEmptyException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceNotEmptyException, NamespaceNotEmptyException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceNotEmptyException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceNotEmptyException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java b/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java
index 894e0af..1a93e57 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceNotFoundException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class NamespaceNotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NamespaceNotFoundException, NamespaceNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<NamespaceNotFoundException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NamespaceNotFoundException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java b/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java
index 9a831a4..a49f127 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/NamespacePermission.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum NamespacePermission implements org.apache.thrift.TEnum {
   READ(0),
   WRITE(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java b/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java
index f28e747..8ba03bb 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/NoMoreEntriesException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class NoMoreEntriesException extends org.apache.thrift.TException implements org.apache.thrift.TBase<NoMoreEntriesException, NoMoreEntriesException._Fields>, java.io.Serializable, Cloneable, Comparable<NoMoreEntriesException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoMoreEntriesException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java b/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java
index 11be665..4958f14 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/PartialKey.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum PartialKey implements org.apache.thrift.TEnum {
   ROW(0),
   ROW_COLFAM(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/Range.java b/src/main/java/org/apache/accumulo/proxy/thrift/Range.java
index 92c6172..188a894 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/Range.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/Range.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class Range implements org.apache.thrift.TBase<Range, Range._Fields>, java.io.Serializable, Cloneable, Comparable<Range> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Range");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java b/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
index 1eb2b48..774c4a0 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ScanColumn implements org.apache.thrift.TBase<ScanColumn, ScanColumn._Fields>, java.io.Serializable, Cloneable, Comparable<ScanColumn> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanColumn");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java b/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
index 08224f9..dbcbf5f 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ScanOptions.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ScanOptions implements org.apache.thrift.TBase<ScanOptions, ScanOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ScanOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanOptions");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java b/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
index f5551cc..a8d1ece 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ScanResult.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class ScanResult implements org.apache.thrift.TBase<ScanResult, ScanResult._Fields>, java.io.Serializable, Cloneable, Comparable<ScanResult> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ScanResult");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java b/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java
index 17d390d..c186e3f 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ScanState.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum ScanState implements org.apache.thrift.TEnum {
   IDLE(0),
   RUNNING(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java b/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java
index 0082b71..436d6c7 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/ScanType.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum ScanType implements org.apache.thrift.TEnum {
   SINGLE(0),
   BATCH(1);

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java b/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
index 27551a9..4964ef3 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum SystemPermission implements org.apache.thrift.TEnum {
   GRANT(0),
   CREATE_TABLE(1),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java b/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java
index 3162458..e0729e1 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/TableExistsException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class TableExistsException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TableExistsException, TableExistsException._Fields>, java.io.Serializable, Cloneable, Comparable<TableExistsException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableExistsException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java b/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
index 1bc9529..29f6229 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class TableNotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TableNotFoundException, TableNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<TableNotFoundException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableNotFoundException");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java b/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java
index c969452..e63cbd2 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/TablePermission.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum TablePermission implements org.apache.thrift.TEnum {
   READ(2),
   WRITE(3),

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java b/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
index 26ebb62..b04579f 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/TimeType.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,6 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-
 public enum TimeType implements org.apache.thrift.TEnum {
   LOGICAL(0),
   MILLIS(1);

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java b/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
index 82ea224..466f409 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/UnknownScanner.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class UnknownScanner extends org.apache.thrift.TException implements org.apache.thrift.TBase<UnknownScanner, UnknownScanner._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownScanner> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownScanner");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java b/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
index 8a7969c..c7ad84b 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/UnknownWriter.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class UnknownWriter extends org.apache.thrift.TException implements org.apache.thrift.TBase<UnknownWriter, UnknownWriter._Fields>, java.io.Serializable, Cloneable, Comparable<UnknownWriter> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnknownWriter");
 

diff --git a/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java b/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java
index 25b48a8..25e1ddf 100644
--- a/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java
+++ b/src/main/java/org/apache/accumulo/proxy/thrift/WriterOptions.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.10.0)
+ * Autogenerated by Thrift Compiler (0.11.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,7 +23,7 @@
 package org.apache.accumulo.proxy.thrift;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.11.0)")
 public class WriterOptions implements org.apache.thrift.TBase<WriterOptions, WriterOptions._Fields>, java.io.Serializable, Cloneable, Comparable<WriterOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WriterOptions");
 

diff --git a/src/main/python/AccumuloProxy-remote b/src/main/python/AccumuloProxy-remote
index a98dd67..47d7ab9 100644
--- a/src/main/python/AccumuloProxy-remote
+++ b/src/main/python/AccumuloProxy-remote

@@ -14,7 +14,7 @@
 # limitations under the License.
 #!/usr/bin/env python
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

diff --git a/src/main/python/AccumuloProxy.py b/src/main/python/AccumuloProxy.py
index ea6e63a..835a80b 100644
--- a/src/main/python/AccumuloProxy.py
+++ b/src/main/python/AccumuloProxy.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -22,11 +22,14 @@
 
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+
 import sys
 import logging
 from .ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
+all_structs = []
 
 
 class Iface(object):
@@ -4854,14 +4857,18 @@
         try:
             result.success = self._handler.login(args.principal, args.loginProperties)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("login", msg_type, seqid)
         result.write(oprot)
@@ -4876,7 +4883,7 @@
         try:
             result.success = self._handler.addConstraint(args.login, args.tableName, args.constraintClassName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -4887,9 +4894,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("addConstraint", msg_type, seqid)
         result.write(oprot)
@@ -4904,7 +4915,7 @@
         try:
             self._handler.addSplits(args.login, args.tableName, args.splits)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -4915,9 +4926,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("addSplits", msg_type, seqid)
         result.write(oprot)
@@ -4932,7 +4947,7 @@
         try:
             self._handler.attachIterator(args.login, args.tableName, args.setting, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch1:
             msg_type = TMessageType.REPLY
@@ -4943,9 +4958,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("attachIterator", msg_type, seqid)
         result.write(oprot)
@@ -4960,7 +4979,7 @@
         try:
             self._handler.checkIteratorConflicts(args.login, args.tableName, args.setting, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch1:
             msg_type = TMessageType.REPLY
@@ -4971,9 +4990,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("checkIteratorConflicts", msg_type, seqid)
         result.write(oprot)
@@ -4988,14 +5011,18 @@
         try:
             self._handler.clearLocatorCache(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except TableNotFoundException as ouch1:
             msg_type = TMessageType.REPLY
             result.ouch1 = ouch1
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("clearLocatorCache", msg_type, seqid)
         result.write(oprot)
@@ -5010,7 +5037,7 @@
         try:
             self._handler.cloneTable(args.login, args.tableName, args.newTableName, args.flush, args.propertiesToSet, args.propertiesToExclude)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5024,9 +5051,13 @@
         except TableExistsException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("cloneTable", msg_type, seqid)
         result.write(oprot)
@@ -5041,7 +5072,7 @@
         try:
             self._handler.compactTable(args.login, args.tableName, args.startRow, args.endRow, args.iterators, args.flush, args.wait, args.compactionStrategy)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5052,9 +5083,13 @@
         except AccumuloException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("compactTable", msg_type, seqid)
         result.write(oprot)
@@ -5069,7 +5104,7 @@
         try:
             self._handler.cancelCompaction(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloSecurityException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5080,9 +5115,13 @@
         except AccumuloException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("cancelCompaction", msg_type, seqid)
         result.write(oprot)
@@ -5097,7 +5136,7 @@
         try:
             self._handler.createTable(args.login, args.tableName, args.versioningIter, args.type)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5108,9 +5147,13 @@
         except TableExistsException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createTable", msg_type, seqid)
         result.write(oprot)
@@ -5125,7 +5168,7 @@
         try:
             self._handler.deleteTable(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5136,9 +5179,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("deleteTable", msg_type, seqid)
         result.write(oprot)
@@ -5153,7 +5200,7 @@
         try:
             self._handler.deleteRows(args.login, args.tableName, args.startRow, args.endRow)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5164,9 +5211,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("deleteRows", msg_type, seqid)
         result.write(oprot)
@@ -5181,7 +5232,7 @@
         try:
             self._handler.exportTable(args.login, args.tableName, args.exportDir)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5192,9 +5243,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("exportTable", msg_type, seqid)
         result.write(oprot)
@@ -5209,7 +5264,7 @@
         try:
             self._handler.flushTable(args.login, args.tableName, args.startRow, args.endRow, args.wait)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5220,9 +5275,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("flushTable", msg_type, seqid)
         result.write(oprot)
@@ -5237,7 +5296,7 @@
         try:
             result.success = self._handler.getDiskUsage(args.login, args.tables)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5248,9 +5307,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getDiskUsage", msg_type, seqid)
         result.write(oprot)
@@ -5265,7 +5328,7 @@
         try:
             result.success = self._handler.getLocalityGroups(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5276,9 +5339,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getLocalityGroups", msg_type, seqid)
         result.write(oprot)
@@ -5293,7 +5360,7 @@
         try:
             result.success = self._handler.getIteratorSetting(args.login, args.tableName, args.iteratorName, args.scope)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5304,9 +5371,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getIteratorSetting", msg_type, seqid)
         result.write(oprot)
@@ -5321,7 +5392,7 @@
         try:
             result.success = self._handler.getMaxRow(args.login, args.tableName, args.auths, args.startRow, args.startInclusive, args.endRow, args.endInclusive)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5332,9 +5403,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getMaxRow", msg_type, seqid)
         result.write(oprot)
@@ -5349,7 +5424,7 @@
         try:
             result.success = self._handler.getTableProperties(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5360,9 +5435,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getTableProperties", msg_type, seqid)
         result.write(oprot)
@@ -5377,7 +5456,7 @@
         try:
             self._handler.importDirectory(args.login, args.tableName, args.importDir, args.failureDir, args.setTime)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except TableNotFoundException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5388,9 +5467,13 @@
         except AccumuloSecurityException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("importDirectory", msg_type, seqid)
         result.write(oprot)
@@ -5405,7 +5488,7 @@
         try:
             self._handler.importTable(args.login, args.tableName, args.importDir)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except TableExistsException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5416,9 +5499,13 @@
         except AccumuloSecurityException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("importTable", msg_type, seqid)
         result.write(oprot)
@@ -5433,7 +5520,7 @@
         try:
             result.success = self._handler.listSplits(args.login, args.tableName, args.maxSplits)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5444,9 +5531,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listSplits", msg_type, seqid)
         result.write(oprot)
@@ -5461,11 +5552,15 @@
         try:
             result.success = self._handler.listTables(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listTables", msg_type, seqid)
         result.write(oprot)
@@ -5480,7 +5575,7 @@
         try:
             result.success = self._handler.listIterators(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5491,9 +5586,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listIterators", msg_type, seqid)
         result.write(oprot)
@@ -5508,7 +5607,7 @@
         try:
             result.success = self._handler.listConstraints(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5519,9 +5618,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listConstraints", msg_type, seqid)
         result.write(oprot)
@@ -5536,7 +5639,7 @@
         try:
             self._handler.mergeTablets(args.login, args.tableName, args.startRow, args.endRow)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5547,9 +5650,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("mergeTablets", msg_type, seqid)
         result.write(oprot)
@@ -5564,7 +5671,7 @@
         try:
             self._handler.offlineTable(args.login, args.tableName, args.wait)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5575,9 +5682,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("offlineTable", msg_type, seqid)
         result.write(oprot)
@@ -5592,7 +5703,7 @@
         try:
             self._handler.onlineTable(args.login, args.tableName, args.wait)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5603,9 +5714,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("onlineTable", msg_type, seqid)
         result.write(oprot)
@@ -5620,7 +5735,7 @@
         try:
             self._handler.removeConstraint(args.login, args.tableName, args.constraint)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5631,9 +5746,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeConstraint", msg_type, seqid)
         result.write(oprot)
@@ -5648,7 +5767,7 @@
         try:
             self._handler.removeIterator(args.login, args.tableName, args.iterName, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5659,9 +5778,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeIterator", msg_type, seqid)
         result.write(oprot)
@@ -5676,7 +5799,7 @@
         try:
             self._handler.removeTableProperty(args.login, args.tableName, args.property)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5687,9 +5810,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeTableProperty", msg_type, seqid)
         result.write(oprot)
@@ -5704,7 +5831,7 @@
         try:
             self._handler.renameTable(args.login, args.oldTableName, args.newTableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5718,9 +5845,13 @@
         except TableExistsException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("renameTable", msg_type, seqid)
         result.write(oprot)
@@ -5735,7 +5866,7 @@
         try:
             self._handler.setLocalityGroups(args.login, args.tableName, args.groups)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5746,9 +5877,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("setLocalityGroups", msg_type, seqid)
         result.write(oprot)
@@ -5763,7 +5898,7 @@
         try:
             self._handler.setTableProperty(args.login, args.tableName, args.property, args.value)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5774,9 +5909,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("setTableProperty", msg_type, seqid)
         result.write(oprot)
@@ -5791,7 +5930,7 @@
         try:
             result.success = self._handler.splitRangeByTablets(args.login, args.tableName, args.range, args.maxSplits)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5802,9 +5941,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("splitRangeByTablets", msg_type, seqid)
         result.write(oprot)
@@ -5819,11 +5962,15 @@
         try:
             result.success = self._handler.tableExists(args.login, args.tableName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("tableExists", msg_type, seqid)
         result.write(oprot)
@@ -5838,11 +5985,15 @@
         try:
             result.success = self._handler.tableIdMap(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("tableIdMap", msg_type, seqid)
         result.write(oprot)
@@ -5857,7 +6008,7 @@
         try:
             result.success = self._handler.testTableClassLoad(args.login, args.tableName, args.className, args.asTypeName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5868,9 +6019,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("testTableClassLoad", msg_type, seqid)
         result.write(oprot)
@@ -5885,7 +6040,7 @@
         try:
             self._handler.pingTabletServer(args.login, args.tserver)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5893,9 +6048,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("pingTabletServer", msg_type, seqid)
         result.write(oprot)
@@ -5910,7 +6069,7 @@
         try:
             result.success = self._handler.getActiveScans(args.login, args.tserver)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5918,9 +6077,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getActiveScans", msg_type, seqid)
         result.write(oprot)
@@ -5935,7 +6098,7 @@
         try:
             result.success = self._handler.getActiveCompactions(args.login, args.tserver)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5943,9 +6106,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getActiveCompactions", msg_type, seqid)
         result.write(oprot)
@@ -5960,7 +6127,7 @@
         try:
             result.success = self._handler.getSiteConfiguration(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5968,9 +6135,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getSiteConfiguration", msg_type, seqid)
         result.write(oprot)
@@ -5985,7 +6156,7 @@
         try:
             result.success = self._handler.getSystemConfiguration(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -5993,9 +6164,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getSystemConfiguration", msg_type, seqid)
         result.write(oprot)
@@ -6010,11 +6185,15 @@
         try:
             result.success = self._handler.getTabletServers(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getTabletServers", msg_type, seqid)
         result.write(oprot)
@@ -6029,7 +6208,7 @@
         try:
             self._handler.removeProperty(args.login, args.property)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6037,9 +6216,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeProperty", msg_type, seqid)
         result.write(oprot)
@@ -6054,7 +6237,7 @@
         try:
             self._handler.setProperty(args.login, args.property, args.value)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6062,9 +6245,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("setProperty", msg_type, seqid)
         result.write(oprot)
@@ -6079,7 +6266,7 @@
         try:
             result.success = self._handler.testClassLoad(args.login, args.className, args.asTypeName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6087,9 +6274,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("testClassLoad", msg_type, seqid)
         result.write(oprot)
@@ -6104,7 +6295,7 @@
         try:
             result.success = self._handler.authenticateUser(args.login, args.user, args.properties)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6112,9 +6303,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("authenticateUser", msg_type, seqid)
         result.write(oprot)
@@ -6129,7 +6324,7 @@
         try:
             self._handler.changeUserAuthorizations(args.login, args.user, args.authorizations)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6137,9 +6332,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("changeUserAuthorizations", msg_type, seqid)
         result.write(oprot)
@@ -6154,7 +6353,7 @@
         try:
             self._handler.changeLocalUserPassword(args.login, args.user, args.password)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6162,9 +6361,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("changeLocalUserPassword", msg_type, seqid)
         result.write(oprot)
@@ -6179,7 +6382,7 @@
         try:
             self._handler.createLocalUser(args.login, args.user, args.password)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6187,9 +6390,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createLocalUser", msg_type, seqid)
         result.write(oprot)
@@ -6204,7 +6411,7 @@
         try:
             self._handler.dropLocalUser(args.login, args.user)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6212,9 +6419,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("dropLocalUser", msg_type, seqid)
         result.write(oprot)
@@ -6229,7 +6440,7 @@
         try:
             result.success = self._handler.getUserAuthorizations(args.login, args.user)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6237,9 +6448,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getUserAuthorizations", msg_type, seqid)
         result.write(oprot)
@@ -6254,7 +6469,7 @@
         try:
             self._handler.grantSystemPermission(args.login, args.user, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6262,9 +6477,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("grantSystemPermission", msg_type, seqid)
         result.write(oprot)
@@ -6279,7 +6498,7 @@
         try:
             self._handler.grantTablePermission(args.login, args.user, args.table, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6290,9 +6509,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("grantTablePermission", msg_type, seqid)
         result.write(oprot)
@@ -6307,7 +6530,7 @@
         try:
             result.success = self._handler.hasSystemPermission(args.login, args.user, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6315,9 +6538,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("hasSystemPermission", msg_type, seqid)
         result.write(oprot)
@@ -6332,7 +6559,7 @@
         try:
             result.success = self._handler.hasTablePermission(args.login, args.user, args.table, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6343,9 +6570,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("hasTablePermission", msg_type, seqid)
         result.write(oprot)
@@ -6360,7 +6591,7 @@
         try:
             result.success = self._handler.listLocalUsers(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6371,9 +6602,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listLocalUsers", msg_type, seqid)
         result.write(oprot)
@@ -6388,7 +6623,7 @@
         try:
             self._handler.revokeSystemPermission(args.login, args.user, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6396,9 +6631,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("revokeSystemPermission", msg_type, seqid)
         result.write(oprot)
@@ -6413,7 +6652,7 @@
         try:
             self._handler.revokeTablePermission(args.login, args.user, args.table, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6424,9 +6663,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("revokeTablePermission", msg_type, seqid)
         result.write(oprot)
@@ -6441,7 +6684,7 @@
         try:
             self._handler.grantNamespacePermission(args.login, args.user, args.namespaceName, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6449,9 +6692,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("grantNamespacePermission", msg_type, seqid)
         result.write(oprot)
@@ -6466,7 +6713,7 @@
         try:
             result.success = self._handler.hasNamespacePermission(args.login, args.user, args.namespaceName, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6474,9 +6721,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("hasNamespacePermission", msg_type, seqid)
         result.write(oprot)
@@ -6491,7 +6742,7 @@
         try:
             self._handler.revokeNamespacePermission(args.login, args.user, args.namespaceName, args.perm)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6499,9 +6750,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("revokeNamespacePermission", msg_type, seqid)
         result.write(oprot)
@@ -6516,7 +6771,7 @@
         try:
             result.success = self._handler.createBatchScanner(args.login, args.tableName, args.options)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6527,9 +6782,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createBatchScanner", msg_type, seqid)
         result.write(oprot)
@@ -6544,7 +6803,7 @@
         try:
             result.success = self._handler.createScanner(args.login, args.tableName, args.options)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6555,9 +6814,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createScanner", msg_type, seqid)
         result.write(oprot)
@@ -6572,14 +6835,18 @@
         try:
             result.success = self._handler.hasNext(args.scanner)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownScanner as ouch1:
             msg_type = TMessageType.REPLY
             result.ouch1 = ouch1
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("hasNext", msg_type, seqid)
         result.write(oprot)
@@ -6594,7 +6861,7 @@
         try:
             result.success = self._handler.nextEntry(args.scanner)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except NoMoreEntriesException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6605,9 +6872,13 @@
         except AccumuloSecurityException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("nextEntry", msg_type, seqid)
         result.write(oprot)
@@ -6622,7 +6893,7 @@
         try:
             result.success = self._handler.nextK(args.scanner, args.k)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except NoMoreEntriesException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6633,9 +6904,13 @@
         except AccumuloSecurityException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("nextK", msg_type, seqid)
         result.write(oprot)
@@ -6650,14 +6925,18 @@
         try:
             self._handler.closeScanner(args.scanner)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownScanner as ouch1:
             msg_type = TMessageType.REPLY
             result.ouch1 = ouch1
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("closeScanner", msg_type, seqid)
         result.write(oprot)
@@ -6672,7 +6951,7 @@
         try:
             self._handler.updateAndFlush(args.login, args.tableName, args.cells)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as outch1:
             msg_type = TMessageType.REPLY
@@ -6686,9 +6965,13 @@
         except MutationsRejectedException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("updateAndFlush", msg_type, seqid)
         result.write(oprot)
@@ -6703,7 +6986,7 @@
         try:
             result.success = self._handler.createWriter(args.login, args.tableName, args.opts)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as outch1:
             msg_type = TMessageType.REPLY
@@ -6714,9 +6997,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createWriter", msg_type, seqid)
         result.write(oprot)
@@ -6729,10 +7016,10 @@
         iprot.readMessageEnd()
         try:
             self._handler.update(args.writer, args.cells)
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except:
-            pass
+        except Exception:
+            logging.exception('Exception in oneway handler')
 
     def process_flush(self, seqid, iprot, oprot):
         args = flush_args()
@@ -6742,7 +7029,7 @@
         try:
             self._handler.flush(args.writer)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownWriter as ouch1:
             msg_type = TMessageType.REPLY
@@ -6750,9 +7037,13 @@
         except MutationsRejectedException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("flush", msg_type, seqid)
         result.write(oprot)
@@ -6767,7 +7058,7 @@
         try:
             self._handler.closeWriter(args.writer)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownWriter as ouch1:
             msg_type = TMessageType.REPLY
@@ -6775,9 +7066,13 @@
         except MutationsRejectedException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("closeWriter", msg_type, seqid)
         result.write(oprot)
@@ -6792,7 +7087,7 @@
         try:
             result.success = self._handler.updateRowConditionally(args.login, args.tableName, args.row, args.updates)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6803,9 +7098,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("updateRowConditionally", msg_type, seqid)
         result.write(oprot)
@@ -6820,7 +7119,7 @@
         try:
             result.success = self._handler.createConditionalWriter(args.login, args.tableName, args.options)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6831,9 +7130,13 @@
         except TableNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createConditionalWriter", msg_type, seqid)
         result.write(oprot)
@@ -6848,7 +7151,7 @@
         try:
             result.success = self._handler.updateRowsConditionally(args.conditionalWriter, args.updates)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except UnknownWriter as ouch1:
             msg_type = TMessageType.REPLY
@@ -6859,9 +7162,13 @@
         except AccumuloSecurityException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("updateRowsConditionally", msg_type, seqid)
         result.write(oprot)
@@ -6876,11 +7183,15 @@
         try:
             self._handler.closeConditionalWriter(args.conditionalWriter)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("closeConditionalWriter", msg_type, seqid)
         result.write(oprot)
@@ -6895,11 +7206,15 @@
         try:
             result.success = self._handler.getRowRange(args.row)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getRowRange", msg_type, seqid)
         result.write(oprot)
@@ -6914,11 +7229,15 @@
         try:
             result.success = self._handler.getFollowing(args.key, args.part)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getFollowing", msg_type, seqid)
         result.write(oprot)
@@ -6933,11 +7252,15 @@
         try:
             result.success = self._handler.systemNamespace()
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("systemNamespace", msg_type, seqid)
         result.write(oprot)
@@ -6952,11 +7275,15 @@
         try:
             result.success = self._handler.defaultNamespace()
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("defaultNamespace", msg_type, seqid)
         result.write(oprot)
@@ -6971,7 +7298,7 @@
         try:
             result.success = self._handler.listNamespaces(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -6979,9 +7306,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listNamespaces", msg_type, seqid)
         result.write(oprot)
@@ -6996,7 +7327,7 @@
         try:
             result.success = self._handler.namespaceExists(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7004,9 +7335,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("namespaceExists", msg_type, seqid)
         result.write(oprot)
@@ -7021,7 +7356,7 @@
         try:
             self._handler.createNamespace(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7032,9 +7367,13 @@
         except NamespaceExistsException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("createNamespace", msg_type, seqid)
         result.write(oprot)
@@ -7049,7 +7388,7 @@
         try:
             self._handler.deleteNamespace(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7063,9 +7402,13 @@
         except NamespaceNotEmptyException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("deleteNamespace", msg_type, seqid)
         result.write(oprot)
@@ -7080,7 +7423,7 @@
         try:
             self._handler.renameNamespace(args.login, args.oldNamespaceName, args.newNamespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7094,9 +7437,13 @@
         except NamespaceExistsException as ouch4:
             msg_type = TMessageType.REPLY
             result.ouch4 = ouch4
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("renameNamespace", msg_type, seqid)
         result.write(oprot)
@@ -7111,7 +7458,7 @@
         try:
             self._handler.setNamespaceProperty(args.login, args.namespaceName, args.property, args.value)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7122,9 +7469,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("setNamespaceProperty", msg_type, seqid)
         result.write(oprot)
@@ -7139,7 +7490,7 @@
         try:
             self._handler.removeNamespaceProperty(args.login, args.namespaceName, args.property)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7150,9 +7501,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeNamespaceProperty", msg_type, seqid)
         result.write(oprot)
@@ -7167,7 +7522,7 @@
         try:
             result.success = self._handler.getNamespaceProperties(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7178,9 +7533,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getNamespaceProperties", msg_type, seqid)
         result.write(oprot)
@@ -7195,7 +7554,7 @@
         try:
             result.success = self._handler.namespaceIdMap(args.login)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7203,9 +7562,13 @@
         except AccumuloSecurityException as ouch2:
             msg_type = TMessageType.REPLY
             result.ouch2 = ouch2
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("namespaceIdMap", msg_type, seqid)
         result.write(oprot)
@@ -7220,7 +7583,7 @@
         try:
             self._handler.attachNamespaceIterator(args.login, args.namespaceName, args.setting, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7231,9 +7594,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("attachNamespaceIterator", msg_type, seqid)
         result.write(oprot)
@@ -7248,7 +7615,7 @@
         try:
             self._handler.removeNamespaceIterator(args.login, args.namespaceName, args.name, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7259,9 +7626,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeNamespaceIterator", msg_type, seqid)
         result.write(oprot)
@@ -7276,7 +7647,7 @@
         try:
             result.success = self._handler.getNamespaceIteratorSetting(args.login, args.namespaceName, args.name, args.scope)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7287,9 +7658,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("getNamespaceIteratorSetting", msg_type, seqid)
         result.write(oprot)
@@ -7304,7 +7679,7 @@
         try:
             result.success = self._handler.listNamespaceIterators(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7315,9 +7690,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listNamespaceIterators", msg_type, seqid)
         result.write(oprot)
@@ -7332,7 +7711,7 @@
         try:
             self._handler.checkNamespaceIteratorConflicts(args.login, args.namespaceName, args.setting, args.scopes)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7343,9 +7722,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("checkNamespaceIteratorConflicts", msg_type, seqid)
         result.write(oprot)
@@ -7360,7 +7743,7 @@
         try:
             result.success = self._handler.addNamespaceConstraint(args.login, args.namespaceName, args.constraintClassName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7371,9 +7754,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("addNamespaceConstraint", msg_type, seqid)
         result.write(oprot)
@@ -7388,7 +7775,7 @@
         try:
             self._handler.removeNamespaceConstraint(args.login, args.namespaceName, args.id)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7399,9 +7786,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("removeNamespaceConstraint", msg_type, seqid)
         result.write(oprot)
@@ -7416,7 +7807,7 @@
         try:
             result.success = self._handler.listNamespaceConstraints(args.login, args.namespaceName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7427,9 +7818,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("listNamespaceConstraints", msg_type, seqid)
         result.write(oprot)
@@ -7444,7 +7839,7 @@
         try:
             result.success = self._handler.testNamespaceClassLoad(args.login, args.namespaceName, args.className, args.asTypeName)
             msg_type = TMessageType.REPLY
-        except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+        except TTransport.TTransportException:
             raise
         except AccumuloException as ouch1:
             msg_type = TMessageType.REPLY
@@ -7455,9 +7850,13 @@
         except NamespaceNotFoundException as ouch3:
             msg_type = TMessageType.REPLY
             result.ouch3 = ouch3
-        except Exception as ex:
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
             msg_type = TMessageType.EXCEPTION
-            logging.exception(ex)
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
             result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
         oprot.writeMessageBegin("testNamespaceClassLoad", msg_type, seqid)
         result.write(oprot)
@@ -7474,11 +7873,6 @@
      - loginProperties
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'principal', 'UTF8', None, ),  # 1
-        (2, TType.MAP, 'loginProperties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 2
-    )
 
     def __init__(self, principal=None, loginProperties=None,):
         self.principal = principal
@@ -7486,7 +7880,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7516,7 +7910,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('login_args')
         if self.principal is not None:
@@ -7547,6 +7941,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(login_args)
+login_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'principal', 'UTF8', None, ),  # 1
+    (2, TType.MAP, 'loginProperties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 2
+)
 
 
 class login_result(object):
@@ -7556,10 +7956,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'BINARY', None, ),  # 0
-        (1, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-    )
 
     def __init__(self, success=None, ouch2=None,):
         self.success = success
@@ -7567,7 +7963,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7592,7 +7988,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('login_result')
         if self.success is not None:
@@ -7619,6 +8015,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(login_result)
+login_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'BINARY', None, ),  # 0
+    (1, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 1
+)
 
 
 class addConstraint_args(object):
@@ -7629,12 +8030,6 @@
      - constraintClassName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'constraintClassName', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, constraintClassName=None,):
         self.login = login
@@ -7643,7 +8038,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7672,7 +8067,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addConstraint_args')
         if self.login is not None:
@@ -7703,6 +8098,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addConstraint_args)
+addConstraint_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'constraintClassName', 'UTF8', None, ),  # 3
+)
 
 
 class addConstraint_result(object):
@@ -7714,12 +8116,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.I32, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -7729,7 +8125,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7766,7 +8162,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addConstraint_result')
         if self.success is not None:
@@ -7801,6 +8197,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addConstraint_result)
+addConstraint_result.thrift_spec = (
+    (0, TType.I32, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class addSplits_args(object):
@@ -7811,12 +8214,6 @@
      - splits
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.SET, 'splits', (TType.STRING, 'BINARY', False), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, splits=None,):
         self.login = login
@@ -7825,7 +8222,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7859,7 +8256,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addSplits_args')
         if self.login is not None:
@@ -7893,6 +8290,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addSplits_args)
+addSplits_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.SET, 'splits', (TType.STRING, 'BINARY', False), None, ),  # 3
+)
 
 
 class addSplits_result(object):
@@ -7903,12 +8307,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -7917,7 +8315,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -7949,7 +8347,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addSplits_result')
         if self.ouch1 is not None:
@@ -7980,6 +8378,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addSplits_result)
+addSplits_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class attachIterator_args(object):
@@ -7991,13 +8396,6 @@
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'setting', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, setting=None, scopes=None,):
         self.login = login
@@ -8007,7 +8405,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8047,7 +8445,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('attachIterator_args')
         if self.login is not None:
@@ -8085,6 +8483,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(attachIterator_args)
+attachIterator_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class attachIterator_result(object):
@@ -8095,12 +8501,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -8109,7 +8509,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8141,7 +8541,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('attachIterator_result')
         if self.ouch1 is not None:
@@ -8172,6 +8572,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(attachIterator_result)
+attachIterator_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloSecurityException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class checkIteratorConflicts_args(object):
@@ -8183,13 +8590,6 @@
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'setting', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, setting=None, scopes=None,):
         self.login = login
@@ -8199,7 +8599,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8239,7 +8639,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('checkIteratorConflicts_args')
         if self.login is not None:
@@ -8277,6 +8677,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(checkIteratorConflicts_args)
+checkIteratorConflicts_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class checkIteratorConflicts_result(object):
@@ -8287,12 +8695,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -8301,7 +8703,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8333,7 +8735,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('checkIteratorConflicts_result')
         if self.ouch1 is not None:
@@ -8364,6 +8766,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(checkIteratorConflicts_result)
+checkIteratorConflicts_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloSecurityException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class clearLocatorCache_args(object):
@@ -8373,11 +8782,6 @@
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -8385,7 +8789,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8409,7 +8813,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('clearLocatorCache_args')
         if self.login is not None:
@@ -8436,6 +8840,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(clearLocatorCache_args)
+clearLocatorCache_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class clearLocatorCache_result(object):
@@ -8444,17 +8854,13 @@
      - ouch1
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 1
-    )
 
     def __init__(self, ouch1=None,):
         self.ouch1 = ouch1
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8474,7 +8880,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('clearLocatorCache_result')
         if self.ouch1 is not None:
@@ -8497,6 +8903,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(clearLocatorCache_result)
+clearLocatorCache_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [TableNotFoundException, None], None, ),  # 1
+)
 
 
 class cloneTable_args(object):
@@ -8510,15 +8921,6 @@
      - propertiesToExclude
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'newTableName', 'UTF8', None, ),  # 3
-        (4, TType.BOOL, 'flush', None, None, ),  # 4
-        (5, TType.MAP, 'propertiesToSet', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 5
-        (6, TType.SET, 'propertiesToExclude', (TType.STRING, 'UTF8', False), None, ),  # 6
-    )
 
     def __init__(self, login=None, tableName=None, newTableName=None, flush=None, propertiesToSet=None, propertiesToExclude=None,):
         self.login = login
@@ -8530,7 +8932,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8585,7 +8987,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('cloneTable_args')
         if self.login is not None:
@@ -8635,6 +9037,16 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(cloneTable_args)
+cloneTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'newTableName', 'UTF8', None, ),  # 3
+    (4, TType.BOOL, 'flush', None, None, ),  # 4
+    (5, TType.MAP, 'propertiesToSet', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 5
+    (6, TType.SET, 'propertiesToExclude', (TType.STRING, 'UTF8', False), None, ),  # 6
+)
 
 
 class cloneTable_result(object):
@@ -8646,13 +9058,6 @@
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ouch4', (TableExistsException, TableExistsException.thrift_spec), None, ),  # 4
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None, ouch4=None,):
         self.ouch1 = ouch1
@@ -8662,7 +9067,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8700,7 +9105,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('cloneTable_result')
         if self.ouch1 is not None:
@@ -8735,6 +9140,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(cloneTable_result)
+cloneTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+    (4, TType.STRUCT, 'ouch4', [TableExistsException, None], None, ),  # 4
+)
 
 
 class compactTable_args(object):
@@ -8750,17 +9163,6 @@
      - compactionStrategy
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
-        (5, TType.LIST, 'iterators', (TType.STRUCT, (IteratorSetting, IteratorSetting.thrift_spec), False), None, ),  # 5
-        (6, TType.BOOL, 'flush', None, None, ),  # 6
-        (7, TType.BOOL, 'wait', None, None, ),  # 7
-        (8, TType.STRUCT, 'compactionStrategy', (CompactionStrategyConfig, CompactionStrategyConfig.thrift_spec), None, ),  # 8
-    )
 
     def __init__(self, login=None, tableName=None, startRow=None, endRow=None, iterators=None, flush=None, wait=None, compactionStrategy=None,):
         self.login = login
@@ -8774,7 +9176,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8835,7 +9237,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('compactTable_args')
         if self.login is not None:
@@ -8889,6 +9291,18 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(compactTable_args)
+compactTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
+    (5, TType.LIST, 'iterators', (TType.STRUCT, [IteratorSetting, None], False), None, ),  # 5
+    (6, TType.BOOL, 'flush', None, None, ),  # 6
+    (7, TType.BOOL, 'wait', None, None, ),  # 7
+    (8, TType.STRUCT, 'compactionStrategy', [CompactionStrategyConfig, None], None, ),  # 8
+)
 
 
 class compactTable_result(object):
@@ -8899,12 +9313,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -8913,7 +9321,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -8945,7 +9353,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('compactTable_result')
         if self.ouch1 is not None:
@@ -8976,6 +9384,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(compactTable_result)
+compactTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloSecurityException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [TableNotFoundException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloException, None], None, ),  # 3
+)
 
 
 class cancelCompaction_args(object):
@@ -8985,11 +9400,6 @@
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -8997,7 +9407,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9021,7 +9431,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('cancelCompaction_args')
         if self.login is not None:
@@ -9048,6 +9458,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(cancelCompaction_args)
+cancelCompaction_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class cancelCompaction_result(object):
@@ -9058,12 +9474,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9072,7 +9482,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9104,7 +9514,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('cancelCompaction_result')
         if self.ouch1 is not None:
@@ -9135,6 +9545,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(cancelCompaction_result)
+cancelCompaction_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloSecurityException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [TableNotFoundException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloException, None], None, ),  # 3
+)
 
 
 class createTable_args(object):
@@ -9146,13 +9563,6 @@
      - type
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.BOOL, 'versioningIter', None, None, ),  # 3
-        (4, TType.I32, 'type', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, versioningIter=None, type=None,):
         self.login = login
@@ -9162,7 +9572,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9196,7 +9606,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createTable_args')
         if self.login is not None:
@@ -9231,6 +9641,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createTable_args)
+createTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.BOOL, 'versioningIter', None, None, ),  # 3
+    (4, TType.I32, 'type', None, None, ),  # 4
+)
 
 
 class createTable_result(object):
@@ -9241,12 +9659,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableExistsException, TableExistsException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9255,7 +9667,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9287,7 +9699,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createTable_result')
         if self.ouch1 is not None:
@@ -9318,6 +9730,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createTable_result)
+createTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableExistsException, None], None, ),  # 3
+)
 
 
 class deleteTable_args(object):
@@ -9327,11 +9746,6 @@
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -9339,7 +9753,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9363,7 +9777,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteTable_args')
         if self.login is not None:
@@ -9390,6 +9804,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteTable_args)
+deleteTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class deleteTable_result(object):
@@ -9400,12 +9820,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9414,7 +9828,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9446,7 +9860,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteTable_result')
         if self.ouch1 is not None:
@@ -9477,6 +9891,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteTable_result)
+deleteTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class deleteRows_args(object):
@@ -9488,13 +9909,6 @@
      - endRow
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, startRow=None, endRow=None,):
         self.login = login
@@ -9504,7 +9918,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9538,7 +9952,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteRows_args')
         if self.login is not None:
@@ -9573,6 +9987,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteRows_args)
+deleteRows_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
+)
 
 
 class deleteRows_result(object):
@@ -9583,12 +10005,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9597,7 +10013,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9629,7 +10045,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteRows_result')
         if self.ouch1 is not None:
@@ -9660,6 +10076,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteRows_result)
+deleteRows_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class exportTable_args(object):
@@ -9670,12 +10093,6 @@
      - exportDir
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'exportDir', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, exportDir=None,):
         self.login = login
@@ -9684,7 +10101,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9713,7 +10130,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('exportTable_args')
         if self.login is not None:
@@ -9744,6 +10161,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(exportTable_args)
+exportTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'exportDir', 'UTF8', None, ),  # 3
+)
 
 
 class exportTable_result(object):
@@ -9754,12 +10178,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9768,7 +10186,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9800,7 +10218,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('exportTable_result')
         if self.ouch1 is not None:
@@ -9831,6 +10249,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(exportTable_result)
+exportTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class flushTable_args(object):
@@ -9843,14 +10268,6 @@
      - wait
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
-        (5, TType.BOOL, 'wait', None, None, ),  # 5
-    )
 
     def __init__(self, login=None, tableName=None, startRow=None, endRow=None, wait=None,):
         self.login = login
@@ -9861,7 +10278,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9900,7 +10317,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('flushTable_args')
         if self.login is not None:
@@ -9939,6 +10356,15 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(flushTable_args)
+flushTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
+    (5, TType.BOOL, 'wait', None, None, ),  # 5
+)
 
 
 class flushTable_result(object):
@@ -9949,12 +10375,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -9963,7 +10383,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -9995,7 +10415,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('flushTable_result')
         if self.ouch1 is not None:
@@ -10026,6 +10446,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(flushTable_result)
+flushTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getDiskUsage_args(object):
@@ -10035,11 +10462,6 @@
      - tables
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.SET, 'tables', (TType.STRING, 'UTF8', False), None, ),  # 2
-    )
 
     def __init__(self, login=None, tables=None,):
         self.login = login
@@ -10047,7 +10469,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10076,7 +10498,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getDiskUsage_args')
         if self.login is not None:
@@ -10106,6 +10528,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getDiskUsage_args)
+getDiskUsage_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.SET, 'tables', (TType.STRING, 'UTF8', False), None, ),  # 2
+)
 
 
 class getDiskUsage_result(object):
@@ -10117,12 +10545,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (DiskUsage, DiskUsage.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10132,7 +10554,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10175,7 +10597,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getDiskUsage_result')
         if self.success is not None:
@@ -10213,6 +10635,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getDiskUsage_result)
+getDiskUsage_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRUCT, [DiskUsage, None], False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getLocalityGroups_args(object):
@@ -10222,11 +10651,6 @@
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -10234,7 +10658,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10258,7 +10682,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getLocalityGroups_args')
         if self.login is not None:
@@ -10285,6 +10709,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getLocalityGroups_args)
+getLocalityGroups_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class getLocalityGroups_result(object):
@@ -10296,12 +10726,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10311,7 +10735,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10359,7 +10783,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getLocalityGroups_result')
         if self.success is not None:
@@ -10401,6 +10825,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getLocalityGroups_result)
+getLocalityGroups_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getIteratorSetting_args(object):
@@ -10412,13 +10843,6 @@
      - scope
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'iteratorName', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'scope', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, iteratorName=None, scope=None,):
         self.login = login
@@ -10428,7 +10852,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10462,7 +10886,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getIteratorSetting_args')
         if self.login is not None:
@@ -10497,6 +10921,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getIteratorSetting_args)
+getIteratorSetting_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'iteratorName', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'scope', None, None, ),  # 4
+)
 
 
 class getIteratorSetting_result(object):
@@ -10508,12 +10940,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRUCT, 'success', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10523,7 +10949,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10561,7 +10987,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getIteratorSetting_result')
         if self.success is not None:
@@ -10596,6 +11022,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getIteratorSetting_result)
+getIteratorSetting_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [IteratorSetting, None], None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getMaxRow_args(object):
@@ -10610,16 +11043,6 @@
      - endInclusive
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.SET, 'auths', (TType.STRING, 'BINARY', False), None, ),  # 3
-        (4, TType.STRING, 'startRow', 'BINARY', None, ),  # 4
-        (5, TType.BOOL, 'startInclusive', None, None, ),  # 5
-        (6, TType.STRING, 'endRow', 'BINARY', None, ),  # 6
-        (7, TType.BOOL, 'endInclusive', None, None, ),  # 7
-    )
 
     def __init__(self, login=None, tableName=None, auths=None, startRow=None, startInclusive=None, endRow=None, endInclusive=None,):
         self.login = login
@@ -10632,7 +11055,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10686,7 +11109,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getMaxRow_args')
         if self.login is not None:
@@ -10736,6 +11159,17 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getMaxRow_args)
+getMaxRow_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.SET, 'auths', (TType.STRING, 'BINARY', False), None, ),  # 3
+    (4, TType.STRING, 'startRow', 'BINARY', None, ),  # 4
+    (5, TType.BOOL, 'startInclusive', None, None, ),  # 5
+    (6, TType.STRING, 'endRow', 'BINARY', None, ),  # 6
+    (7, TType.BOOL, 'endInclusive', None, None, ),  # 7
+)
 
 
 class getMaxRow_result(object):
@@ -10747,12 +11181,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'BINARY', None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10762,7 +11190,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10799,7 +11227,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getMaxRow_result')
         if self.success is not None:
@@ -10834,6 +11262,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getMaxRow_result)
+getMaxRow_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'BINARY', None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class getTableProperties_args(object):
@@ -10843,11 +11278,6 @@
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -10855,7 +11285,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10879,7 +11309,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getTableProperties_args')
         if self.login is not None:
@@ -10906,6 +11336,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getTableProperties_args)
+getTableProperties_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class getTableProperties_result(object):
@@ -10917,12 +11353,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -10932,7 +11362,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -10975,7 +11405,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getTableProperties_result')
         if self.success is not None:
@@ -11014,6 +11444,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getTableProperties_result)
+getTableProperties_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class importDirectory_args(object):
@@ -11026,14 +11463,6 @@
      - setTime
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'importDir', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'failureDir', 'UTF8', None, ),  # 4
-        (5, TType.BOOL, 'setTime', None, None, ),  # 5
-    )
 
     def __init__(self, login=None, tableName=None, importDir=None, failureDir=None, setTime=None,):
         self.login = login
@@ -11044,7 +11473,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11083,7 +11512,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('importDirectory_args')
         if self.login is not None:
@@ -11122,6 +11551,15 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(importDirectory_args)
+importDirectory_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'importDir', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'failureDir', 'UTF8', None, ),  # 4
+    (5, TType.BOOL, 'setTime', None, None, ),  # 5
+)
 
 
 class importDirectory_result(object):
@@ -11132,12 +11570,6 @@
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch3', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch4', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch3=None, ouch4=None,):
         self.ouch1 = ouch1
@@ -11146,7 +11578,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11178,7 +11610,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('importDirectory_result')
         if self.ouch1 is not None:
@@ -11209,6 +11641,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(importDirectory_result)
+importDirectory_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [TableNotFoundException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch3', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch4', [AccumuloSecurityException, None], None, ),  # 3
+)
 
 
 class importTable_args(object):
@@ -11219,12 +11658,6 @@
      - importDir
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'importDir', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, importDir=None,):
         self.login = login
@@ -11233,7 +11666,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11262,7 +11695,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('importTable_args')
         if self.login is not None:
@@ -11293,6 +11726,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(importTable_args)
+importTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'importDir', 'UTF8', None, ),  # 3
+)
 
 
 class importTable_result(object):
@@ -11303,12 +11743,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (TableExistsException, TableExistsException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -11317,7 +11751,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11349,7 +11783,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('importTable_result')
         if self.ouch1 is not None:
@@ -11380,6 +11814,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(importTable_result)
+importTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [TableExistsException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloSecurityException, None], None, ),  # 3
+)
 
 
 class listSplits_args(object):
@@ -11390,12 +11831,6 @@
      - maxSplits
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'maxSplits', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, maxSplits=None,):
         self.login = login
@@ -11404,7 +11839,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11433,7 +11868,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listSplits_args')
         if self.login is not None:
@@ -11464,6 +11899,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listSplits_args)
+listSplits_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'maxSplits', None, None, ),  # 3
+)
 
 
 class listSplits_result(object):
@@ -11475,12 +11917,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'BINARY', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -11490,7 +11926,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11532,7 +11968,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listSplits_result')
         if self.success is not None:
@@ -11570,6 +12006,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listSplits_result)
+listSplits_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRING, 'BINARY', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class listTables_args(object):
@@ -11578,17 +12021,13 @@
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11607,7 +12046,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listTables_args')
         if self.login is not None:
@@ -11630,6 +12069,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listTables_args)
+listTables_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class listTables_result(object):
@@ -11638,16 +12082,13 @@
      - success
     """
 
-    thrift_spec = (
-        (0, TType.SET, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11671,7 +12112,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listTables_result')
         if self.success is not None:
@@ -11697,6 +12138,10 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listTables_result)
+listTables_result.thrift_spec = (
+    (0, TType.SET, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+)
 
 
 class listIterators_args(object):
@@ -11706,11 +12151,6 @@
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -11718,7 +12158,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11742,7 +12182,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listIterators_args')
         if self.login is not None:
@@ -11769,6 +12209,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listIterators_args)
+listIterators_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class listIterators_result(object):
@@ -11780,12 +12226,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.I32, None, False), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -11795,7 +12235,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11843,7 +12283,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listIterators_result')
         if self.success is not None:
@@ -11885,6 +12325,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listIterators_result)
+listIterators_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.I32, None, False), False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class listConstraints_args(object):
@@ -11894,11 +12341,6 @@
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -11906,7 +12348,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -11930,7 +12372,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listConstraints_args')
         if self.login is not None:
@@ -11957,6 +12399,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listConstraints_args)
+listConstraints_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class listConstraints_result(object):
@@ -11968,12 +12416,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -11983,7 +12425,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12026,7 +12468,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listConstraints_result')
         if self.success is not None:
@@ -12065,6 +12507,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listConstraints_result)
+listConstraints_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class mergeTablets_args(object):
@@ -12076,13 +12525,6 @@
      - endRow
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, startRow=None, endRow=None,):
         self.login = login
@@ -12092,7 +12534,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12126,7 +12568,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('mergeTablets_args')
         if self.login is not None:
@@ -12161,6 +12603,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(mergeTablets_args)
+mergeTablets_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'startRow', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'endRow', 'BINARY', None, ),  # 4
+)
 
 
 class mergeTablets_result(object):
@@ -12171,12 +12621,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12185,7 +12629,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12217,7 +12661,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('mergeTablets_result')
         if self.ouch1 is not None:
@@ -12248,6 +12692,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(mergeTablets_result)
+mergeTablets_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class offlineTable_args(object):
@@ -12258,21 +12709,15 @@
      - wait
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.BOOL, 'wait', None, False, ),  # 3
-    )
 
-    def __init__(self, login=None, tableName=None, wait=thrift_spec[3][4],):
+    def __init__(self, login=None, tableName=None, wait=False,):
         self.login = login
         self.tableName = tableName
         self.wait = wait
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12301,7 +12746,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('offlineTable_args')
         if self.login is not None:
@@ -12332,6 +12777,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(offlineTable_args)
+offlineTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.BOOL, 'wait', None, False, ),  # 3
+)
 
 
 class offlineTable_result(object):
@@ -12342,12 +12794,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12356,7 +12802,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12388,7 +12834,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('offlineTable_result')
         if self.ouch1 is not None:
@@ -12419,6 +12865,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(offlineTable_result)
+offlineTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class onlineTable_args(object):
@@ -12429,21 +12882,15 @@
      - wait
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.BOOL, 'wait', None, False, ),  # 3
-    )
 
-    def __init__(self, login=None, tableName=None, wait=thrift_spec[3][4],):
+    def __init__(self, login=None, tableName=None, wait=False,):
         self.login = login
         self.tableName = tableName
         self.wait = wait
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12472,7 +12919,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('onlineTable_args')
         if self.login is not None:
@@ -12503,6 +12950,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(onlineTable_args)
+onlineTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.BOOL, 'wait', None, False, ),  # 3
+)
 
 
 class onlineTable_result(object):
@@ -12513,12 +12967,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12527,7 +12975,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12559,7 +13007,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('onlineTable_result')
         if self.ouch1 is not None:
@@ -12590,6 +13038,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(onlineTable_result)
+onlineTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class removeConstraint_args(object):
@@ -12600,12 +13055,6 @@
      - constraint
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'constraint', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, constraint=None,):
         self.login = login
@@ -12614,7 +13063,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12643,7 +13092,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeConstraint_args')
         if self.login is not None:
@@ -12674,6 +13123,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeConstraint_args)
+removeConstraint_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'constraint', None, None, ),  # 3
+)
 
 
 class removeConstraint_result(object):
@@ -12684,12 +13140,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12698,7 +13148,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12730,7 +13180,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeConstraint_result')
         if self.ouch1 is not None:
@@ -12761,6 +13211,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeConstraint_result)
+removeConstraint_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class removeIterator_args(object):
@@ -12772,13 +13229,6 @@
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'iterName', 'UTF8', None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, iterName=None, scopes=None,):
         self.login = login
@@ -12788,7 +13238,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12827,7 +13277,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeIterator_args')
         if self.login is not None:
@@ -12865,6 +13315,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeIterator_args)
+removeIterator_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'iterName', 'UTF8', None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class removeIterator_result(object):
@@ -12875,12 +13333,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -12889,7 +13341,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -12921,7 +13373,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeIterator_result')
         if self.ouch1 is not None:
@@ -12952,6 +13404,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeIterator_result)
+removeIterator_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class removeTableProperty_args(object):
@@ -12962,12 +13421,6 @@
      - property
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, property=None,):
         self.login = login
@@ -12976,7 +13429,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13005,7 +13458,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeTableProperty_args')
         if self.login is not None:
@@ -13036,6 +13489,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeTableProperty_args)
+removeTableProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
+)
 
 
 class removeTableProperty_result(object):
@@ -13046,12 +13506,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -13060,7 +13514,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13092,7 +13546,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeTableProperty_result')
         if self.ouch1 is not None:
@@ -13123,6 +13577,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeTableProperty_result)
+removeTableProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class renameTable_args(object):
@@ -13133,12 +13594,6 @@
      - newTableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'oldTableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'newTableName', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, oldTableName=None, newTableName=None,):
         self.login = login
@@ -13147,7 +13602,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13176,7 +13631,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('renameTable_args')
         if self.login is not None:
@@ -13207,6 +13662,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(renameTable_args)
+renameTable_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'oldTableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'newTableName', 'UTF8', None, ),  # 3
+)
 
 
 class renameTable_result(object):
@@ -13218,13 +13680,6 @@
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ouch4', (TableExistsException, TableExistsException.thrift_spec), None, ),  # 4
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None, ouch4=None,):
         self.ouch1 = ouch1
@@ -13234,7 +13689,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13272,7 +13727,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('renameTable_result')
         if self.ouch1 is not None:
@@ -13307,6 +13762,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(renameTable_result)
+renameTable_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+    (4, TType.STRUCT, 'ouch4', [TableExistsException, None], None, ),  # 4
+)
 
 
 class setLocalityGroups_args(object):
@@ -13317,12 +13780,6 @@
      - groups
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.MAP, 'groups', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, groups=None,):
         self.login = login
@@ -13331,7 +13788,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13371,7 +13828,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setLocalityGroups_args')
         if self.login is not None:
@@ -13409,6 +13866,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setLocalityGroups_args)
+setLocalityGroups_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.MAP, 'groups', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ),  # 3
+)
 
 
 class setLocalityGroups_result(object):
@@ -13419,12 +13883,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -13433,7 +13891,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13465,7 +13923,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setLocalityGroups_result')
         if self.ouch1 is not None:
@@ -13496,6 +13954,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setLocalityGroups_result)
+setLocalityGroups_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class setTableProperty_args(object):
@@ -13507,13 +13972,6 @@
      - value
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'value', 'UTF8', None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, property=None, value=None,):
         self.login = login
@@ -13523,7 +13981,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13557,7 +14015,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setTableProperty_args')
         if self.login is not None:
@@ -13592,6 +14050,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setTableProperty_args)
+setTableProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'value', 'UTF8', None, ),  # 4
+)
 
 
 class setTableProperty_result(object):
@@ -13602,12 +14068,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -13616,7 +14076,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13648,7 +14108,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setTableProperty_result')
         if self.ouch1 is not None:
@@ -13679,6 +14139,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setTableProperty_result)
+setTableProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class splitRangeByTablets_args(object):
@@ -13690,13 +14157,6 @@
      - maxSplits
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'range', (Range, Range.thrift_spec), None, ),  # 3
-        (4, TType.I32, 'maxSplits', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, range=None, maxSplits=None,):
         self.login = login
@@ -13706,7 +14166,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13741,7 +14201,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('splitRangeByTablets_args')
         if self.login is not None:
@@ -13776,6 +14236,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(splitRangeByTablets_args)
+splitRangeByTablets_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'range', [Range, None], None, ),  # 3
+    (4, TType.I32, 'maxSplits', None, None, ),  # 4
+)
 
 
 class splitRangeByTablets_result(object):
@@ -13787,12 +14255,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.SET, 'success', (TType.STRUCT, (Range, Range.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -13802,7 +14264,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13845,7 +14307,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('splitRangeByTablets_result')
         if self.success is not None:
@@ -13883,6 +14345,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(splitRangeByTablets_result)
+splitRangeByTablets_result.thrift_spec = (
+    (0, TType.SET, 'success', (TType.STRUCT, [Range, None], False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class tableExists_args(object):
@@ -13892,11 +14361,6 @@
      - tableName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tableName=None,):
         self.login = login
@@ -13904,7 +14368,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13928,7 +14392,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('tableExists_args')
         if self.login is not None:
@@ -13955,6 +14419,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(tableExists_args)
+tableExists_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+)
 
 
 class tableExists_result(object):
@@ -13963,16 +14433,13 @@
      - success
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -13991,7 +14458,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('tableExists_result')
         if self.success is not None:
@@ -14014,6 +14481,10 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(tableExists_result)
+tableExists_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+)
 
 
 class tableIdMap_args(object):
@@ -14022,17 +14493,13 @@
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14051,7 +14518,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('tableIdMap_args')
         if self.login is not None:
@@ -14074,6 +14541,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(tableIdMap_args)
+tableIdMap_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class tableIdMap_result(object):
@@ -14082,16 +14554,13 @@
      - success
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14116,7 +14585,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('tableIdMap_result')
         if self.success is not None:
@@ -14143,6 +14612,10 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(tableIdMap_result)
+tableIdMap_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+)
 
 
 class testTableClassLoad_args(object):
@@ -14154,13 +14627,6 @@
      - asTypeName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'className', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, className=None, asTypeName=None,):
         self.login = login
@@ -14170,7 +14636,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14204,7 +14670,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testTableClassLoad_args')
         if self.login is not None:
@@ -14239,6 +14705,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testTableClassLoad_args)
+testTableClassLoad_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'className', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 4
+)
 
 
 class testTableClassLoad_result(object):
@@ -14250,12 +14724,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -14265,7 +14733,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14302,7 +14770,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testTableClassLoad_result')
         if self.success is not None:
@@ -14337,6 +14805,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testTableClassLoad_result)
+testTableClassLoad_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class pingTabletServer_args(object):
@@ -14346,11 +14821,6 @@
      - tserver
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tserver=None,):
         self.login = login
@@ -14358,7 +14828,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14382,7 +14852,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('pingTabletServer_args')
         if self.login is not None:
@@ -14409,6 +14879,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(pingTabletServer_args)
+pingTabletServer_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
+)
 
 
 class pingTabletServer_result(object):
@@ -14418,11 +14894,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -14430,7 +14901,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14456,7 +14927,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('pingTabletServer_result')
         if self.ouch1 is not None:
@@ -14483,6 +14954,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(pingTabletServer_result)
+pingTabletServer_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getActiveScans_args(object):
@@ -14492,11 +14969,6 @@
      - tserver
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tserver=None,):
         self.login = login
@@ -14504,7 +14976,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14528,7 +15000,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getActiveScans_args')
         if self.login is not None:
@@ -14555,6 +15027,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getActiveScans_args)
+getActiveScans_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
+)
 
 
 class getActiveScans_result(object):
@@ -14565,11 +15043,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (ActiveScan, ActiveScan.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -14578,7 +15051,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14615,7 +15088,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getActiveScans_result')
         if self.success is not None:
@@ -14649,6 +15122,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getActiveScans_result)
+getActiveScans_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRUCT, [ActiveScan, None], False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getActiveCompactions_args(object):
@@ -14658,11 +15137,6 @@
      - tserver
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, tserver=None,):
         self.login = login
@@ -14670,7 +15144,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14694,7 +15168,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getActiveCompactions_args')
         if self.login is not None:
@@ -14721,6 +15195,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getActiveCompactions_args)
+getActiveCompactions_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tserver', 'UTF8', None, ),  # 2
+)
 
 
 class getActiveCompactions_result(object):
@@ -14731,11 +15211,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRUCT, (ActiveCompaction, ActiveCompaction.thrift_spec), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -14744,7 +15219,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14781,7 +15256,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getActiveCompactions_result')
         if self.success is not None:
@@ -14815,6 +15290,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getActiveCompactions_result)
+getActiveCompactions_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRUCT, [ActiveCompaction, None], False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getSiteConfiguration_args(object):
@@ -14823,17 +15304,13 @@
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14852,7 +15329,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getSiteConfiguration_args')
         if self.login is not None:
@@ -14875,6 +15352,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getSiteConfiguration_args)
+getSiteConfiguration_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class getSiteConfiguration_result(object):
@@ -14885,11 +15367,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -14898,7 +15375,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -14935,7 +15412,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getSiteConfiguration_result')
         if self.success is not None:
@@ -14970,6 +15447,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getSiteConfiguration_result)
+getSiteConfiguration_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getSystemConfiguration_args(object):
@@ -14978,17 +15461,13 @@
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15007,7 +15486,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getSystemConfiguration_args')
         if self.login is not None:
@@ -15030,6 +15509,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getSystemConfiguration_args)
+getSystemConfiguration_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class getSystemConfiguration_result(object):
@@ -15040,11 +15524,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -15053,7 +15532,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15090,7 +15569,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getSystemConfiguration_result')
         if self.success is not None:
@@ -15125,6 +15604,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getSystemConfiguration_result)
+getSystemConfiguration_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getTabletServers_args(object):
@@ -15133,17 +15618,13 @@
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15162,7 +15643,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getTabletServers_args')
         if self.login is not None:
@@ -15185,6 +15666,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getTabletServers_args)
+getTabletServers_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class getTabletServers_result(object):
@@ -15193,16 +15679,13 @@
      - success
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15226,7 +15709,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getTabletServers_result')
         if self.success is not None:
@@ -15252,6 +15735,10 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getTabletServers_result)
+getTabletServers_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+)
 
 
 class removeProperty_args(object):
@@ -15261,11 +15748,6 @@
      - property
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'property', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, property=None,):
         self.login = login
@@ -15273,7 +15755,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15297,7 +15779,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeProperty_args')
         if self.login is not None:
@@ -15324,6 +15806,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeProperty_args)
+removeProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'property', 'UTF8', None, ),  # 2
+)
 
 
 class removeProperty_result(object):
@@ -15333,11 +15821,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -15345,7 +15828,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15371,7 +15854,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeProperty_result')
         if self.ouch1 is not None:
@@ -15398,6 +15881,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeProperty_result)
+removeProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class setProperty_args(object):
@@ -15408,12 +15897,6 @@
      - value
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'property', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'value', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, property=None, value=None,):
         self.login = login
@@ -15422,7 +15905,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15451,7 +15934,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setProperty_args')
         if self.login is not None:
@@ -15482,6 +15965,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setProperty_args)
+setProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'property', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'value', 'UTF8', None, ),  # 3
+)
 
 
 class setProperty_result(object):
@@ -15491,11 +15981,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -15503,7 +15988,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15529,7 +16014,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setProperty_result')
         if self.ouch1 is not None:
@@ -15556,6 +16041,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setProperty_result)
+setProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class testClassLoad_args(object):
@@ -15566,12 +16057,6 @@
      - asTypeName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'className', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, className=None, asTypeName=None,):
         self.login = login
@@ -15580,7 +16065,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15609,7 +16094,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testClassLoad_args')
         if self.login is not None:
@@ -15640,6 +16125,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testClassLoad_args)
+testClassLoad_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'className', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 3
+)
 
 
 class testClassLoad_result(object):
@@ -15650,11 +16142,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -15663,7 +16150,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15694,7 +16181,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testClassLoad_result')
         if self.success is not None:
@@ -15725,6 +16212,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testClassLoad_result)
+testClassLoad_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class authenticateUser_args(object):
@@ -15735,12 +16228,6 @@
      - properties
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.MAP, 'properties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, properties=None,):
         self.login = login
@@ -15749,7 +16236,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15784,7 +16271,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('authenticateUser_args')
         if self.login is not None:
@@ -15819,6 +16306,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(authenticateUser_args)
+authenticateUser_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.MAP, 'properties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 3
+)
 
 
 class authenticateUser_result(object):
@@ -15829,11 +16323,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -15842,7 +16331,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15873,7 +16362,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('authenticateUser_result')
         if self.success is not None:
@@ -15904,6 +16393,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(authenticateUser_result)
+authenticateUser_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class changeUserAuthorizations_args(object):
@@ -15914,12 +16409,6 @@
      - authorizations
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, authorizations=None,):
         self.login = login
@@ -15928,7 +16417,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -15962,7 +16451,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('changeUserAuthorizations_args')
         if self.login is not None:
@@ -15996,6 +16485,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(changeUserAuthorizations_args)
+changeUserAuthorizations_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 3
+)
 
 
 class changeUserAuthorizations_result(object):
@@ -16005,11 +16501,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16017,7 +16508,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16043,7 +16534,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('changeUserAuthorizations_result')
         if self.ouch1 is not None:
@@ -16070,6 +16561,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(changeUserAuthorizations_result)
+changeUserAuthorizations_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class changeLocalUserPassword_args(object):
@@ -16080,12 +16577,6 @@
      - password
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'password', 'BINARY', None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, password=None,):
         self.login = login
@@ -16094,7 +16585,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16123,7 +16614,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('changeLocalUserPassword_args')
         if self.login is not None:
@@ -16154,6 +16645,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(changeLocalUserPassword_args)
+changeLocalUserPassword_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'password', 'BINARY', None, ),  # 3
+)
 
 
 class changeLocalUserPassword_result(object):
@@ -16163,11 +16661,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16175,7 +16668,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16201,7 +16694,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('changeLocalUserPassword_result')
         if self.ouch1 is not None:
@@ -16228,6 +16721,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(changeLocalUserPassword_result)
+changeLocalUserPassword_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class createLocalUser_args(object):
@@ -16238,12 +16737,6 @@
      - password
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'password', 'BINARY', None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, password=None,):
         self.login = login
@@ -16252,7 +16745,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16281,7 +16774,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createLocalUser_args')
         if self.login is not None:
@@ -16312,6 +16805,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createLocalUser_args)
+createLocalUser_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'password', 'BINARY', None, ),  # 3
+)
 
 
 class createLocalUser_result(object):
@@ -16321,11 +16821,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16333,7 +16828,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16359,7 +16854,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createLocalUser_result')
         if self.ouch1 is not None:
@@ -16386,6 +16881,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createLocalUser_result)
+createLocalUser_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class dropLocalUser_args(object):
@@ -16395,11 +16896,6 @@
      - user
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, user=None,):
         self.login = login
@@ -16407,7 +16903,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16431,7 +16927,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('dropLocalUser_args')
         if self.login is not None:
@@ -16458,6 +16954,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(dropLocalUser_args)
+dropLocalUser_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+)
 
 
 class dropLocalUser_result(object):
@@ -16467,11 +16969,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16479,7 +16976,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16505,7 +17002,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('dropLocalUser_result')
         if self.ouch1 is not None:
@@ -16532,6 +17029,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(dropLocalUser_result)
+dropLocalUser_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class getUserAuthorizations_args(object):
@@ -16541,11 +17044,6 @@
      - user
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, user=None,):
         self.login = login
@@ -16553,7 +17051,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16577,7 +17075,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getUserAuthorizations_args')
         if self.login is not None:
@@ -16604,6 +17102,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getUserAuthorizations_args)
+getUserAuthorizations_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+)
 
 
 class getUserAuthorizations_result(object):
@@ -16614,11 +17118,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'BINARY', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -16627,7 +17126,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16663,7 +17162,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getUserAuthorizations_result')
         if self.success is not None:
@@ -16697,6 +17196,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getUserAuthorizations_result)
+getUserAuthorizations_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRING, 'BINARY', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class grantSystemPermission_args(object):
@@ -16707,12 +17212,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'perm', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, perm=None,):
         self.login = login
@@ -16721,7 +17220,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16750,7 +17249,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantSystemPermission_args')
         if self.login is not None:
@@ -16781,6 +17280,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantSystemPermission_args)
+grantSystemPermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'perm', None, None, ),  # 3
+)
 
 
 class grantSystemPermission_result(object):
@@ -16790,11 +17296,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -16802,7 +17303,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16828,7 +17329,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantSystemPermission_result')
         if self.ouch1 is not None:
@@ -16855,6 +17356,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantSystemPermission_result)
+grantSystemPermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class grantTablePermission_args(object):
@@ -16866,13 +17373,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, table=None, perm=None,):
         self.login = login
@@ -16882,7 +17382,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -16916,7 +17416,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantTablePermission_args')
         if self.login is not None:
@@ -16951,6 +17451,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantTablePermission_args)
+grantTablePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class grantTablePermission_result(object):
@@ -16961,12 +17469,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -16975,7 +17477,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17007,7 +17509,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantTablePermission_result')
         if self.ouch1 is not None:
@@ -17038,6 +17540,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantTablePermission_result)
+grantTablePermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class hasSystemPermission_args(object):
@@ -17048,12 +17557,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'perm', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, perm=None,):
         self.login = login
@@ -17062,7 +17565,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17091,7 +17594,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasSystemPermission_args')
         if self.login is not None:
@@ -17122,6 +17625,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasSystemPermission_args)
+hasSystemPermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'perm', None, None, ),  # 3
+)
 
 
 class hasSystemPermission_result(object):
@@ -17132,11 +17642,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -17145,7 +17650,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17176,7 +17681,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasSystemPermission_result')
         if self.success is not None:
@@ -17207,6 +17712,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasSystemPermission_result)
+hasSystemPermission_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class hasTablePermission_args(object):
@@ -17218,13 +17729,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, table=None, perm=None,):
         self.login = login
@@ -17234,7 +17738,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17268,7 +17772,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasTablePermission_args')
         if self.login is not None:
@@ -17303,6 +17807,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasTablePermission_args)
+hasTablePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class hasTablePermission_result(object):
@@ -17314,12 +17826,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -17329,7 +17835,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17366,7 +17872,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasTablePermission_result')
         if self.success is not None:
@@ -17401,6 +17907,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasTablePermission_result)
+hasTablePermission_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class listLocalUsers_args(object):
@@ -17409,17 +17922,13 @@
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17438,7 +17947,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listLocalUsers_args')
         if self.login is not None:
@@ -17461,6 +17970,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listLocalUsers_args)
+listLocalUsers_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class listLocalUsers_result(object):
@@ -17472,12 +17986,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.SET, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -17487,7 +17995,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17529,7 +18037,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listLocalUsers_result')
         if self.success is not None:
@@ -17567,6 +18075,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listLocalUsers_result)
+listLocalUsers_result.thrift_spec = (
+    (0, TType.SET, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class revokeSystemPermission_args(object):
@@ -17577,12 +18092,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'perm', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, user=None, perm=None,):
         self.login = login
@@ -17591,7 +18100,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17620,7 +18129,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeSystemPermission_args')
         if self.login is not None:
@@ -17651,6 +18160,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeSystemPermission_args)
+revokeSystemPermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'perm', None, None, ),  # 3
+)
 
 
 class revokeSystemPermission_result(object):
@@ -17660,11 +18176,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -17672,7 +18183,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17698,7 +18209,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeSystemPermission_result')
         if self.ouch1 is not None:
@@ -17725,6 +18236,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeSystemPermission_result)
+revokeSystemPermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class revokeTablePermission_args(object):
@@ -17736,13 +18253,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, table=None, perm=None,):
         self.login = login
@@ -17752,7 +18262,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17786,7 +18296,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeTablePermission_args')
         if self.login is not None:
@@ -17821,6 +18331,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeTablePermission_args)
+revokeTablePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class revokeTablePermission_result(object):
@@ -17831,12 +18349,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -17845,7 +18357,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17877,7 +18389,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeTablePermission_result')
         if self.ouch1 is not None:
@@ -17908,6 +18420,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeTablePermission_result)
+revokeTablePermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class grantNamespacePermission_args(object):
@@ -17919,13 +18438,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, namespaceName=None, perm=None,):
         self.login = login
@@ -17935,7 +18447,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -17969,7 +18481,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantNamespacePermission_args')
         if self.login is not None:
@@ -18004,6 +18516,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantNamespacePermission_args)
+grantNamespacePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class grantNamespacePermission_result(object):
@@ -18013,11 +18533,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -18025,7 +18540,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18051,7 +18566,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('grantNamespacePermission_result')
         if self.ouch1 is not None:
@@ -18078,6 +18593,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(grantNamespacePermission_result)
+grantNamespacePermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class hasNamespacePermission_args(object):
@@ -18089,13 +18610,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, namespaceName=None, perm=None,):
         self.login = login
@@ -18105,7 +18619,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18139,7 +18653,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasNamespacePermission_args')
         if self.login is not None:
@@ -18174,6 +18688,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasNamespacePermission_args)
+hasNamespacePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class hasNamespacePermission_result(object):
@@ -18184,11 +18706,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -18197,7 +18714,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18228,7 +18745,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasNamespacePermission_result')
         if self.success is not None:
@@ -18259,6 +18776,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasNamespacePermission_result)
+hasNamespacePermission_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class revokeNamespacePermission_args(object):
@@ -18270,13 +18793,6 @@
      - perm
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'perm', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, user=None, namespaceName=None, perm=None,):
         self.login = login
@@ -18286,7 +18802,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18320,7 +18836,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeNamespacePermission_args')
         if self.login is not None:
@@ -18355,6 +18871,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeNamespacePermission_args)
+revokeNamespacePermission_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'perm', None, None, ),  # 4
+)
 
 
 class revokeNamespacePermission_result(object):
@@ -18364,11 +18888,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -18376,7 +18895,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18402,7 +18921,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('revokeNamespacePermission_result')
         if self.ouch1 is not None:
@@ -18429,6 +18948,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(revokeNamespacePermission_result)
+revokeNamespacePermission_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class createBatchScanner_args(object):
@@ -18439,12 +18964,6 @@
      - options
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'options', (BatchScanOptions, BatchScanOptions.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, options=None,):
         self.login = login
@@ -18453,7 +18972,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18483,7 +19002,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createBatchScanner_args')
         if self.login is not None:
@@ -18514,6 +19033,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createBatchScanner_args)
+createBatchScanner_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'options', [BatchScanOptions, None], None, ),  # 3
+)
 
 
 class createBatchScanner_result(object):
@@ -18525,12 +19051,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -18540,7 +19060,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18577,7 +19097,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createBatchScanner_result')
         if self.success is not None:
@@ -18612,6 +19132,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createBatchScanner_result)
+createBatchScanner_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class createScanner_args(object):
@@ -18622,12 +19149,6 @@
      - options
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'options', (ScanOptions, ScanOptions.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, options=None,):
         self.login = login
@@ -18636,7 +19157,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18666,7 +19187,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createScanner_args')
         if self.login is not None:
@@ -18697,6 +19218,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createScanner_args)
+createScanner_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'options', [ScanOptions, None], None, ),  # 3
+)
 
 
 class createScanner_result(object):
@@ -18708,12 +19236,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -18723,7 +19245,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18760,7 +19282,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createScanner_result')
         if self.success is not None:
@@ -18795,6 +19317,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createScanner_result)
+createScanner_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class hasNext_args(object):
@@ -18803,17 +19332,13 @@
      - scanner
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'scanner', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, scanner=None,):
         self.scanner = scanner
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18832,7 +19357,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasNext_args')
         if self.scanner is not None:
@@ -18855,6 +19380,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasNext_args)
+hasNext_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'scanner', 'UTF8', None, ),  # 1
+)
 
 
 class hasNext_result(object):
@@ -18864,10 +19394,6 @@
      - ouch1
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (UnknownScanner, UnknownScanner.thrift_spec), None, ),  # 1
-    )
 
     def __init__(self, success=None, ouch1=None,):
         self.success = success
@@ -18875,7 +19401,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18900,7 +19426,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('hasNext_result')
         if self.success is not None:
@@ -18927,6 +19453,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(hasNext_result)
+hasNext_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [UnknownScanner, None], None, ),  # 1
+)
 
 
 class nextEntry_args(object):
@@ -18935,17 +19466,13 @@
      - scanner
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'scanner', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, scanner=None,):
         self.scanner = scanner
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -18964,7 +19491,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('nextEntry_args')
         if self.scanner is not None:
@@ -18987,6 +19514,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(nextEntry_args)
+nextEntry_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'scanner', 'UTF8', None, ),  # 1
+)
 
 
 class nextEntry_result(object):
@@ -18998,12 +19530,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRUCT, 'success', (KeyValueAndPeek, KeyValueAndPeek.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (NoMoreEntriesException, NoMoreEntriesException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (UnknownScanner, UnknownScanner.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -19013,7 +19539,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19051,7 +19577,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('nextEntry_result')
         if self.success is not None:
@@ -19086,6 +19612,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(nextEntry_result)
+nextEntry_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [KeyValueAndPeek, None], None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [NoMoreEntriesException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [UnknownScanner, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloSecurityException, None], None, ),  # 3
+)
 
 
 class nextK_args(object):
@@ -19095,11 +19628,6 @@
      - k
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'scanner', 'UTF8', None, ),  # 1
-        (2, TType.I32, 'k', None, None, ),  # 2
-    )
 
     def __init__(self, scanner=None, k=None,):
         self.scanner = scanner
@@ -19107,7 +19635,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19131,7 +19659,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('nextK_args')
         if self.scanner is not None:
@@ -19158,6 +19686,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(nextK_args)
+nextK_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'scanner', 'UTF8', None, ),  # 1
+    (2, TType.I32, 'k', None, None, ),  # 2
+)
 
 
 class nextK_result(object):
@@ -19169,12 +19703,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRUCT, 'success', (ScanResult, ScanResult.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (NoMoreEntriesException, NoMoreEntriesException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (UnknownScanner, UnknownScanner.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -19184,7 +19712,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19222,7 +19750,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('nextK_result')
         if self.success is not None:
@@ -19257,6 +19785,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(nextK_result)
+nextK_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [ScanResult, None], None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [NoMoreEntriesException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [UnknownScanner, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloSecurityException, None], None, ),  # 3
+)
 
 
 class closeScanner_args(object):
@@ -19265,17 +19800,13 @@
      - scanner
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'scanner', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, scanner=None,):
         self.scanner = scanner
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19294,7 +19825,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('closeScanner_args')
         if self.scanner is not None:
@@ -19317,6 +19848,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(closeScanner_args)
+closeScanner_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'scanner', 'UTF8', None, ),  # 1
+)
 
 
 class closeScanner_result(object):
@@ -19325,17 +19861,13 @@
      - ouch1
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (UnknownScanner, UnknownScanner.thrift_spec), None, ),  # 1
-    )
 
     def __init__(self, ouch1=None,):
         self.ouch1 = ouch1
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19355,7 +19887,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('closeScanner_result')
         if self.ouch1 is not None:
@@ -19378,6 +19910,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(closeScanner_result)
+closeScanner_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [UnknownScanner, None], None, ),  # 1
+)
 
 
 class updateAndFlush_args(object):
@@ -19388,12 +19925,6 @@
      - cells
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.MAP, 'cells', (TType.STRING, 'BINARY', TType.LIST, (TType.STRUCT, (ColumnUpdate, ColumnUpdate.thrift_spec), False), False), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, cells=None,):
         self.login = login
@@ -19402,7 +19933,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19443,7 +19974,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('updateAndFlush_args')
         if self.login is not None:
@@ -19481,6 +20012,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(updateAndFlush_args)
+updateAndFlush_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.MAP, 'cells', (TType.STRING, 'BINARY', TType.LIST, (TType.STRUCT, [ColumnUpdate, None], False), False), None, ),  # 3
+)
 
 
 class updateAndFlush_result(object):
@@ -19492,13 +20030,6 @@
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'outch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ouch4', (MutationsRejectedException, MutationsRejectedException.thrift_spec), None, ),  # 4
-    )
 
     def __init__(self, outch1=None, ouch2=None, ouch3=None, ouch4=None,):
         self.outch1 = outch1
@@ -19508,7 +20039,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19546,7 +20077,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('updateAndFlush_result')
         if self.outch1 is not None:
@@ -19581,6 +20112,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(updateAndFlush_result)
+updateAndFlush_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'outch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+    (4, TType.STRUCT, 'ouch4', [MutationsRejectedException, None], None, ),  # 4
+)
 
 
 class createWriter_args(object):
@@ -19591,12 +20130,6 @@
      - opts
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'opts', (WriterOptions, WriterOptions.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, opts=None,):
         self.login = login
@@ -19605,7 +20138,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19635,7 +20168,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createWriter_args')
         if self.login is not None:
@@ -19666,6 +20199,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createWriter_args)
+createWriter_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'opts', [WriterOptions, None], None, ),  # 3
+)
 
 
 class createWriter_result(object):
@@ -19677,12 +20217,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'outch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, outch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -19692,7 +20226,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19729,7 +20263,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createWriter_result')
         if self.success is not None:
@@ -19764,6 +20298,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createWriter_result)
+createWriter_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+    (1, TType.STRUCT, 'outch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class update_args(object):
@@ -19773,11 +20314,6 @@
      - cells
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'writer', 'UTF8', None, ),  # 1
-        (2, TType.MAP, 'cells', (TType.STRING, 'BINARY', TType.LIST, (TType.STRUCT, (ColumnUpdate, ColumnUpdate.thrift_spec), False), False), None, ),  # 2
-    )
 
     def __init__(self, writer=None, cells=None,):
         self.writer = writer
@@ -19785,7 +20321,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19821,7 +20357,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('update_args')
         if self.writer is not None:
@@ -19855,6 +20391,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(update_args)
+update_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'writer', 'UTF8', None, ),  # 1
+    (2, TType.MAP, 'cells', (TType.STRING, 'BINARY', TType.LIST, (TType.STRUCT, [ColumnUpdate, None], False), False), None, ),  # 2
+)
 
 
 class flush_args(object):
@@ -19863,17 +20405,13 @@
      - writer
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'writer', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, writer=None,):
         self.writer = writer
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19892,7 +20430,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('flush_args')
         if self.writer is not None:
@@ -19915,6 +20453,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(flush_args)
+flush_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'writer', 'UTF8', None, ),  # 1
+)
 
 
 class flush_result(object):
@@ -19924,11 +20467,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (UnknownWriter, UnknownWriter.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (MutationsRejectedException, MutationsRejectedException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -19936,7 +20474,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -19962,7 +20500,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('flush_result')
         if self.ouch1 is not None:
@@ -19989,6 +20527,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(flush_result)
+flush_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [UnknownWriter, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [MutationsRejectedException, None], None, ),  # 2
+)
 
 
 class closeWriter_args(object):
@@ -19997,17 +20541,13 @@
      - writer
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'writer', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, writer=None,):
         self.writer = writer
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20026,7 +20566,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('closeWriter_args')
         if self.writer is not None:
@@ -20049,6 +20589,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(closeWriter_args)
+closeWriter_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'writer', 'UTF8', None, ),  # 1
+)
 
 
 class closeWriter_result(object):
@@ -20058,11 +20603,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (UnknownWriter, UnknownWriter.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (MutationsRejectedException, MutationsRejectedException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, ouch1=None, ouch2=None,):
         self.ouch1 = ouch1
@@ -20070,7 +20610,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20096,7 +20636,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('closeWriter_result')
         if self.ouch1 is not None:
@@ -20123,6 +20663,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(closeWriter_result)
+closeWriter_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [UnknownWriter, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [MutationsRejectedException, None], None, ),  # 2
+)
 
 
 class updateRowConditionally_args(object):
@@ -20134,13 +20680,6 @@
      - updates
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'row', 'BINARY', None, ),  # 3
-        (4, TType.STRUCT, 'updates', (ConditionalUpdates, ConditionalUpdates.thrift_spec), None, ),  # 4
-    )
 
     def __init__(self, login=None, tableName=None, row=None, updates=None,):
         self.login = login
@@ -20150,7 +20689,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20185,7 +20724,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('updateRowConditionally_args')
         if self.login is not None:
@@ -20220,6 +20759,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(updateRowConditionally_args)
+updateRowConditionally_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'row', 'BINARY', None, ),  # 3
+    (4, TType.STRUCT, 'updates', [ConditionalUpdates, None], None, ),  # 4
+)
 
 
 class updateRowConditionally_result(object):
@@ -20231,12 +20778,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.I32, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -20246,7 +20787,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20283,7 +20824,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('updateRowConditionally_result')
         if self.success is not None:
@@ -20318,6 +20859,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(updateRowConditionally_result)
+updateRowConditionally_result.thrift_spec = (
+    (0, TType.I32, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class createConditionalWriter_args(object):
@@ -20328,12 +20876,6 @@
      - options
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'options', (ConditionalWriterOptions, ConditionalWriterOptions.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, login=None, tableName=None, options=None,):
         self.login = login
@@ -20342,7 +20884,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20372,7 +20914,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createConditionalWriter_args')
         if self.login is not None:
@@ -20403,6 +20945,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createConditionalWriter_args)
+createConditionalWriter_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'tableName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'options', [ConditionalWriterOptions, None], None, ),  # 3
+)
 
 
 class createConditionalWriter_result(object):
@@ -20414,12 +20963,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (TableNotFoundException, TableNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -20429,7 +20972,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20466,7 +21009,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createConditionalWriter_result')
         if self.success is not None:
@@ -20501,6 +21044,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createConditionalWriter_result)
+createConditionalWriter_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [TableNotFoundException, None], None, ),  # 3
+)
 
 
 class updateRowsConditionally_args(object):
@@ -20510,11 +21060,6 @@
      - updates
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'conditionalWriter', 'UTF8', None, ),  # 1
-        (2, TType.MAP, 'updates', (TType.STRING, 'BINARY', TType.STRUCT, (ConditionalUpdates, ConditionalUpdates.thrift_spec), False), None, ),  # 2
-    )
 
     def __init__(self, conditionalWriter=None, updates=None,):
         self.conditionalWriter = conditionalWriter
@@ -20522,7 +21067,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20553,7 +21098,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('updateRowsConditionally_args')
         if self.conditionalWriter is not None:
@@ -20584,6 +21129,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(updateRowsConditionally_args)
+updateRowsConditionally_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'conditionalWriter', 'UTF8', None, ),  # 1
+    (2, TType.MAP, 'updates', (TType.STRING, 'BINARY', TType.STRUCT, [ConditionalUpdates, None], False), None, ),  # 2
+)
 
 
 class updateRowsConditionally_result(object):
@@ -20595,12 +21146,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'BINARY', TType.I32, None, False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (UnknownWriter, UnknownWriter.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -20610,7 +21155,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20653,7 +21198,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('updateRowsConditionally_result')
         if self.success is not None:
@@ -20692,6 +21237,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(updateRowsConditionally_result)
+updateRowsConditionally_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'BINARY', TType.I32, None, False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [UnknownWriter, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [AccumuloSecurityException, None], None, ),  # 3
+)
 
 
 class closeConditionalWriter_args(object):
@@ -20700,17 +21252,13 @@
      - conditionalWriter
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'conditionalWriter', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, conditionalWriter=None,):
         self.conditionalWriter = conditionalWriter
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20729,7 +21277,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('closeConditionalWriter_args')
         if self.conditionalWriter is not None:
@@ -20752,16 +21300,19 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(closeConditionalWriter_args)
+closeConditionalWriter_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'conditionalWriter', 'UTF8', None, ),  # 1
+)
 
 
 class closeConditionalWriter_result(object):
 
-    thrift_spec = (
-    )
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20775,7 +21326,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('closeConditionalWriter_result')
         oprot.writeFieldStop()
@@ -20794,6 +21345,9 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(closeConditionalWriter_result)
+closeConditionalWriter_result.thrift_spec = (
+)
 
 
 class getRowRange_args(object):
@@ -20802,17 +21356,13 @@
      - row
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'row', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, row=None,):
         self.row = row
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20831,7 +21381,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getRowRange_args')
         if self.row is not None:
@@ -20854,6 +21404,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getRowRange_args)
+getRowRange_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'row', 'BINARY', None, ),  # 1
+)
 
 
 class getRowRange_result(object):
@@ -20862,16 +21417,13 @@
      - success
     """
 
-    thrift_spec = (
-        (0, TType.STRUCT, 'success', (Range, Range.thrift_spec), None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20891,7 +21443,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getRowRange_result')
         if self.success is not None:
@@ -20914,6 +21466,10 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getRowRange_result)
+getRowRange_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [Range, None], None, ),  # 0
+)
 
 
 class getFollowing_args(object):
@@ -20923,11 +21479,6 @@
      - part
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'key', (Key, Key.thrift_spec), None, ),  # 1
-        (2, TType.I32, 'part', None, None, ),  # 2
-    )
 
     def __init__(self, key=None, part=None,):
         self.key = key
@@ -20935,7 +21486,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -20960,7 +21511,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getFollowing_args')
         if self.key is not None:
@@ -20987,6 +21538,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getFollowing_args)
+getFollowing_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'key', [Key, None], None, ),  # 1
+    (2, TType.I32, 'part', None, None, ),  # 2
+)
 
 
 class getFollowing_result(object):
@@ -20995,16 +21552,13 @@
      - success
     """
 
-    thrift_spec = (
-        (0, TType.STRUCT, 'success', (Key, Key.thrift_spec), None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21024,7 +21578,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getFollowing_result')
         if self.success is not None:
@@ -21047,16 +21601,18 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getFollowing_result)
+getFollowing_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [Key, None], None, ),  # 0
+)
 
 
 class systemNamespace_args(object):
 
-    thrift_spec = (
-    )
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21070,7 +21626,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('systemNamespace_args')
         oprot.writeFieldStop()
@@ -21089,6 +21645,9 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(systemNamespace_args)
+systemNamespace_args.thrift_spec = (
+)
 
 
 class systemNamespace_result(object):
@@ -21097,16 +21656,13 @@
      - success
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21125,7 +21681,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('systemNamespace_result')
         if self.success is not None:
@@ -21148,16 +21704,18 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(systemNamespace_result)
+systemNamespace_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+)
 
 
 class defaultNamespace_args(object):
 
-    thrift_spec = (
-    )
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21171,7 +21729,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('defaultNamespace_args')
         oprot.writeFieldStop()
@@ -21190,6 +21748,9 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(defaultNamespace_args)
+defaultNamespace_args.thrift_spec = (
+)
 
 
 class defaultNamespace_result(object):
@@ -21198,16 +21759,13 @@
      - success
     """
 
-    thrift_spec = (
-        (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
-    )
 
     def __init__(self, success=None,):
         self.success = success
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21226,7 +21784,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('defaultNamespace_result')
         if self.success is not None:
@@ -21249,6 +21807,10 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(defaultNamespace_result)
+defaultNamespace_result.thrift_spec = (
+    (0, TType.STRING, 'success', 'UTF8', None, ),  # 0
+)
 
 
 class listNamespaces_args(object):
@@ -21257,17 +21819,13 @@
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21286,7 +21844,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listNamespaces_args')
         if self.login is not None:
@@ -21309,6 +21867,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listNamespaces_args)
+listNamespaces_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class listNamespaces_result(object):
@@ -21319,11 +21882,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -21332,7 +21890,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21368,7 +21926,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listNamespaces_result')
         if self.success is not None:
@@ -21402,6 +21960,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listNamespaces_result)
+listNamespaces_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class namespaceExists_args(object):
@@ -21411,11 +21975,6 @@
      - namespaceName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, namespaceName=None,):
         self.login = login
@@ -21423,7 +21982,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21447,7 +22006,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('namespaceExists_args')
         if self.login is not None:
@@ -21474,6 +22033,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(namespaceExists_args)
+namespaceExists_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+)
 
 
 class namespaceExists_result(object):
@@ -21484,11 +22049,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -21497,7 +22057,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21528,7 +22088,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('namespaceExists_result')
         if self.success is not None:
@@ -21559,6 +22119,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(namespaceExists_result)
+namespaceExists_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class createNamespace_args(object):
@@ -21568,11 +22134,6 @@
      - namespaceName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, namespaceName=None,):
         self.login = login
@@ -21580,7 +22141,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21604,7 +22165,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createNamespace_args')
         if self.login is not None:
@@ -21631,6 +22192,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createNamespace_args)
+createNamespace_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+)
 
 
 class createNamespace_result(object):
@@ -21641,12 +22208,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceExistsException, NamespaceExistsException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -21655,7 +22216,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21687,7 +22248,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('createNamespace_result')
         if self.ouch1 is not None:
@@ -21718,6 +22279,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(createNamespace_result)
+createNamespace_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceExistsException, None], None, ),  # 3
+)
 
 
 class deleteNamespace_args(object):
@@ -21727,11 +22295,6 @@
      - namespaceName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, namespaceName=None,):
         self.login = login
@@ -21739,7 +22302,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21763,7 +22326,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteNamespace_args')
         if self.login is not None:
@@ -21790,6 +22353,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteNamespace_args)
+deleteNamespace_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+)
 
 
 class deleteNamespace_result(object):
@@ -21801,13 +22370,6 @@
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ouch4', (NamespaceNotEmptyException, NamespaceNotEmptyException.thrift_spec), None, ),  # 4
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None, ouch4=None,):
         self.ouch1 = ouch1
@@ -21817,7 +22379,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21855,7 +22417,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('deleteNamespace_result')
         if self.ouch1 is not None:
@@ -21890,6 +22452,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(deleteNamespace_result)
+deleteNamespace_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+    (4, TType.STRUCT, 'ouch4', [NamespaceNotEmptyException, None], None, ),  # 4
+)
 
 
 class renameNamespace_args(object):
@@ -21900,12 +22470,6 @@
      - newNamespaceName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'oldNamespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'newNamespaceName', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, oldNamespaceName=None, newNamespaceName=None,):
         self.login = login
@@ -21914,7 +22478,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -21943,7 +22507,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('renameNamespace_args')
         if self.login is not None:
@@ -21974,6 +22538,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(renameNamespace_args)
+renameNamespace_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'oldNamespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'newNamespaceName', 'UTF8', None, ),  # 3
+)
 
 
 class renameNamespace_result(object):
@@ -21985,13 +22556,6 @@
      - ouch4
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-        (4, TType.STRUCT, 'ouch4', (NamespaceExistsException, NamespaceExistsException.thrift_spec), None, ),  # 4
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None, ouch4=None,):
         self.ouch1 = ouch1
@@ -22001,7 +22565,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22039,7 +22603,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('renameNamespace_result')
         if self.ouch1 is not None:
@@ -22074,6 +22638,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(renameNamespace_result)
+renameNamespace_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+    (4, TType.STRUCT, 'ouch4', [NamespaceExistsException, None], None, ),  # 4
+)
 
 
 class setNamespaceProperty_args(object):
@@ -22085,13 +22657,6 @@
      - value
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'value', 'UTF8', None, ),  # 4
-    )
 
     def __init__(self, login=None, namespaceName=None, property=None, value=None,):
         self.login = login
@@ -22101,7 +22666,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22135,7 +22700,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setNamespaceProperty_args')
         if self.login is not None:
@@ -22170,6 +22735,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setNamespaceProperty_args)
+setNamespaceProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'value', 'UTF8', None, ),  # 4
+)
 
 
 class setNamespaceProperty_result(object):
@@ -22180,12 +22753,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -22194,7 +22761,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22226,7 +22793,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('setNamespaceProperty_result')
         if self.ouch1 is not None:
@@ -22257,6 +22824,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(setNamespaceProperty_result)
+setNamespaceProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class removeNamespaceProperty_args(object):
@@ -22267,12 +22841,6 @@
      - property
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, namespaceName=None, property=None,):
         self.login = login
@@ -22281,7 +22849,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22310,7 +22878,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeNamespaceProperty_args')
         if self.login is not None:
@@ -22341,6 +22909,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeNamespaceProperty_args)
+removeNamespaceProperty_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'property', 'UTF8', None, ),  # 3
+)
 
 
 class removeNamespaceProperty_result(object):
@@ -22351,12 +22926,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -22365,7 +22934,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22397,7 +22966,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeNamespaceProperty_result')
         if self.ouch1 is not None:
@@ -22428,6 +22997,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeNamespaceProperty_result)
+removeNamespaceProperty_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class getNamespaceProperties_args(object):
@@ -22437,11 +23013,6 @@
      - namespaceName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, namespaceName=None,):
         self.login = login
@@ -22449,7 +23020,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22473,7 +23044,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getNamespaceProperties_args')
         if self.login is not None:
@@ -22500,6 +23071,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getNamespaceProperties_args)
+getNamespaceProperties_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+)
 
 
 class getNamespaceProperties_result(object):
@@ -22511,12 +23088,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -22526,7 +23097,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22569,7 +23140,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getNamespaceProperties_result')
         if self.success is not None:
@@ -22608,6 +23179,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getNamespaceProperties_result)
+getNamespaceProperties_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class namespaceIdMap_args(object):
@@ -22616,17 +23194,13 @@
      - login
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-    )
 
     def __init__(self, login=None,):
         self.login = login
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22645,7 +23219,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('namespaceIdMap_args')
         if self.login is not None:
@@ -22668,6 +23242,11 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(namespaceIdMap_args)
+namespaceIdMap_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+)
 
 
 class namespaceIdMap_result(object):
@@ -22678,11 +23257,6 @@
      - ouch2
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None,):
         self.success = success
@@ -22691,7 +23265,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22728,7 +23302,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('namespaceIdMap_result')
         if self.success is not None:
@@ -22763,6 +23337,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(namespaceIdMap_result)
+namespaceIdMap_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+)
 
 
 class attachNamespaceIterator_args(object):
@@ -22774,13 +23354,6 @@
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'setting', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, namespaceName=None, setting=None, scopes=None,):
         self.login = login
@@ -22790,7 +23363,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22830,7 +23403,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('attachNamespaceIterator_args')
         if self.login is not None:
@@ -22868,6 +23441,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(attachNamespaceIterator_args)
+attachNamespaceIterator_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class attachNamespaceIterator_result(object):
@@ -22878,12 +23459,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -22892,7 +23467,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -22924,7 +23499,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('attachNamespaceIterator_result')
         if self.ouch1 is not None:
@@ -22955,6 +23530,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(attachNamespaceIterator_result)
+attachNamespaceIterator_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class removeNamespaceIterator_args(object):
@@ -22966,13 +23548,6 @@
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'name', 'UTF8', None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, namespaceName=None, name=None, scopes=None,):
         self.login = login
@@ -22982,7 +23557,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23021,7 +23596,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeNamespaceIterator_args')
         if self.login is not None:
@@ -23059,6 +23634,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeNamespaceIterator_args)
+removeNamespaceIterator_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'name', 'UTF8', None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class removeNamespaceIterator_result(object):
@@ -23069,12 +23652,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -23083,7 +23660,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23115,7 +23692,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeNamespaceIterator_result')
         if self.ouch1 is not None:
@@ -23146,6 +23723,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeNamespaceIterator_result)
+removeNamespaceIterator_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class getNamespaceIteratorSetting_args(object):
@@ -23157,13 +23741,6 @@
      - scope
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'name', 'UTF8', None, ),  # 3
-        (4, TType.I32, 'scope', None, None, ),  # 4
-    )
 
     def __init__(self, login=None, namespaceName=None, name=None, scope=None,):
         self.login = login
@@ -23173,7 +23750,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23207,7 +23784,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getNamespaceIteratorSetting_args')
         if self.login is not None:
@@ -23242,6 +23819,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getNamespaceIteratorSetting_args)
+getNamespaceIteratorSetting_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'name', 'UTF8', None, ),  # 3
+    (4, TType.I32, 'scope', None, None, ),  # 4
+)
 
 
 class getNamespaceIteratorSetting_result(object):
@@ -23253,12 +23838,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.STRUCT, 'success', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -23268,7 +23847,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23306,7 +23885,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('getNamespaceIteratorSetting_result')
         if self.success is not None:
@@ -23341,6 +23920,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(getNamespaceIteratorSetting_result)
+getNamespaceIteratorSetting_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [IteratorSetting, None], None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class listNamespaceIterators_args(object):
@@ -23350,11 +23936,6 @@
      - namespaceName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, namespaceName=None,):
         self.login = login
@@ -23362,7 +23943,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23386,7 +23967,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listNamespaceIterators_args')
         if self.login is not None:
@@ -23413,6 +23994,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listNamespaceIterators_args)
+listNamespaceIterators_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+)
 
 
 class listNamespaceIterators_result(object):
@@ -23424,12 +24011,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.I32, None, False), False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -23439,7 +24020,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23487,7 +24068,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listNamespaceIterators_result')
         if self.success is not None:
@@ -23529,6 +24110,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listNamespaceIterators_result)
+listNamespaceIterators_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.SET, (TType.I32, None, False), False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class checkNamespaceIteratorConflicts_args(object):
@@ -23540,13 +24128,6 @@
      - scopes
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRUCT, 'setting', (IteratorSetting, IteratorSetting.thrift_spec), None, ),  # 3
-        (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
-    )
 
     def __init__(self, login=None, namespaceName=None, setting=None, scopes=None,):
         self.login = login
@@ -23556,7 +24137,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23596,7 +24177,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('checkNamespaceIteratorConflicts_args')
         if self.login is not None:
@@ -23634,6 +24215,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(checkNamespaceIteratorConflicts_args)
+checkNamespaceIteratorConflicts_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ),  # 3
+    (4, TType.SET, 'scopes', (TType.I32, None, False), None, ),  # 4
+)
 
 
 class checkNamespaceIteratorConflicts_result(object):
@@ -23644,12 +24233,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -23658,7 +24241,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23690,7 +24273,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('checkNamespaceIteratorConflicts_result')
         if self.ouch1 is not None:
@@ -23721,6 +24304,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(checkNamespaceIteratorConflicts_result)
+checkNamespaceIteratorConflicts_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class addNamespaceConstraint_args(object):
@@ -23731,12 +24321,6 @@
      - constraintClassName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'constraintClassName', 'UTF8', None, ),  # 3
-    )
 
     def __init__(self, login=None, namespaceName=None, constraintClassName=None,):
         self.login = login
@@ -23745,7 +24329,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23774,7 +24358,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addNamespaceConstraint_args')
         if self.login is not None:
@@ -23805,6 +24389,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addNamespaceConstraint_args)
+addNamespaceConstraint_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'constraintClassName', 'UTF8', None, ),  # 3
+)
 
 
 class addNamespaceConstraint_result(object):
@@ -23816,12 +24407,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.I32, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -23831,7 +24416,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23868,7 +24453,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('addNamespaceConstraint_result')
         if self.success is not None:
@@ -23903,6 +24488,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(addNamespaceConstraint_result)
+addNamespaceConstraint_result.thrift_spec = (
+    (0, TType.I32, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class removeNamespaceConstraint_args(object):
@@ -23913,12 +24505,6 @@
      - id
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'id', None, None, ),  # 3
-    )
 
     def __init__(self, login=None, namespaceName=None, id=None,):
         self.login = login
@@ -23927,7 +24513,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -23956,7 +24542,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeNamespaceConstraint_args')
         if self.login is not None:
@@ -23987,6 +24573,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeNamespaceConstraint_args)
+removeNamespaceConstraint_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.I32, 'id', None, None, ),  # 3
+)
 
 
 class removeNamespaceConstraint_result(object):
@@ -23997,12 +24590,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, ouch1=None, ouch2=None, ouch3=None,):
         self.ouch1 = ouch1
@@ -24011,7 +24598,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -24043,7 +24630,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('removeNamespaceConstraint_result')
         if self.ouch1 is not None:
@@ -24074,6 +24661,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(removeNamespaceConstraint_result)
+removeNamespaceConstraint_result.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class listNamespaceConstraints_args(object):
@@ -24083,11 +24677,6 @@
      - namespaceName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-    )
 
     def __init__(self, login=None, namespaceName=None,):
         self.login = login
@@ -24095,7 +24684,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -24119,7 +24708,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listNamespaceConstraints_args')
         if self.login is not None:
@@ -24146,6 +24735,12 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listNamespaceConstraints_args)
+listNamespaceConstraints_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+)
 
 
 class listNamespaceConstraints_result(object):
@@ -24157,12 +24752,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -24172,7 +24761,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -24215,7 +24804,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('listNamespaceConstraints_result')
         if self.success is not None:
@@ -24254,6 +24843,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(listNamespaceConstraints_result)
+listNamespaceConstraints_result.thrift_spec = (
+    (0, TType.MAP, 'success', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
 
 
 class testNamespaceClassLoad_args(object):
@@ -24265,13 +24861,6 @@
      - asTypeName
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'className', 'UTF8', None, ),  # 3
-        (4, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 4
-    )
 
     def __init__(self, login=None, namespaceName=None, className=None, asTypeName=None,):
         self.login = login
@@ -24281,7 +24870,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -24315,7 +24904,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testNamespaceClassLoad_args')
         if self.login is not None:
@@ -24350,6 +24939,14 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testNamespaceClassLoad_args)
+testNamespaceClassLoad_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'login', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'namespaceName', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'className', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'asTypeName', 'UTF8', None, ),  # 4
+)
 
 
 class testNamespaceClassLoad_result(object):
@@ -24361,12 +24958,6 @@
      - ouch3
     """
 
-    thrift_spec = (
-        (0, TType.BOOL, 'success', None, None, ),  # 0
-        (1, TType.STRUCT, 'ouch1', (AccumuloException, AccumuloException.thrift_spec), None, ),  # 1
-        (2, TType.STRUCT, 'ouch2', (AccumuloSecurityException, AccumuloSecurityException.thrift_spec), None, ),  # 2
-        (3, TType.STRUCT, 'ouch3', (NamespaceNotFoundException, NamespaceNotFoundException.thrift_spec), None, ),  # 3
-    )
 
     def __init__(self, success=None, ouch1=None, ouch2=None, ouch3=None,):
         self.success = success
@@ -24376,7 +24967,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -24413,7 +25004,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('testNamespaceClassLoad_result')
         if self.success is not None:
@@ -24448,3 +25039,13 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(testNamespaceClassLoad_result)
+testNamespaceClassLoad_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+    (1, TType.STRUCT, 'ouch1', [AccumuloException, None], None, ),  # 1
+    (2, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ),  # 2
+    (3, TType.STRUCT, 'ouch3', [NamespaceNotFoundException, None], None, ),  # 3
+)
+fix_spec(all_structs)
+del all_structs
+

diff --git a/src/main/python/constants.py b/src/main/python/constants.py
index 3b2f97a..e78d3f4 100644
--- a/src/main/python/constants.py
+++ b/src/main/python/constants.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -22,5 +22,7 @@
 
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+
 import sys
 from .ttypes import *

diff --git a/src/main/python/ttypes.py b/src/main/python/ttypes.py
index ca90543..780d9bf 100644
--- a/src/main/python/ttypes.py
+++ b/src/main/python/ttypes.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -22,9 +22,12 @@
 
 from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
 from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+
 import sys
 
 from thrift.transport import TTransport
+all_structs = []
 
 
 class PartialKey(object):
@@ -331,16 +334,8 @@
      - timestamp
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'row', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'colFamily', 'BINARY', None, ),  # 2
-        (3, TType.STRING, 'colQualifier', 'BINARY', None, ),  # 3
-        (4, TType.STRING, 'colVisibility', 'BINARY', None, ),  # 4
-        (5, TType.I64, 'timestamp', None, 9223372036854775807, ),  # 5
-    )
 
-    def __init__(self, row=None, colFamily=None, colQualifier=None, colVisibility=None, timestamp=thrift_spec[5][4],):
+    def __init__(self, row=None, colFamily=None, colQualifier=None, colVisibility=None, timestamp=9223372036854775807,):
         self.row = row
         self.colFamily = colFamily
         self.colQualifier = colQualifier
@@ -349,7 +344,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -388,7 +383,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('Key')
         if self.row is not None:
@@ -440,15 +435,6 @@
      - deleteCell
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'colFamily', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'colQualifier', 'BINARY', None, ),  # 2
-        (3, TType.STRING, 'colVisibility', 'BINARY', None, ),  # 3
-        (4, TType.I64, 'timestamp', None, None, ),  # 4
-        (5, TType.STRING, 'value', 'BINARY', None, ),  # 5
-        (6, TType.BOOL, 'deleteCell', None, None, ),  # 6
-    )
 
     def __init__(self, colFamily=None, colQualifier=None, colVisibility=None, timestamp=None, value=None, deleteCell=None,):
         self.colFamily = colFamily
@@ -460,7 +446,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -504,7 +490,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('ColumnUpdate')
         if self.colFamily is not None:
@@ -556,11 +542,6 @@
      - usage
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.LIST, 'tables', (TType.STRING, 'UTF8', False), None, ),  # 1
-        (2, TType.I64, 'usage', None, None, ),  # 2
-    )
 
     def __init__(self, tables=None, usage=None,):
         self.tables = tables
@@ -568,7 +549,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -597,7 +578,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('DiskUsage')
         if self.tables is not None:
@@ -636,11 +617,6 @@
      - value
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'key', (Key, Key.thrift_spec), None, ),  # 1
-        (2, TType.STRING, 'value', 'BINARY', None, ),  # 2
-    )
 
     def __init__(self, key=None, value=None,):
         self.key = key
@@ -648,7 +624,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -673,7 +649,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('KeyValue')
         if self.key is not None:
@@ -709,11 +685,6 @@
      - more
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.LIST, 'results', (TType.STRUCT, (KeyValue, KeyValue.thrift_spec), False), None, ),  # 1
-        (2, TType.BOOL, 'more', None, None, ),  # 2
-    )
 
     def __init__(self, results=None, more=None,):
         self.results = results
@@ -721,7 +692,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -751,7 +722,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('ScanResult')
         if self.results is not None:
@@ -792,13 +763,6 @@
      - stopInclusive
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'start', (Key, Key.thrift_spec), None, ),  # 1
-        (2, TType.BOOL, 'startInclusive', None, None, ),  # 2
-        (3, TType.STRUCT, 'stop', (Key, Key.thrift_spec), None, ),  # 3
-        (4, TType.BOOL, 'stopInclusive', None, None, ),  # 4
-    )
 
     def __init__(self, start=None, startInclusive=None, stop=None, stopInclusive=None,):
         self.start = start
@@ -808,7 +772,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -844,7 +808,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('Range')
         if self.start is not None:
@@ -888,11 +852,6 @@
      - colQualifier
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'colFamily', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'colQualifier', 'BINARY', None, ),  # 2
-    )
 
     def __init__(self, colFamily=None, colQualifier=None,):
         self.colFamily = colFamily
@@ -900,7 +859,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -924,7 +883,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('ScanColumn')
         if self.colFamily is not None:
@@ -962,13 +921,6 @@
      - properties
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.I32, 'priority', None, None, ),  # 1
-        (2, TType.STRING, 'name', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'iteratorClass', 'UTF8', None, ),  # 3
-        (4, TType.MAP, 'properties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 4
-    )
 
     def __init__(self, priority=None, name=None, iteratorClass=None, properties=None,):
         self.priority = priority
@@ -978,7 +930,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1018,7 +970,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('IteratorSetting')
         if self.priority is not None:
@@ -1069,14 +1021,6 @@
      - bufferSize
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 1
-        (2, TType.STRUCT, 'range', (Range, Range.thrift_spec), None, ),  # 2
-        (3, TType.LIST, 'columns', (TType.STRUCT, (ScanColumn, ScanColumn.thrift_spec), False), None, ),  # 3
-        (4, TType.LIST, 'iterators', (TType.STRUCT, (IteratorSetting, IteratorSetting.thrift_spec), False), None, ),  # 4
-        (5, TType.I32, 'bufferSize', None, None, ),  # 5
-    )
 
     def __init__(self, authorizations=None, range=None, columns=None, iterators=None, bufferSize=None,):
         self.authorizations = authorizations
@@ -1087,7 +1031,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1144,7 +1088,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('ScanOptions')
         if self.authorizations is not None:
@@ -1204,14 +1148,6 @@
      - threads
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 1
-        (2, TType.LIST, 'ranges', (TType.STRUCT, (Range, Range.thrift_spec), False), None, ),  # 2
-        (3, TType.LIST, 'columns', (TType.STRUCT, (ScanColumn, ScanColumn.thrift_spec), False), None, ),  # 3
-        (4, TType.LIST, 'iterators', (TType.STRUCT, (IteratorSetting, IteratorSetting.thrift_spec), False), None, ),  # 4
-        (5, TType.I32, 'threads', None, None, ),  # 5
-    )
 
     def __init__(self, authorizations=None, ranges=None, columns=None, iterators=None, threads=None,):
         self.authorizations = authorizations
@@ -1222,7 +1158,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1284,7 +1220,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('BatchScanOptions')
         if self.authorizations is not None:
@@ -1344,11 +1280,6 @@
      - hasNext
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'keyValue', (KeyValue, KeyValue.thrift_spec), None, ),  # 1
-        (2, TType.BOOL, 'hasNext', None, None, ),  # 2
-    )
 
     def __init__(self, keyValue=None, hasNext=None,):
         self.keyValue = keyValue
@@ -1356,7 +1287,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1381,7 +1312,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('KeyValueAndPeek')
         if self.keyValue is not None:
@@ -1418,12 +1349,6 @@
      - prevEndRow
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'tableId', 'UTF8', None, ),  # 1
-        (2, TType.STRING, 'endRow', 'BINARY', None, ),  # 2
-        (3, TType.STRING, 'prevEndRow', 'BINARY', None, ),  # 3
-    )
 
     def __init__(self, tableId=None, endRow=None, prevEndRow=None,):
         self.tableId = tableId
@@ -1432,7 +1357,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1461,7 +1386,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('KeyExtent')
         if self.tableId is not None:
@@ -1502,12 +1427,6 @@
      - colVisibility
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'colFamily', 'BINARY', None, ),  # 1
-        (2, TType.STRING, 'colQualifier', 'BINARY', None, ),  # 2
-        (3, TType.STRING, 'colVisibility', 'BINARY', None, ),  # 3
-    )
 
     def __init__(self, colFamily=None, colQualifier=None, colVisibility=None,):
         self.colFamily = colFamily
@@ -1516,7 +1435,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1545,7 +1464,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('Column')
         if self.colFamily is not None:
@@ -1587,13 +1506,6 @@
      - iterators
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'column', (Column, Column.thrift_spec), None, ),  # 1
-        (2, TType.I64, 'timestamp', None, None, ),  # 2
-        (3, TType.STRING, 'value', 'BINARY', None, ),  # 3
-        (4, TType.LIST, 'iterators', (TType.STRUCT, (IteratorSetting, IteratorSetting.thrift_spec), False), None, ),  # 4
-    )
 
     def __init__(self, column=None, timestamp=None, value=None, iterators=None,):
         self.column = column
@@ -1603,7 +1515,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1644,7 +1556,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('Condition')
         if self.column is not None:
@@ -1691,12 +1603,6 @@
      - updates
     """
 
-    thrift_spec = (
-        None,  # 0
-        None,  # 1
-        (2, TType.LIST, 'conditions', (TType.STRUCT, (Condition, Condition.thrift_spec), False), None, ),  # 2
-        (3, TType.LIST, 'updates', (TType.STRUCT, (ColumnUpdate, ColumnUpdate.thrift_spec), False), None, ),  # 3
-    )
 
     def __init__(self, conditions=None, updates=None,):
         self.conditions = conditions
@@ -1704,7 +1610,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1740,7 +1646,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('ConditionalUpdates')
         if self.conditions is not None:
@@ -1785,14 +1691,6 @@
      - durability
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.I64, 'maxMemory', None, None, ),  # 1
-        (2, TType.I64, 'timeoutMs', None, None, ),  # 2
-        (3, TType.I32, 'threads', None, None, ),  # 3
-        (4, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 4
-        (5, TType.I32, 'durability', None, None, ),  # 5
-    )
 
     def __init__(self, maxMemory=None, timeoutMs=None, threads=None, authorizations=None, durability=None,):
         self.maxMemory = maxMemory
@@ -1803,7 +1701,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -1847,7 +1745,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('ConditionalWriterOptions')
         if self.maxMemory is not None:
@@ -1907,20 +1805,6 @@
      - authorizations
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'client', 'UTF8', None, ),  # 1
-        (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
-        (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
-        (4, TType.I64, 'age', None, None, ),  # 4
-        (5, TType.I64, 'idleTime', None, None, ),  # 5
-        (6, TType.I32, 'type', None, None, ),  # 6
-        (7, TType.I32, 'state', None, None, ),  # 7
-        (8, TType.STRUCT, 'extent', (KeyExtent, KeyExtent.thrift_spec), None, ),  # 8
-        (9, TType.LIST, 'columns', (TType.STRUCT, (Column, Column.thrift_spec), False), None, ),  # 9
-        (10, TType.LIST, 'iterators', (TType.STRUCT, (IteratorSetting, IteratorSetting.thrift_spec), False), None, ),  # 10
-        (11, TType.LIST, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 11
-    )
 
     def __init__(self, client=None, user=None, table=None, age=None, idleTime=None, type=None, state=None, extent=None, columns=None, iterators=None, authorizations=None,):
         self.client = client
@@ -1937,7 +1821,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2024,7 +1908,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('ActiveScan')
         if self.client is not None:
@@ -2113,19 +1997,6 @@
      - iterators
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRUCT, 'extent', (KeyExtent, KeyExtent.thrift_spec), None, ),  # 1
-        (2, TType.I64, 'age', None, None, ),  # 2
-        (3, TType.LIST, 'inputFiles', (TType.STRING, 'UTF8', False), None, ),  # 3
-        (4, TType.STRING, 'outputFile', 'UTF8', None, ),  # 4
-        (5, TType.I32, 'type', None, None, ),  # 5
-        (6, TType.I32, 'reason', None, None, ),  # 6
-        (7, TType.STRING, 'localityGroup', 'UTF8', None, ),  # 7
-        (8, TType.I64, 'entriesRead', None, None, ),  # 8
-        (9, TType.I64, 'entriesWritten', None, None, ),  # 9
-        (10, TType.LIST, 'iterators', (TType.STRUCT, (IteratorSetting, IteratorSetting.thrift_spec), False), None, ),  # 10
-    )
 
     def __init__(self, extent=None, age=None, inputFiles=None, outputFile=None, type=None, reason=None, localityGroup=None, entriesRead=None, entriesWritten=None, iterators=None,):
         self.extent = extent
@@ -2141,7 +2012,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2217,7 +2088,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('ActiveCompaction')
         if self.extent is not None:
@@ -2294,14 +2165,6 @@
      - durability
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.I64, 'maxMemory', None, None, ),  # 1
-        (2, TType.I64, 'latencyMs', None, None, ),  # 2
-        (3, TType.I64, 'timeoutMs', None, None, ),  # 3
-        (4, TType.I32, 'threads', None, None, ),  # 4
-        (5, TType.I32, 'durability', None, None, ),  # 5
-    )
 
     def __init__(self, maxMemory=None, latencyMs=None, timeoutMs=None, threads=None, durability=None,):
         self.maxMemory = maxMemory
@@ -2312,7 +2175,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2351,7 +2214,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('WriterOptions')
         if self.maxMemory is not None:
@@ -2399,11 +2262,6 @@
      - options
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'className', 'UTF8', None, ),  # 1
-        (2, TType.MAP, 'options', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 2
-    )
 
     def __init__(self, className=None, options=None,):
         self.className = className
@@ -2411,7 +2269,7 @@
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2441,7 +2299,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('CompactionStrategyConfig')
         if self.className is not None:
@@ -2480,17 +2338,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2509,7 +2363,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('UnknownScanner')
         if self.msg is not None:
@@ -2543,17 +2397,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2572,7 +2422,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('UnknownWriter')
         if self.msg is not None:
@@ -2606,17 +2456,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2635,7 +2481,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('NoMoreEntriesException')
         if self.msg is not None:
@@ -2669,17 +2515,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2698,7 +2540,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('AccumuloException')
         if self.msg is not None:
@@ -2732,17 +2574,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2761,7 +2599,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('AccumuloSecurityException')
         if self.msg is not None:
@@ -2795,17 +2633,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2824,7 +2658,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('TableNotFoundException')
         if self.msg is not None:
@@ -2858,17 +2692,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2887,7 +2717,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('TableExistsException')
         if self.msg is not None:
@@ -2921,17 +2751,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -2950,7 +2776,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('MutationsRejectedException')
         if self.msg is not None:
@@ -2984,17 +2810,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -3013,7 +2835,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('NamespaceExistsException')
         if self.msg is not None:
@@ -3047,17 +2869,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -3076,7 +2894,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('NamespaceNotFoundException')
         if self.msg is not None:
@@ -3110,17 +2928,13 @@
      - msg
     """
 
-    thrift_spec = (
-        None,  # 0
-        (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
-    )
 
     def __init__(self, msg=None,):
         self.msg = msg
 
     def read(self, iprot):
         if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
-            iprot._fast_decode(self, iprot, (self.__class__, self.thrift_spec))
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
             return
         iprot.readStructBegin()
         while True:
@@ -3139,7 +2953,7 @@
 
     def write(self, oprot):
         if oprot._fast_encode is not None and self.thrift_spec is not None:
-            oprot.trans.write(oprot._fast_encode(self, (self.__class__, self.thrift_spec)))
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
             return
         oprot.writeStructBegin('NamespaceNotEmptyException')
         if self.msg is not None:
@@ -3165,3 +2979,225 @@
 
     def __ne__(self, other):
         return not (self == other)
+all_structs.append(Key)
+Key.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'row', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'colFamily', 'BINARY', None, ),  # 2
+    (3, TType.STRING, 'colQualifier', 'BINARY', None, ),  # 3
+    (4, TType.STRING, 'colVisibility', 'BINARY', None, ),  # 4
+    (5, TType.I64, 'timestamp', None, 9223372036854775807, ),  # 5
+)
+all_structs.append(ColumnUpdate)
+ColumnUpdate.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'colFamily', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'colQualifier', 'BINARY', None, ),  # 2
+    (3, TType.STRING, 'colVisibility', 'BINARY', None, ),  # 3
+    (4, TType.I64, 'timestamp', None, None, ),  # 4
+    (5, TType.STRING, 'value', 'BINARY', None, ),  # 5
+    (6, TType.BOOL, 'deleteCell', None, None, ),  # 6
+)
+all_structs.append(DiskUsage)
+DiskUsage.thrift_spec = (
+    None,  # 0
+    (1, TType.LIST, 'tables', (TType.STRING, 'UTF8', False), None, ),  # 1
+    (2, TType.I64, 'usage', None, None, ),  # 2
+)
+all_structs.append(KeyValue)
+KeyValue.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'key', [Key, None], None, ),  # 1
+    (2, TType.STRING, 'value', 'BINARY', None, ),  # 2
+)
+all_structs.append(ScanResult)
+ScanResult.thrift_spec = (
+    None,  # 0
+    (1, TType.LIST, 'results', (TType.STRUCT, [KeyValue, None], False), None, ),  # 1
+    (2, TType.BOOL, 'more', None, None, ),  # 2
+)
+all_structs.append(Range)
+Range.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'start', [Key, None], None, ),  # 1
+    (2, TType.BOOL, 'startInclusive', None, None, ),  # 2
+    (3, TType.STRUCT, 'stop', [Key, None], None, ),  # 3
+    (4, TType.BOOL, 'stopInclusive', None, None, ),  # 4
+)
+all_structs.append(ScanColumn)
+ScanColumn.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'colFamily', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'colQualifier', 'BINARY', None, ),  # 2
+)
+all_structs.append(IteratorSetting)
+IteratorSetting.thrift_spec = (
+    None,  # 0
+    (1, TType.I32, 'priority', None, None, ),  # 1
+    (2, TType.STRING, 'name', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'iteratorClass', 'UTF8', None, ),  # 3
+    (4, TType.MAP, 'properties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 4
+)
+all_structs.append(ScanOptions)
+ScanOptions.thrift_spec = (
+    None,  # 0
+    (1, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 1
+    (2, TType.STRUCT, 'range', [Range, None], None, ),  # 2
+    (3, TType.LIST, 'columns', (TType.STRUCT, [ScanColumn, None], False), None, ),  # 3
+    (4, TType.LIST, 'iterators', (TType.STRUCT, [IteratorSetting, None], False), None, ),  # 4
+    (5, TType.I32, 'bufferSize', None, None, ),  # 5
+)
+all_structs.append(BatchScanOptions)
+BatchScanOptions.thrift_spec = (
+    None,  # 0
+    (1, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 1
+    (2, TType.LIST, 'ranges', (TType.STRUCT, [Range, None], False), None, ),  # 2
+    (3, TType.LIST, 'columns', (TType.STRUCT, [ScanColumn, None], False), None, ),  # 3
+    (4, TType.LIST, 'iterators', (TType.STRUCT, [IteratorSetting, None], False), None, ),  # 4
+    (5, TType.I32, 'threads', None, None, ),  # 5
+)
+all_structs.append(KeyValueAndPeek)
+KeyValueAndPeek.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'keyValue', [KeyValue, None], None, ),  # 1
+    (2, TType.BOOL, 'hasNext', None, None, ),  # 2
+)
+all_structs.append(KeyExtent)
+KeyExtent.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'tableId', 'UTF8', None, ),  # 1
+    (2, TType.STRING, 'endRow', 'BINARY', None, ),  # 2
+    (3, TType.STRING, 'prevEndRow', 'BINARY', None, ),  # 3
+)
+all_structs.append(Column)
+Column.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'colFamily', 'BINARY', None, ),  # 1
+    (2, TType.STRING, 'colQualifier', 'BINARY', None, ),  # 2
+    (3, TType.STRING, 'colVisibility', 'BINARY', None, ),  # 3
+)
+all_structs.append(Condition)
+Condition.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'column', [Column, None], None, ),  # 1
+    (2, TType.I64, 'timestamp', None, None, ),  # 2
+    (3, TType.STRING, 'value', 'BINARY', None, ),  # 3
+    (4, TType.LIST, 'iterators', (TType.STRUCT, [IteratorSetting, None], False), None, ),  # 4
+)
+all_structs.append(ConditionalUpdates)
+ConditionalUpdates.thrift_spec = (
+    None,  # 0
+    None,  # 1
+    (2, TType.LIST, 'conditions', (TType.STRUCT, [Condition, None], False), None, ),  # 2
+    (3, TType.LIST, 'updates', (TType.STRUCT, [ColumnUpdate, None], False), None, ),  # 3
+)
+all_structs.append(ConditionalWriterOptions)
+ConditionalWriterOptions.thrift_spec = (
+    None,  # 0
+    (1, TType.I64, 'maxMemory', None, None, ),  # 1
+    (2, TType.I64, 'timeoutMs', None, None, ),  # 2
+    (3, TType.I32, 'threads', None, None, ),  # 3
+    (4, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 4
+    (5, TType.I32, 'durability', None, None, ),  # 5
+)
+all_structs.append(ActiveScan)
+ActiveScan.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'client', 'UTF8', None, ),  # 1
+    (2, TType.STRING, 'user', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'table', 'UTF8', None, ),  # 3
+    (4, TType.I64, 'age', None, None, ),  # 4
+    (5, TType.I64, 'idleTime', None, None, ),  # 5
+    (6, TType.I32, 'type', None, None, ),  # 6
+    (7, TType.I32, 'state', None, None, ),  # 7
+    (8, TType.STRUCT, 'extent', [KeyExtent, None], None, ),  # 8
+    (9, TType.LIST, 'columns', (TType.STRUCT, [Column, None], False), None, ),  # 9
+    (10, TType.LIST, 'iterators', (TType.STRUCT, [IteratorSetting, None], False), None, ),  # 10
+    (11, TType.LIST, 'authorizations', (TType.STRING, 'BINARY', False), None, ),  # 11
+)
+all_structs.append(ActiveCompaction)
+ActiveCompaction.thrift_spec = (
+    None,  # 0
+    (1, TType.STRUCT, 'extent', [KeyExtent, None], None, ),  # 1
+    (2, TType.I64, 'age', None, None, ),  # 2
+    (3, TType.LIST, 'inputFiles', (TType.STRING, 'UTF8', False), None, ),  # 3
+    (4, TType.STRING, 'outputFile', 'UTF8', None, ),  # 4
+    (5, TType.I32, 'type', None, None, ),  # 5
+    (6, TType.I32, 'reason', None, None, ),  # 6
+    (7, TType.STRING, 'localityGroup', 'UTF8', None, ),  # 7
+    (8, TType.I64, 'entriesRead', None, None, ),  # 8
+    (9, TType.I64, 'entriesWritten', None, None, ),  # 9
+    (10, TType.LIST, 'iterators', (TType.STRUCT, [IteratorSetting, None], False), None, ),  # 10
+)
+all_structs.append(WriterOptions)
+WriterOptions.thrift_spec = (
+    None,  # 0
+    (1, TType.I64, 'maxMemory', None, None, ),  # 1
+    (2, TType.I64, 'latencyMs', None, None, ),  # 2
+    (3, TType.I64, 'timeoutMs', None, None, ),  # 3
+    (4, TType.I32, 'threads', None, None, ),  # 4
+    (5, TType.I32, 'durability', None, None, ),  # 5
+)
+all_structs.append(CompactionStrategyConfig)
+CompactionStrategyConfig.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'className', 'UTF8', None, ),  # 1
+    (2, TType.MAP, 'options', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ),  # 2
+)
+all_structs.append(UnknownScanner)
+UnknownScanner.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(UnknownWriter)
+UnknownWriter.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(NoMoreEntriesException)
+NoMoreEntriesException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(AccumuloException)
+AccumuloException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(AccumuloSecurityException)
+AccumuloSecurityException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(TableNotFoundException)
+TableNotFoundException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(TableExistsException)
+TableExistsException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(MutationsRejectedException)
+MutationsRejectedException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(NamespaceExistsException)
+NamespaceExistsException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(NamespaceNotFoundException)
+NamespaceNotFoundException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+all_structs.append(NamespaceNotEmptyException)
+NamespaceNotEmptyException.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'msg', 'UTF8', None, ),  # 1
+)
+fix_spec(all_structs)
+del all_structs

diff --git a/src/main/ruby/accumulo_proxy.rb b/src/main/ruby/accumulo_proxy.rb
index 3c02507..33f8922 100644
--- a/src/main/ruby/accumulo_proxy.rb
+++ b/src/main/ruby/accumulo_proxy.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

diff --git a/src/main/ruby/proxy_constants.rb b/src/main/ruby/proxy_constants.rb
index 47eb2cf..3eb0c52 100644
--- a/src/main/ruby/proxy_constants.rb
+++ b/src/main/ruby/proxy_constants.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

diff --git a/src/main/ruby/proxy_types.rb b/src/main/ruby/proxy_types.rb
index 69a5da8..28a3b82 100644
--- a/src/main/ruby/proxy_types.rb
+++ b/src/main/ruby/proxy_types.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.10.0)
+# Autogenerated by Thrift Compiler (0.11.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #