accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1438312 [3/5] - in /accumulo/branches/ACCUMULO-259: ./ assemble/ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/mapred/...
Date Fri, 25 Jan 2013 03:56:16 GMT
Modified: accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java?rev=1438312&r1=1438311&r2=1438312&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java (original)
+++ accumulo/branches/ACCUMULO-259/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java Fri Jan 25 03:56:14 2013
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
 
     public IteratorSetting getIteratorSetting(UserPass userpass, String tableName, String iteratorName, IteratorScope scope) throws AccumuloSecurityException, AccumuloException, TableNotFoundException, org.apache.thrift.TException;
 
-    public ByteBuffer getMaxRow(UserPass userpass, String tableName, List<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
+    public ByteBuffer getMaxRow(UserPass userpass, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException;
 
     public Map<String,String> getTableProperties(UserPass userpass, String tableName) throws AccumuloException, TableNotFoundException, org.apache.thrift.TException;
 
@@ -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, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, List<Range> range) throws 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, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, Range range) throws 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 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) throws 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;
 
@@ -224,7 +224,7 @@ import org.slf4j.LoggerFactory;
 
     public void getIteratorSetting(UserPass userpass, String tableName, String iteratorName, IteratorScope scope, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getIteratorSetting_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void getMaxRow(UserPass userpass, String tableName, List<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getMaxRow_call> resultHandler) throws org.apache.thrift.TException;
+    public void getMaxRow(UserPass userpass, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getMaxRow_call> resultHandler) throws org.apache.thrift.TException;
 
     public void getTableProperties(UserPass userpass, String tableName, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getTableProperties_call> resultHandler) 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, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, List<Range> range, 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, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, Range range, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.createScanner_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, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.createWriter_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;
 
@@ -821,13 +821,13 @@ import org.slf4j.LoggerFactory;
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getIteratorSetting failed: unknown result");
     }
 
-    public ByteBuffer getMaxRow(UserPass userpass, String tableName, List<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
+    public ByteBuffer getMaxRow(UserPass userpass, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws TableNotFoundException, AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
       send_getMaxRow(userpass, tableName, auths, startRow, startInclusive, endRow, endInclusive);
       return recv_getMaxRow();
     }
 
-    public void send_getMaxRow(UserPass userpass, String tableName, List<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws org.apache.thrift.TException
+    public void send_getMaxRow(UserPass userpass, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive) throws org.apache.thrift.TException
     {
       getMaxRow_args args = new getMaxRow_args();
       args.setUserpass(userpass);
@@ -2055,103 +2055,112 @@ import org.slf4j.LoggerFactory;
       return;
     }
 
-    public String createBatchScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, List<Range> range) throws 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, authorizations, iteratorSetting, range);
+      send_createBatchScanner(userpass, tableName, ranges, options);
       return recv_createBatchScanner();
     }
 
-    public void send_createBatchScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, List<Range> range) 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.setAuthorizations(authorizations);
-      args.setIteratorSetting(iteratorSetting);
-      args.setRange(range);
+      args.setRanges(ranges);
+      args.setOptions(options);
       sendBase("createBatchScanner", args);
     }
 
-    public String recv_createBatchScanner() throws org.apache.thrift.TException
+    public String recv_createBatchScanner() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
       createBatchScanner_result result = new createBatchScanner_result();
       receiveBase(result, "createBatchScanner");
       if (result.isSetSuccess()) {
         return result.success;
       }
+      if (result.ouch1 != null) {
+        throw result.ouch1;
+      }
+      if (result.ouch2 != null) {
+        throw result.ouch2;
+      }
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createBatchScanner failed: unknown result");
     }
 
-    public String createScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, Range range) throws org.apache.thrift.TException
+    public String createScanner(UserPass userpass, String tableName, ScanOptions options) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
-      send_createScanner(userpass, tableName, authorizations, iteratorSetting, range);
+      send_createScanner(userpass, tableName, options);
       return recv_createScanner();
     }
 
-    public void send_createScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, Range range) throws org.apache.thrift.TException
+    public void send_createScanner(UserPass userpass, String tableName, ScanOptions options) throws org.apache.thrift.TException
     {
       createScanner_args args = new createScanner_args();
       args.setUserpass(userpass);
       args.setTableName(tableName);
-      args.setAuthorizations(authorizations);
-      args.setIteratorSetting(iteratorSetting);
-      args.setRange(range);
+      args.setOptions(options);
       sendBase("createScanner", args);
     }
 
