accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [accumulo] branch 1.9 updated: Format the thrift files
Date Thu, 21 Feb 2019 01:17:46 GMT
This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.9 by this push:
     new d7fa411  Format the thrift files
d7fa411 is described below

commit d7fa411c76a719ca2299887d54e717265bda1ab4
Author: Christopher Tubbs <ctubbsii@apache.org>
AuthorDate: Wed Feb 20 20:09:28 2019 -0500

    Format the thrift files
    
    Apply consistent formatting to the thrift files to make it easier to
    read, edit, and view diffs.
    
    * Remove tab characters
    * Apply consistent 2-space indentation
    * Wrap parameters and exceptions onto their own line
    * Put blank line between each service method definition
    * Remove unnecessary commas and semicolons
    * Use consistent comment format, and spaces in generic params
    * Put struct braces and method parens on same line
    * Put blank lines between service open/close and methods
    
    (generated thrift files were re-generated to demonstrate that there were
    no differences in the generated files)
---
 core/src/main/thrift/client.thrift                 |  273 ++++-
 core/src/main/thrift/data.thrift                   |  140 +--
 core/src/main/thrift/gc.thrift                     |   30 +-
 core/src/main/thrift/master.thrift                 |  243 +++-
 core/src/main/thrift/replication.thrift            |   43 +-
 core/src/main/thrift/security.thrift               |   34 +-
 core/src/main/thrift/tabletserver.thrift           |  480 +++++---
 core/src/main/thrift/trace.thrift                  |    4 +-
 proxy/src/main/thrift/proxy.thrift                 | 1284 ++++++++++++++++----
 server/tracer/src/main/thrift/tracer.thrift        |   37 +-
 .../test/functional/FateConcurrencyIT.java         |    2 +-
 11 files changed, 1969 insertions(+), 601 deletions(-)

