accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1438157 [2/3] - in /accumulo/trunk: core/src/test/java/org/apache/accumulo/core/client/admin/ core/src/test/java/org/apache/accumulo/core/client/mock/ proxy/examples/python/ proxy/examples/ruby/ proxy/src/main/java/org/apache/accumulo/prox...
Date Thu, 24 Jan 2013 20:16:58 GMT
Modified: accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java?rev=1438157&r1=1438156&r2=1438157&view=diff
==============================================================================
--- accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java (original)
+++ accumulo/trunk/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java Thu Jan 24 20:16:57 2013
@@ -164,27 +164,27 @@ import org.slf4j.LoggerFactory;
 
     public void revokeTablePermission(UserPass userpass, String user, String table, TablePermission perm) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public String createBatchScanner(UserPass userpass, String tableName, BatchScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public String createBatchScanner(UserPass userpass, String tableName, List<Range> ranges, BatchScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
     public String createScanner(UserPass userpass, String tableName, ScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public boolean scanner_hasnext(String scanner) throws UnknownScanner, org.apache.thrift.TException;
+    public boolean hasNext(String scanner) throws UnknownScanner, org.apache.thrift.TException;
 
-    public KeyValueAndPeek scanner_next(String scanner) throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException;
+    public KeyValueAndPeek nextEntry(String scanner) throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public ScanResult scanner_next_k(String scanner, int k) throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException;
+    public ScanResult nextK(String scanner, int k) throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public void close_scanner(String scanner) throws UnknownScanner, org.apache.thrift.TException;
+    public void closeScanner(String scanner) throws UnknownScanner, org.apache.thrift.TException;
 
     public void updateAndFlush(UserPass userpass, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
     public String createWriter(UserPass userpass, String tableName, WriterOptions opts) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public void writer_update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells) throws org.apache.thrift.TException;
+    public void update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells) throws org.apache.thrift.TException;
 
-    public void writer_flush(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException;
+    public void flush(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException;
 
-    public void writer_close(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException;
+    public void closeWriter(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException;
 
     public Range getRowRange(ByteBuffer row) throws org.apache.thrift.TException;
 
@@ -308,27 +308,27 @@ import org.slf4j.LoggerFactory;
 
     public void revokeTablePermission(UserPass userpass, String user, String table, TablePermission perm, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.revokeTablePermission_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void createBatchScanner(UserPass userpass, String tableName, BatchScanOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.createBatchScanner_call> resultHandler) throws org.apache.thrift.TException;
+    public void createBatchScanner(UserPass userpass, String tableName, List<Range> ranges, BatchScanOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.createBatchScanner_call> resultHandler) throws org.apache.thrift.TException;
 
     public void createScanner(UserPass userpass, String tableName, ScanOptions options, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.createScanner_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void scanner_hasnext(String scanner, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.scanner_hasnext_call> resultHandler) throws org.apache.thrift.TException;
+    public void hasNext(String scanner, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.hasNext_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void scanner_next(String scanner, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.scanner_next_call> resultHandler) throws org.apache.thrift.TException;
+    public void nextEntry(String scanner, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.nextEntry_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void scanner_next_k(String scanner, int k, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.scanner_next_k_call> resultHandler) throws org.apache.thrift.TException;
+    public void nextK(String scanner, int k, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.nextK_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void close_scanner(String scanner, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.close_scanner_call> resultHandler) throws org.apache.thrift.TException;
+    public void closeScanner(String scanner, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.closeScanner_call> resultHandler) throws org.apache.thrift.TException;
 
     public void updateAndFlush(UserPass userpass, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.updateAndFlush_call> resultHandler) throws org.apache.thrift.TException;
 
     public void createWriter(UserPass userpass, String tableName, WriterOptions opts, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.createWriter_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void writer_update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.writer_update_call> resultHandler) throws org.apache.thrift.TException;
+    public void update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.update_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void writer_flush(String writer, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.writer_flush_call> resultHandler) throws org.apache.thrift.TException;
+    public void flush(String writer, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.flush_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void writer_close(String writer, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.writer_close_call> resultHandler) throws org.apache.thrift.TException;
+    public void closeWriter(String writer, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.closeWriter_call> resultHandler) throws org.apache.thrift.TException;
 
     public void getRowRange(ByteBuffer row, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getRowRange_call> resultHandler) throws org.apache.thrift.TException;
 
@@ -2055,17 +2055,18 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public String createBatchScanner(UserPass userpass, String tableName, BatchScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public String createBatchScanner(UserPass userpass, String tableName, List<Range> ranges, BatchScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
-      send_createBatchScanner(userpass, tableName, options);
+      send_createBatchScanner(userpass, tableName, ranges, options);
       return recv_createBatchScanner();
     }
 
-    public void send_createBatchScanner(UserPass userpass, String tableName, BatchScanOptions options) throws org.apache.thrift.TException
+    public void send_createBatchScanner(UserPass userpass, String tableName, List<Range> ranges, BatchScanOptions options) throws org.apache.thrift.TException
     {
       createBatchScanner_args args = new createBatchScanner_args();
       args.setUserpass(userpass);
       args.setTableName(tableName);
+      args.setRanges(ranges);
       args.setOptions(options);
       sendBase("createBatchScanner", args);
     }
@@ -2117,49 +2118,49 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createScanner failed: unknown result");
     }
 
-    public boolean scanner_hasnext(String scanner) throws UnknownScanner, org.apache.thrift.TException
+    public boolean hasNext(String scanner) throws UnknownScanner, org.apache.thrift.TException
     {
-      send_scanner_hasnext(scanner);
-      return recv_scanner_hasnext();
+      send_hasNext(scanner);
+      return recv_hasNext();
     }
 
-    public void send_scanner_hasnext(String scanner) throws org.apache.thrift.TException
+    public void send_hasNext(String scanner) throws org.apache.thrift.TException
     {
-      scanner_hasnext_args args = new scanner_hasnext_args();
+      hasNext_args args = new hasNext_args();
       args.setScanner(scanner);
-      sendBase("scanner_hasnext", args);
+      sendBase("hasNext", args);
     }
 
-    public boolean recv_scanner_hasnext() throws UnknownScanner, org.apache.thrift.TException
+    public boolean recv_hasNext() throws UnknownScanner, org.apache.thrift.TException
     {
-      scanner_hasnext_result result = new scanner_hasnext_result();
-      receiveBase(result, "scanner_hasnext");
+      hasNext_result result = new hasNext_result();
+      receiveBase(result, "hasNext");
       if (result.isSetSuccess()) {
         return result.success;
       }
       if (result.ouch1 != null) {
         throw result.ouch1;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scanner_hasnext failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "hasNext failed: unknown result");
     }
 
-    public KeyValueAndPeek scanner_next(String scanner) throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException
+    public KeyValueAndPeek nextEntry(String scanner) throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException
     {
-      send_scanner_next(scanner);
-      return recv_scanner_next();
+      send_nextEntry(scanner);
+      return recv_nextEntry();
     }
 
-    public void send_scanner_next(String scanner) throws org.apache.thrift.TException
+    public void send_nextEntry(String scanner) throws org.apache.thrift.TException
     {
-      scanner_next_args args = new scanner_next_args();
+      nextEntry_args args = new nextEntry_args();
       args.setScanner(scanner);
-      sendBase("scanner_next", args);
+      sendBase("nextEntry", args);
     }
 
-    public KeyValueAndPeek recv_scanner_next() throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException
+    public KeyValueAndPeek recv_nextEntry() throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException
     {
-      scanner_next_result result = new scanner_next_result();
-      receiveBase(result, "scanner_next");
+      nextEntry_result result = new nextEntry_result();
+      receiveBase(result, "nextEntry");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -2172,27 +2173,27 @@ import org.slf4j.LoggerFactory;
       if (result.ouch3 != null) {
         throw result.ouch3;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scanner_next failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "nextEntry failed: unknown result");
     }
 
-    public ScanResult scanner_next_k(String scanner, int k) throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException
+    public ScanResult nextK(String scanner, int k) throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException
     {
-      send_scanner_next_k(scanner, k);
-      return recv_scanner_next_k();
+      send_nextK(scanner, k);
+      return recv_nextK();
     }
 
-    public void send_scanner_next_k(String scanner, int k) throws org.apache.thrift.TException
+    public void send_nextK(String scanner, int k) throws org.apache.thrift.TException
     {
-      scanner_next_k_args args = new scanner_next_k_args();
+      nextK_args args = new nextK_args();
       args.setScanner(scanner);
       args.setK(k);
-      sendBase("scanner_next_k", args);
+      sendBase("nextK", args);
     }
 
-    public ScanResult recv_scanner_next_k() throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException
+    public ScanResult recv_nextK() throws NoMoreEntriesException, UnknownScanner, AccumuloSecurityException, org.apache.thrift.TException
     {
-      scanner_next_k_result result = new scanner_next_k_result();
-      receiveBase(result, "scanner_next_k");
+      nextK_result result = new nextK_result();
+      receiveBase(result, "nextK");
       if (result.isSetSuccess()) {
         return result.success;
       }
@@ -2205,26 +2206,26 @@ import org.slf4j.LoggerFactory;
       if (result.ouch3 != null) {
         throw result.ouch3;
       }
-      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "scanner_next_k failed: unknown result");
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "nextK failed: unknown result");
     }
 
-    public void close_scanner(String scanner) throws UnknownScanner, org.apache.thrift.TException
+    public void closeScanner(String scanner) throws UnknownScanner, org.apache.thrift.TException
     {
-      send_close_scanner(scanner);
-      recv_close_scanner();
+      send_closeScanner(scanner);
+      recv_closeScanner();
     }
 
-    public void send_close_scanner(String scanner) throws org.apache.thrift.TException
+    public void send_closeScanner(String scanner) throws org.apache.thrift.TException
     {
-      close_scanner_args args = new close_scanner_args();
+      closeScanner_args args = new closeScanner_args();
       args.setScanner(scanner);
-      sendBase("close_scanner", args);
+      sendBase("closeScanner", args);
     }
 
-    public void recv_close_scanner() throws UnknownScanner, org.apache.thrift.TException
+    public void recv_closeScanner() throws UnknownScanner, org.apache.thrift.TException
     {
-      close_scanner_result result = new close_scanner_result();
-      receiveBase(result, "close_scanner");
+      closeScanner_result result = new closeScanner_result();
+      receiveBase(result, "closeScanner");
       if (result.ouch1 != null) {
         throw result.ouch1;
       }
@@ -2290,36 +2291,36 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createWriter failed: unknown result");
     }
 
-    public void writer_update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells) throws org.apache.thrift.TException
+    public void update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells) throws org.apache.thrift.TException
     {
-      send_writer_update(writer, cells);
+      send_update(writer, cells);
     }
 
-    public void send_writer_update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells) throws org.apache.thrift.TException
+    public void send_update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells) throws org.apache.thrift.TException
     {
-      writer_update_args args = new writer_update_args();
+      update_args args = new update_args();
       args.setWriter(writer);
       args.setCells(cells);
-      sendBase("writer_update", args);
+      sendBase("update", args);
     }
 
-    public void writer_flush(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
+    public void flush(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
     {
-      send_writer_flush(writer);
-      recv_writer_flush();
+      send_flush(writer);
+      recv_flush();
     }
 
-    public void send_writer_flush(String writer) throws org.apache.thrift.TException
+    public void send_flush(String writer) throws org.apache.thrift.TException
     {
-      writer_flush_args args = new writer_flush_args();
+      flush_args args = new flush_args();
       args.setWriter(writer);
-      sendBase("writer_flush", args);
+      sendBase("flush", args);
     }
 
-    public void recv_writer_flush() throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
+    public void recv_flush() throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
     {
-      writer_flush_result result = new writer_flush_result();
-      receiveBase(result, "writer_flush");
+      flush_result result = new flush_result();
+      receiveBase(result, "flush");
       if (result.ouch1 != null) {
         throw result.ouch1;
       }
@@ -2329,23 +2330,23 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public void writer_close(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
+    public void closeWriter(String writer) throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
     {
-      send_writer_close(writer);
-      recv_writer_close();
+      send_closeWriter(writer);
+      recv_closeWriter();
     }
 
-    public void send_writer_close(String writer) throws org.apache.thrift.TException
+    public void send_closeWriter(String writer) throws org.apache.thrift.TException
     {
-      writer_close_args args = new writer_close_args();
+      closeWriter_args args = new closeWriter_args();
       args.setWriter(writer);
-      sendBase("writer_close", args);
+      sendBase("closeWriter", args);
     }
 
-    public void recv_writer_close() throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
+    public void recv_closeWriter() throws UnknownWriter, AccumuloSecurityException, org.apache.thrift.TException
     {
-      writer_close_result result = new writer_close_result();
-      receiveBase(result, "writer_close");
+      closeWriter_result result = new closeWriter_result();
+      receiveBase(result, "closeWriter");
       if (result.ouch1 != null) {
         throw result.ouch1;
       }
@@ -4580,9 +4581,9 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void createBatchScanner(UserPass userpass, String tableName, BatchScanOptions options, org.apache.thrift.async.AsyncMethodCallback<createBatchScanner_call> resultHandler) throws org.apache.thrift.TException {
+    public void createBatchScanner(UserPass userpass, String tableName, List<Range> ranges, BatchScanOptions options, org.apache.thrift.async.AsyncMethodCallback<createBatchScanner_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      createBatchScanner_call method_call = new createBatchScanner_call(userpass, tableName, options, resultHandler, this, ___protocolFactory, ___transport);
+      createBatchScanner_call method_call = new createBatchScanner_call(userpass, tableName, ranges, options, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -4590,11 +4591,13 @@ import org.slf4j.LoggerFactory;
     public static class createBatchScanner_call extends org.apache.thrift.async.TAsyncMethodCall {
       private UserPass userpass;
       private String tableName;
+      private List<Range> ranges;
       private BatchScanOptions options;
-      public createBatchScanner_call(UserPass userpass, String tableName, BatchScanOptions options, org.apache.thrift.async.AsyncMethodCallback<createBatchScanner_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public createBatchScanner_call(UserPass userpass, String tableName, List<Range> ranges, BatchScanOptions options, org.apache.thrift.async.AsyncMethodCallback<createBatchScanner_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userpass = userpass;
         this.tableName = tableName;
+        this.ranges = ranges;
         this.options = options;
       }
 
@@ -4603,6 +4606,7 @@ import org.slf4j.LoggerFactory;
         createBatchScanner_args args = new createBatchScanner_args();
         args.setUserpass(userpass);
         args.setTableName(tableName);
+        args.setRanges(ranges);
         args.setOptions(options);
         args.write(prot);
         prot.writeMessageEnd();
@@ -4656,23 +4660,23 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void scanner_hasnext(String scanner, org.apache.thrift.async.AsyncMethodCallback<scanner_hasnext_call> resultHandler) throws org.apache.thrift.TException {
+    public void hasNext(String scanner, org.apache.thrift.async.AsyncMethodCallback<hasNext_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      scanner_hasnext_call method_call = new scanner_hasnext_call(scanner, resultHandler, this, ___protocolFactory, ___transport);
+      hasNext_call method_call = new hasNext_call(scanner, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class scanner_hasnext_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class hasNext_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String scanner;
-      public scanner_hasnext_call(String scanner, org.apache.thrift.async.AsyncMethodCallback<scanner_hasnext_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public hasNext_call(String scanner, org.apache.thrift.async.AsyncMethodCallback<hasNext_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.scanner = scanner;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scanner_hasnext", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        scanner_hasnext_args args = new scanner_hasnext_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("hasNext", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        hasNext_args args = new hasNext_args();
         args.setScanner(scanner);
         args.write(prot);
         prot.writeMessageEnd();
@@ -4684,27 +4688,27 @@ import org.slf4j.LoggerFactory;
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_scanner_hasnext();
+        return (new Client(prot)).recv_hasNext();
       }
     }
 
-    public void scanner_next(String scanner, org.apache.thrift.async.AsyncMethodCallback<scanner_next_call> resultHandler) throws org.apache.thrift.TException {
+    public void nextEntry(String scanner, org.apache.thrift.async.AsyncMethodCallback<nextEntry_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      scanner_next_call method_call = new scanner_next_call(scanner, resultHandler, this, ___protocolFactory, ___transport);
+      nextEntry_call method_call = new nextEntry_call(scanner, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class scanner_next_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class nextEntry_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String scanner;
-      public scanner_next_call(String scanner, org.apache.thrift.async.AsyncMethodCallback<scanner_next_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public nextEntry_call(String scanner, org.apache.thrift.async.AsyncMethodCallback<nextEntry_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.scanner = scanner;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scanner_next", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        scanner_next_args args = new scanner_next_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("nextEntry", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        nextEntry_args args = new nextEntry_args();
         args.setScanner(scanner);
         args.write(prot);
         prot.writeMessageEnd();
@@ -4716,29 +4720,29 @@ import org.slf4j.LoggerFactory;
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_scanner_next();
+        return (new Client(prot)).recv_nextEntry();
       }
     }
 
-    public void scanner_next_k(String scanner, int k, org.apache.thrift.async.AsyncMethodCallback<scanner_next_k_call> resultHandler) throws org.apache.thrift.TException {
+    public void nextK(String scanner, int k, org.apache.thrift.async.AsyncMethodCallback<nextK_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      scanner_next_k_call method_call = new scanner_next_k_call(scanner, k, resultHandler, this, ___protocolFactory, ___transport);
+      nextK_call method_call = new nextK_call(scanner, k, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class scanner_next_k_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class nextK_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String scanner;
       private int k;
-      public scanner_next_k_call(String scanner, int k, org.apache.thrift.async.AsyncMethodCallback<scanner_next_k_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public nextK_call(String scanner, int k, org.apache.thrift.async.AsyncMethodCallback<nextK_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.scanner = scanner;
         this.k = k;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("scanner_next_k", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        scanner_next_k_args args = new scanner_next_k_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("nextK", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        nextK_args args = new nextK_args();
         args.setScanner(scanner);
         args.setK(k);
         args.write(prot);
@@ -4751,27 +4755,27 @@ import org.slf4j.LoggerFactory;
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_scanner_next_k();
+        return (new Client(prot)).recv_nextK();
       }
     }
 
-    public void close_scanner(String scanner, org.apache.thrift.async.AsyncMethodCallback<close_scanner_call> resultHandler) throws org.apache.thrift.TException {
+    public void closeScanner(String scanner, org.apache.thrift.async.AsyncMethodCallback<closeScanner_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      close_scanner_call method_call = new close_scanner_call(scanner, resultHandler, this, ___protocolFactory, ___transport);
+      closeScanner_call method_call = new closeScanner_call(scanner, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class close_scanner_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class closeScanner_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String scanner;
-      public close_scanner_call(String scanner, org.apache.thrift.async.AsyncMethodCallback<close_scanner_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public closeScanner_call(String scanner, org.apache.thrift.async.AsyncMethodCallback<closeScanner_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.scanner = scanner;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("close_scanner", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        close_scanner_args args = new close_scanner_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("closeScanner", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        closeScanner_args args = new closeScanner_args();
         args.setScanner(scanner);
         args.write(prot);
         prot.writeMessageEnd();
@@ -4783,7 +4787,7 @@ import org.slf4j.LoggerFactory;
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_close_scanner();
+        (new Client(prot)).recv_closeScanner();
       }
     }
 
@@ -4863,25 +4867,25 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void writer_update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells, org.apache.thrift.async.AsyncMethodCallback<writer_update_call> resultHandler) throws org.apache.thrift.TException {
+    public void update(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells, org.apache.thrift.async.AsyncMethodCallback<update_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      writer_update_call method_call = new writer_update_call(writer, cells, resultHandler, this, ___protocolFactory, ___transport);
+      update_call method_call = new update_call(writer, cells, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class writer_update_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class update_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String writer;
       private Map<ByteBuffer,List<ColumnUpdate>> cells;
-      public writer_update_call(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells, org.apache.thrift.async.AsyncMethodCallback<writer_update_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public update_call(String writer, Map<ByteBuffer,List<ColumnUpdate>> cells, org.apache.thrift.async.AsyncMethodCallback<update_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, true);
         this.writer = writer;
         this.cells = cells;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("writer_update", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        writer_update_args args = new writer_update_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("update", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        update_args args = new update_args();
         args.setWriter(writer);
         args.setCells(cells);
         args.write(prot);
@@ -4897,23 +4901,23 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void writer_flush(String writer, org.apache.thrift.async.AsyncMethodCallback<writer_flush_call> resultHandler) throws org.apache.thrift.TException {
+    public void flush(String writer, org.apache.thrift.async.AsyncMethodCallback<flush_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      writer_flush_call method_call = new writer_flush_call(writer, resultHandler, this, ___protocolFactory, ___transport);
+      flush_call method_call = new flush_call(writer, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class writer_flush_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class flush_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String writer;
-      public writer_flush_call(String writer, org.apache.thrift.async.AsyncMethodCallback<writer_flush_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public flush_call(String writer, org.apache.thrift.async.AsyncMethodCallback<flush_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.writer = writer;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("writer_flush", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        writer_flush_args args = new writer_flush_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("flush", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        flush_args args = new flush_args();
         args.setWriter(writer);
         args.write(prot);
         prot.writeMessageEnd();
@@ -4925,27 +4929,27 @@ import org.slf4j.LoggerFactory;
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_writer_flush();
+        (new Client(prot)).recv_flush();
       }
     }
 
-    public void writer_close(String writer, org.apache.thrift.async.AsyncMethodCallback<writer_close_call> resultHandler) throws org.apache.thrift.TException {
+    public void closeWriter(String writer, org.apache.thrift.async.AsyncMethodCallback<closeWriter_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      writer_close_call method_call = new writer_close_call(writer, resultHandler, this, ___protocolFactory, ___transport);
+      closeWriter_call method_call = new closeWriter_call(writer, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class writer_close_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class closeWriter_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String writer;
-      public writer_close_call(String writer, org.apache.thrift.async.AsyncMethodCallback<writer_close_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public closeWriter_call(String writer, org.apache.thrift.async.AsyncMethodCallback<closeWriter_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.writer = writer;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
-        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("writer_close", org.apache.thrift.protocol.TMessageType.CALL, 0));
-        writer_close_args args = new writer_close_args();
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("closeWriter", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        closeWriter_args args = new closeWriter_args();
         args.setWriter(writer);
         args.write(prot);
         prot.writeMessageEnd();
@@ -4957,7 +4961,7 @@ import org.slf4j.LoggerFactory;
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_writer_close();
+        (new Client(prot)).recv_closeWriter();
       }
     }
 
@@ -5100,15 +5104,15 @@ import org.slf4j.LoggerFactory;
       processMap.put("revokeTablePermission", new revokeTablePermission());
       processMap.put("createBatchScanner", new createBatchScanner());
       processMap.put("createScanner", new createScanner());
-      processMap.put("scanner_hasnext", new scanner_hasnext());
-      processMap.put("scanner_next", new scanner_next());
-      processMap.put("scanner_next_k", new scanner_next_k());
-      processMap.put("close_scanner", new close_scanner());
+      processMap.put("hasNext", new hasNext());
+      processMap.put("nextEntry", new nextEntry());
+      processMap.put("nextK", new nextK());
+      processMap.put("closeScanner", new closeScanner());
       processMap.put("updateAndFlush", new updateAndFlush());
       processMap.put("createWriter", new createWriter());
-      processMap.put("writer_update", new writer_update());
-      processMap.put("writer_flush", new writer_flush());
-      processMap.put("writer_close", new writer_close());
+      processMap.put("update", new update());
+      processMap.put("flush", new flush());
+      processMap.put("closeWriter", new closeWriter());
       processMap.put("getRowRange", new getRowRange());
       processMap.put("getFollowing", new getFollowing());
       return processMap;
@@ -6631,7 +6635,7 @@ import org.slf4j.LoggerFactory;
       public createBatchScanner_result getResult(I iface, createBatchScanner_args args) throws org.apache.thrift.TException {
         createBatchScanner_result result = new createBatchScanner_result();
         try {
-          result.success = iface.createBatchScanner(args.userpass, args.tableName, args.options);
+          result.success = iface.createBatchScanner(args.userpass, args.tableName, args.ranges, args.options);
         } catch (AccumuloException ouch1) {
           result.ouch1 = ouch1;
         } catch (AccumuloSecurityException ouch2) {
@@ -6667,23 +6671,23 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public static class scanner_hasnext<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scanner_hasnext_args> {
-      public scanner_hasnext() {
-        super("scanner_hasnext");
+    public static class hasNext<I extends Iface> extends org.apache.thrift.ProcessFunction<I, hasNext_args> {
+      public hasNext() {
+        super("hasNext");
       }
 
-      public scanner_hasnext_args getEmptyArgsInstance() {
-        return new scanner_hasnext_args();
+      public hasNext_args getEmptyArgsInstance() {
+        return new hasNext_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public scanner_hasnext_result getResult(I iface, scanner_hasnext_args args) throws org.apache.thrift.TException {
-        scanner_hasnext_result result = new scanner_hasnext_result();
+      public hasNext_result getResult(I iface, hasNext_args args) throws org.apache.thrift.TException {
+        hasNext_result result = new hasNext_result();
         try {
-          result.success = iface.scanner_hasnext(args.scanner);
+          result.success = iface.hasNext(args.scanner);
           result.setSuccessIsSet(true);
         } catch (UnknownScanner ouch1) {
           result.ouch1 = ouch1;
@@ -6692,23 +6696,23 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public static class scanner_next<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scanner_next_args> {
-      public scanner_next() {
-        super("scanner_next");
+    public static class nextEntry<I extends Iface> extends org.apache.thrift.ProcessFunction<I, nextEntry_args> {
+      public nextEntry() {
+        super("nextEntry");
       }
 
-      public scanner_next_args getEmptyArgsInstance() {
-        return new scanner_next_args();
+      public nextEntry_args getEmptyArgsInstance() {
+        return new nextEntry_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public scanner_next_result getResult(I iface, scanner_next_args args) throws org.apache.thrift.TException {
-        scanner_next_result result = new scanner_next_result();
+      public nextEntry_result getResult(I iface, nextEntry_args args) throws org.apache.thrift.TException {
+        nextEntry_result result = new nextEntry_result();
         try {
-          result.success = iface.scanner_next(args.scanner);
+          result.success = iface.nextEntry(args.scanner);
         } catch (NoMoreEntriesException ouch1) {
           result.ouch1 = ouch1;
         } catch (UnknownScanner ouch2) {
@@ -6720,23 +6724,23 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public static class scanner_next_k<I extends Iface> extends org.apache.thrift.ProcessFunction<I, scanner_next_k_args> {
-      public scanner_next_k() {
-        super("scanner_next_k");
+    public static class nextK<I extends Iface> extends org.apache.thrift.ProcessFunction<I, nextK_args> {
+      public nextK() {
+        super("nextK");
       }
 
-      public scanner_next_k_args getEmptyArgsInstance() {
-        return new scanner_next_k_args();
+      public nextK_args getEmptyArgsInstance() {
+        return new nextK_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public scanner_next_k_result getResult(I iface, scanner_next_k_args args) throws org.apache.thrift.TException {
-        scanner_next_k_result result = new scanner_next_k_result();
+      public nextK_result getResult(I iface, nextK_args args) throws org.apache.thrift.TException {
+        nextK_result result = new nextK_result();
         try {
-          result.success = iface.scanner_next_k(args.scanner, args.k);
+          result.success = iface.nextK(args.scanner, args.k);
         } catch (NoMoreEntriesException ouch1) {
           result.ouch1 = ouch1;
         } catch (UnknownScanner ouch2) {
@@ -6748,23 +6752,23 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public static class close_scanner<I extends Iface> extends org.apache.thrift.ProcessFunction<I, close_scanner_args> {
-      public close_scanner() {
-        super("close_scanner");
+    public static class closeScanner<I extends Iface> extends org.apache.thrift.ProcessFunction<I, closeScanner_args> {
+      public closeScanner() {
+        super("closeScanner");
       }
 
-      public close_scanner_args getEmptyArgsInstance() {
-        return new close_scanner_args();
+      public closeScanner_args getEmptyArgsInstance() {
+        return new closeScanner_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public close_scanner_result getResult(I iface, close_scanner_args args) throws org.apache.thrift.TException {
-        close_scanner_result result = new close_scanner_result();
+      public closeScanner_result getResult(I iface, closeScanner_args args) throws org.apache.thrift.TException {
+        closeScanner_result result = new closeScanner_result();
         try {
-          iface.close_scanner(args.scanner);
+          iface.closeScanner(args.scanner);
         } catch (UnknownScanner ouch1) {
           result.ouch1 = ouch1;
         }
@@ -6824,42 +6828,42 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public static class writer_update<I extends Iface> extends org.apache.thrift.ProcessFunction<I, writer_update_args> {
-      public writer_update() {
-        super("writer_update");
+    public static class update<I extends Iface> extends org.apache.thrift.ProcessFunction<I, update_args> {
+      public update() {
+        super("update");
       }
 
-      public writer_update_args getEmptyArgsInstance() {
-        return new writer_update_args();
+      public update_args getEmptyArgsInstance() {
+        return new update_args();
       }
 
       protected boolean isOneway() {
         return true;
       }
 
-      public org.apache.thrift.TBase getResult(I iface, writer_update_args args) throws org.apache.thrift.TException {
-        iface.writer_update(args.writer, args.cells);
+      public org.apache.thrift.TBase getResult(I iface, update_args args) throws org.apache.thrift.TException {
+        iface.update(args.writer, args.cells);
         return null;
       }
     }
 
-    public static class writer_flush<I extends Iface> extends org.apache.thrift.ProcessFunction<I, writer_flush_args> {
-      public writer_flush() {
-        super("writer_flush");
+    public static class flush<I extends Iface> extends org.apache.thrift.ProcessFunction<I, flush_args> {
+      public flush() {
+        super("flush");
       }
 
-      public writer_flush_args getEmptyArgsInstance() {
-        return new writer_flush_args();
+      public flush_args getEmptyArgsInstance() {
+        return new flush_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public writer_flush_result getResult(I iface, writer_flush_args args) throws org.apache.thrift.TException {
-        writer_flush_result result = new writer_flush_result();
+      public flush_result getResult(I iface, flush_args args) throws org.apache.thrift.TException {
+        flush_result result = new flush_result();
         try {
-          iface.writer_flush(args.writer);
+          iface.flush(args.writer);
         } catch (UnknownWriter ouch1) {
           result.ouch1 = ouch1;
         } catch (AccumuloSecurityException ouch2) {
@@ -6869,23 +6873,23 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public static class writer_close<I extends Iface> extends org.apache.thrift.ProcessFunction<I, writer_close_args> {
-      public writer_close() {
-        super("writer_close");
+    public static class closeWriter<I extends Iface> extends org.apache.thrift.ProcessFunction<I, closeWriter_args> {
+      public closeWriter() {
+        super("closeWriter");
       }
 
-      public writer_close_args getEmptyArgsInstance() {
-        return new writer_close_args();
+      public closeWriter_args getEmptyArgsInstance() {
+        return new closeWriter_args();
       }
 
       protected boolean isOneway() {
         return false;
       }
 
-      public writer_close_result getResult(I iface, writer_close_args args) throws org.apache.thrift.TException {
-        writer_close_result result = new writer_close_result();
+      public closeWriter_result getResult(I iface, closeWriter_args args) throws org.apache.thrift.TException {
+        closeWriter_result result = new closeWriter_result();
         try {
-          iface.writer_close(args.writer);
+          iface.closeWriter(args.writer);
         } catch (UnknownWriter ouch1) {
           result.ouch1 = ouch1;
         } catch (AccumuloSecurityException ouch2) {
@@ -9354,13 +9358,13 @@ import org.slf4j.LoggerFactory;
             case 3: // SPLITS
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set114 = iprot.readSetBegin();
-                  struct.splits = new HashSet<ByteBuffer>(2*_set114.size);
-                  for (int _i115 = 0; _i115 < _set114.size; ++_i115)
+                  org.apache.thrift.protocol.TSet _set106 = iprot.readSetBegin();
+                  struct.splits = new HashSet<ByteBuffer>(2*_set106.size);
+                  for (int _i107 = 0; _i107 < _set106.size; ++_i107)
                   {
-                    ByteBuffer _elem116; // required
-                    _elem116 = iprot.readBinary();
-                    struct.splits.add(_elem116);
+                    ByteBuffer _elem108; // required
+                    _elem108 = iprot.readBinary();
+                    struct.splits.add(_elem108);
                   }
                   iprot.readSetEnd();
                 }
@@ -9398,9 +9402,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SPLITS_FIELD_DESC);
           {
             oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.splits.size()));
-            for (ByteBuffer _iter117 : struct.splits)
+            for (ByteBuffer _iter109 : struct.splits)
             {
-              oprot.writeBinary(_iter117);
+              oprot.writeBinary(_iter109);
             }
             oprot.writeSetEnd();
           }
@@ -9443,9 +9447,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSplits()) {
           {
             oprot.writeI32(struct.splits.size());
-            for (ByteBuffer _iter118 : struct.splits)
+            for (ByteBuffer _iter110 : struct.splits)
             {
-              oprot.writeBinary(_iter118);
+              oprot.writeBinary(_iter110);
             }
           }
         }
@@ -9466,13 +9470,13 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TSet _set119 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.splits = new HashSet<ByteBuffer>(2*_set119.size);
-            for (int _i120 = 0; _i120 < _set119.size; ++_i120)
+            org.apache.thrift.protocol.TSet _set111 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.splits = new HashSet<ByteBuffer>(2*_set111.size);
+            for (int _i112 = 0; _i112 < _set111.size; ++_i112)
             {
-              ByteBuffer _elem121; // required
-              _elem121 = iprot.readBinary();
-              struct.splits.add(_elem121);
+              ByteBuffer _elem113; // required
+              _elem113 = iprot.readBinary();
+              struct.splits.add(_elem113);
             }
           }
           struct.setSplitsIsSet(true);
@@ -10614,13 +10618,13 @@ import org.slf4j.LoggerFactory;
             case 4: // SCOPES
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set122 = iprot.readSetBegin();
-                  struct.scopes = new HashSet<IteratorScope>(2*_set122.size);
-                  for (int _i123 = 0; _i123 < _set122.size; ++_i123)
+                  org.apache.thrift.protocol.TSet _set114 = iprot.readSetBegin();
+                  struct.scopes = new HashSet<IteratorScope>(2*_set114.size);
+                  for (int _i115 = 0; _i115 < _set114.size; ++_i115)
                   {
-                    IteratorScope _elem124; // required
-                    _elem124 = IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem124);
+                    IteratorScope _elem116; // required
+                    _elem116 = IteratorScope.findByValue(iprot.readI32());
+                    struct.scopes.add(_elem116);
                   }
                   iprot.readSetEnd();
                 }
@@ -10663,9 +10667,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SCOPES_FIELD_DESC);
           {
             oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, struct.scopes.size()));
-            for (IteratorScope _iter125 : struct.scopes)
+            for (IteratorScope _iter117 : struct.scopes)
             {
-              oprot.writeI32(_iter125.getValue());
+              oprot.writeI32(_iter117.getValue());
             }
             oprot.writeSetEnd();
           }
@@ -10714,9 +10718,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetScopes()) {
           {
             oprot.writeI32(struct.scopes.size());
-            for (IteratorScope _iter126 : struct.scopes)
+            for (IteratorScope _iter118 : struct.scopes)
             {
-              oprot.writeI32(_iter126.getValue());
+              oprot.writeI32(_iter118.getValue());
             }
           }
         }
@@ -10742,13 +10746,13 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TSet _set127 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new HashSet<IteratorScope>(2*_set127.size);
-            for (int _i128 = 0; _i128 < _set127.size; ++_i128)
+            org.apache.thrift.protocol.TSet _set119 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+            struct.scopes = new HashSet<IteratorScope>(2*_set119.size);
+            for (int _i120 = 0; _i120 < _set119.size; ++_i120)
             {
-              IteratorScope _elem129; // required
-              _elem129 = IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem129);
+              IteratorScope _elem121; // required
+              _elem121 = IteratorScope.findByValue(iprot.readI32());
+              struct.scopes.add(_elem121);
             }
           }
           struct.setScopesIsSet(true);
@@ -11890,13 +11894,13 @@ import org.slf4j.LoggerFactory;
             case 4: // SCOPES
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set130 = iprot.readSetBegin();
-                  struct.scopes = new HashSet<IteratorScope>(2*_set130.size);
-                  for (int _i131 = 0; _i131 < _set130.size; ++_i131)
+                  org.apache.thrift.protocol.TSet _set122 = iprot.readSetBegin();
+                  struct.scopes = new HashSet<IteratorScope>(2*_set122.size);
+                  for (int _i123 = 0; _i123 < _set122.size; ++_i123)
                   {
-                    IteratorScope _elem132; // required
-                    _elem132 = IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem132);
+                    IteratorScope _elem124; // required
+                    _elem124 = IteratorScope.findByValue(iprot.readI32());
+                    struct.scopes.add(_elem124);
                   }
                   iprot.readSetEnd();
                 }
@@ -11939,9 +11943,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SCOPES_FIELD_DESC);
           {
             oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, struct.scopes.size()));
-            for (IteratorScope _iter133 : struct.scopes)
+            for (IteratorScope _iter125 : struct.scopes)
             {
-              oprot.writeI32(_iter133.getValue());
+              oprot.writeI32(_iter125.getValue());
             }
             oprot.writeSetEnd();
           }
@@ -11990,9 +11994,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetScopes()) {
           {
             oprot.writeI32(struct.scopes.size());
-            for (IteratorScope _iter134 : struct.scopes)
+            for (IteratorScope _iter126 : struct.scopes)
             {
-              oprot.writeI32(_iter134.getValue());
+              oprot.writeI32(_iter126.getValue());
             }
           }
         }
@@ -12018,13 +12022,13 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TSet _set135 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new HashSet<IteratorScope>(2*_set135.size);
-            for (int _i136 = 0; _i136 < _set135.size; ++_i136)
+            org.apache.thrift.protocol.TSet _set127 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+            struct.scopes = new HashSet<IteratorScope>(2*_set127.size);
+            for (int _i128 = 0; _i128 < _set127.size; ++_i128)
             {
-              IteratorScope _elem137; // required
-              _elem137 = IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem137);
+              IteratorScope _elem129; // required
+              _elem129 = IteratorScope.findByValue(iprot.readI32());
+              struct.scopes.add(_elem129);
             }
           }
           struct.setScopesIsSet(true);
@@ -14062,15 +14066,15 @@ import org.slf4j.LoggerFactory;
             case 5: // PROPERTIES_TO_SET
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map138 = iprot.readMapBegin();
-                  struct.propertiesToSet = new HashMap<String,String>(2*_map138.size);
-                  for (int _i139 = 0; _i139 < _map138.size; ++_i139)
+                  org.apache.thrift.protocol.TMap _map130 = iprot.readMapBegin();
+                  struct.propertiesToSet = new HashMap<String,String>(2*_map130.size);
+                  for (int _i131 = 0; _i131 < _map130.size; ++_i131)
                   {
-                    String _key140; // required
-                    String _val141; // required
-                    _key140 = iprot.readString();
-                    _val141 = iprot.readString();
-                    struct.propertiesToSet.put(_key140, _val141);
+                    String _key132; // required
+                    String _val133; // required
+                    _key132 = iprot.readString();
+                    _val133 = iprot.readString();
+                    struct.propertiesToSet.put(_key132, _val133);
                   }
                   iprot.readMapEnd();
                 }
@@ -14082,13 +14086,13 @@ import org.slf4j.LoggerFactory;
             case 6: // PROPERTIES_TO_EXCLUDE
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set142 = iprot.readSetBegin();
-                  struct.propertiesToExclude = new HashSet<String>(2*_set142.size);
-                  for (int _i143 = 0; _i143 < _set142.size; ++_i143)
+                  org.apache.thrift.protocol.TSet _set134 = iprot.readSetBegin();
+                  struct.propertiesToExclude = new HashSet<String>(2*_set134.size);
+                  for (int _i135 = 0; _i135 < _set134.size; ++_i135)
                   {
-                    String _elem144; // required
-                    _elem144 = iprot.readString();
-                    struct.propertiesToExclude.add(_elem144);
+                    String _elem136; // required
+                    _elem136 = iprot.readString();
+                    struct.propertiesToExclude.add(_elem136);
                   }
                   iprot.readSetEnd();
                 }
@@ -14134,10 +14138,10 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(PROPERTIES_TO_SET_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.propertiesToSet.size()));
-            for (Map.Entry<String, String> _iter145 : struct.propertiesToSet.entrySet())
+            for (Map.Entry<String, String> _iter137 : struct.propertiesToSet.entrySet())
             {
-              oprot.writeString(_iter145.getKey());
-              oprot.writeString(_iter145.getValue());
+              oprot.writeString(_iter137.getKey());
+              oprot.writeString(_iter137.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -14147,9 +14151,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(PROPERTIES_TO_EXCLUDE_FIELD_DESC);
           {
             oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.propertiesToExclude.size()));
-            for (String _iter146 : struct.propertiesToExclude)
+            for (String _iter138 : struct.propertiesToExclude)
             {
-              oprot.writeString(_iter146);
+              oprot.writeString(_iter138);
             }
             oprot.writeSetEnd();
           }
@@ -14207,19 +14211,19 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetPropertiesToSet()) {
           {
             oprot.writeI32(struct.propertiesToSet.size());
-            for (Map.Entry<String, String> _iter147 : struct.propertiesToSet.entrySet())
+            for (Map.Entry<String, String> _iter139 : struct.propertiesToSet.entrySet())
             {
-              oprot.writeString(_iter147.getKey());
-              oprot.writeString(_iter147.getValue());
+              oprot.writeString(_iter139.getKey());
+              oprot.writeString(_iter139.getValue());
             }
           }
         }
         if (struct.isSetPropertiesToExclude()) {
           {
             oprot.writeI32(struct.propertiesToExclude.size());
-            for (String _iter148 : struct.propertiesToExclude)
+            for (String _iter140 : struct.propertiesToExclude)
             {
-              oprot.writeString(_iter148);
+              oprot.writeString(_iter140);
             }
           }
         }
@@ -14248,28 +14252,28 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TMap _map149 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.propertiesToSet = new HashMap<String,String>(2*_map149.size);
-            for (int _i150 = 0; _i150 < _map149.size; ++_i150)
+            org.apache.thrift.protocol.TMap _map141 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.propertiesToSet = new HashMap<String,String>(2*_map141.size);
+            for (int _i142 = 0; _i142 < _map141.size; ++_i142)
             {
-              String _key151; // required
-              String _val152; // required
-              _key151 = iprot.readString();
-              _val152 = iprot.readString();
-              struct.propertiesToSet.put(_key151, _val152);
+              String _key143; // required
+              String _val144; // required
+              _key143 = iprot.readString();
+              _val144 = iprot.readString();
+              struct.propertiesToSet.put(_key143, _val144);
             }
           }
           struct.setPropertiesToSetIsSet(true);
         }
         if (incoming.get(5)) {
           {
-            org.apache.thrift.protocol.TSet _set153 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.propertiesToExclude = new HashSet<String>(2*_set153.size);
-            for (int _i154 = 0; _i154 < _set153.size; ++_i154)
+            org.apache.thrift.protocol.TSet _set145 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.propertiesToExclude = new HashSet<String>(2*_set145.size);
+            for (int _i146 = 0; _i146 < _set145.size; ++_i146)
             {
-              String _elem155; // required
-              _elem155 = iprot.readString();
-              struct.propertiesToExclude.add(_elem155);
+              String _elem147; // required
+              _elem147 = iprot.readString();
+              struct.propertiesToExclude.add(_elem147);
             }
           }
           struct.setPropertiesToExcludeIsSet(true);
@@ -15766,14 +15770,14 @@ import org.slf4j.LoggerFactory;
             case 5: // ITERATORS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list156 = iprot.readListBegin();
-                  struct.iterators = new ArrayList<IteratorSetting>(_list156.size);
-                  for (int _i157 = 0; _i157 < _list156.size; ++_i157)
+                  org.apache.thrift.protocol.TList _list148 = iprot.readListBegin();
+                  struct.iterators = new ArrayList<IteratorSetting>(_list148.size);
+                  for (int _i149 = 0; _i149 < _list148.size; ++_i149)
                   {
-                    IteratorSetting _elem158; // required
-                    _elem158 = new IteratorSetting();
-                    _elem158.read(iprot);
-                    struct.iterators.add(_elem158);
+                    IteratorSetting _elem150; // required
+                    _elem150 = new IteratorSetting();
+                    _elem150.read(iprot);
+                    struct.iterators.add(_elem150);
                   }
                   iprot.readListEnd();
                 }
@@ -15837,9 +15841,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(ITERATORS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.iterators.size()));
-            for (IteratorSetting _iter159 : struct.iterators)
+            for (IteratorSetting _iter151 : struct.iterators)
             {
-              _iter159.write(oprot);
+              _iter151.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -15906,9 +15910,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetIterators()) {
           {
             oprot.writeI32(struct.iterators.size());
-            for (IteratorSetting _iter160 : struct.iterators)
+            for (IteratorSetting _iter152 : struct.iterators)
             {
-              _iter160.write(oprot);
+              _iter152.write(oprot);
             }
           }
         }
@@ -15943,14 +15947,14 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TList _list161 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.iterators = new ArrayList<IteratorSetting>(_list161.size);
-            for (int _i162 = 0; _i162 < _list161.size; ++_i162)
+            org.apache.thrift.protocol.TList _list153 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+            struct.iterators = new ArrayList<IteratorSetting>(_list153.size);
+            for (int _i154 = 0; _i154 < _list153.size; ++_i154)
             {
-              IteratorSetting _elem163; // required
-              _elem163 = new IteratorSetting();
-              _elem163.read(iprot);
-              struct.iterators.add(_elem163);
+              IteratorSetting _elem155; // required
+              _elem155 = new IteratorSetting();
+              _elem155.read(iprot);
+              struct.iterators.add(_elem155);
             }
           }
           struct.setIteratorsIsSet(true);
@@ -23308,25 +23312,25 @@ import org.slf4j.LoggerFactory;
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map164 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,Set<String>>(2*_map164.size);
-                  for (int _i165 = 0; _i165 < _map164.size; ++_i165)
+                  org.apache.thrift.protocol.TMap _map156 = iprot.readMapBegin();
+                  struct.success = new HashMap<String,Set<String>>(2*_map156.size);
+                  for (int _i157 = 0; _i157 < _map156.size; ++_i157)
                   {
-                    String _key166; // required
-                    Set<String> _val167; // required
-                    _key166 = iprot.readString();
+                    String _key158; // required
+                    Set<String> _val159; // required
+                    _key158 = iprot.readString();
                     {
-                      org.apache.thrift.protocol.TSet _set168 = iprot.readSetBegin();
-                      _val167 = new HashSet<String>(2*_set168.size);
-                      for (int _i169 = 0; _i169 < _set168.size; ++_i169)
+                      org.apache.thrift.protocol.TSet _set160 = iprot.readSetBegin();
+                      _val159 = new HashSet<String>(2*_set160.size);
+                      for (int _i161 = 0; _i161 < _set160.size; ++_i161)
                       {
-                        String _elem170; // required
-                        _elem170 = iprot.readString();
-                        _val167.add(_elem170);
+                        String _elem162; // required
+                        _elem162 = iprot.readString();
+                        _val159.add(_elem162);
                       }
                       iprot.readSetEnd();
                     }
-                    struct.success.put(_key166, _val167);
+                    struct.success.put(_key158, _val159);
                   }
                   iprot.readMapEnd();
                 }
@@ -23372,14 +23376,14 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, struct.success.size()));
-            for (Map.Entry<String, Set<String>> _iter171 : struct.success.entrySet())
+            for (Map.Entry<String, Set<String>> _iter163 : struct.success.entrySet())
             {
-              oprot.writeString(_iter171.getKey());
+              oprot.writeString(_iter163.getKey());
               {
-                oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, _iter171.getValue().size()));
-                for (String _iter172 : _iter171.getValue())
+                oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, _iter163.getValue().size()));
+                for (String _iter164 : _iter163.getValue())
                 {
-                  oprot.writeString(_iter172);
+                  oprot.writeString(_iter164);
                 }
                 oprot.writeSetEnd();
               }
@@ -23429,14 +23433,14 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, Set<String>> _iter173 : struct.success.entrySet())
+            for (Map.Entry<String, Set<String>> _iter165 : struct.success.entrySet())
             {
-              oprot.writeString(_iter173.getKey());
+              oprot.writeString(_iter165.getKey());
               {
-                oprot.writeI32(_iter173.getValue().size());
-                for (String _iter174 : _iter173.getValue())
+                oprot.writeI32(_iter165.getValue().size());
+                for (String _iter166 : _iter165.getValue())
                 {
-                  oprot.writeString(_iter174);
+                  oprot.writeString(_iter166);
                 }
               }
             }
@@ -23456,24 +23460,24 @@ import org.slf4j.LoggerFactory;
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map175 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, iprot.readI32());
-            struct.success = new HashMap<String,Set<String>>(2*_map175.size);
-            for (int _i176 = 0; _i176 < _map175.size; ++_i176)
+            org.apache.thrift.protocol.TMap _map167 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, iprot.readI32());
+            struct.success = new HashMap<String,Set<String>>(2*_map167.size);
+            for (int _i168 = 0; _i168 < _map167.size; ++_i168)
             {
-              String _key177; // required
-              Set<String> _val178; // required
-              _key177 = iprot.readString();
+              String _key169; // required
+              Set<String> _val170; // required
+              _key169 = iprot.readString();
               {
-                org.apache.thrift.protocol.TSet _set179 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-                _val178 = new HashSet<String>(2*_set179.size);
-                for (int _i180 = 0; _i180 < _set179.size; ++_i180)
+                org.apache.thrift.protocol.TSet _set171 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+                _val170 = new HashSet<String>(2*_set171.size);
+                for (int _i172 = 0; _i172 < _set171.size; ++_i172)
                 {
-                  String _elem181; // required
-                  _elem181 = iprot.readString();
-                  _val178.add(_elem181);
+                  String _elem173; // required
+                  _elem173 = iprot.readString();
+                  _val170.add(_elem173);
                 }
               }
-              struct.success.put(_key177, _val178);
+              struct.success.put(_key169, _val170);
             }
           }
           struct.setSuccessIsSet(true);
@@ -25644,13 +25648,13 @@ import org.slf4j.LoggerFactory;
             case 3: // AUTHS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list182 = iprot.readListBegin();
-                  struct.auths = new ArrayList<ByteBuffer>(_list182.size);
-                  for (int _i183 = 0; _i183 < _list182.size; ++_i183)
+                  org.apache.thrift.protocol.TList _list174 = iprot.readListBegin();
+                  struct.auths = new ArrayList<ByteBuffer>(_list174.size);
+                  for (int _i175 = 0; _i175 < _list174.size; ++_i175)
                   {
-                    ByteBuffer _elem184; // required
-                    _elem184 = iprot.readBinary();
-                    struct.auths.add(_elem184);
+                    ByteBuffer _elem176; // required
+                    _elem176 = iprot.readBinary();
+                    struct.auths.add(_elem176);
                   }
                   iprot.readListEnd();
                 }
@@ -25720,9 +25724,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(AUTHS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.auths.size()));
-            for (ByteBuffer _iter185 : struct.auths)
+            for (ByteBuffer _iter177 : struct.auths)
             {
-              oprot.writeBinary(_iter185);
+              oprot.writeBinary(_iter177);
             }
             oprot.writeListEnd();
           }
@@ -25793,9 +25797,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetAuths()) {
           {
             oprot.writeI32(struct.auths.size());
-            for (ByteBuffer _iter186 : struct.auths)
+            for (ByteBuffer _iter178 : struct.auths)
             {
-              oprot.writeBinary(_iter186);
+              oprot.writeBinary(_iter178);
             }
           }
         }
@@ -25828,13 +25832,13 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list187 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.auths = new ArrayList<ByteBuffer>(_list187.size);
-            for (int _i188 = 0; _i188 < _list187.size; ++_i188)
+            org.apache.thrift.protocol.TList _list179 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.auths = new ArrayList<ByteBuffer>(_list179.size);
+            for (int _i180 = 0; _i180 < _list179.size; ++_i180)
             {
-              ByteBuffer _elem189; // required
-              _elem189 = iprot.readBinary();
-              struct.auths.add(_elem189);
+              ByteBuffer _elem181; // required
+              _elem181 = iprot.readBinary();
+              struct.auths.add(_elem181);
             }
           }
           struct.setAuthsIsSet(true);
@@ -27458,15 +27462,15 @@ import org.slf4j.LoggerFactory;
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map190 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,String>(2*_map190.size);
-                  for (int _i191 = 0; _i191 < _map190.size; ++_i191)
+                  org.apache.thrift.protocol.TMap _map182 = iprot.readMapBegin();
+                  struct.success = new HashMap<String,String>(2*_map182.size);
+                  for (int _i183 = 0; _i183 < _map182.size; ++_i183)
                   {
-                    String _key192; // required
-                    String _val193; // required
-                    _key192 = iprot.readString();
-                    _val193 = iprot.readString();
-                    struct.success.put(_key192, _val193);
+                    String _key184; // required
+                    String _val185; // required
+                    _key184 = iprot.readString();
+                    _val185 = iprot.readString();
+                    struct.success.put(_key184, _val185);
                   }
                   iprot.readMapEnd();
                 }
@@ -27512,10 +27516,10 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (Map.Entry<String, String> _iter194 : struct.success.entrySet())
+            for (Map.Entry<String, String> _iter186 : struct.success.entrySet())
             {
-              oprot.writeString(_iter194.getKey());
-              oprot.writeString(_iter194.getValue());
+              oprot.writeString(_iter186.getKey());
+              oprot.writeString(_iter186.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -27562,10 +27566,10 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, String> _iter195 : struct.success.entrySet())
+            for (Map.Entry<String, String> _iter187 : struct.success.entrySet())
             {
-              oprot.writeString(_iter195.getKey());
-              oprot.writeString(_iter195.getValue());
+              oprot.writeString(_iter187.getKey());
+              oprot.writeString(_iter187.getValue());
             }
           }
         }
@@ -27583,15 +27587,15 @@ import org.slf4j.LoggerFactory;
         BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map196 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new HashMap<String,String>(2*_map196.size);
-            for (int _i197 = 0; _i197 < _map196.size; ++_i197)
+            org.apache.thrift.protocol.TMap _map188 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new HashMap<String,String>(2*_map188.size);
+            for (int _i189 = 0; _i189 < _map188.size; ++_i189)
             {
-              String _key198; // required
-              String _val199; // required
-              _key198 = iprot.readString();
-              _val199 = iprot.readString();
-              struct.success.put(_key198, _val199);
+              String _key190; // required
+              String _val191; // required
+              _key190 = iprot.readString();
+              _val191 = iprot.readString();
+              struct.success.put(_key190, _val191);
             }
           }
           struct.setSuccessIsSet(true);
@@ -28556,13 +28560,13 @@ import org.slf4j.LoggerFactory;
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list200 = iprot.readListBegin();
-                  struct.success = new ArrayList<ByteBuffer>(_list200.size);
-                  for (int _i201 = 0; _i201 < _list200.size; ++_i201)
+                  org.apache.thrift.protocol.TList _list192 = iprot.readListBegin();
+                  struct.success = new ArrayList<ByteBuffer>(_list192.size);
+                  for (int _i193 = 0; _i193 < _list192.size; ++_i193)
                   {
-                    ByteBuffer _elem202; // required
-                    _elem202 = iprot.readBinary();
-                    struct.success.add(_elem202);
+                    ByteBuffer _elem194; // required
+                    _elem194 = iprot.readBinary();
+                    struct.success.add(_elem194);
                   }
                   iprot.readListEnd();
                 }
@@ -28599,9 +28603,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (ByteBuffer _iter203 : struct.success)
+            for (ByteBuffer _iter195 : struct.success)
             {
-              oprot.writeBinary(_iter203);
+              oprot.writeBinary(_iter195);
             }
             oprot.writeListEnd();
           }
@@ -28640,9 +28644,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ByteBuffer _iter204 : struct.success)
+            for (ByteBuffer _iter196 : struct.success)
             {
-              oprot.writeBinary(_iter204);
+              oprot.writeBinary(_iter196);
             }
           }
         }
@@ -28657,13 +28661,13 @@ import org.slf4j.LoggerFactory;
         BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list205 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.success = new ArrayList<ByteBuffer>(_list205.size);
-            for (int _i206 = 0; _i206 < _list205.size; ++_i206)
+            org.apache.thrift.protocol.TList _list197 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+            struct.success = new ArrayList<ByteBuffer>(_list197.size);
+            for (int _i198 = 0; _i198 < _list197.size; ++_i198)
             {
-              ByteBuffer _elem207; // required
-              _elem207 = iprot.readBinary();
-              struct.success.add(_elem207);
+              ByteBuffer _elem199; // required
+              _elem199 = iprot.readBinary();
+              struct.success.add(_elem199);
             }
           }
           struct.setSuccessIsSet(true);
@@ -31782,13 +31786,13 @@ import org.slf4j.LoggerFactory;
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set208 = iprot.readSetBegin();
-                  struct.success = new HashSet<String>(2*_set208.size);
-                  for (int _i209 = 0; _i209 < _set208.size; ++_i209)
+                  org.apache.thrift.protocol.TSet _set200 = iprot.readSetBegin();
+                  struct.success = new HashSet<String>(2*_set200.size);
+                  for (int _i201 = 0; _i201 < _set200.size; ++_i201)
                   {
-                    String _elem210; // required
-                    _elem210 = iprot.readString();
-                    struct.success.add(_elem210);
+                    String _elem202; // required
+                    _elem202 = iprot.readString();
+                    struct.success.add(_elem202);
                   }
                   iprot.readSetEnd();
                 }
@@ -31816,9 +31820,9 @@ import org.slf4j.LoggerFactory;
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.success.size()));
-            for (String _iter211 : struct.success)
+            for (String _iter203 : struct.success)
             {
-              oprot.writeString(_iter211);
+              oprot.writeString(_iter203);
             }
             oprot.writeSetEnd();
           }

[... 3695 lines stripped ...]


Mime
View raw message