-    public String recv_createScanner() throws org.apache.thrift.TException
+    public String recv_createScanner() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
       createScanner_result result = new createScanner_result();
       receiveBase(result, "createScanner");
       if (result.isSetSuccess()) {
         return result.success;
       }
+      if (result.ouch1 != null) {
+        throw result.ouch1;
+      }
+      if (result.ouch2 != null) {
+        throw result.ouch2;
+      }
       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;
       }
@@ -2164,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;
       }
@@ -2197,33 +2206,33 @@ 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;
       }
       return;
     }
 
-    public void updateAndFlush(UserPass userpass, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells) throws org.apache.thrift.TException
+    public void updateAndFlush(UserPass userpass, String tableName, Map<ByteBuffer,List<ColumnUpdate>> cells) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
       send_updateAndFlush(userpass, tableName, cells);
       recv_updateAndFlush();
@@ -2238,67 +2247,80 @@ import org.slf4j.LoggerFactory;
       sendBase("updateAndFlush", args);
     }
 
-    public void recv_updateAndFlush() throws org.apache.thrift.TException
+    public void recv_updateAndFlush() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
       updateAndFlush_result result = new updateAndFlush_result();
       receiveBase(result, "updateAndFlush");
+      if (result.outch1 != null) {
+        throw result.outch1;
+      }
+      if (result.ouch2 != null) {
+        throw result.ouch2;
+      }
       return;
     }
 
-    public String createWriter(UserPass userpass, String tableName) throws org.apache.thrift.TException
+    public String createWriter(UserPass userpass, String tableName, WriterOptions opts) throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
-      send_createWriter(userpass, tableName);
+      send_createWriter(userpass, tableName, opts);
       return recv_createWriter();
     }
 
-    public void send_createWriter(UserPass userpass, String tableName) throws org.apache.thrift.TException
+    public void send_createWriter(UserPass userpass, String tableName, WriterOptions opts) throws org.apache.thrift.TException
     {
       createWriter_args args = new createWriter_args();
       args.setUserpass(userpass);
       args.setTableName(tableName);
+      args.setOpts(opts);
       sendBase("createWriter", args);
     }
 
-    public String recv_createWriter() throws org.apache.thrift.TException
+    public String recv_createWriter() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException
     {
       createWriter_result result = new createWriter_result();
       receiveBase(result, "createWriter");
       if (result.isSetSuccess()) {
         return result.success;
       }
+      if (result.outch1 != null) {
+        throw result.outch1;
+      }
+      if (result.ouch2 != null) {
+        throw result.ouch2;
+      }
       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;
       }
@@ -2308,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;
       }