diff --git a/core/src/main/thrift/client.thrift b/core/src/main/thrift/client.thrift
index 38a8076..0a4af7c 100644
--- a/core/src/main/thrift/client.thrift
+++ b/core/src/main/thrift/client.thrift
@@ -78,7 +78,7 @@ enum SecurityErrorCode {
   TOKEN_EXPIRED = 15
   SERIALIZATION_ERROR = 16
   INSUFFICIENT_PROPERTIES = 17
-  NAMESPACE_DOESNT_EXIST = 18;
+  NAMESPACE_DOESNT_EXIST = 18
 }
 
 exception ThriftSecurityException {
@@ -106,51 +106,262 @@ service ClientService {
   string getInstanceId()
   string getZooKeepers()
 
-  list<string> bulkImportFiles(1:trace.TInfo tinfo, 8:security.TCredentials credentials, 3:i64 tid, 4:string tableId, 5:list<string> files, 6:string errorDir, 7:bool setTime) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope);
+  list<string> bulkImportFiles(
+    1:trace.TInfo tinfo
+    8:security.TCredentials credentials
+    3:i64 tid
+    4:string tableId
+    5:list<string> files
+    6:string errorDir
+    7:bool setTime
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
+
   // ensures that nobody is working on the transaction id above
-  bool isActive(1:trace.TInfo tinfo, 2:i64 tid)
+  bool isActive(
+    1:trace.TInfo tinfo
+    2:i64 tid
+  )
 
-  void ping(2:security.TCredentials credentials) throws (1:ThriftSecurityException sec)
+  void ping(
+    2:security.TCredentials credentials
+  ) throws (
+    1:ThriftSecurityException sec
+  )
 
-  list<TDiskUsage> getDiskUsage(2:set<string> tables, 1:security.TCredentials credentials) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException toe)
+  list<TDiskUsage> getDiskUsage(
+    2:set<string> tables
+    1:security.TCredentials credentials
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException toe
+  )
 
   // user management methods
-  set<string> listLocalUsers(2:trace.TInfo tinfo, 3:security.TCredentials credentials) throws (1:ThriftSecurityException sec)
-  void createLocalUser(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:binary password) throws (1:ThriftSecurityException sec)
-  void dropLocalUser(3:trace.TInfo tinfo, 4:security.TCredentials credentials, 2:string principal) throws (1:ThriftSecurityException sec)
-  void changeLocalUserPassword(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:binary password) throws (1:ThriftSecurityException sec)
+  set<string> listLocalUsers(
+    2:trace.TInfo tinfo
+    3:security.TCredentials credentials
+  ) throws (
+    1:ThriftSecurityException sec
+  )
+
+  void createLocalUser(
+    5:trace.TInfo tinfo
+    6:security.TCredentials credentials
+    2:string principal
+    3:binary password
+  ) throws (
+    1:ThriftSecurityException sec
+  )
+
+  void dropLocalUser(
+    3:trace.TInfo tinfo
+    4:security.TCredentials credentials
+    2:string principal
+  ) throws (
+    1:ThriftSecurityException sec
+  )
+
+  void changeLocalUserPassword(
+    4:trace.TInfo tinfo
+    5:security.TCredentials credentials
+    2:string principal
+    3:binary password
+  ) throws (
+    1:ThriftSecurityException sec
+  )
 
   // authentication-related methods
-  bool authenticate(1:trace.TInfo tinfo, 2:security.TCredentials credentials) throws (1:ThriftSecurityException sec)
-  bool authenticateUser(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:security.TCredentials toAuth) throws (1:ThriftSecurityException sec)
+  bool authenticate(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+  ) throws (
+    1:ThriftSecurityException sec
+  )
+
+  bool authenticateUser(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:security.TCredentials toAuth
+  ) throws (
+    1:ThriftSecurityException sec
+  )
 
   // authorization-related methods
-  void changeAuthorizations(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:list<binary> authorizations) throws (1:ThriftSecurityException sec)
-  list<binary> getUserAuthorizations(3:trace.TInfo tinfo, 4:security.TCredentials credentials, 2:string principal) throws (1:ThriftSecurityException sec)
+  void changeAuthorizations(
+    4:trace.TInfo tinfo
+    5:security.TCredentials credentials
+    2:string principal
+    3:list<binary> authorizations
+  ) throws (
+    1:ThriftSecurityException sec
+  )
+
+  list<binary> getUserAuthorizations(
+    3:trace.TInfo tinfo
+    4:security.TCredentials credentials
+    2:string principal
+  ) throws (
+    1:ThriftSecurityException sec
+  )
 
   // permissions-related methods
-  bool hasSystemPermission(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:byte sysPerm) throws (1:ThriftSecurityException sec)
-  bool hasTablePermission(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:string tableName, 4:byte tblPerm) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
-  bool hasNamespacePermission(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string principal, 4:string ns, 5:byte tblNspcPerm) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
-  void grantSystemPermission(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:byte permission) throws (1:ThriftSecurityException sec)
-  void revokeSystemPermission(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:byte permission) throws (1:ThriftSecurityException sec)
-  void grantTablePermission(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:string tableName, 4:byte permission) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
-  void revokeTablePermission(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:string tableName, 4:byte permission) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
-  void grantNamespacePermission(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string principal, 4:string ns, 5:byte permission) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
-  void revokeNamespacePermission(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string principal, 4:string ns, 5:byte permission) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
+  bool hasSystemPermission(
+    4:trace.TInfo tinfo
+    5:security.TCredentials credentials
+    2:string principal
+    3:byte sysPerm
+  ) throws (
+    1:ThriftSecurityException sec
+  )
+
+  bool hasTablePermission(
+    5:trace.TInfo tinfo
+    6:security.TCredentials credentials
+    2:string principal
+    3:string tableName
+    4:byte tblPerm
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
+
+  bool hasNamespacePermission(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:string principal
+    4:string ns
+    5:byte tblNspcPerm
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
+
+  void grantSystemPermission(
+    4:trace.TInfo tinfo
+    5:security.TCredentials credentials
+    2:string principal
+    3:byte permission
+  ) throws (
+    1:ThriftSecurityException sec
+  )
+
+  void revokeSystemPermission(
+    4:trace.TInfo tinfo
+    5:security.TCredentials credentials
+    2:string principal
+    3:byte permission
+  ) throws (
+    1:ThriftSecurityException sec
+  )
+
+  void grantTablePermission(
+    5:trace.TInfo tinfo
+    6:security.TCredentials credentials
+    2:string principal
+    3:string tableName
+    4:byte permission
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
+
+  void revokeTablePermission(
+    5:trace.TInfo tinfo
+    6:security.TCredentials credentials
+    2:string principal
+    3:string tableName
+    4:byte permission
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
+
+  void grantNamespacePermission(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:string principal
+    4:string ns
+    5:byte permission
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
+
+  void revokeNamespacePermission(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:string principal
+    4:string ns
+    5:byte permission
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
 
   // configuration methods
-  map<string, string> getConfiguration(2:trace.TInfo tinfo, 3:security.TCredentials credentials, 1:ConfigurationType type);
-  map<string, string> getTableConfiguration(1:trace.TInfo tinfo, 3:security.TCredentials credentials, 2:string tableName) throws (1:ThriftTableOperationException tope);
-  map<string, string> getNamespaceConfiguration(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string ns) throws (1:ThriftTableOperationException tope);
-  bool checkClass(1:trace.TInfo tinfo, 4:security.TCredentials credentials, 2:string className, 3:string interfaceMatch);
-  bool checkTableClass(1:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string tableId, 3:string className, 4:string interfaceMatch) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope);
-  bool checkNamespaceClass(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string namespaceId, 4:string className, 5:string interfaceMatch) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope);
+  map<string, string> getConfiguration(
+    2:trace.TInfo tinfo
+    3:security.TCredentials credentials
+    1:ConfigurationType type
+  )
+
+  map<string, string> getTableConfiguration(
+    1:trace.TInfo tinfo
+    3:security.TCredentials credentials
+    2:string tableName
+  ) throws (
+    1:ThriftTableOperationException tope
+  )
+
+  map<string, string> getNamespaceConfiguration(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:string ns
+  ) throws (
+    1:ThriftTableOperationException tope
+  )
+
+  bool checkClass(
+    1:trace.TInfo tinfo
+    4:security.TCredentials credentials
+    2:string className
+    3:string interfaceMatch
+  )
+
+  bool checkTableClass(
+    1:trace.TInfo tinfo
+    5:security.TCredentials credentials
+    2:string tableId
+    3:string className
+    4:string interfaceMatch
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
+
+  bool checkNamespaceClass(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:string namespaceId
+    4:string className
+    5:string interfaceMatch
+  ) throws (
+    1:ThriftSecurityException sec
+    2:ThriftTableOperationException tope
+  )
+
 }
 
 // Only used for a unit test
 service ThriftTest {
-  bool success();
-  bool fails();
-  bool throwsError() throws (1:ThriftSecurityException ex);
+
+  bool success()
+  bool fails()
+  bool throwsError() throws (
+    1:ThriftSecurityException ex
+  )
+
 }
diff --git a/core/src/main/thrift/data.thrift b/core/src/main/thrift/data.thrift
index 3e5c56c..001dba6 100644
--- a/core/src/main/thrift/data.thrift
+++ b/core/src/main/thrift/data.thrift
@@ -24,133 +24,133 @@ typedef i64 ScanID
 typedef i64 UpdateID
 
 struct TKey {
-	1:binary row;
-	2:binary colFamily;
-	3:binary colQualifier;
-	4:binary colVisibility;
-	5:i64 timestamp
+  1:binary row
+  2:binary colFamily
+  3:binary colQualifier
+  4:binary colVisibility
+  5:i64 timestamp
 }
 
 struct TColumn {
-	1:binary columnFamily,
-	2:binary columnQualifier,
-	3:binary columnVisibility
+  1:binary columnFamily
+  2:binary columnQualifier
+  3:binary columnVisibility
 }
 
 struct TMutation {
-	1:binary row,
-	2:binary data,
-	3:list<binary> values
-	4:i32 entries,
-	5:optional list<string> sources, 
+  1:binary row
+  2:binary data
+  3:list<binary> values
+  4:i32 entries
+  5:optional list<string> sources
 }
 
 struct TKeyExtent {
-	1:binary table,
-	2:binary endRow,
-	3:binary prevEndRow
+  1:binary table
+  2:binary endRow
+  3:binary prevEndRow
 }
 
 struct TKeyValue {
-	1:TKey key,
-	2:binary value
+  1:TKey key
+  2:binary value
 }
 
 struct ScanResult {
-	1:list<TKeyValue> results,
-	2:bool more
+  1:list<TKeyValue> results
+  2:bool more
 }
 
 struct TRange {
-	1:TKey start,
-	2:TKey stop,
-	3:bool startKeyInclusive,
-	4:bool stopKeyInclusive,
-	5:bool infiniteStartKey,
-	6:bool infiniteStopKey
+  1:TKey start
+  2:TKey stop
+  3:bool startKeyInclusive
+  4:bool stopKeyInclusive
+  5:bool infiniteStartKey
+  6:bool infiniteStopKey
 }
 
 typedef map<TKeyExtent, list<TRange>> ScanBatch
-	
+
 struct MultiScanResult {
-	1:list<TKeyValue> results,
-	2:ScanBatch failures,
-	3:list<TKeyExtent> fullScans,
-	4:TKeyExtent partScan,
-	5:TKey partNextKey,
-	6:bool partNextKeyInclusive,
-	7:bool more
+  1:list<TKeyValue> results
+  2:ScanBatch failures
+  3:list<TKeyExtent> fullScans
+  4:TKeyExtent partScan
+  5:TKey partNextKey
+  6:bool partNextKeyInclusive
+  7:bool more
 }
 
 struct InitialScan {
-	1:ScanID scanID,
-	2:ScanResult result
+  1:ScanID scanID
+  2:ScanResult result
 }
 
 struct InitialMultiScan {
-	1:ScanID scanID,
-	2:MultiScanResult result
+  1:ScanID scanID
+  2:MultiScanResult result
 }
 
 struct IterInfo {
-	1:i32 priority,
-	2:string className,
-	3:string iterName
+  1:i32 priority
+  2:string className
+  3:string iterName
 }
 
 struct TConstraintViolationSummary {
-	1:string constrainClass,
-	2:i16 violationCode,
-	3:string violationDescription,
-	4:i64 numberOfViolatingMutations
+  1:string constrainClass
+  2:i16 violationCode
+  3:string violationDescription
+  4:i64 numberOfViolatingMutations
 }
 
 struct UpdateErrors {
-	1:map<TKeyExtent, i64> failedExtents,
-	2:list<TConstraintViolationSummary> violationSummaries,
-	3:map<TKeyExtent, client.SecurityErrorCode> authorizationFailures
+  1:map<TKeyExtent, i64> failedExtents
+  2:list<TConstraintViolationSummary> violationSummaries
+  3:map<TKeyExtent, client.SecurityErrorCode> authorizationFailures
 }
 
 enum TCMStatus {
-	ACCEPTED,
-	REJECTED,
-	VIOLATED,
-	IGNORED
+  ACCEPTED
+  REJECTED
+  VIOLATED
+  IGNORED
 }
 
 struct TCMResult {
-	1:i64 cmid,
-	2:TCMStatus status
+  1:i64 cmid
+  2:TCMStatus status
 }
 
 struct MapFileInfo {
-	1:i64 estimatedSize
+  1:i64 estimatedSize
 }
 
 struct TCondition {
-	1:binary cf;
-	2:binary cq;
-	3:binary cv;
-	4:i64 ts;
-	5:bool hasTimestamp;
-	6:binary val;
-	7:binary iterators;
+  1:binary cf
+  2:binary cq
+  3:binary cv
+  4:i64 ts
+  5:bool hasTimestamp
+  6:binary val
+  7:binary iterators
 }
 
 struct TConditionalMutation {
-	1:list<TCondition> conditions;
-	2:TMutation mutation;
-	3:i64 id;
+  1:list<TCondition> conditions
+  2:TMutation mutation
+  3:i64 id
 }
 
 struct TConditionalSession {
-	1:i64 sessionId;
-	2:string tserverLock;
-        3:i64 ttl;
+  1:i64 sessionId
+  2:string tserverLock
+  3:i64 ttl
 }
 
-typedef map<TKeyExtent,list<TConditionalMutation>> CMBatch
+typedef map<TKeyExtent, list<TConditionalMutation>> CMBatch
 
-typedef map<TKeyExtent,list<TMutation>> UpdateBatch
+typedef map<TKeyExtent, list<TMutation>> UpdateBatch
 
 typedef map<TKeyExtent, map<string, MapFileInfo>> TabletFiles
diff --git a/core/src/main/thrift/gc.thrift b/core/src/main/thrift/gc.thrift
index 3fb0c97..ae68efd 100644
--- a/core/src/main/thrift/gc.thrift
+++ b/core/src/main/thrift/gc.thrift
@@ -22,22 +22,28 @@ include "trace.thrift"
 include "client.thrift"
 
 struct GcCycleStats {
-   1:i64 started;
-   2:i64 finished;
-   3:i64 candidates;
-   4:i64 inUse;
-   5:i64 deleted;
-   6:i64 errors;
+  1:i64 started
+  2:i64 finished
+  3:i64 candidates
+  4:i64 inUse
+  5:i64 deleted
+  6:i64 errors
 }
 
 struct GCStatus {
-   1:GcCycleStats last;
-   2:GcCycleStats lastLog;
-   3:GcCycleStats current;
-   4:GcCycleStats currentLog;
+  1:GcCycleStats last
+  2:GcCycleStats lastLog
+  3:GcCycleStats current
+  4:GcCycleStats currentLog
 }
 
-
 service GCMonitorService {
-   GCStatus getStatus(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec);
+
+  GCStatus getStatus(
+    2:trace.TInfo tinfo
+    1:security.TCredentials credentials
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
 }
diff --git a/core/src/main/thrift/master.thrift b/core/src/main/thrift/master.thrift
index b959074..9f8af05 100644
--- a/core/src/main/thrift/master.thrift
+++ b/core/src/main/thrift/master.thrift
@@ -36,32 +36,33 @@ struct TableInfo {
   6:double ingestByteRate
   7:double queryRate
   8:double queryByteRate
-  9:Compacting minors;
-  10:Compacting majors;
-  11:Compacting scans;
-  12:double scanRate;
+  9:Compacting minors
+  10:Compacting majors
+  11:Compacting scans
+  12:double scanRate
 }
 
 struct RecoveryStatus {
   2:string name
-  5:i32 runtime                   // in millis
+  // in millis
+  5:i32 runtime
   6:double progress
 }
 
 enum BulkImportState {
-   INITIAL
-   # master moves the files into the accumulo area
-   MOVING
-   # slave tserver examines the index of the file
-   PROCESSING
-   # slave tserver assigns the file to tablets
-   ASSIGNING
-   # tserver incorporates file into tablet
-   LOADING
-   # master moves error files into the error directory
-   COPY_FILES
-   # flags and locks removed
-   CLEANUP
+  INITIAL
+  // master moves the files into the accumulo area
+  MOVING
+  // tserver examines the index of the file
+  PROCESSING
+  // tserver assigns the file to tablets
+  ASSIGNING
+  // tserver incorporates file into tablet
+  LOADING
+  // master moves error files into the error directory
+  COPY_FILES
+  // flags and locks removed
+  CLEANUP
 }
 
 struct BulkImportStatus {
@@ -160,48 +161,210 @@ enum FateOperation {
 }
 
 service FateService {
+
   // register a fate operation by reserving an opid
-  i64 beginFateOperation(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
+  i64 beginFateOperation(
+    2:trace.TInfo tinfo
+    1:security.TCredentials credentials
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
   // initiate execution of the fate operation; set autoClean to true if not waiting for completion
-  void executeFateOperation(7:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:i64 opid, 3:FateOperation op, 4:list<binary> arguments, 5:map<string, string> options, 6:bool autoClean) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
+  void executeFateOperation(
+    7:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:i64 opid
+    3:FateOperation op
+    4:list<binary> arguments
+    5:map<string, string> options
+    6:bool autoClean
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:client.ThriftTableOperationException tope
+  )
+
   // wait for completion of the operation and get the returned exception, if any
-  string waitForFateOperation(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:i64 opid) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
+  string waitForFateOperation(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:i64 opid
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:client.ThriftTableOperationException tope
+  )
+
   // clean up fate operation if autoClean was not set, after waiting
-  void finishFateOperation(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:i64 opid) throws (1:client.ThriftSecurityException sec)
+  void finishFateOperation(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:i64 opid
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
 }
 
 service MasterClientService extends FateService {
 
   // table management methods
-  i64 initiateFlush(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableName) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
-  void waitForFlush(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableName, 6:binary startRow, 7:binary endRow, 3:i64 flushID, 4:i64 maxLoops) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
+  i64 initiateFlush(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string tableName
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:client.ThriftTableOperationException tope
+  )
+
+  void waitForFlush(
+    5:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string tableName
+    6:binary startRow
+    7:binary endRow
+    3:i64 flushID
+    4:i64 maxLoops
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:client.ThriftTableOperationException tope
+  )
+
+  void setTableProperty(
+    5:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string tableName
+    3:string property
+    4:string value
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:client.ThriftTableOperationException tope
+  )
 
-  void setTableProperty(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableName, 3:string property, 4:string value) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
-  void removeTableProperty(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableName, 3:string property) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
+  void removeTableProperty(
+    4:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string tableName
+    3:string property
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:client.ThriftTableOperationException tope
+  )
 
-  void setNamespaceProperty(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string ns, 3:string property, 4:string value) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
-  void removeNamespaceProperty(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string ns, 3:string property) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
+  void setNamespaceProperty(
+    5:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string ns
+    3:string property
+    4:string value
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:client.ThriftTableOperationException tope
+  )
+
+  void removeNamespaceProperty(
+    4:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string ns
+    3:string property
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:client.ThriftTableOperationException tope
+  )
 
   // system management methods
-  void setMasterGoalState(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:MasterGoalState state) throws (1:client.ThriftSecurityException sec);
-  void shutdown(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:bool stopTabletServers) throws (1:client.ThriftSecurityException sec)
-  void shutdownTabletServer(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tabletServer, 4:bool force) throws (1: client.ThriftSecurityException sec)
-  void setSystemProperty(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string property, 3:string value) throws (1:client.ThriftSecurityException sec)
-  void removeSystemProperty(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string property) throws (1:client.ThriftSecurityException sec)
+  void setMasterGoalState(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:MasterGoalState state
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  void shutdown(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:bool stopTabletServers
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  void shutdownTabletServer(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string tabletServer
+    4:bool force
+  ) throws (
+    1: client.ThriftSecurityException sec
+  )
+
+  void setSystemProperty(
+    4:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string property
+    3:string value
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  void removeSystemProperty(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string property
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
 
   // system monitoring methods
-  MasterMonitorInfo getMasterStats(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
-  void waitForBalance(1:trace.TInfo tinfo) 
+  MasterMonitorInfo getMasterStats(
+    2:trace.TInfo tinfo
+    1:security.TCredentials credentials
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  void waitForBalance(
+    1:trace.TInfo tinfo
+  )
 
   // tablet server reporting
-  oneway void reportSplitExtent(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string serverName, 3:TabletSplit split)
-  oneway void reportTabletStatus(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string serverName, 3:TabletLoadState status, 4:data.TKeyExtent tablet)
+  oneway void reportSplitExtent(
+    4:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string serverName
+    3:TabletSplit split
+  )
 
-  list<string> getActiveTservers(1:trace.TInfo tinfo, 2:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
+  oneway void reportTabletStatus(
+    5:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string serverName
+    3:TabletLoadState status
+    4:data.TKeyExtent tablet
+  )
+
+  list<string> getActiveTservers(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
 
   // Delegation token request
-  security.TDelegationToken getDelegationToken(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:security.TDelegationTokenConfig cfg) throws (1:client.ThriftSecurityException sec)
+  security.TDelegationToken getDelegationToken(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:security.TDelegationTokenConfig cfg
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
 
   // Determine when all provided logs are replicated
-  bool drainReplicationTable(1:trace.TInfo tfino, 2:security.TCredentials credentials, 3:string tableName, 4:set<string> logsToWatch)
+  bool drainReplicationTable(
+    1:trace.TInfo tfino
+    2:security.TCredentials credentials
+    3:string tableName
+    4:set<string> logsToWatch
+  )
+
 }
diff --git a/core/src/main/thrift/replication.thrift b/core/src/main/thrift/replication.thrift
index 27ca191..573564d 100644
--- a/core/src/main/thrift/replication.thrift
+++ b/core/src/main/thrift/replication.thrift
@@ -14,7 +14,6 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-
 namespace java org.apache.accumulo.core.replication.thrift
 namespace cpp org.apache.accumulo.core.replication.thrift
 
@@ -22,11 +21,11 @@ include "data.thrift"
 include "security.thrift"
 
 struct WalEdits {
-    1:list<binary> edits
+  1:list<binary> edits
 }
 
 struct KeyValues {
-    1:list<data.TKeyValue> keyValues
+  1:list<data.TKeyValue> keyValues
 }
 
 enum RemoteReplicationErrorCode {
@@ -44,20 +43,42 @@ enum ReplicationCoordinatorErrorCode {
 }
 
 exception ReplicationCoordinatorException {
-    1:ReplicationCoordinatorErrorCode code,
-    2:string reason
+  1:ReplicationCoordinatorErrorCode code
+  2:string reason
 }
 
 exception RemoteReplicationException {
-    1:RemoteReplicationErrorCode code,
-    2:string reason
+  1:RemoteReplicationErrorCode code
+  2:string reason
 }
 
 service ReplicationCoordinator {
-	string getServicerAddress(1:string remoteTableId, 2:security.TCredentials credentials) throws (1:ReplicationCoordinatorException e),
+
+  string getServicerAddress(
+    1:string remoteTableId
+    2:security.TCredentials credentials
+  ) throws (
+    1:ReplicationCoordinatorException e
+  )
+
 }
 
 service ReplicationServicer {
-    i64 replicateLog(1:string remoteTableId, 2:WalEdits data, 3:security.TCredentials credentials) throws (1:RemoteReplicationException e),
-    i64 replicateKeyValues(1:string remoteTableId, 2:KeyValues data, 3:security.TCredentials credentials) throws (1:RemoteReplicationException e)
-}
\ No newline at end of file
+
+  i64 replicateLog(
+    1:string remoteTableId
+    2:WalEdits data
+    3:security.TCredentials credentials
+  ) throws (
+    1:RemoteReplicationException e
+  )
+
+  i64 replicateKeyValues(
+    1:string remoteTableId
+    2:KeyValues data
+    3:security.TCredentials credentials
+  ) throws (
+    1:RemoteReplicationException e
+  )
+
+}
diff --git a/core/src/main/thrift/security.thrift b/core/src/main/thrift/security.thrift
index 74b7f12..b011720 100644
--- a/core/src/main/thrift/security.thrift
+++ b/core/src/main/thrift/security.thrift
@@ -18,32 +18,32 @@ namespace java org.apache.accumulo.core.security.thrift
 namespace cpp org.apache.accumulo.core.security.thrift
 
 struct TCredentials {
-    1:string principal,
-    2:string tokenClassName,
-    3:binary token,
-    4:string instanceId
+  1:string principal
+  2:string tokenClassName
+  3:binary token
+  4:string instanceId
 }
 
 struct TAuthenticationTokenIdentifier {
-    1:string principal,
-    2:optional i32 keyId,
-    3:optional i64 issueDate,
-    4:optional i64 expirationDate,
-    5:optional string instanceId
+  1:string principal
+  2:optional i32 keyId
+  3:optional i64 issueDate
+  4:optional i64 expirationDate
+  5:optional string instanceId
 }
 
 struct TAuthenticationKey {
-    1:binary secret,
-    2:optional i32 keyId,
-    3:optional i64 expirationDate,
-    4:optional i64 creationDate
+  1:binary secret
+  2:optional i32 keyId
+  3:optional i64 expirationDate
+  4:optional i64 creationDate
 }
 
 struct TDelegationToken {
-    1:binary password,
-    2:TAuthenticationTokenIdentifier identifier
+  1:binary password
+  2:TAuthenticationTokenIdentifier identifier
 }
 
 struct TDelegationTokenConfig {
-    1:optional i64 lifetime
-}
\ No newline at end of file
+  1:optional i64 lifetime
+}
diff --git a/core/src/main/thrift/tabletserver.thrift b/core/src/main/thrift/tabletserver.thrift
index 7697a2d..6d73f9f 100644
--- a/core/src/main/thrift/tabletserver.thrift
+++ b/core/src/main/thrift/tabletserver.thrift
@@ -35,201 +35,399 @@ exception TSampleNotPresentException {
   1:data.TKeyExtent extent
 }
 
-exception NoSuchScanIDException {
-}
+exception NoSuchScanIDException {}
 
 exception ConstraintViolationException {
   1:list<data.TConstraintViolationSummary> violationSummaries
 }
 
 struct ActionStats {
-    1:i32 status
-    2:double elapsed
-    3:i32 num
-    4:i64 count
-    5:double sumDev  // sum of the square of the elapsed time
-    6:i32 fail
-    7:double queueTime
-    8:double queueSumDev // sum of the square of the queue time
+  1:i32 status
+  2:double elapsed
+  3:i32 num
+  4:i64 count
+  // sum of the square of the elapsed time
+  5:double sumDev
+  6:i32 fail
+  7:double queueTime
+  // sum of the square of the queue time
+  8:double queueSumDev
 }
 
 struct TabletStats {
-    1:data.TKeyExtent extent
-    2:ActionStats majors
-    3:ActionStats minors
-    4:ActionStats splits
-    5:i64 numEntries
-    6:double ingestRate
-    7:double queryRate
-    // zero if loaded by the master, currentTimeMillis when the split was created
-    8:i64 splitCreationTime
+  1:data.TKeyExtent extent
+  2:ActionStats majors
+  3:ActionStats minors
+  4:ActionStats splits
+  5:i64 numEntries
+  6:double ingestRate
+  7:double queryRate
+  // zero if loaded by the master, currentTimeMillis when the split was created
+  8:i64 splitCreationTime
 }
 
 enum ScanType {
-    SINGLE,
-    BATCH
+  SINGLE
+  BATCH
 }
 
 enum ScanState {
-    IDLE,
-    RUNNING,
-    QUEUED
+  IDLE
+  RUNNING
+  QUEUED
 }
 
 struct ActiveScan {
-    2:string client
-    3:string user
-    4:string tableId
-    5:i64 age
-    6:i64 idleTime
-    7:ScanType type
-    8:ScanState state
-    9:data.TKeyExtent extent
-    10:list<data.TColumn> columns
-    11:list<data.IterInfo> ssiList
-    12:map<string, map<string, string>> ssio  /* Server Side Iterator Options */
-    13:list<binary> authorizations
-    14:optional i64 scanId
-    15:string classLoaderContext /* name of the classloader context */
+  2:string client
+  3:string user
+  4:string tableId
+  5:i64 age
+  6:i64 idleTime
+  7:ScanType type
+  8:ScanState state
+  9:data.TKeyExtent extent
+  10:list<data.TColumn> columns
+  11:list<data.IterInfo> ssiList
+  // Server Side Iterator Options
+  12:map<string, map<string, string>> ssio
+  13:list<binary> authorizations
+  14:optional i64 scanId
+  // name of the classloader context
+  15:string classLoaderContext
 }
 
 enum CompactionType {
-   MINOR,
-   MERGE,
-   MAJOR,
-   FULL
+  MINOR
+  MERGE
+  MAJOR
+  FULL
 }
 
 enum CompactionReason {
-   USER,
-   SYSTEM,
-   CHOP,
-   IDLE,
-   CLOSE
+  USER
+  SYSTEM
+  CHOP
+  IDLE
+  CLOSE
 }
 
 enum TDurability {
-  DEFAULT = 0,
-  SYNC = 1,
-  FLUSH = 2,
-  LOG = 3,
+  DEFAULT = 0
+  SYNC = 1
+  FLUSH = 2
+  LOG = 3
   NONE = 4
 }
 
 struct ActiveCompaction {
-    1:data.TKeyExtent extent
-    2:i64 age
-    3:list<string> inputFiles
-    4:string outputFile
-    5:CompactionType type
-    6:CompactionReason reason
-    7:string localityGroup
-    8:i64 entriesRead
-    9:i64 entriesWritten
-    10:list<data.IterInfo> ssiList
-    11:map<string, map<string, string>> ssio 
+  1:data.TKeyExtent extent
+  2:i64 age
+  3:list<string> inputFiles
+  4:string outputFile
+  5:CompactionType type
+  6:CompactionReason reason
+  7:string localityGroup
+  8:i64 entriesRead
+  9:i64 entriesWritten
+  10:list<data.IterInfo> ssiList
+  11:map<string, map<string, string>> ssio
 }
 
 struct TIteratorSetting {
-    1:i32 priority;
-    2:string name;
-    3:string iteratorClass;
-    4:map<string,string> properties;
+  1:i32 priority
+  2:string name
+  3:string iteratorClass
+  4:map<string, string> properties
 }
 
 struct IteratorConfig {
-   1:list<TIteratorSetting> iterators;
+  1:list<TIteratorSetting> iterators
 }
 
 struct TSamplerConfiguration {
-   1:string className
-   2:map<string, string> options
+  1:string className
+  2:map<string, string> options
 }
 
 enum TUnloadTabletGoal {
-   UNKNOWN,
-   UNASSIGNED,
-   SUSPENDED,
-   DELETED
+  UNKNOWN
+  UNASSIGNED
+  SUSPENDED
+  DELETED
 }
 
 service TabletClientService extends client.ClientService {
+
   // scan a range of keys
-  data.InitialScan startScan(11:trace.TInfo tinfo,
-                             1:security.TCredentials credentials,
-                             2:data.TKeyExtent extent,
-                             3:data.TRange range,
-                             4:list<data.TColumn> columns,
-                             5:i32 batchSize,
-                             6:list<data.IterInfo> ssiList,
-                             7:map<string, map<string, string>> ssio,
-                             8:list<binary> authorizations
-                             9:bool waitForWrites,
-                             10:bool isolated,
-                             12:i64 readaheadThreshold,
-                             13:TSamplerConfiguration samplerConfig,
-                             14:i64 batchTimeOut,
-                             15:string classLoaderContext /* name of the classloader context */)  throws (1:client.ThriftSecurityException sec, 2:NotServingTabletException nste, 3:TooManyFilesException tmfe, 4:TSampleNotPresentException tsnpe),
-                             
-  data.ScanResult continueScan(2:trace.TInfo tinfo, 1:data.ScanID scanID)  throws (1:NoSuchScanIDException nssi, 2:NotServingTabletException nste, 3:TooManyFilesException tmfe, 4:TSampleNotPresentException tsnpe),
-  oneway void closeScan(2:trace.TInfo tinfo, 1:data.ScanID scanID),
+  data.InitialScan startScan(
+    11:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:data.TKeyExtent extent
+    3:data.TRange range
+    4:list<data.TColumn> columns
+    5:i32 batchSize
+    6:list<data.IterInfo> ssiList
+    7:map<string, map<string, string>> ssio
+    8:list<binary> authorizations
+    9:bool waitForWrites
+    10:bool isolated
+    12:i64 readaheadThreshold
+    13:TSamplerConfiguration samplerConfig
+    14:i64 batchTimeOut
+    // name of the classloader context
+    15:string classLoaderContext
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:NotServingTabletException nste
+    3:TooManyFilesException tmfe
+    4:TSampleNotPresentException tsnpe
+  )
+
+  data.ScanResult continueScan(
+    2:trace.TInfo tinfo
+    1:data.ScanID scanID
+  ) throws (
+    1:NoSuchScanIDException nssi
+    2:NotServingTabletException nste
+    3:TooManyFilesException tmfe
+    4:TSampleNotPresentException tsnpe
+  )
+
+  oneway void closeScan(
+    2:trace.TInfo tinfo
+    1:data.ScanID scanID
+  )
 
   // scan over a series of ranges
-  data.InitialMultiScan startMultiScan(8:trace.TInfo tinfo,
-                                  1:security.TCredentials credentials,
-                                  2:data.ScanBatch batch,
-                                  3:list<data.TColumn> columns,
-                                  4:list<data.IterInfo> ssiList,
-                                  5:map<string, map<string, string>> ssio,
-                                  6:list<binary> authorizations,
-                                  7:bool waitForWrites,
-                                  9:TSamplerConfiguration samplerConfig,
-                                  10:i64 batchTimeOut,
-                                  11:string classLoaderContext /* name of the classloader context */)  throws (1:client.ThriftSecurityException sec, 2:TSampleNotPresentException tsnpe),
-  data.MultiScanResult continueMultiScan(2:trace.TInfo tinfo, 1:data.ScanID scanID) throws (1:NoSuchScanIDException nssi, 2:TSampleNotPresentException tsnpe),
-  void closeMultiScan(2:trace.TInfo tinfo, 1:data.ScanID scanID) throws (1:NoSuchScanIDException nssi),
-  
+  data.InitialMultiScan startMultiScan(
+    8:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:data.ScanBatch batch
+    3:list<data.TColumn> columns
+    4:list<data.IterInfo> ssiList
+    5:map<string, map<string, string>> ssio
+    6:list<binary> authorizations
+    7:bool waitForWrites
+    9:TSamplerConfiguration samplerConfig
+    10:i64 batchTimeOut
+    // name of the classloader context
+    11:string classLoaderContext
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:TSampleNotPresentException tsnpe
+  )
+
+  data.MultiScanResult continueMultiScan(
+    2:trace.TInfo tinfo
+    1:data.ScanID scanID
+  ) throws (
+    1:NoSuchScanIDException nssi
+    2:TSampleNotPresentException tsnpe
+  )
+
+  void closeMultiScan(
+    2:trace.TInfo tinfo
+    1:data.ScanID scanID
+  ) throws (
+    1:NoSuchScanIDException nssi
+  )
+
   //the following calls support a batch update to multiple tablets on a tablet server
-  data.UpdateID startUpdate(2:trace.TInfo tinfo, 1:security.TCredentials credentials, 3:TDurability durability) throws (1:client.ThriftSecurityException sec),
-  oneway void applyUpdates(1:trace.TInfo tinfo, 2:data.UpdateID updateID, 3:data.TKeyExtent keyExtent, 4:list<data.TMutation> mutations),
-  data.UpdateErrors closeUpdate(2:trace.TInfo tinfo, 1:data.UpdateID updateID) throws (1:NoSuchScanIDException nssi),
+  data.UpdateID startUpdate(
+    2:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    3:TDurability durability
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  oneway void applyUpdates(
+    1:trace.TInfo tinfo
+    2:data.UpdateID updateID
+    3:data.TKeyExtent keyExtent
+    4:list<data.TMutation> mutations
+  )
+
+  data.UpdateErrors closeUpdate(
+    2:trace.TInfo tinfo
+    1:data.UpdateID updateID
+  ) throws (
+    1:NoSuchScanIDException nssi
+  )
 
   //the following call supports making a single update to a tablet
-  void update(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:data.TKeyExtent keyExtent, 3:data.TMutation mutation, 5:TDurability durability)
-    throws (1:client.ThriftSecurityException sec, 
-            2:NotServingTabletException nste, 
-            3:ConstraintViolationException cve),
-
-  data.TConditionalSession startConditionalUpdate(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:list<binary> authorizations, 4:string tableID, 5:TDurability durability, 6:string classLoaderContext)
-     throws (1:client.ThriftSecurityException sec);
-  
-  list<data.TCMResult> conditionalUpdate(1:trace.TInfo tinfo, 2:data.UpdateID sessID, 3:data.CMBatch mutations, 4:list<string> symbols)
-     throws (1:NoSuchScanIDException nssi);
-  void invalidateConditionalUpdate(1:trace.TInfo tinfo, 2:data.UpdateID sessID);
-  oneway void closeConditionalUpdate(1:trace.TInfo tinfo, 2:data.UpdateID sessID);
+  void update(
+    4:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:data.TKeyExtent keyExtent
+    3:data.TMutation mutation
+    5:TDurability durability
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:NotServingTabletException nste
+    3:ConstraintViolationException cve
+  )
+
+  data.TConditionalSession startConditionalUpdate(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:list<binary> authorizations
+    4:string tableID
+    5:TDurability durability
+    6:string classLoaderContext
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  list<data.TCMResult> conditionalUpdate(
+    1:trace.TInfo tinfo
+    2:data.UpdateID sessID
+    3:data.CMBatch mutations
+    4:list<string> symbols
+  ) throws (
+    1:NoSuchScanIDException nssi
+  )
+
+  void invalidateConditionalUpdate(
+    1:trace.TInfo tinfo
+    2:data.UpdateID sessID
+  )
+
+  oneway void closeConditionalUpdate(
+    1:trace.TInfo tinfo
+    2:data.UpdateID sessID
+  )
 
   // on success, returns an empty list
-  list<data.TKeyExtent> bulkImport(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 4:i64 tid, 2:data.TabletFiles files, 5:bool setTime) throws (1:client.ThriftSecurityException sec),
-
-  void splitTablet(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:data.TKeyExtent extent, 3:binary splitPoint) throws (1:client.ThriftSecurityException sec, 2:NotServingTabletException nste)
- 
-  oneway void loadTablet(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 4:string lock, 2:data.TKeyExtent extent),
-  oneway void unloadTablet(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 4:string lock, 2:data.TKeyExtent extent, 6:TUnloadTabletGoal goal, 7:i64 requestTime),
-  oneway void flush(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 3:string lock, 2:string tableId, 5:binary startRow, 6:binary endRow),
-  oneway void flushTablet(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string lock, 4:data.TKeyExtent extent),
-  oneway void chop(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string lock, 4:data.TKeyExtent extent),
-  oneway void compact(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string lock, 4:string tableId, 5:binary startRow, 6:binary endRow),
-  
-  master.TabletServerStatus getTabletServerStatus(3:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
-  list<TabletStats> getTabletStats(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableId) throws (1:client.ThriftSecurityException sec)
-  TabletStats getHistoricalStats(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
-  void halt(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string lock) throws (1:client.ThriftSecurityException sec)
-  oneway void fastHalt(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string lock);
-  
-  list<ActiveScan> getActiveScans(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
-  list<ActiveCompaction> getActiveCompactions(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
-  oneway void removeLogs(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:list<string> filenames)
-  list<string> getActiveLogs(1:trace.TInfo tinfo, 2:security.TCredentials credentials)
+  list<data.TKeyExtent> bulkImport(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    4:i64 tid
+    2:data.TabletFiles files
+    5:bool setTime
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  void splitTablet(
+    4:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:data.TKeyExtent extent
+    3:binary splitPoint
+  ) throws (
+    1:client.ThriftSecurityException sec
+    2:NotServingTabletException nste
+  )
+
+  oneway void loadTablet(
+    5:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    4:string lock
+    2:data.TKeyExtent extent
+  )
+
+  oneway void unloadTablet(
+    5:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    4:string lock
+    2:data.TKeyExtent extent
+    6:TUnloadTabletGoal goal
+    7:i64 requestTime
+  )
+
+  oneway void flush(
+    4:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    3:string lock
+    2:string tableId
+    5:binary startRow
+    6:binary endRow
+  )
+
+  oneway void flushTablet(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:string lock
+    4:data.TKeyExtent extent
+  )
+
+  oneway void chop(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:string lock
+    4:data.TKeyExtent extent
+  )
+
+  oneway void compact(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:string lock
+    4:string tableId
+    5:binary startRow
+    6:binary endRow
+  )
+
+  master.TabletServerStatus getTabletServerStatus(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  list<TabletStats> getTabletStats(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string tableId
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  TabletStats getHistoricalStats(
+    2:trace.TInfo tinfo
+    1:security.TCredentials credentials
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  void halt(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string lock
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  oneway void fastHalt(
+    3:trace.TInfo tinfo
+    1:security.TCredentials credentials
+    2:string lock
+  )
+
+  list<ActiveScan> getActiveScans(
+    2:trace.TInfo tinfo
+    1:security.TCredentials credentials
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  list<ActiveCompaction> getActiveCompactions(
+    2:trace.TInfo tinfo
+    1:security.TCredentials credentials
+  ) throws (
+    1:client.ThriftSecurityException sec
+  )
+
+  oneway void removeLogs(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+    3:list<string> filenames
+  )
+
+  list<string> getActiveLogs(
+    1:trace.TInfo tinfo
+    2:security.TCredentials credentials
+  )
+
 }
 
 typedef i32 TabletID
diff --git a/core/src/main/thrift/trace.thrift b/core/src/main/thrift/trace.thrift
index dc6c44d..8a32c0a 100644
--- a/core/src/main/thrift/trace.thrift
+++ b/core/src/main/thrift/trace.thrift
@@ -18,6 +18,6 @@ namespace java org.apache.accumulo.core.trace.thrift
 namespace cpp org.apache.accumulo.core.trace.thrift
 
 struct TInfo {
-   1:i64 traceId,
-   2:i64 parentId,
+  1:i64 traceId
+  2:i64 parentId
 }
diff --git a/proxy/src/main/thrift/proxy.thrift b/proxy/src/main/thrift/proxy.thrift
index e15990c..95fe2fb 100644
--- a/proxy/src/main/thrift/proxy.thrift
+++ b/proxy/src/main/thrift/proxy.thrift
@@ -25,193 +25,192 @@
  * Therefore if changes to this IDL break your client code, then using an older
  * version of the IDL with a new version of the proxy server is an option.
  */
-
 namespace cpp accumulo
 namespace java org.apache.accumulo.proxy.thrift
 namespace rb Accumulo
 namespace py accumulo
 
 struct Key {
-  1:binary row;
-  2:binary colFamily;
-  3:binary colQualifier;
-  4:binary colVisibility;
+  1:binary row
+  2:binary colFamily
+  3:binary colQualifier
+  4:binary colVisibility
   5:optional i64 timestamp = 0x7FFFFFFFFFFFFFFF
 }
 
 enum PartialKey {
-  ROW,
-  ROW_COLFAM,
-  ROW_COLFAM_COLQUAL,
-  ROW_COLFAM_COLQUAL_COLVIS,
-  ROW_COLFAM_COLQUAL_COLVIS_TIME,
+  ROW
+  ROW_COLFAM
+  ROW_COLFAM_COLQUAL
+  ROW_COLFAM_COLQUAL_COLVIS
+  ROW_COLFAM_COLQUAL_COLVIS_TIME
   ROW_COLFAM_COLQUAL_COLVIS_TIME_DEL
 }
 
 struct ColumnUpdate {
-  1:binary colFamily,
-  2:binary colQualifier,
-  3:optional binary colVisibility,
-  4:optional i64 timestamp,
-  5:optional binary value,
+  1:binary colFamily
+  2:binary colQualifier
+  3:optional binary colVisibility
+  4:optional i64 timestamp
+  5:optional binary value
   6:optional bool deleteCell
 }
 
-//since 1.6.0
+// since 1.6.0
 struct DiskUsage {
-  1:list<string> tables,
+  1:list<string> tables
   2:i64 usage
 }
 
 struct KeyValue {
-  1:Key key,
+  1:Key key
   2:binary value
 }
 
 struct ScanResult {
-  1:list<KeyValue> results,
+  1:list<KeyValue> results
   2:bool more
 }
 
 struct Range {
-  1:Key start,
+  1:Key start
   2:bool startInclusive
-  3:Key stop,
+  3:Key stop
   4:bool stopInclusive
 }
 
 struct ScanColumn {
-  1:binary colFamily,
+  1:binary colFamily
   2:optional binary colQualifier
 }
 
 struct IteratorSetting {
-  1: i32 priority,
-  2: string name,
-  3: string iteratorClass,
-  4: map<string,string> properties
+  1: i32 priority
+  2: string name
+  3: string iteratorClass
+  4: map<string, string> properties
 }
 
 struct ScanOptions {
-  1:optional set<binary> authorizations;
-  2:optional Range range,
-  3:optional list<ScanColumn> columns;
-  4:optional list<IteratorSetting> iterators;
-  5:optional i32 bufferSize;
-} 
+  1:optional set<binary> authorizations
+  2:optional Range range
+  3:optional list<ScanColumn> columns
+  4:optional list<IteratorSetting> iterators
+  5:optional i32 bufferSize
+}
 
 struct BatchScanOptions {
-  1:optional set<binary> authorizations;
-  2:optional list<Range> ranges;
-  3:optional list<ScanColumn> columns;
-  4:optional list<IteratorSetting> iterators;
-  5:optional i32 threads;
-} 
+  1:optional set<binary> authorizations
+  2:optional list<Range> ranges
+  3:optional list<ScanColumn> columns
+  4:optional list<IteratorSetting> iterators
+  5:optional i32 threads
+}
 
 struct KeyValueAndPeek {
-  1:KeyValue keyValue,
+  1:KeyValue keyValue
   2:bool hasNext
 }
 
 enum TablePermission {
-  READ = 2,
-  WRITE = 3,
-  BULK_IMPORT = 4,
-  ALTER_TABLE = 5,
-  GRANT = 6,
-  DROP_TABLE = 7,
+  READ = 2
+  WRITE = 3
+  BULK_IMPORT = 4
+  ALTER_TABLE = 5
+  GRANT = 6
+  DROP_TABLE = 7
 }
 
 enum SystemPermission {
-  GRANT = 0,
-  CREATE_TABLE = 1,
-  DROP_TABLE = 2,
-  ALTER_TABLE = 3,
-  CREATE_USER = 4,
-  DROP_USER = 5,
-  ALTER_USER = 6,
-  SYSTEM = 7,
-  CREATE_NAMESPACE = 8,
-  DROP_NAMESPACE = 9,
-  ALTER_NAMESPACE = 10,
-  OBTAIN_DELEGATION_TOKEN = 11,
+  GRANT = 0
+  CREATE_TABLE = 1
+  DROP_TABLE = 2
+  ALTER_TABLE = 3
+  CREATE_USER = 4
+  DROP_USER = 5
+  ALTER_USER = 6
+  SYSTEM = 7
+  CREATE_NAMESPACE = 8
+  DROP_NAMESPACE = 9
+  ALTER_NAMESPACE = 10
+  OBTAIN_DELEGATION_TOKEN = 11
 }
 
 enum NamespacePermission {
-  READ = 0,
-  WRITE = 1,
-  ALTER_NAMESPACE = 2,
-  GRANT = 3,
-  ALTER_TABLE = 4,
-  CREATE_TABLE = 5,
-  DROP_TABLE = 6,
-  BULK_IMPORT = 7,
+  READ = 0
+  WRITE = 1
+  ALTER_NAMESPACE = 2
+  GRANT = 3
+  ALTER_TABLE = 4
+  CREATE_TABLE = 5
+  DROP_TABLE = 6
+  BULK_IMPORT = 7
   DROP_NAMESPACE = 8
 }
 
 enum ScanType {
-    SINGLE,
-    BATCH
+  SINGLE
+  BATCH
 }
 
 enum ScanState {
-    IDLE,
-    RUNNING,
-    QUEUED
+  IDLE
+  RUNNING
+  QUEUED
 }
 
 struct KeyExtent {
-  1:string tableId,
-  2:binary endRow,
+  1:string tableId
+  2:binary endRow
   3:binary prevEndRow
 }
 
 struct Column {
-  1:binary colFamily;
-  2:binary colQualifier;
-  3:binary colVisibility;
+  1:binary colFamily
+  2:binary colQualifier
+  3:binary colVisibility
 }
 
-//since 1.6.0
+// since 1.6.0
 struct Condition {
-  1:Column column;
-  2:optional i64 timestamp;
-  3:optional binary value;
-  4:optional list<IteratorSetting> iterators;
+  1:Column column
+  2:optional i64 timestamp
+  3:optional binary value
+  4:optional list<IteratorSetting> iterators
 }
 
-//since 1.6.0
+// since 1.6.0
 struct ConditionalUpdates {
-	2:list<Condition> conditions
-	3:list<ColumnUpdate> updates 
+  2:list<Condition> conditions
+  3:list<ColumnUpdate> updates
 }
 
-//since 1.6.0
+// since 1.6.0
 enum ConditionalStatus {
-  ACCEPTED,
-  REJECTED,
-  VIOLATED,
-  UNKNOWN,
+  ACCEPTED
+  REJECTED
+  VIOLATED
+  UNKNOWN
   INVISIBLE_VISIBILITY
 }
 
-//since 1.7.0
+// since 1.7.0
 enum Durability {
-	DEFAULT,
-	NONE,
-	LOG,
-	FLUSH,
-	SYNC
+  DEFAULT
+  NONE
+  LOG
+  FLUSH
+  SYNC
 }
 
-//since 1.6.0
+// since 1.6.0
 struct ConditionalWriterOptions {
-   1:optional i64 maxMemory
-   2:optional i64 timeoutMs
-   3:optional i32 threads
-   4:optional set<binary> authorizations;
-   //since 1.7.0
-   5:optional Durability durability;
+  1:optional i64 maxMemory
+  2:optional i64 timeoutMs
+  3:optional i32 threads
+  4:optional set<binary> authorizations
+  // since 1.7.0
+  5:optional Durability durability
 }
 
 struct ActiveScan {
@@ -229,18 +228,18 @@ struct ActiveScan {
 }
 
 enum CompactionType {
-   MINOR,
-   MERGE,
-   MAJOR,
-   FULL
+  MINOR
+  MERGE
+  MAJOR
+  FULL
 }
 
 enum CompactionReason {
-   USER,
-   SYSTEM,
-   CHOP,
-   IDLE,
-   CLOSE
+  USER
+  SYSTEM
+  CHOP
+  IDLE
+  CLOSE
 }
 
 struct ActiveCompaction {
@@ -253,7 +252,7 @@ struct ActiveCompaction {
   7:string localityGroup
   8:i64 entriesRead
   9:i64 entriesWritten
-  10:list<IteratorSetting> iterators;
+  10:list<IteratorSetting> iterators
 }
 
 struct WriterOptions {
@@ -261,23 +260,23 @@ struct WriterOptions {
  2:i64 latencyMs
  3:i64 timeoutMs
  4:i32 threads
- //since 1.7.0
+ // since 1.7.0
  5:optional Durability durability
 }
 
 struct CompactionStrategyConfig {
   1:string className
-  2:map<string,string> options
+  2:map<string, string> options
 }
 
 enum IteratorScope {
-  MINC,
-  MAJC,
+  MINC
+  MAJC
   SCAN
 }
 
 enum TimeType {
-  LOGICAL,
+  LOGICAL
   MILLIS
 }
 
@@ -325,169 +324,930 @@ exception NamespaceNotEmptyException {
   1:string msg
 }
 
-service AccumuloProxy
-{
+service AccumuloProxy {
+
   // get an authentication token
-  binary login(1:string principal, 2:map<string, string> loginProperties)                              throws (1:AccumuloSecurityException ouch2);
+  binary login(
+    1:string principal
+    2:map<string, string> loginProperties
+  ) throws (
+    1:AccumuloSecurityException ouch2
+  )
 
   // table operations
-  i32 addConstraint (1:binary login, 2:string tableName, 3:string constraintClassName)                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void addSplits (1:binary login, 2:string tableName, 3:set<binary> splits)                            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void attachIterator (1:binary login, 2:string tableName, 3:IteratorSetting setting, 
-                       4:set<IteratorScope> scopes) 
-                                                                                                       throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException ouch3);
-  void checkIteratorConflicts (1:binary login, 2:string tableName, 3:IteratorSetting setting, 
-                               4:set<IteratorScope> scopes) 
-                                                                                                       throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException ouch3);
-  void clearLocatorCache (1:binary login, 2:string tableName)                                          throws (1:TableNotFoundException ouch1);
-  void cloneTable (1:binary login, 2:string tableName, 3:string newTableName, 4:bool flush, 
-                   5:map<string,string> propertiesToSet, 6:set<string> propertiesToExclude) 
-                                                                                                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3, 4:TableExistsException ouch4);
-  //changed in 1.7.0, see comment at top about compatibility
-  void compactTable (1:binary login, 2:string tableName, 3:binary startRow, 4:binary endRow, 
-		     5:list<IteratorSetting> iterators, 6:bool flush, 7:bool wait, 
-		     8:CompactionStrategyConfig compactionStrategy)                                            throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2, 3:AccumuloException ouch3);
-  void cancelCompaction(1:binary login, 2:string tableName)                                            throws (1:AccumuloSecurityException ouch1, 2:TableNotFoundException ouch2, 3:AccumuloException ouch3);
-                                                                                                            
-  void createTable (1:binary login, 2:string tableName, 3:bool versioningIter, 4:TimeType type)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableExistsException ouch3);
-  void deleteTable (1:binary login, 2:string tableName)                                                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void deleteRows (1:binary login, 2:string tableName, 3:binary startRow, 4:binary endRow)             throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void exportTable (1:binary login, 2:string tableName, 3:string exportDir)                            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void flushTable (1:binary login, 2:string tableName, 3:binary startRow, 4:binary endRow, 
-                   5:bool wait)
-                                                                                                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  //since 1.6.0                                                                                                       
-  list<DiskUsage> getDiskUsage(1:binary login, 2:set<string> tables)                                   throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  map<string,set<string>> getLocalityGroups (1:binary login, 2:string tableName)                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  IteratorSetting getIteratorSetting (1:binary login, 2:string tableName, 
-                                      3:string iteratorName, 4:IteratorScope scope) 
-                                                                                                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  binary getMaxRow (1:binary login, 2:string tableName, 3:set<binary> auths, 4:binary startRow, 
-                    5:bool startInclusive, 6:binary endRow, 7:bool endInclusive) 
-                                                                                                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  map<string,string> getTableProperties (1:binary login, 2:string tableName)                           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void importDirectory (1:binary login, 2:string tableName, 3:string importDir, 
-                        4:string failureDir, 5:bool setTime) 
-                                                                                                       throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch3, 3:AccumuloSecurityException ouch4);
-  void importTable (1:binary login, 2:string tableName, 3:string importDir)                            throws (1:TableExistsException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException ouch3);
-  list<binary> listSplits (1:binary login, 2:string tableName, 3:i32 maxSplits)                        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  set<string> listTables (1:binary login);
-  map<string,set<IteratorScope>> listIterators (1:binary login, 2:string tableName)                    throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  map<string,i32> listConstraints (1:binary login, 2:string tableName)                                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void mergeTablets (1:binary login, 2:string tableName, 3:binary startRow, 4:binary endRow)           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  //changed in 1.6.0, see comment at top about compatibility
-  void offlineTable (1:binary login, 2:string tableName, 3:bool wait=false)                            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  //changed in 1.6.0, see comment at top about compatibility
-  void onlineTable (1:binary login, 2:string tableName, 3:bool wait=false)                             throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void removeConstraint (1:binary login, 2:string tableName, 3:i32 constraint)                         throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void removeIterator (1:binary login, 2:string tableName, 3:string iterName, 
-                       4:set<IteratorScope> scopes)
-                                                                                                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void removeTableProperty (1:binary login, 2:string tableName, 3:string property)                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void renameTable (1:binary login, 2:string oldTableName, 3:string newTableName)                      throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3, 4:TableExistsException ouch4);
-  void setLocalityGroups (1:binary login, 2:string tableName, 3:map<string,set<string>> groups)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void setTableProperty (1:binary login, 2:string tableName, 3:string property, 4:string value)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  set<Range> splitRangeByTablets (1:binary login, 2:string tableName, 3:Range range, 4:i32 maxSplits)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  bool tableExists (1:binary login, 2:string tableName);
-  map<string,string> tableIdMap (1:binary login);
-  bool testTableClassLoad (1:binary login, 2:string tableName, 3:string className                     
-                           , 4:string asTypeName)                                                      throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
+  i32 addConstraint (
+    1:binary login
+    2:string tableName
+    3:string constraintClassName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void addSplits (
+    1:binary login
+    2:string tableName
+    3:set<binary> splits
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void attachIterator (
+    1:binary login
+    2:string tableName
+    3:IteratorSetting setting
+    4:set<IteratorScope> scopes
+  ) throws (
+    1:AccumuloSecurityException ouch1
+    2:AccumuloException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void checkIteratorConflicts (
+    1:binary login
+    2:string tableName
+    3:IteratorSetting setting
+    4:set<IteratorScope> scopes
+  ) throws (
+    1:AccumuloSecurityException ouch1
+    2:AccumuloException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void clearLocatorCache (
+    1:binary login
+    2:string tableName
+  ) throws (
+    1:TableNotFoundException ouch1
+  )
+
+  void cloneTable (
+    1:binary login
+    2:string tableName
+    3:string newTableName
+    4:bool flush
+    5:map<string, string> propertiesToSet
+    6:set<string> propertiesToExclude
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+    4:TableExistsException ouch4
+  )
+
+  // changed in 1.7.0, see comment at top about compatibility
+  void compactTable (
+    1:binary login
+    2:string tableName
+    3:binary startRow
+    4:binary endRow
+    5:list<IteratorSetting> iterators
+    6:bool flush
+    7:bool wait
+    8:CompactionStrategyConfig compactionStrategy
+  ) throws (
+    1:AccumuloSecurityException ouch1
+    2:TableNotFoundException ouch2
+    3:AccumuloException ouch3
+  )
+
+  void cancelCompaction(
+    1:binary login
+    2:string tableName
+  ) throws (
+    1:AccumuloSecurityException ouch1
+    2:TableNotFoundException ouch2
+    3:AccumuloException ouch3
+  )
+
+  void createTable (
+    1:binary login
+    2:string tableName
+    3:bool versioningIter
+    4:TimeType type
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableExistsException ouch3
+  )
+
+  void deleteTable (
+    1:binary login
+    2:string tableName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void deleteRows (
+    1:binary login
+    2:string tableName
+    3:binary startRow
+    4:binary endRow
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void exportTable (
+    1:binary login
+    2:string tableName
+    3:string exportDir
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void flushTable (
+    1:binary login
+    2:string tableName
+    3:binary startRow
+    4:binary endRow
+    5:bool wait
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  // since 1.6.0
+  list<DiskUsage> getDiskUsage(
+    1:binary login
+    2:set<string> tables
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  map<string, set<string>> getLocalityGroups (
+    1:binary login
+    2:string tableName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  IteratorSetting getIteratorSetting (
+    1:binary login
+    2:string tableName
+    3:string iteratorName
+    4:IteratorScope scope
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  binary getMaxRow (
+    1:binary login
+    2:string tableName
+    3:set<binary> auths
+    4:binary startRow
+    5:bool startInclusive
+    6:binary endRow
+    7:bool endInclusive
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  map<string, string> getTableProperties (
+    1:binary login
+    2:string tableName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void importDirectory (
+    1:binary login
+    2:string tableName
+    3:string importDir
+    4:string failureDir
+    5:bool setTime
+  ) throws (
+    1:TableNotFoundException ouch1
+    2:AccumuloException ouch3
+    3:AccumuloSecurityException ouch4
+  )
+
+  void importTable (
+    1:binary login
+    2:string tableName
+    3:string importDir
+  ) throws (
+    1:TableExistsException ouch1
+    2:AccumuloException ouch2
+    3:AccumuloSecurityException ouch3
+  )
+
+  list<binary> listSplits (
+    1:binary login
+    2:string tableName
+    3:i32 maxSplits
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  set<string> listTables (
+    1:binary login
+  )
+
+  map<string, set<IteratorScope>> listIterators (
+    1:binary login
+    2:string tableName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  map<string, i32> listConstraints (
+    1:binary login
+    2:string tableName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void mergeTablets (
+    1:binary login
+    2:string tableName
+    3:binary startRow
+    4:binary endRow
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  // changed in 1.6.0, see comment at top about compatibility
+  void offlineTable (
+    1:binary login
+    2:string tableName
+    3:bool wait=false
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  // changed in 1.6.0, see comment at top about compatibility
+  void onlineTable (
+    1:binary login
+    2:string tableName
+    3:bool wait=false
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void removeConstraint (
+    1:binary login
+    2:string tableName
+    3:i32 constraint
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void removeIterator (
+    1:binary login
+    2:string tableName
+    3:string iterName
+    4:set<IteratorScope> scopes
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void removeTableProperty (
+    1:binary login
+    2:string tableName
+    3:string property
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void renameTable (
+    1:binary login
+    2:string oldTableName
+    3:string newTableName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+    4:TableExistsException ouch4
+  )
+
+  void setLocalityGroups (
+    1:binary login
+    2:string tableName
+    3:map<string, set<string>> groups
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void setTableProperty (
+    1:binary login
+    2:string tableName
+    3:string property
+    4:string value
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  set<Range> splitRangeByTablets (
+    1:binary login
+    2:string tableName
+    3:Range range
+    4:i32 maxSplits
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  bool tableExists (
+    1:binary login
+    2:string tableName
+  )
+
+  map<string, string> tableIdMap (
+    1:binary login
+  )
+
+  bool testTableClassLoad (
+    1:binary login
+    2:string tableName
+    3:string className 
+    4:string asTypeName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
 
   // instance operations
-  void pingTabletServer(1:binary login, 2:string tserver)                                            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  list<ActiveScan> getActiveScans (1:binary login, 2:string tserver)                                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  list<ActiveCompaction> getActiveCompactions(1:binary login, 2:string tserver)                      throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  map<string,string> getSiteConfiguration (1:binary login)                                           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  map<string,string> getSystemConfiguration (1:binary login)                                         throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  list<string> getTabletServers (1:binary login);
-  void removeProperty (1:binary login, 2:string property)                                            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void setProperty (1:binary login, 2:string property, 3:string value)                               throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  bool testClassLoad (1:binary login, 2:string className, 3:string asTypeName)                       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  void pingTabletServer(
+    1:binary login
+    2:string tserver
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  list<ActiveScan> getActiveScans (
+    1:binary login
+    2:string tserver
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  list<ActiveCompaction> getActiveCompactions(
+    1:binary login
+    2:string tserver
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  map<string, string> getSiteConfiguration (
+    1:binary login
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  map<string, string> getSystemConfiguration (
+    1:binary login
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  list<string> getTabletServers (
+    1:binary login
+  )
+
+  void removeProperty (
+    1:binary login
+    2:string property
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void setProperty (
+    1:binary login
+    2:string property
+    3:string value
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  bool testClassLoad (
+    1:binary login
+    2:string className
+    3:string asTypeName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
 
   // security operations
-  bool authenticateUser (1:binary login, 2:string user, 3:map<string, string> properties)            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void changeUserAuthorizations (1:binary login, 2:string user, 3:set<binary> authorizations)        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void changeLocalUserPassword (1:binary login, 2:string user, 3:binary password)                    throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void createLocalUser (1:binary login, 2:string user, 3:binary password)                            throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void dropLocalUser (1:binary login, 2:string user)                                                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  list<binary> getUserAuthorizations (1:binary login, 2:string user)                                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void grantSystemPermission (1:binary login, 2:string user, 3:SystemPermission perm)                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void grantTablePermission (1:binary login, 2:string user, 3:string table, 4:TablePermission perm)  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  bool hasSystemPermission (1:binary login, 2:string user, 3:SystemPermission perm)                  throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  bool hasTablePermission (1:binary login, 2:string user, 3:string table, 4:TablePermission perm)    throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  set<string> listLocalUsers (1:binary login)                                                        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void revokeSystemPermission (1:binary login, 2:string user, 3:SystemPermission perm)               throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void revokeTablePermission (1:binary login, 2:string user, 3:string table, 4:TablePermission perm) throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  void grantNamespacePermission (1:binary login, 2:string user, 3:string namespaceName,
-                                 4:NamespacePermission perm)                                         throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  bool hasNamespacePermission (1:binary login, 2:string user, 3:string namespaceName,
-                               4:NamespacePermission perm)                                           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void revokeNamespacePermission (1:binary login, 2:string user, 3:string namespaceName,
-                                  4:NamespacePermission perm)                                        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
+  bool authenticateUser (
+    1:binary login
+    2:string user
+    3:map<string, string> properties
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void changeUserAuthorizations (
+    1:binary login
+    2:string user
+    3:set<binary> authorizations
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void changeLocalUserPassword (
+    1:binary login
+    2:string user
+    3:binary password
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void createLocalUser (
+    1:binary login
+    2:string user
+    3:binary password
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void dropLocalUser (
+    1:binary login
+    2:string user
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  list<binary> getUserAuthorizations (
+    1:binary login
+    2:string user
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void grantSystemPermission (
+    1:binary login
+    2:string user
+    3:SystemPermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void grantTablePermission (
+    1:binary login
+    2:string user
+    3:string table
+    4:TablePermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  bool hasSystemPermission (
+    1:binary login
+    2:string user
+    3:SystemPermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  bool hasTablePermission (
+    1:binary login
+    2:string user
+    3:string table
+    4:TablePermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  set<string> listLocalUsers (
+    1:binary login
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void revokeSystemPermission (
+    1:binary login
+    2:string user
+    3:SystemPermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void revokeTablePermission (
+    1:binary login
+    2:string user
+    3:string table
+    4:TablePermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  void grantNamespacePermission (
+    1:binary login
+    2:string user
+    3:string namespaceName
+    4:NamespacePermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  bool hasNamespacePermission (
+    1:binary login
+    2:string user
+    3:string namespaceName
+    4:NamespacePermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void revokeNamespacePermission (
+    1:binary login
+    2:string user
+    3:string namespaceName
+    4:NamespacePermission perm
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
 
   // scanning
-  string createBatchScanner(1:binary login, 2:string tableName, 3:BatchScanOptions options)          throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  string createScanner(1:binary login, 2:string tableName, 3:ScanOptions options)                    throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
+  string createBatchScanner(
+    1:binary login
+    2:string tableName
+    3:BatchScanOptions options
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  string createScanner(
+    1:binary login
+    2:string tableName
+    3:ScanOptions options
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
 
   // use the scanner
-  bool hasNext(1:string scanner)                        throws(1:UnknownScanner ouch1);
-  KeyValueAndPeek nextEntry(1:string scanner)           throws(1:NoMoreEntriesException ouch1, 2:UnknownScanner ouch2, 3:AccumuloSecurityException ouch3);
-  ScanResult nextK(1:string scanner, 2:i32 k)           throws(1:NoMoreEntriesException ouch1, 2:UnknownScanner ouch2, 3:AccumuloSecurityException ouch3);
-  void closeScanner(1:string scanner)                   throws(1:UnknownScanner ouch1);
+  bool hasNext(
+    1:string scanner
+  ) throws (
+    1:UnknownScanner ouch1
+  )
+
+  KeyValueAndPeek nextEntry(
+    1:string scanner
+  ) throws (
+    1:NoMoreEntriesException ouch1
+    2:UnknownScanner ouch2
+    3:AccumuloSecurityException ouch3
+  )
+
+  ScanResult nextK(
+    1:string scanner
+    2:i32 k
+  ) throws (
+    1:NoMoreEntriesException ouch1
+    2:UnknownScanner ouch2
+    3:AccumuloSecurityException ouch3
+  )
+
+  void closeScanner(
+    1:string scanner
+  ) throws (
+    1:UnknownScanner ouch1
+  )
 
   // writing
-  void updateAndFlush(1:binary login, 2:string tableName, 3:map<binary, list<ColumnUpdate>> cells) throws(1:AccumuloException outch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3, 4:MutationsRejectedException ouch4);
-  string createWriter(1:binary login, 2:string tableName, 3:WriterOptions opts)                    throws(1:AccumuloException outch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
+  void updateAndFlush(
+    1:binary login
+    2:string tableName
+    3:map<binary, list<ColumnUpdate>> cells
+  ) throws (
+    1:AccumuloException outch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+    4:MutationsRejectedException ouch4
+  )
+
+  string createWriter(
+    1:binary login
+    2:string tableName
+    3:WriterOptions opts
+  ) throws (
+    1:AccumuloException outch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
 
   // use the writer
-  oneway void update(1:string writer, 2:map<binary, list<ColumnUpdate>> cells);
-  void flush(1:string writer)                                                                      throws (1:UnknownWriter ouch1, 2:MutationsRejectedException ouch2);
-  void closeWriter(1:string writer)                                                                throws (1:UnknownWriter ouch1, 2:MutationsRejectedException ouch2);
-
-  //api for a single conditional update
-  ConditionalStatus updateRowConditionally(1:binary login, 2:string tableName, 3:binary row, 
-                                           4:ConditionalUpdates updates)                           throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  
-  //api for batch conditional updates
-  //since 1.6.0
-  string createConditionalWriter(1:binary login, 2:string tableName, 
-                                 3:ConditionalWriterOptions options)                               throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:TableNotFoundException ouch3);
-  //since 1.6.0
-  map<binary, ConditionalStatus> updateRowsConditionally(1:string conditionalWriter,                   
-                                                     2:map<binary, ConditionalUpdates> updates)    throws (1:UnknownWriter ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException ouch3);
-  //since 1.6.0
-  void closeConditionalWriter(1:string conditionalWriter);
+  oneway void update(
+    1:string writer
+    2:map<binary, list<ColumnUpdate>> cells
+  )
+
+  void flush(
+    1:string writer
+  ) throws (
+    1:UnknownWriter ouch1
+    2:MutationsRejectedException ouch2
+  )
+
+  void closeWriter(
+    1:string writer
+  ) throws (
+    1:UnknownWriter ouch1
+    2:MutationsRejectedException ouch2
+  )
+
+  // api for a single conditional update
+  ConditionalStatus updateRowConditionally(
+    1:binary login
+    2:string tableName
+    3:binary row
+    4:ConditionalUpdates updates
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  // since 1.6.0; api for batch conditional updates
+  string createConditionalWriter(
+    1:binary login
+    2:string tableName
+    3:ConditionalWriterOptions options
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:TableNotFoundException ouch3
+  )
+
+  // since 1.6.0
+  map<binary, ConditionalStatus> updateRowsConditionally(
+    1:string conditionalWriter
+    2:map<binary, ConditionalUpdates> updates
+  ) throws (
+    1:UnknownWriter ouch1
+    2:AccumuloException ouch2
+    3:AccumuloSecurityException ouch3
+  )
+
+  // since 1.6.0
+  void closeConditionalWriter(
+    1:string conditionalWriter
+  )
 
   // utilities
-  Range getRowRange(1:binary row);
-  Key getFollowing(1:Key key, 2:PartialKey part);
+  Range getRowRange(
+    1:binary row
+  )
+
+  Key getFollowing(
+    1:Key key
+    2:PartialKey part
+  )
 
   // namespace operations, since 1.8.0
-  string systemNamespace();
-  string defaultNamespace();
-  list<string> listNamespaces(1:binary login)                                                      throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  bool namespaceExists(1:binary login, 2:string namespaceName)                                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void createNamespace(1:binary login, 2:string namespaceName)                                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceExistsException ouch3);
-  void deleteNamespace(1:binary login, 2:string namespaceName)                                     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3, 4:NamespaceNotEmptyException ouch4);
-  void renameNamespace(1:binary login, 2:string oldNamespaceName, 3:string newNamespaceName)       throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3, 4:NamespaceExistsException ouch4);
-  void setNamespaceProperty(1:binary login, 2:string namespaceName, 3:string property,
-                            4:string value)                                                        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  void removeNamespaceProperty(1:binary login, 2:string namespaceName, 3:string property)          throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  map<string,string> getNamespaceProperties(1:binary login, 2:string namespaceName)                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  map<string,string> namespaceIdMap(1:binary login)                                                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2);
-  void attachNamespaceIterator(1:binary login, 2:string namespaceName, 3:IteratorSetting setting,
-                               4:set<IteratorScope> scopes)                                        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  void removeNamespaceIterator(1:binary login, 2:string namespaceName, 3:string name,
-                               4:set<IteratorScope> scopes)                                        throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  IteratorSetting getNamespaceIteratorSetting(1:binary login, 2:string namespaceName,
-                                              3:string name, 4:IteratorScope scope)                throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  map<string,set<IteratorScope>> listNamespaceIterators(1:binary login, 2:string namespaceName)    throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  void checkNamespaceIteratorConflicts(1:binary login, 2:string namespaceName,
-                                       3:IteratorSetting setting, 4:set<IteratorScope> scopes)     throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  i32 addNamespaceConstraint(1:binary login, 2:string namespaceName,
-                             3:string constraintClassName)                                         throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  void removeNamespaceConstraint(1:binary login, 2:string namespaceName, 3:i32 id)                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  map<string,i32> listNamespaceConstraints(1:binary login, 2:string namespaceName)                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
-  bool testNamespaceClassLoad(1:binary login, 2:string namespaceName, 3:string className,
-                              4:string asTypeName)                                                 throws (1:AccumuloException ouch1, 2:AccumuloSecurityException ouch2, 3:NamespaceNotFoundException ouch3);
+  string systemNamespace()
+  string defaultNamespace()
+
+  list<string> listNamespaces(
+    1:binary login
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  bool namespaceExists(
+    1:binary login
+    2:string namespaceName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void createNamespace(
+    1:binary login
+    2:string namespaceName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceExistsException ouch3
+  )
+
+  void deleteNamespace(
+    1:binary login
+    2:string namespaceName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+    4:NamespaceNotEmptyException ouch4
+  )
+
+  void renameNamespace(
+    1:binary login
+    2:string oldNamespaceName
+    3:string newNamespaceName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+    4:NamespaceExistsException ouch4
+  )
+
+  void setNamespaceProperty(
+    1:binary login
+    2:string namespaceName
+    3:string property
+    4:string value
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  void removeNamespaceProperty(
+    1:binary login
+    2:string namespaceName
+    3:string property
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  map<string, string> getNamespaceProperties(
+    1:binary login
+    2:string namespaceName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  map<string, string> namespaceIdMap(
+    1:binary login
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+  )
+
+  void attachNamespaceIterator(
+    1:binary login
+    2:string namespaceName
+    3:IteratorSetting setting
+    4:set<IteratorScope> scopes
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  void removeNamespaceIterator(
+    1:binary login
+    2:string namespaceName
+    3:string name
+    4:set<IteratorScope> scopes
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  IteratorSetting getNamespaceIteratorSetting(
+    1:binary login
+    2:string namespaceName
+    3:string name
+    4:IteratorScope scope
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  map<string, set<IteratorScope>> listNamespaceIterators(
+    1:binary login
+    2:string namespaceName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  void checkNamespaceIteratorConflicts(
+    1:binary login
+    2:string namespaceName
+    3:IteratorSetting setting
+    4:set<IteratorScope> scopes
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  i32 addNamespaceConstraint(
+    1:binary login
+    2:string namespaceName
+    3:string constraintClassName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  void removeNamespaceConstraint(
+    1:binary login
+    2:string namespaceName
+    3:i32 id
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  map<string, i32> listNamespaceConstraints(
+    1:binary login
+    2:string namespaceName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
+  bool testNamespaceClassLoad(
+    1:binary login
+    2:string namespaceName
+    3:string className
+    4:string asTypeName
+  ) throws (
+    1:AccumuloException ouch1
+    2:AccumuloSecurityException ouch2
+    3:NamespaceNotFoundException ouch3
+  )
+
 }
diff --git a/server/tracer/src/main/thrift/tracer.thrift b/server/tracer/src/main/thrift/tracer.thrift
index 4802c89..8f21473 100644
--- a/server/tracer/src/main/thrift/tracer.thrift
+++ b/server/tracer/src/main/thrift/tracer.thrift
@@ -20,28 +20,37 @@ namespace cpp org.apache.accumulo.tracer.thrift
 include "trace.thrift"
 
 struct Annotation {
-   1:i64 time,
-   2:string msg
+  1:i64 time
+  2:string msg
 }
 
 struct RemoteSpan {
-   1:string sender,
-   2:string svc, 
-   3:i64 traceId, 
-   4:i64 spanId, 
-   5:i64 parentId, 
-   6:i64 start, 
-   7:i64 stop, 
-   8:string description, 
-   9:map<string, string> data,
-   10:list<Annotation> annotations
+  1:string sender
+  2:string svc
+  3:i64 traceId
+  4:i64 spanId
+  5:i64 parentId
+  6:i64 start
+  7:i64 stop
+  8:string description
+  9:map<string, string> data
+  10:list<Annotation> annotations
 }
 
 service SpanReceiver {
-   oneway void span(1:RemoteSpan span);
+
+  oneway void span(
+    1:RemoteSpan span
+  )
+
 }
 
 // used for testing trace
 service TestService {
-   bool checkTrace(1:trace.TInfo tinfo, 2:string message),
+
+  bool checkTrace(
+    1:trace.TInfo tinfo
+    2:string message
+  )
+
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
index b9829df..56d51ad 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
@@ -70,7 +70,7 @@ import org.slf4j.LoggerFactory;
  * already in that state returns without blocking.</li>
  * <li>AdminUtil refactor to provide methods that provide FATE status, one with table lock info
  * (original) and additional method without.</li>
- *</ul>
+ * </ul>
  */
 public class FateConcurrencyIT extends AccumuloClusterHarness {
 


Mime
View raw message