@@ -2996,7 +3018,7 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void getMaxRow(UserPass userpass, String tableName, List<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive, org.apache.thrift.async.AsyncMethodCallback<getMaxRow_call> resultHandler) throws org.apache.thrift.TException {
+    public void getMaxRow(UserPass userpass, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive, org.apache.thrift.async.AsyncMethodCallback<getMaxRow_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getMaxRow_call method_call = new getMaxRow_call(userpass, tableName, auths, startRow, startInclusive, endRow, endInclusive, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -3006,12 +3028,12 @@ import org.slf4j.LoggerFactory;
     public static class getMaxRow_call extends org.apache.thrift.async.TAsyncMethodCall {
       private UserPass userpass;
       private String tableName;
-      private List<ByteBuffer> auths;
+      private Set<ByteBuffer> auths;
       private ByteBuffer startRow;
       private boolean startInclusive;
       private ByteBuffer endRow;
       private boolean endInclusive;
-      public getMaxRow_call(UserPass userpass, String tableName, List<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive, org.apache.thrift.async.AsyncMethodCallback<getMaxRow_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 getMaxRow_call(UserPass userpass, String tableName, Set<ByteBuffer> auths, ByteBuffer startRow, boolean startInclusive, ByteBuffer endRow, boolean endInclusive, org.apache.thrift.async.AsyncMethodCallback<getMaxRow_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;
@@ -4559,9 +4581,9 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void createBatchScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, List<Range> range, 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, authorizations, iteratorSetting, range, 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);
     }
@@ -4569,16 +4591,14 @@ import org.slf4j.LoggerFactory;
     public static class createBatchScanner_call extends org.apache.thrift.async.TAsyncMethodCall {
       private UserPass userpass;
       private String tableName;
-      private Set<ByteBuffer> authorizations;
-      private List<IteratorSetting> iteratorSetting;
-      private List<Range> range;
-      public createBatchScanner_call(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, List<Range> range, 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 {
+      private List<Range> ranges;
+      private BatchScanOptions options;
+      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.authorizations = authorizations;
-        this.iteratorSetting = iteratorSetting;
-        this.range = range;
+        this.ranges = ranges;
+        this.options = options;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -4586,14 +4606,13 @@ import org.slf4j.LoggerFactory;
         createBatchScanner_args args = new createBatchScanner_args();
         args.setUserpass(userpass);
         args.setTableName(tableName);
-        args.setAuthorizations(authorizations);
-        args.setIteratorSetting(iteratorSetting);
-        args.setRange(range);
+        args.setRanges(ranges);
+        args.setOptions(options);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws org.apache.thrift.TException {
+      public String getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4603,9 +4622,9 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void createScanner(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, Range range, org.apache.thrift.async.AsyncMethodCallback<createScanner_call> resultHandler) throws org.apache.thrift.TException {
+    public void createScanner(UserPass userpass, String tableName, ScanOptions options, org.apache.thrift.async.AsyncMethodCallback<createScanner_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      createScanner_call method_call = new createScanner_call(userpass, tableName, authorizations, iteratorSetting, range, resultHandler, this, ___protocolFactory, ___transport);
+      createScanner_call method_call = new createScanner_call(userpass, tableName, options, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -4613,16 +4632,12 @@ import org.slf4j.LoggerFactory;
     public static class createScanner_call extends org.apache.thrift.async.TAsyncMethodCall {
       private UserPass userpass;
       private String tableName;
-      private Set<ByteBuffer> authorizations;
-      private List<IteratorSetting> iteratorSetting;
-      private Range range;
-      public createScanner_call(UserPass userpass, String tableName, Set<ByteBuffer> authorizations, List<IteratorSetting> iteratorSetting, Range range, org.apache.thrift.async.AsyncMethodCallback<createScanner_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 {
+      private ScanOptions options;
+      public createScanner_call(UserPass userpass, String tableName, ScanOptions options, org.apache.thrift.async.AsyncMethodCallback<createScanner_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.authorizations = authorizations;
-        this.iteratorSetting = iteratorSetting;
-        this.range = range;
+        this.options = options;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -4630,14 +4645,12 @@ import org.slf4j.LoggerFactory;
         createScanner_args args = new createScanner_args();
         args.setUserpass(userpass);
         args.setTableName(tableName);
-        args.setAuthorizations(authorizations);
-        args.setIteratorSetting(iteratorSetting);
-        args.setRange(range);
+        args.setOptions(options);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws org.apache.thrift.TException {
+      public String getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4647,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();
@@ -4675,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();
@@ -4707,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);
@@ -4742,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();
@@ -4774,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();
       }
     }
 
@@ -4806,7 +4819,7 @@ import org.slf4j.LoggerFactory;
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws org.apache.thrift.TException {
+      public void getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4816,9 +4829,9 @@ import org.slf4j.LoggerFactory;
       }
     }
 
-    public void createWriter(UserPass userpass, String tableName, org.apache.thrift.async.AsyncMethodCallback<createWriter_call> resultHandler) throws org.apache.thrift.TException {
+    public void createWriter(UserPass userpass, String tableName, WriterOptions opts, org.apache.thrift.async.AsyncMethodCallback<createWriter_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      createWriter_call method_call = new createWriter_call(userpass, tableName, resultHandler, this, ___protocolFactory, ___transport);
+      createWriter_call method_call = new createWriter_call(userpass, tableName, opts, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -4826,10 +4839,12 @@ import org.slf4j.LoggerFactory;
     public static class createWriter_call extends org.apache.thrift.async.TAsyncMethodCall {
       private UserPass userpass;
       private String tableName;
-      public createWriter_call(UserPass userpass, String tableName, org.apache.thrift.async.AsyncMethodCallback<createWriter_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 {
+      private WriterOptions opts;
+      public createWriter_call(UserPass userpass, String tableName, WriterOptions opts, org.apache.thrift.async.AsyncMethodCallback<createWriter_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.opts = opts;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -4837,11 +4852,12 @@ import org.slf4j.LoggerFactory;
         createWriter_args args = new createWriter_args();
         args.setUserpass(userpass);
         args.setTableName(tableName);
+        args.setOpts(opts);
         args.write(prot);
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws org.apache.thrift.TException {
+      public String getResult() throws AccumuloException, AccumuloSecurityException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -4851,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);
@@ -4885,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();
@@ -4913,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();
@@ -4945,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();
       }
     }
 
@@ -5088,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;
@@ -6618,7 +6634,13 @@ import org.slf4j.LoggerFactory;
 
       public createBatchScanner_result getResult(I iface, createBatchScanner_args args) throws org.apache.thrift.TException {
         createBatchScanner_result result = new createBatchScanner_result();
-        result.success = iface.createBatchScanner(args.userpass, args.tableName, args.authorizations, args.iteratorSetting, args.range);
+        try {
+          result.success = iface.createBatchScanner(args.userpass, args.tableName, args.ranges, args.options);
+        } catch (AccumuloException ouch1) {
+          result.ouch1 = ouch1;
+        } catch (AccumuloSecurityException ouch2) {
+          result.ouch2 = ouch2;
+        }
         return result;
       }
     }
@@ -6638,28 +6660,34 @@ import org.slf4j.LoggerFactory;
 
       public createScanner_result getResult(I iface, createScanner_args args) throws org.apache.thrift.TException {
         createScanner_result result = new createScanner_result();
-        result.success = iface.createScanner(args.userpass, args.tableName, args.authorizations, args.iteratorSetting, args.range);
+        try {
+          result.success = iface.createScanner(args.userpass, args.tableName, args.options);
+        } catch (AccumuloException ouch1) {
+          result.ouch1 = ouch1;
+        } catch (AccumuloSecurityException ouch2) {
+          result.ouch2 = ouch2;
+        }
         return result;
       }
     }
 
-    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;
@@ -6668,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) {
@@ -6696,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) {
@@ -6724,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;
         }
@@ -6763,7 +6791,13 @@ import org.slf4j.LoggerFactory;
 
       public updateAndFlush_result getResult(I iface, updateAndFlush_args args) throws org.apache.thrift.TException {
         updateAndFlush_result result = new updateAndFlush_result();
-        iface.updateAndFlush(args.userpass, args.tableName, args.cells);
+        try {
+          iface.updateAndFlush(args.userpass, args.tableName, args.cells);
+        } catch (AccumuloException outch1) {
+          result.outch1 = outch1;
+        } catch (AccumuloSecurityException ouch2) {
+          result.ouch2 = ouch2;
+        }
         return result;
       }
     }
@@ -6783,47 +6817,53 @@ import org.slf4j.LoggerFactory;
 
       public createWriter_result getResult(I iface, createWriter_args args) throws org.apache.thrift.TException {
         createWriter_result result = new createWriter_result();
-        result.success = iface.createWriter(args.userpass, args.tableName);
+        try {
+          result.success = iface.createWriter(args.userpass, args.tableName, args.opts);
+        } catch (AccumuloException outch1) {
+          result.outch1 = outch1;
+        } catch (AccumuloSecurityException ouch2) {
+          result.ouch2 = ouch2;
+        }
         return result;
       }
     }
 
-    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) {
@@ -6833,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) {
@@ -9318,13 +9358,13 @@ import org.slf4j.LoggerFactory;
             case 3: // SPLITS
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set58 = iprot.readSetBegin();
-                  struct.splits = new HashSet<ByteBuffer>(2*_set58.size);
-                  for (int _i59 = 0; _i59 < _set58.size; ++_i59)
+                  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 _elem60; // required
-                    _elem60 = iprot.readBinary();
-                    struct.splits.add(_elem60);
+                    ByteBuffer _elem108; // required
+                    _elem108 = iprot.readBinary();
+                    struct.splits.add(_elem108);
                   }
                   iprot.readSetEnd();
                 }
@@ -9362,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 _iter61 : struct.splits)
+            for (ByteBuffer _iter109 : struct.splits)
             {
-              oprot.writeBinary(_iter61);
+              oprot.writeBinary(_iter109);
             }
             oprot.writeSetEnd();
           }
@@ -9407,9 +9447,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetSplits()) {
           {
             oprot.writeI32(struct.splits.size());
-            for (ByteBuffer _iter62 : struct.splits)
+            for (ByteBuffer _iter110 : struct.splits)
             {
-              oprot.writeBinary(_iter62);
+              oprot.writeBinary(_iter110);
             }
           }
         }
@@ -9430,13 +9470,13 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TSet _set63 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.splits = new HashSet<ByteBuffer>(2*_set63.size);
-            for (int _i64 = 0; _i64 < _set63.size; ++_i64)
+            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 _elem65; // required
-              _elem65 = iprot.readBinary();
-              struct.splits.add(_elem65);
+              ByteBuffer _elem113; // required
+              _elem113 = iprot.readBinary();
+              struct.splits.add(_elem113);
             }
           }
           struct.setSplitsIsSet(true);
@@ -10578,13 +10618,13 @@ import org.slf4j.LoggerFactory;
             case 4: // SCOPES
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set66 = iprot.readSetBegin();
-                  struct.scopes = new HashSet<IteratorScope>(2*_set66.size);
-                  for (int _i67 = 0; _i67 < _set66.size; ++_i67)
+                  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 _elem68; // required
-                    _elem68 = IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem68);
+                    IteratorScope _elem116; // required
+                    _elem116 = IteratorScope.findByValue(iprot.readI32());
+                    struct.scopes.add(_elem116);
                   }
                   iprot.readSetEnd();
                 }
@@ -10627,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 _iter69 : struct.scopes)
+            for (IteratorScope _iter117 : struct.scopes)
             {
-              oprot.writeI32(_iter69.getValue());
+              oprot.writeI32(_iter117.getValue());
             }
             oprot.writeSetEnd();
           }
@@ -10678,9 +10718,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetScopes()) {
           {
             oprot.writeI32(struct.scopes.size());
-            for (IteratorScope _iter70 : struct.scopes)
+            for (IteratorScope _iter118 : struct.scopes)
             {
-              oprot.writeI32(_iter70.getValue());
+              oprot.writeI32(_iter118.getValue());
             }
           }
         }
@@ -10706,13 +10746,13 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TSet _set71 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new HashSet<IteratorScope>(2*_set71.size);
-            for (int _i72 = 0; _i72 < _set71.size; ++_i72)
+            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 _elem73; // required
-              _elem73 = IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem73);
+              IteratorScope _elem121; // required
+              _elem121 = IteratorScope.findByValue(iprot.readI32());
+              struct.scopes.add(_elem121);
             }
           }
           struct.setScopesIsSet(true);
@@ -11854,13 +11894,13 @@ import org.slf4j.LoggerFactory;
             case 4: // SCOPES
               if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
                 {
-                  org.apache.thrift.protocol.TSet _set74 = iprot.readSetBegin();
-                  struct.scopes = new HashSet<IteratorScope>(2*_set74.size);
-                  for (int _i75 = 0; _i75 < _set74.size; ++_i75)
+                  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 _elem76; // required
-                    _elem76 = IteratorScope.findByValue(iprot.readI32());
-                    struct.scopes.add(_elem76);
+                    IteratorScope _elem124; // required
+                    _elem124 = IteratorScope.findByValue(iprot.readI32());
+                    struct.scopes.add(_elem124);
                   }
                   iprot.readSetEnd();
                 }
@@ -11903,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 _iter77 : struct.scopes)
+            for (IteratorScope _iter125 : struct.scopes)
             {
-              oprot.writeI32(_iter77.getValue());
+              oprot.writeI32(_iter125.getValue());
             }
             oprot.writeSetEnd();
           }
@@ -11954,9 +11994,9 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetScopes()) {
           {
             oprot.writeI32(struct.scopes.size());
-            for (IteratorScope _iter78 : struct.scopes)
+            for (IteratorScope _iter126 : struct.scopes)
             {
-              oprot.writeI32(_iter78.getValue());
+              oprot.writeI32(_iter126.getValue());
             }
           }
         }
@@ -11982,13 +12022,13 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TSet _set79 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.scopes = new HashSet<IteratorScope>(2*_set79.size);
-            for (int _i80 = 0; _i80 < _set79.size; ++_i80)
+            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 _elem81; // required
-              _elem81 = IteratorScope.findByValue(iprot.readI32());
-              struct.scopes.add(_elem81);
+              IteratorScope _elem129; // required
+              _elem129 = IteratorScope.findByValue(iprot.readI32());
+              struct.scopes.add(_elem129);
             }
           }
           struct.setScopesIsSet(true);
@@ -14026,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 _map82 = iprot.readMapBegin();
-                  struct.propertiesToSet = new HashMap<String,String>(2*_map82.size);
-                  for (int _i83 = 0; _i83 < _map82.size; ++_i83)
+                  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 _key84; // required
-                    String _val85; // required
-                    _key84 = iprot.readString();
-                    _val85 = iprot.readString();
-                    struct.propertiesToSet.put(_key84, _val85);
+                    String _key132; // required
+                    String _val133; // required
+                    _key132 = iprot.readString();
+                    _val133 = iprot.readString();
+                    struct.propertiesToSet.put(_key132, _val133);
                   }
                   iprot.readMapEnd();
                 }
@@ -14046,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 _set86 = iprot.readSetBegin();
-                  struct.propertiesToExclude = new HashSet<String>(2*_set86.size);
-                  for (int _i87 = 0; _i87 < _set86.size; ++_i87)
+                  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 _elem88; // required
-                    _elem88 = iprot.readString();
-                    struct.propertiesToExclude.add(_elem88);
+                    String _elem136; // required
+                    _elem136 = iprot.readString();
+                    struct.propertiesToExclude.add(_elem136);
                   }
                   iprot.readSetEnd();
                 }
@@ -14098,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> _iter89 : struct.propertiesToSet.entrySet())
+            for (Map.Entry<String, String> _iter137 : struct.propertiesToSet.entrySet())
             {
-              oprot.writeString(_iter89.getKey());
-              oprot.writeString(_iter89.getValue());
+              oprot.writeString(_iter137.getKey());
+              oprot.writeString(_iter137.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -14111,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 _iter90 : struct.propertiesToExclude)
+            for (String _iter138 : struct.propertiesToExclude)
             {
-              oprot.writeString(_iter90);
+              oprot.writeString(_iter138);
             }
             oprot.writeSetEnd();
           }
@@ -14171,19 +14211,19 @@ import org.slf4j.LoggerFactory;
         if (struct.isSetPropertiesToSet()) {
           {
             oprot.writeI32(struct.propertiesToSet.size());
-            for (Map.Entry<String, String> _iter91 : struct.propertiesToSet.entrySet())
+            for (Map.Entry<String, String> _iter139 : struct.propertiesToSet.entrySet())
             {
-              oprot.writeString(_iter91.getKey());
-              oprot.writeString(_iter91.getValue());
+              oprot.writeString(_iter139.getKey());
+              oprot.writeString(_iter139.getValue());
             }
           }
         }
         if (struct.isSetPropertiesToExclude()) {
           {
             oprot.writeI32(struct.propertiesToExclude.size());
-            for (String _iter92 : struct.propertiesToExclude)
+            for (String _iter140 : struct.propertiesToExclude)
             {
-              oprot.writeString(_iter92);
+              oprot.writeString(_iter140);
             }
           }
         }
@@ -14212,28 +14252,28 @@ import org.slf4j.LoggerFactory;
         }
         if (incoming.get(4)) {
           {
-            org.apache.thrift.protocol.TMap _map93 = 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*_map93.size);
-            for (int _i94 = 0; _i94 < _map93.size; ++_i94)
+            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 _key95; // required
-              String _val96; // required
-              _key95 = iprot.readString();
-              _val96 = iprot.readString();
-              struct.propertiesToSet.put(_key95, _val96);
+              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 _set97 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.propertiesToExclude = new HashSet<String>(2*_set97.size);
-            for (int _i98 = 0; _i98 < _set97.size; ++_i98)
+            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 _elem99; // required
-              _elem99 = iprot.readString();
-              struct.propertiesToExclude.add(_elem99);

[... 7093 lines stripped ...]


Mime
View raw message