accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [36/36] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Thu, 19 Jun 2014 00:57:46 GMT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
	core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
	core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
	core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
	core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
	server/base/src/main/java/org/apache/accumulo/server/util/TServerUtils.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/fca82d84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/fca82d84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/fca82d84

Branch: refs/heads/master
Commit: fca82d84840fcd2f50979a1652b0dd7a6f43c1fe
Parents: 8efcbd8 011c176
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Jun 18 20:25:09 2014 -0400
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Wed Jun 18 20:25:09 2014 -0400

----------------------------------------------------------------------
 .../core/client/impl/thrift/ClientService.java  | 2939 +++++--
 .../client/impl/thrift/ConfigurationType.java   |    2 +-
 .../client/impl/thrift/SecurityErrorCode.java   |    2 +-
 .../core/client/impl/thrift/TDiskUsage.java     |   25 +-
 .../core/client/impl/thrift/TableOperation.java |    2 +-
 .../thrift/TableOperationExceptionType.java     |    2 +-
 .../impl/thrift/ThriftSecurityException.java    |   16 +-
 .../thrift/ThriftTableOperationException.java   |   28 +-
 .../core/client/impl/thrift/ThriftTest.java     |  243 +-
 .../core/data/thrift/InitialMultiScan.java      |   16 +-
 .../accumulo/core/data/thrift/InitialScan.java  |   16 +-
 .../accumulo/core/data/thrift/IterInfo.java     |   20 +-
 .../accumulo/core/data/thrift/MapFileInfo.java  |   12 +-
 .../core/data/thrift/MultiScanResult.java       |   60 +-
 .../accumulo/core/data/thrift/ScanResult.java   |   22 +-
 .../accumulo/core/data/thrift/TCMResult.java    |   16 +-
 .../accumulo/core/data/thrift/TCMStatus.java    |    2 +-
 .../accumulo/core/data/thrift/TColumn.java      |   20 +-
 .../accumulo/core/data/thrift/TCondition.java   |   36 +-
 .../core/data/thrift/TConditionalMutation.java  |   26 +-
 .../core/data/thrift/TConditionalSession.java   |   20 +-
 .../thrift/TConstraintViolationSummary.java     |   24 +-
 .../apache/accumulo/core/data/thrift/TKey.java  |   28 +-
 .../accumulo/core/data/thrift/TKeyExtent.java   |   20 +-
 .../accumulo/core/data/thrift/TKeyValue.java    |   16 +-
 .../accumulo/core/data/thrift/TMutation.java    |   48 +-
 .../accumulo/core/data/thrift/TRange.java       |   32 +-
 .../accumulo/core/data/thrift/UpdateErrors.java |   46 +-
 .../core/gc/thrift/GCMonitorService.java        |  108 +-
 .../accumulo/core/gc/thrift/GCStatus.java       |   24 +-
 .../accumulo/core/gc/thrift/GcCycleStats.java   |   32 +-
 .../accumulo/core/master/thrift/Compacting.java |   16 +-
 .../accumulo/core/master/thrift/DeadServer.java |   20 +-
 .../core/master/thrift/FateOperation.java       |    2 +-
 .../core/master/thrift/FateService.java         |  441 +-
 .../core/master/thrift/MasterClientService.java | 1287 ++-
 .../core/master/thrift/MasterGoalState.java     |    2 +-
 .../core/master/thrift/MasterMonitorInfo.java   |   92 +-
 .../core/master/thrift/MasterState.java         |    2 +-
 .../core/master/thrift/RecoveryException.java   |   12 +-
 .../core/master/thrift/RecoveryStatus.java      |   20 +-
 .../accumulo/core/master/thrift/TableInfo.java  |   56 +-
 .../core/master/thrift/TabletLoadState.java     |    2 +-
 .../core/master/thrift/TabletServerStatus.java  |   68 +-
 .../core/master/thrift/TabletSplit.java         |   22 +-
 .../core/replication/thrift/KeyValues.java      |   18 +-
 .../thrift/RemoteReplicationErrorCode.java      |    2 +-
 .../thrift/RemoteReplicationException.java      |   16 +-
 .../thrift/ReplicationCoordinator.java          |  108 +-
 .../thrift/ReplicationCoordinatorErrorCode.java |    2 +-
 .../thrift/ReplicationCoordinatorException.java |   16 +-
 .../replication/thrift/ReplicationServicer.java |  206 +-
 .../core/replication/thrift/WalEdits.java       |   23 +-
 .../core/security/thrift/TCredentials.java      |   24 +-
 .../core/tabletserver/thrift/ActionStats.java   |   40 +-
 .../tabletserver/thrift/ActiveCompaction.java   |   98 +-
 .../core/tabletserver/thrift/ActiveScan.java    |  110 +-
 .../tabletserver/thrift/CompactionReason.java   |    2 +-
 .../tabletserver/thrift/CompactionType.java     |    2 +-
 .../thrift/ConstraintViolationException.java    |   18 +-
 .../tabletserver/thrift/IteratorConfig.java     |   18 +-
 .../thrift/NoSuchScanIDException.java           |    8 +-
 .../thrift/NotServingTabletException.java       |   12 +-
 .../core/tabletserver/thrift/ScanState.java     |    2 +-
 .../core/tabletserver/thrift/ScanType.java      |    2 +-
 .../tabletserver/thrift/TIteratorSetting.java   |   45 +-
 .../thrift/TabletClientService.java             | 2651 ++++--
 .../core/tabletserver/thrift/TabletStats.java   |   40 +-
 .../thrift/TooManyFilesException.java           |   12 +-
 pom.xml                                         |   40 +-
 proxy/src/main/cpp/AccumuloProxy.cpp            |    2 +-
 proxy/src/main/cpp/AccumuloProxy.h              |    2 +-
 proxy/src/main/cpp/proxy_constants.cpp          |    2 +-
 proxy/src/main/cpp/proxy_constants.h            |    2 +-
 proxy/src/main/cpp/proxy_types.cpp              |    2 +-
 proxy/src/main/cpp/proxy_types.h                |    3 +-
 .../proxy/thrift/AccumuloException.java         |   12 +-
 .../accumulo/proxy/thrift/AccumuloProxy.java    | 8186 ++++++++++++++----
 .../proxy/thrift/AccumuloSecurityException.java |   12 +-
 .../accumulo/proxy/thrift/ActiveCompaction.java |   63 +-
 .../accumulo/proxy/thrift/ActiveScan.java       |   75 +-
 .../accumulo/proxy/thrift/BatchScanOptions.java |   57 +-
 .../apache/accumulo/proxy/thrift/Column.java    |   20 +-
 .../accumulo/proxy/thrift/ColumnUpdate.java     |   32 +-
 .../accumulo/proxy/thrift/CompactionReason.java |    2 +-
 .../accumulo/proxy/thrift/CompactionType.java   |    2 +-
 .../apache/accumulo/proxy/thrift/Condition.java |   30 +-
 .../proxy/thrift/ConditionalStatus.java         |    2 +-
 .../proxy/thrift/ConditionalUpdates.java        |   28 +-
 .../proxy/thrift/ConditionalWriterOptions.java  |   35 +-
 .../apache/accumulo/proxy/thrift/DiskUsage.java |   25 +-
 .../accumulo/proxy/thrift/IteratorScope.java    |    2 +-
 .../accumulo/proxy/thrift/IteratorSetting.java  |   45 +-
 .../org/apache/accumulo/proxy/thrift/Key.java   |   28 +-
 .../apache/accumulo/proxy/thrift/KeyExtent.java |   20 +-
 .../apache/accumulo/proxy/thrift/KeyValue.java  |   16 +-
 .../accumulo/proxy/thrift/KeyValueAndPeek.java  |   16 +-
 .../thrift/MutationsRejectedException.java      |   12 +-
 .../proxy/thrift/NoMoreEntriesException.java    |   12 +-
 .../accumulo/proxy/thrift/PartialKey.java       |    2 +-
 .../org/apache/accumulo/proxy/thrift/Range.java |   24 +-
 .../accumulo/proxy/thrift/ScanColumn.java       |   16 +-
 .../accumulo/proxy/thrift/ScanOptions.java      |   51 +-
 .../accumulo/proxy/thrift/ScanResult.java       |   22 +-
 .../apache/accumulo/proxy/thrift/ScanState.java |    2 +-
 .../apache/accumulo/proxy/thrift/ScanType.java  |    2 +-
 .../accumulo/proxy/thrift/SystemPermission.java |    2 +-
 .../proxy/thrift/TableExistsException.java      |   12 +-
 .../proxy/thrift/TableNotFoundException.java    |   12 +-
 .../accumulo/proxy/thrift/TablePermission.java  |    2 +-
 .../apache/accumulo/proxy/thrift/TimeType.java  |    2 +-
 .../accumulo/proxy/thrift/UnknownScanner.java   |   12 +-
 .../accumulo/proxy/thrift/UnknownWriter.java    |   12 +-
 .../accumulo/proxy/thrift/WriterOptions.java    |   24 +-
 proxy/src/main/python/AccumuloProxy-remote      |    6 +-
 proxy/src/main/python/AccumuloProxy.py          |  550 +-
 proxy/src/main/python/constants.py              |    2 +-
 proxy/src/main/python/ttypes.py                 |    4 +-
 proxy/src/main/ruby/accumulo_proxy.rb           |    2 +-
 proxy/src/main/ruby/proxy_constants.rb          |    2 +-
 proxy/src/main/ruby/proxy_types.rb              |    2 +-
 .../server/util/CustomNonBlockingServer.java    |  268 +
 .../accumulo/server/util/TServerUtils.java      |   42 +-
 .../accumulo/trace/thrift/RemoteSpan.java       |   65 +-
 .../accumulo/trace/thrift/SpanReceiver.java     |   63 +-
 .../org/apache/accumulo/trace/thrift/TInfo.java |   16 +-
 .../accumulo/trace/thrift/TestService.java      |   99 +-
 127 files changed, 14691 insertions(+), 4832 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
index 03e6342,d7c0374..82783df
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
@@@ -850,14 -852,14 +852,14 @@@ import org.slf4j.LoggerFactory
            case 1: // RESULTS
              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                {
 -                org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
 -                struct.results = new ArrayList<TKeyValue>(_list16.size);
 -                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
 +                org.apache.thrift.protocol.TList _list24 = iprot.readListBegin();
 +                struct.results = new ArrayList<TKeyValue>(_list24.size);
 +                for (int _i25 = 0; _i25 < _list24.size; ++_i25)
                  {
-                   TKeyValue _elem26; // required
 -                  TKeyValue _elem18;
 -                  _elem18 = new TKeyValue();
 -                  _elem18.read(iprot);
 -                  struct.results.add(_elem18);
++                  TKeyValue _elem26;
 +                  _elem26 = new TKeyValue();
 +                  _elem26.read(iprot);
 +                  struct.results.add(_elem26);
                  }
                  iprot.readListEnd();
                }
@@@ -869,23 -871,23 +871,23 @@@
            case 2: // FAILURES
              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                {
 -                org.apache.thrift.protocol.TMap _map19 = iprot.readMapBegin();
 -                struct.failures = new HashMap<TKeyExtent,List<TRange>>(2*_map19.size);
 -                for (int _i20 = 0; _i20 < _map19.size; ++_i20)
 +                org.apache.thrift.protocol.TMap _map27 = iprot.readMapBegin();
 +                struct.failures = new HashMap<TKeyExtent,List<TRange>>(2*_map27.size);
 +                for (int _i28 = 0; _i28 < _map27.size; ++_i28)
                  {
-                   TKeyExtent _key29; // required
-                   List<TRange> _val30; // required
 -                  TKeyExtent _key21;
 -                  List<TRange> _val22;
 -                  _key21 = new TKeyExtent();
 -                  _key21.read(iprot);
++                  TKeyExtent _key29;
++                  List<TRange> _val30;
 +                  _key29 = new TKeyExtent();
 +                  _key29.read(iprot);
                    {
 -                    org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
 -                    _val22 = new ArrayList<TRange>(_list23.size);
 -                    for (int _i24 = 0; _i24 < _list23.size; ++_i24)
 +                    org.apache.thrift.protocol.TList _list31 = iprot.readListBegin();
 +                    _val30 = new ArrayList<TRange>(_list31.size);
 +                    for (int _i32 = 0; _i32 < _list31.size; ++_i32)
                      {
-                       TRange _elem33; // required
 -                      TRange _elem25;
 -                      _elem25 = new TRange();
 -                      _elem25.read(iprot);
 -                      _val22.add(_elem25);
++                      TRange _elem33;
 +                      _elem33 = new TRange();
 +                      _elem33.read(iprot);
 +                      _val30.add(_elem33);
                      }
                      iprot.readListEnd();
                    }
@@@ -901,14 -903,14 +903,14 @@@
            case 3: // FULL_SCANS
              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                {
 -                org.apache.thrift.protocol.TList _list26 = iprot.readListBegin();
 -                struct.fullScans = new ArrayList<TKeyExtent>(_list26.size);
 -                for (int _i27 = 0; _i27 < _list26.size; ++_i27)
 +                org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
 +                struct.fullScans = new ArrayList<TKeyExtent>(_list34.size);
 +                for (int _i35 = 0; _i35 < _list34.size; ++_i35)
                  {
-                   TKeyExtent _elem36; // required
 -                  TKeyExtent _elem28;
 -                  _elem28 = new TKeyExtent();
 -                  _elem28.read(iprot);
 -                  struct.fullScans.add(_elem28);
++                  TKeyExtent _elem36;
 +                  _elem36 = new TKeyExtent();
 +                  _elem36.read(iprot);
 +                  struct.fullScans.add(_elem36);
                  }
                  iprot.readListEnd();
                }
@@@ -1120,54 -1122,54 +1122,54 @@@
        BitSet incoming = iprot.readBitSet(7);
        if (incoming.get(0)) {
          {
 -          org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 -          struct.results = new ArrayList<TKeyValue>(_list37.size);
 -          for (int _i38 = 0; _i38 < _list37.size; ++_i38)
 +          org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 +          struct.results = new ArrayList<TKeyValue>(_list45.size);
 +          for (int _i46 = 0; _i46 < _list45.size; ++_i46)
            {
-             TKeyValue _elem47; // required
 -            TKeyValue _elem39;
 -            _elem39 = new TKeyValue();
 -            _elem39.read(iprot);
 -            struct.results.add(_elem39);
++            TKeyValue _elem47;
 +            _elem47 = new TKeyValue();
 +            _elem47.read(iprot);
 +            struct.results.add(_elem47);
            }
          }
          struct.setResultsIsSet(true);
        }
        if (incoming.get(1)) {
          {
 -          org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
 -          struct.failures = new HashMap<TKeyExtent,List<TRange>>(2*_map40.size);
 -          for (int _i41 = 0; _i41 < _map40.size; ++_i41)
 +          org.apache.thrift.protocol.TMap _map48 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
 +          struct.failures = new HashMap<TKeyExtent,List<TRange>>(2*_map48.size);
 +          for (int _i49 = 0; _i49 < _map48.size; ++_i49)
            {
-             TKeyExtent _key50; // required
-             List<TRange> _val51; // required
 -            TKeyExtent _key42;
 -            List<TRange> _val43;
 -            _key42 = new TKeyExtent();
 -            _key42.read(iprot);
++            TKeyExtent _key50;
++            List<TRange> _val51;
 +            _key50 = new TKeyExtent();
 +            _key50.read(iprot);
              {
 -              org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 -              _val43 = new ArrayList<TRange>(_list44.size);
 -              for (int _i45 = 0; _i45 < _list44.size; ++_i45)
 +              org.apache.thrift.protocol.TList _list52 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 +              _val51 = new ArrayList<TRange>(_list52.size);
 +              for (int _i53 = 0; _i53 < _list52.size; ++_i53)
                {
-                 TRange _elem54; // required
 -                TRange _elem46;
 -                _elem46 = new TRange();
 -                _elem46.read(iprot);
 -                _val43.add(_elem46);
++                TRange _elem54;
 +                _elem54 = new TRange();
 +                _elem54.read(iprot);
 +                _val51.add(_elem54);
                }
              }
 -            struct.failures.put(_key42, _val43);
 +            struct.failures.put(_key50, _val51);
            }
          }
          struct.setFailuresIsSet(true);
        }
        if (incoming.get(2)) {
          {
 -          org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 -          struct.fullScans = new ArrayList<TKeyExtent>(_list47.size);
 -          for (int _i48 = 0; _i48 < _list47.size; ++_i48)
 +          org.apache.thrift.protocol.TList _list55 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 +          struct.fullScans = new ArrayList<TKeyExtent>(_list55.size);
 +          for (int _i56 = 0; _i56 < _list55.size; ++_i56)
            {
-             TKeyExtent _elem57; // required
 -            TKeyExtent _elem49;
 -            _elem49 = new TKeyExtent();
 -            _elem49.read(iprot);
 -            struct.fullScans.add(_elem49);
++            TKeyExtent _elem57;
 +            _elem57 = new TKeyExtent();
 +            _elem57.read(iprot);
 +            struct.fullScans.add(_elem57);
            }
          }
          struct.setFullScansIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
index 150a683,ce418a6..defb0b4
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
@@@ -432,14 -434,14 +434,14 @@@ import org.slf4j.LoggerFactory
            case 1: // RESULTS
              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                {
 -                org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
 -                struct.results = new ArrayList<TKeyValue>(_list8.size);
 -                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
 +                org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
 +                struct.results = new ArrayList<TKeyValue>(_list16.size);
 +                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
                  {
-                   TKeyValue _elem18; // required
 -                  TKeyValue _elem10;
 -                  _elem10 = new TKeyValue();
 -                  _elem10.read(iprot);
 -                  struct.results.add(_elem10);
++                  TKeyValue _elem18;
 +                  _elem18 = new TKeyValue();
 +                  _elem18.read(iprot);
 +                  struct.results.add(_elem18);
                  }
                  iprot.readListEnd();
                }
@@@ -531,14 -533,14 +533,14 @@@
        BitSet incoming = iprot.readBitSet(2);
        if (incoming.get(0)) {
          {
 -          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 -          struct.results = new ArrayList<TKeyValue>(_list13.size);
 -          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
 +          org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 +          struct.results = new ArrayList<TKeyValue>(_list21.size);
 +          for (int _i22 = 0; _i22 < _list21.size; ++_i22)
            {
-             TKeyValue _elem23; // required
 -            TKeyValue _elem15;
 -            _elem15 = new TKeyValue();
 -            _elem15.read(iprot);
 -            struct.results.add(_elem15);
++            TKeyValue _elem23;
 +            _elem23 = new TKeyValue();
 +            _elem23.read(iprot);
 +            struct.results.add(_elem23);
            }
          }
          struct.setResultsIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
index 40cf38b,3d49c45..3f18caf
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TConditionalMutation.java
@@@ -512,14 -514,14 +514,14 @@@ import org.slf4j.LoggerFactory
            case 1: // CONDITIONS
              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                {
 -                org.apache.thrift.protocol.TList _list78 = iprot.readListBegin();
 -                struct.conditions = new ArrayList<TCondition>(_list78.size);
 -                for (int _i79 = 0; _i79 < _list78.size; ++_i79)
 +                org.apache.thrift.protocol.TList _list86 = iprot.readListBegin();
 +                struct.conditions = new ArrayList<TCondition>(_list86.size);
 +                for (int _i87 = 0; _i87 < _list86.size; ++_i87)
                  {
-                   TCondition _elem88; // required
 -                  TCondition _elem80;
 -                  _elem80 = new TCondition();
 -                  _elem80.read(iprot);
 -                  struct.conditions.add(_elem80);
++                  TCondition _elem88;
 +                  _elem88 = new TCondition();
 +                  _elem88.read(iprot);
 +                  struct.conditions.add(_elem88);
                  }
                  iprot.readListEnd();
                }
@@@ -631,14 -633,14 +633,14 @@@
        BitSet incoming = iprot.readBitSet(3);
        if (incoming.get(0)) {
          {
 -          org.apache.thrift.protocol.TList _list83 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 -          struct.conditions = new ArrayList<TCondition>(_list83.size);
 -          for (int _i84 = 0; _i84 < _list83.size; ++_i84)
 +          org.apache.thrift.protocol.TList _list91 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 +          struct.conditions = new ArrayList<TCondition>(_list91.size);
 +          for (int _i92 = 0; _i92 < _list91.size; ++_i92)
            {
-             TCondition _elem93; // required
 -            TCondition _elem85;
 -            _elem85 = new TCondition();
 -            _elem85.read(iprot);
 -            struct.conditions.add(_elem85);
++            TCondition _elem93;
 +            _elem93 = new TCondition();
 +            _elem93.read(iprot);
 +            struct.conditions.add(_elem93);
            }
          }
          struct.setConditionsIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
index d0ac5dd,1e00047..cb4a474
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
@@@ -200,13 -188,6 +197,10 @@@ import org.slf4j.LoggerFactory
        this.values = __this__values;
      }
      this.entries = other.entries;
 +    if (other.isSetSources()) {
-       List<String> __this__sources = new ArrayList<String>();
-       for (String other_element : other.sources) {
-         __this__sources.add(other_element);
-       }
++      List<String> __this__sources = new ArrayList<String>(other.sources);
 +      this.sources = __this__sources;
 +    }
    }
  
    public TMutation deepCopy() {
@@@ -593,16 -512,6 +587,16 @@@
          return lastComparison;
        }
      }
-     lastComparison = Boolean.valueOf(isSetSources()).compareTo(typedOther.isSetSources());
++    lastComparison = Boolean.valueOf(isSetSources()).compareTo(other.isSetSources());
 +    if (lastComparison != 0) {
 +      return lastComparison;
 +    }
 +    if (isSetSources()) {
-       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sources, typedOther.sources);
++      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sources, other.sources);
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +    }
      return 0;
    }
  
@@@ -747,24 -646,6 +741,24 @@@
                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
              }
              break;
 +          case 5: // SOURCES
 +            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
 +              {
 +                org.apache.thrift.protocol.TList _list3 = iprot.readListBegin();
 +                struct.sources = new ArrayList<String>(_list3.size);
 +                for (int _i4 = 0; _i4 < _list3.size; ++_i4)
 +                {
-                   String _elem5; // required
++                  String _elem5;
 +                  _elem5 = iprot.readString();
 +                  struct.sources.add(_elem5);
 +                }
 +                iprot.readListEnd();
 +              }
 +              struct.setSourcesIsSet(true);
 +            } else { 
 +              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +            }
 +            break;
            default:
              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
          }
@@@ -896,13 -751,13 +890,13 @@@
        }
        if (incoming.get(2)) {
          {
 -          org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
 -          struct.values = new ArrayList<ByteBuffer>(_list5.size);
 -          for (int _i6 = 0; _i6 < _list5.size; ++_i6)
 +          org.apache.thrift.protocol.TList _list10 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
 +          struct.values = new ArrayList<ByteBuffer>(_list10.size);
 +          for (int _i11 = 0; _i11 < _list10.size; ++_i11)
            {
-             ByteBuffer _elem12; // required
 -            ByteBuffer _elem7;
 -            _elem7 = iprot.readBinary();
 -            struct.values.add(_elem7);
++            ByteBuffer _elem12;
 +            _elem12 = iprot.readBinary();
 +            struct.values.add(_elem12);
            }
          }
          struct.setValuesIsSet(true);
@@@ -911,19 -766,6 +905,19 @@@
          struct.entries = iprot.readI32();
          struct.setEntriesIsSet(true);
        }
 +      if (incoming.get(4)) {
 +        {
 +          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
 +          struct.sources = new ArrayList<String>(_list13.size);
 +          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
 +          {
-             String _elem15; // required
++            String _elem15;
 +            _elem15 = iprot.readString();
 +            struct.sources.add(_elem15);
 +          }
 +        }
 +        struct.setSourcesIsSet(true);
 +      }
      }
    }
  

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
index 280ff62,55a0602..4d581a0
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
@@@ -559,16 -561,16 +561,16 @@@ import org.slf4j.LoggerFactory
            case 1: // FAILED_EXTENTS
              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                {
 -                org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin();
 -                struct.failedExtents = new HashMap<TKeyExtent,Long>(2*_map50.size);
 -                for (int _i51 = 0; _i51 < _map50.size; ++_i51)
 +                org.apache.thrift.protocol.TMap _map58 = iprot.readMapBegin();
 +                struct.failedExtents = new HashMap<TKeyExtent,Long>(2*_map58.size);
 +                for (int _i59 = 0; _i59 < _map58.size; ++_i59)
                  {
-                   TKeyExtent _key60; // required
-                   long _val61; // required
 -                  TKeyExtent _key52;
 -                  long _val53;
 -                  _key52 = new TKeyExtent();
 -                  _key52.read(iprot);
 -                  _val53 = iprot.readI64();
 -                  struct.failedExtents.put(_key52, _val53);
++                  TKeyExtent _key60;
++                  long _val61;
 +                  _key60 = new TKeyExtent();
 +                  _key60.read(iprot);
 +                  _val61 = iprot.readI64();
 +                  struct.failedExtents.put(_key60, _val61);
                  }
                  iprot.readMapEnd();
                }
@@@ -580,14 -582,14 +582,14 @@@
            case 2: // VIOLATION_SUMMARIES
              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                {
 -                org.apache.thrift.protocol.TList _list54 = iprot.readListBegin();
 -                struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list54.size);
 -                for (int _i55 = 0; _i55 < _list54.size; ++_i55)
 +                org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
 +                struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list62.size);
 +                for (int _i63 = 0; _i63 < _list62.size; ++_i63)
                  {
-                   TConstraintViolationSummary _elem64; // required
 -                  TConstraintViolationSummary _elem56;
 -                  _elem56 = new TConstraintViolationSummary();
 -                  _elem56.read(iprot);
 -                  struct.violationSummaries.add(_elem56);
++                  TConstraintViolationSummary _elem64;
 +                  _elem64 = new TConstraintViolationSummary();
 +                  _elem64.read(iprot);
 +                  struct.violationSummaries.add(_elem64);
                  }
                  iprot.readListEnd();
                }
@@@ -599,16 -601,16 +601,16 @@@
            case 3: // AUTHORIZATION_FAILURES
              if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                {
 -                org.apache.thrift.protocol.TMap _map57 = iprot.readMapBegin();
 -                struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map57.size);
 -                for (int _i58 = 0; _i58 < _map57.size; ++_i58)
 +                org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
 +                struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map65.size);
 +                for (int _i66 = 0; _i66 < _map65.size; ++_i66)
                  {
-                   TKeyExtent _key67; // required
-                   org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val68; // required
 -                  TKeyExtent _key59;
 -                  org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val60;
 -                  _key59 = new TKeyExtent();
 -                  _key59.read(iprot);
 -                  _val60 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32());
 -                  struct.authorizationFailures.put(_key59, _val60);
++                  TKeyExtent _key67;
++                  org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val68;
 +                  _key67 = new TKeyExtent();
 +                  _key67.read(iprot);
 +                  _val68 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32());
 +                  struct.authorizationFailures.put(_key67, _val68);
                  }
                  iprot.readMapEnd();
                }
@@@ -735,46 -737,46 +737,46 @@@
        BitSet incoming = iprot.readBitSet(3);
        if (incoming.get(0)) {
          {
 -          org.apache.thrift.protocol.TMap _map67 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
 -          struct.failedExtents = new HashMap<TKeyExtent,Long>(2*_map67.size);
 -          for (int _i68 = 0; _i68 < _map67.size; ++_i68)
 +          org.apache.thrift.protocol.TMap _map75 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32());
 +          struct.failedExtents = new HashMap<TKeyExtent,Long>(2*_map75.size);
 +          for (int _i76 = 0; _i76 < _map75.size; ++_i76)
            {
-             TKeyExtent _key77; // required
-             long _val78; // required
 -            TKeyExtent _key69;
 -            long _val70;
 -            _key69 = new TKeyExtent();
 -            _key69.read(iprot);
 -            _val70 = iprot.readI64();
 -            struct.failedExtents.put(_key69, _val70);
++            TKeyExtent _key77;
++            long _val78;
 +            _key77 = new TKeyExtent();
 +            _key77.read(iprot);
 +            _val78 = iprot.readI64();
 +            struct.failedExtents.put(_key77, _val78);
            }
          }
          struct.setFailedExtentsIsSet(true);
        }
        if (incoming.get(1)) {
          {
 -          org.apache.thrift.protocol.TList _list71 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 -          struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list71.size);
 -          for (int _i72 = 0; _i72 < _list71.size; ++_i72)
 +          org.apache.thrift.protocol.TList _list79 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 +          struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list79.size);
 +          for (int _i80 = 0; _i80 < _list79.size; ++_i80)
            {
-             TConstraintViolationSummary _elem81; // required
 -            TConstraintViolationSummary _elem73;
 -            _elem73 = new TConstraintViolationSummary();
 -            _elem73.read(iprot);
 -            struct.violationSummaries.add(_elem73);
++            TConstraintViolationSummary _elem81;
 +            _elem81 = new TConstraintViolationSummary();
 +            _elem81.read(iprot);
 +            struct.violationSummaries.add(_elem81);
            }
          }
          struct.setViolationSummariesIsSet(true);
        }
        if (incoming.get(2)) {
          {
 -          org.apache.thrift.protocol.TMap _map74 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32, iprot.readI32());
 -          struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map74.size);
 -          for (int _i75 = 0; _i75 < _map74.size; ++_i75)
 +          org.apache.thrift.protocol.TMap _map82 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32, iprot.readI32());
 +          struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map82.size);
 +          for (int _i83 = 0; _i83 < _map82.size; ++_i83)
            {
-             TKeyExtent _key84; // required
-             org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val85; // required
 -            TKeyExtent _key76;
 -            org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val77;
 -            _key76 = new TKeyExtent();
 -            _key76.read(iprot);
 -            _val77 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32());
 -            struct.authorizationFailures.put(_key76, _val77);
++            TKeyExtent _key84;
++            org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val85;
 +            _key84 = new TKeyExtent();
 +            _key84.read(iprot);
 +            _val85 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32());
 +            struct.authorizationFailures.put(_key84, _val85);
            }
          }
          struct.setAuthorizationFailuresIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java
index b11f3b2,0000000..5540e8f
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java
@@@ -1,456 -1,0 +1,458 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +/**
-  * Autogenerated by Thrift Compiler (0.9.0)
++ * Autogenerated by Thrift Compiler (0.9.1)
 + *
 + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 + *  @generated
 + */
 +package org.apache.accumulo.core.replication.thrift;
 +
 +import org.apache.thrift.scheme.IScheme;
 +import org.apache.thrift.scheme.SchemeFactory;
 +import org.apache.thrift.scheme.StandardScheme;
 +
 +import org.apache.thrift.scheme.TupleScheme;
 +import org.apache.thrift.protocol.TTupleProtocol;
 +import org.apache.thrift.protocol.TProtocolException;
 +import org.apache.thrift.EncodingUtils;
 +import org.apache.thrift.TException;
++import org.apache.thrift.async.AsyncMethodCallback;
++import org.apache.thrift.server.AbstractNonblockingServer.*;
 +import java.util.List;
 +import java.util.ArrayList;
 +import java.util.Map;
 +import java.util.HashMap;
 +import java.util.EnumMap;
 +import java.util.Set;
 +import java.util.HashSet;
 +import java.util.EnumSet;
 +import java.util.Collections;
 +import java.util.BitSet;
 +import java.nio.ByteBuffer;
 +import java.util.Arrays;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
- @SuppressWarnings("all") public class KeyValues implements org.apache.thrift.TBase<KeyValues, KeyValues._Fields>, java.io.Serializable, Cloneable {
++@SuppressWarnings("all") public class KeyValues implements org.apache.thrift.TBase<KeyValues, KeyValues._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValues> {
 +  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyValues");
 +
 +  private static final org.apache.thrift.protocol.TField KEY_VALUES_FIELD_DESC = new org.apache.thrift.protocol.TField("keyValues", org.apache.thrift.protocol.TType.LIST, (short)1);
 +
 +  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
 +  static {
 +    schemes.put(StandardScheme.class, new KeyValuesStandardSchemeFactory());
 +    schemes.put(TupleScheme.class, new KeyValuesTupleSchemeFactory());
 +  }
 +
 +  public List<org.apache.accumulo.core.data.thrift.TKeyValue> keyValues; // required
 +
 +  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
 +  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 +    KEY_VALUES((short)1, "keyValues");
 +
 +    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 +
 +    static {
 +      for (_Fields field : EnumSet.allOf(_Fields.class)) {
 +        byName.put(field.getFieldName(), field);
 +      }
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches fieldId, or null if its not found.
 +     */
 +    public static _Fields findByThriftId(int fieldId) {
 +      switch(fieldId) {
 +        case 1: // KEY_VALUES
 +          return KEY_VALUES;
 +        default:
 +          return null;
 +      }
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches fieldId, throwing an exception
 +     * if it is not found.
 +     */
 +    public static _Fields findByThriftIdOrThrow(int fieldId) {
 +      _Fields fields = findByThriftId(fieldId);
 +      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
 +      return fields;
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches name, or null if its not found.
 +     */
 +    public static _Fields findByName(String name) {
 +      return byName.get(name);
 +    }
 +
 +    private final short _thriftId;
 +    private final String _fieldName;
 +
 +    _Fields(short thriftId, String fieldName) {
 +      _thriftId = thriftId;
 +      _fieldName = fieldName;
 +    }
 +
 +    public short getThriftFieldId() {
 +      return _thriftId;
 +    }
 +
 +    public String getFieldName() {
 +      return _fieldName;
 +    }
 +  }
 +
 +  // isset id assignments
 +  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
 +  static {
 +    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
 +    tmpMap.put(_Fields.KEY_VALUES, new org.apache.thrift.meta_data.FieldMetaData("keyValues", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
 +            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.data.thrift.TKeyValue.class))));
 +    metaDataMap = Collections.unmodifiableMap(tmpMap);
 +    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(KeyValues.class, metaDataMap);
 +  }
 +
 +  public KeyValues() {
 +  }
 +
 +  public KeyValues(
 +    List<org.apache.accumulo.core.data.thrift.TKeyValue> keyValues)
 +  {
 +    this();
 +    this.keyValues = keyValues;
 +  }
 +
 +  /**
 +   * Performs a deep copy on <i>other</i>.
 +   */
 +  public KeyValues(KeyValues other) {
 +    if (other.isSetKeyValues()) {
-       List<org.apache.accumulo.core.data.thrift.TKeyValue> __this__keyValues = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyValue>();
++      List<org.apache.accumulo.core.data.thrift.TKeyValue> __this__keyValues = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyValue>(other.keyValues.size());
 +      for (org.apache.accumulo.core.data.thrift.TKeyValue other_element : other.keyValues) {
 +        __this__keyValues.add(new org.apache.accumulo.core.data.thrift.TKeyValue(other_element));
 +      }
 +      this.keyValues = __this__keyValues;
 +    }
 +  }
 +
 +  public KeyValues deepCopy() {
 +    return new KeyValues(this);
 +  }
 +
 +  @Override
 +  public void clear() {
 +    this.keyValues = null;
 +  }
 +
 +  public int getKeyValuesSize() {
 +    return (this.keyValues == null) ? 0 : this.keyValues.size();
 +  }
 +
 +  public java.util.Iterator<org.apache.accumulo.core.data.thrift.TKeyValue> getKeyValuesIterator() {
 +    return (this.keyValues == null) ? null : this.keyValues.iterator();
 +  }
 +
 +  public void addToKeyValues(org.apache.accumulo.core.data.thrift.TKeyValue elem) {
 +    if (this.keyValues == null) {
 +      this.keyValues = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyValue>();
 +    }
 +    this.keyValues.add(elem);
 +  }
 +
 +  public List<org.apache.accumulo.core.data.thrift.TKeyValue> getKeyValues() {
 +    return this.keyValues;
 +  }
 +
 +  public KeyValues setKeyValues(List<org.apache.accumulo.core.data.thrift.TKeyValue> keyValues) {
 +    this.keyValues = keyValues;
 +    return this;
 +  }
 +
 +  public void unsetKeyValues() {
 +    this.keyValues = null;
 +  }
 +
 +  /** Returns true if field keyValues is set (has been assigned a value) and false otherwise */
 +  public boolean isSetKeyValues() {
 +    return this.keyValues != null;
 +  }
 +
 +  public void setKeyValuesIsSet(boolean value) {
 +    if (!value) {
 +      this.keyValues = null;
 +    }
 +  }
 +
 +  public void setFieldValue(_Fields field, Object value) {
 +    switch (field) {
 +    case KEY_VALUES:
 +      if (value == null) {
 +        unsetKeyValues();
 +      } else {
 +        setKeyValues((List<org.apache.accumulo.core.data.thrift.TKeyValue>)value);
 +      }
 +      break;
 +
 +    }
 +  }
 +
 +  public Object getFieldValue(_Fields field) {
 +    switch (field) {
 +    case KEY_VALUES:
 +      return getKeyValues();
 +
 +    }
 +    throw new IllegalStateException();
 +  }
 +
 +  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
 +  public boolean isSet(_Fields field) {
 +    if (field == null) {
 +      throw new IllegalArgumentException();
 +    }
 +
 +    switch (field) {
 +    case KEY_VALUES:
 +      return isSetKeyValues();
 +    }
 +    throw new IllegalStateException();
 +  }
 +
 +  @Override
 +  public boolean equals(Object that) {
 +    if (that == null)
 +      return false;
 +    if (that instanceof KeyValues)
 +      return this.equals((KeyValues)that);
 +    return false;
 +  }
 +
 +  public boolean equals(KeyValues that) {
 +    if (that == null)
 +      return false;
 +
 +    boolean this_present_keyValues = true && this.isSetKeyValues();
 +    boolean that_present_keyValues = true && that.isSetKeyValues();
 +    if (this_present_keyValues || that_present_keyValues) {
 +      if (!(this_present_keyValues && that_present_keyValues))
 +        return false;
 +      if (!this.keyValues.equals(that.keyValues))
 +        return false;
 +    }
 +
 +    return true;
 +  }
 +
 +  @Override
 +  public int hashCode() {
 +    return 0;
 +  }
 +
++  @Override
 +  public int compareTo(KeyValues other) {
 +    if (!getClass().equals(other.getClass())) {
 +      return getClass().getName().compareTo(other.getClass().getName());
 +    }
 +
 +    int lastComparison = 0;
-     KeyValues typedOther = (KeyValues)other;
 +
-     lastComparison = Boolean.valueOf(isSetKeyValues()).compareTo(typedOther.isSetKeyValues());
++    lastComparison = Boolean.valueOf(isSetKeyValues()).compareTo(other.isSetKeyValues());
 +    if (lastComparison != 0) {
 +      return lastComparison;
 +    }
 +    if (isSetKeyValues()) {
-       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keyValues, typedOther.keyValues);
++      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keyValues, other.keyValues);
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +    }
 +    return 0;
 +  }
 +
 +  public _Fields fieldForId(int fieldId) {
 +    return _Fields.findByThriftId(fieldId);
 +  }
 +
 +  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
 +    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
 +  }
 +
 +  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
 +    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
 +  }
 +
 +  @Override
 +  public String toString() {
 +    StringBuilder sb = new StringBuilder("KeyValues(");
 +    boolean first = true;
 +
 +    sb.append("keyValues:");
 +    if (this.keyValues == null) {
 +      sb.append("null");
 +    } else {
 +      sb.append(this.keyValues);
 +    }
 +    first = false;
 +    sb.append(")");
 +    return sb.toString();
 +  }
 +
 +  public void validate() throws org.apache.thrift.TException {
 +    // check for required fields
 +    // check for sub-struct validity
 +  }
 +
 +  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
 +    try {
 +      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
 +    } catch (org.apache.thrift.TException te) {
 +      throw new java.io.IOException(te);
 +    }
 +  }
 +
 +  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
 +    try {
 +      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
 +    } catch (org.apache.thrift.TException te) {
 +      throw new java.io.IOException(te);
 +    }
 +  }
 +
 +  private static class KeyValuesStandardSchemeFactory implements SchemeFactory {
 +    public KeyValuesStandardScheme getScheme() {
 +      return new KeyValuesStandardScheme();
 +    }
 +  }
 +
 +  private static class KeyValuesStandardScheme extends StandardScheme<KeyValues> {
 +
 +    public void read(org.apache.thrift.protocol.TProtocol iprot, KeyValues struct) throws org.apache.thrift.TException {
 +      org.apache.thrift.protocol.TField schemeField;
 +      iprot.readStructBegin();
 +      while (true)
 +      {
 +        schemeField = iprot.readFieldBegin();
 +        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
 +          break;
 +        }
 +        switch (schemeField.id) {
 +          case 1: // KEY_VALUES
 +            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
 +              {
 +                org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
 +                struct.keyValues = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyValue>(_list8.size);
 +                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
 +                {
-                   org.apache.accumulo.core.data.thrift.TKeyValue _elem10; // required
++                  org.apache.accumulo.core.data.thrift.TKeyValue _elem10;
 +                  _elem10 = new org.apache.accumulo.core.data.thrift.TKeyValue();
 +                  _elem10.read(iprot);
 +                  struct.keyValues.add(_elem10);
 +                }
 +                iprot.readListEnd();
 +              }
 +              struct.setKeyValuesIsSet(true);
 +            } else { 
 +              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +            }
 +            break;
 +          default:
 +            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +        }
 +        iprot.readFieldEnd();
 +      }
 +      iprot.readStructEnd();
 +
 +      // check for required fields of primitive type, which can't be checked in the validate method
 +      struct.validate();
 +    }
 +
 +    public void write(org.apache.thrift.protocol.TProtocol oprot, KeyValues struct) throws org.apache.thrift.TException {
 +      struct.validate();
 +
 +      oprot.writeStructBegin(STRUCT_DESC);
 +      if (struct.keyValues != null) {
 +        oprot.writeFieldBegin(KEY_VALUES_FIELD_DESC);
 +        {
 +          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.keyValues.size()));
 +          for (org.apache.accumulo.core.data.thrift.TKeyValue _iter11 : struct.keyValues)
 +          {
 +            _iter11.write(oprot);
 +          }
 +          oprot.writeListEnd();
 +        }
 +        oprot.writeFieldEnd();
 +      }
 +      oprot.writeFieldStop();
 +      oprot.writeStructEnd();
 +    }
 +
 +  }
 +
 +  private static class KeyValuesTupleSchemeFactory implements SchemeFactory {
 +    public KeyValuesTupleScheme getScheme() {
 +      return new KeyValuesTupleScheme();
 +    }
 +  }
 +
 +  private static class KeyValuesTupleScheme extends TupleScheme<KeyValues> {
 +
 +    @Override
 +    public void write(org.apache.thrift.protocol.TProtocol prot, KeyValues struct) throws org.apache.thrift.TException {
 +      TTupleProtocol oprot = (TTupleProtocol) prot;
 +      BitSet optionals = new BitSet();
 +      if (struct.isSetKeyValues()) {
 +        optionals.set(0);
 +      }
 +      oprot.writeBitSet(optionals, 1);
 +      if (struct.isSetKeyValues()) {
 +        {
 +          oprot.writeI32(struct.keyValues.size());
 +          for (org.apache.accumulo.core.data.thrift.TKeyValue _iter12 : struct.keyValues)
 +          {
 +            _iter12.write(oprot);
 +          }
 +        }
 +      }
 +    }
 +
 +    @Override
 +    public void read(org.apache.thrift.protocol.TProtocol prot, KeyValues struct) throws org.apache.thrift.TException {
 +      TTupleProtocol iprot = (TTupleProtocol) prot;
 +      BitSet incoming = iprot.readBitSet(1);
 +      if (incoming.get(0)) {
 +        {
 +          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
 +          struct.keyValues = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyValue>(_list13.size);
 +          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
 +          {
-             org.apache.accumulo.core.data.thrift.TKeyValue _elem15; // required
++            org.apache.accumulo.core.data.thrift.TKeyValue _elem15;
 +            _elem15 = new org.apache.accumulo.core.data.thrift.TKeyValue();
 +            _elem15.read(iprot);
 +            struct.keyValues.add(_elem15);
 +          }
 +        }
 +        struct.setKeyValuesIsSet(true);
 +      }
 +    }
 +  }
 +
 +}
 +

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
index 5da3327,0000000..98ecd11
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java
@@@ -1,70 -1,0 +1,70 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +/**
-  * Autogenerated by Thrift Compiler (0.9.0)
++ * Autogenerated by Thrift Compiler (0.9.1)
 + *
 + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 + *  @generated
 + */
 +package org.apache.accumulo.core.replication.thrift;
 +
 +
 +import java.util.Map;
 +import java.util.HashMap;
 +import org.apache.thrift.TEnum;
 +
 +@SuppressWarnings("all") public enum RemoteReplicationErrorCode implements org.apache.thrift.TEnum {
 +  COULD_NOT_DESERIALIZE(0),
 +  COULD_NOT_APPLY(1),
 +  TABLE_DOES_NOT_EXIST(2),
 +  CANNOT_AUTHENTICATE(3),
 +  CANNOT_INSTANTIATE_REPLAYER(4);
 +
 +  private final int value;
 +
 +  private RemoteReplicationErrorCode(int value) {
 +    this.value = value;
 +  }
 +
 +  /**
 +   * Get the integer value of this enum value, as defined in the Thrift IDL.
 +   */
 +  public int getValue() {
 +    return value;
 +  }
 +
 +  /**
 +   * Find a the enum type by its integer value, as defined in the Thrift IDL.
 +   * @return null if the value is not found.
 +   */
 +  public static RemoteReplicationErrorCode findByValue(int value) { 
 +    switch (value) {
 +      case 0:
 +        return COULD_NOT_DESERIALIZE;
 +      case 1:
 +        return COULD_NOT_APPLY;
 +      case 2:
 +        return TABLE_DOES_NOT_EXIST;
 +      case 3:
 +        return CANNOT_AUTHENTICATE;
 +      case 4:
 +        return CANNOT_INSTANTIATE_REPLAYER;
 +      default:
 +        return null;
 +    }
 +  }
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fca82d84/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
index e825d2c,0000000..5125c54
mode 100644,000000..100644
--- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
+++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationException.java
@@@ -1,518 -1,0 +1,520 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +/**
-  * Autogenerated by Thrift Compiler (0.9.0)
++ * Autogenerated by Thrift Compiler (0.9.1)
 + *
 + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 + *  @generated
 + */
 +package org.apache.accumulo.core.replication.thrift;
 +
 +import org.apache.thrift.scheme.IScheme;
 +import org.apache.thrift.scheme.SchemeFactory;
 +import org.apache.thrift.scheme.StandardScheme;
 +
 +import org.apache.thrift.scheme.TupleScheme;
 +import org.apache.thrift.protocol.TTupleProtocol;
 +import org.apache.thrift.protocol.TProtocolException;
 +import org.apache.thrift.EncodingUtils;
 +import org.apache.thrift.TException;
++import org.apache.thrift.async.AsyncMethodCallback;
++import org.apache.thrift.server.AbstractNonblockingServer.*;
 +import java.util.List;
 +import java.util.ArrayList;
 +import java.util.Map;
 +import java.util.HashMap;
 +import java.util.EnumMap;
 +import java.util.Set;
 +import java.util.HashSet;
 +import java.util.EnumSet;
 +import java.util.Collections;
 +import java.util.BitSet;
 +import java.nio.ByteBuffer;
 +import java.util.Arrays;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
 +
- @SuppressWarnings("all") public class RemoteReplicationException extends TException implements org.apache.thrift.TBase<RemoteReplicationException, RemoteReplicationException._Fields>, java.io.Serializable, Cloneable {
++@SuppressWarnings("all") public class RemoteReplicationException extends TException implements org.apache.thrift.TBase<RemoteReplicationException, RemoteReplicationException._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteReplicationException> {
 +  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RemoteReplicationException");
 +
 +  private static final org.apache.thrift.protocol.TField CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("code", org.apache.thrift.protocol.TType.I32, (short)1);
 +  private static final org.apache.thrift.protocol.TField REASON_FIELD_DESC = new org.apache.thrift.protocol.TField("reason", org.apache.thrift.protocol.TType.STRING, (short)2);
 +
 +  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
 +  static {
 +    schemes.put(StandardScheme.class, new RemoteReplicationExceptionStandardSchemeFactory());
 +    schemes.put(TupleScheme.class, new RemoteReplicationExceptionTupleSchemeFactory());
 +  }
 +
 +  /**
 +   * 
 +   * @see RemoteReplicationErrorCode
 +   */
 +  public RemoteReplicationErrorCode code; // required
 +  public String reason; // required
 +
 +  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
 +  @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 +    /**
 +     * 
 +     * @see RemoteReplicationErrorCode
 +     */
 +    CODE((short)1, "code"),
 +    REASON((short)2, "reason");
 +
 +    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 +
 +    static {
 +      for (_Fields field : EnumSet.allOf(_Fields.class)) {
 +        byName.put(field.getFieldName(), field);
 +      }
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches fieldId, or null if its not found.
 +     */
 +    public static _Fields findByThriftId(int fieldId) {
 +      switch(fieldId) {
 +        case 1: // CODE
 +          return CODE;
 +        case 2: // REASON
 +          return REASON;
 +        default:
 +          return null;
 +      }
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches fieldId, throwing an exception
 +     * if it is not found.
 +     */
 +    public static _Fields findByThriftIdOrThrow(int fieldId) {
 +      _Fields fields = findByThriftId(fieldId);
 +      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
 +      return fields;
 +    }
 +
 +    /**
 +     * Find the _Fields constant that matches name, or null if its not found.
 +     */
 +    public static _Fields findByName(String name) {
 +      return byName.get(name);
 +    }
 +
 +    private final short _thriftId;
 +    private final String _fieldName;
 +
 +    _Fields(short thriftId, String fieldName) {
 +      _thriftId = thriftId;
 +      _fieldName = fieldName;
 +    }
 +
 +    public short getThriftFieldId() {
 +      return _thriftId;
 +    }
 +
 +    public String getFieldName() {
 +      return _fieldName;
 +    }
 +  }
 +
 +  // isset id assignments
 +  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
 +  static {
 +    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
 +    tmpMap.put(_Fields.CODE, new org.apache.thrift.meta_data.FieldMetaData("code", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, RemoteReplicationErrorCode.class)));
 +    tmpMap.put(_Fields.REASON, new org.apache.thrift.meta_data.FieldMetaData("reason", org.apache.thrift.TFieldRequirementType.DEFAULT, 
 +        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
 +    metaDataMap = Collections.unmodifiableMap(tmpMap);
 +    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RemoteReplicationException.class, metaDataMap);
 +  }
 +
 +  public RemoteReplicationException() {
 +  }
 +
 +  public RemoteReplicationException(
 +    RemoteReplicationErrorCode code,
 +    String reason)
 +  {
 +    this();
 +    this.code = code;
 +    this.reason = reason;
 +  }
 +
 +  /**
 +   * Performs a deep copy on <i>other</i>.
 +   */
 +  public RemoteReplicationException(RemoteReplicationException other) {
 +    if (other.isSetCode()) {
 +      this.code = other.code;
 +    }
 +    if (other.isSetReason()) {
 +      this.reason = other.reason;
 +    }
 +  }
 +
 +  public RemoteReplicationException deepCopy() {
 +    return new RemoteReplicationException(this);
 +  }
 +
 +  @Override
 +  public void clear() {
 +    this.code = null;
 +    this.reason = null;
 +  }
 +
 +  /**
 +   * 
 +   * @see RemoteReplicationErrorCode
 +   */
 +  public RemoteReplicationErrorCode getCode() {
 +    return this.code;
 +  }
 +
 +  /**
 +   * 
 +   * @see RemoteReplicationErrorCode
 +   */
 +  public RemoteReplicationException setCode(RemoteReplicationErrorCode code) {
 +    this.code = code;
 +    return this;
 +  }
 +
 +  public void unsetCode() {
 +    this.code = null;
 +  }
 +
 +  /** Returns true if field code is set (has been assigned a value) and false otherwise */
 +  public boolean isSetCode() {
 +    return this.code != null;
 +  }
 +
 +  public void setCodeIsSet(boolean value) {
 +    if (!value) {
 +      this.code = null;
 +    }
 +  }
 +
 +  public String getReason() {
 +    return this.reason;
 +  }
 +
 +  public RemoteReplicationException setReason(String reason) {
 +    this.reason = reason;
 +    return this;
 +  }
 +
 +  public void unsetReason() {
 +    this.reason = null;
 +  }
 +
 +  /** Returns true if field reason is set (has been assigned a value) and false otherwise */
 +  public boolean isSetReason() {
 +    return this.reason != null;
 +  }
 +
 +  public void setReasonIsSet(boolean value) {
 +    if (!value) {
 +      this.reason = null;
 +    }
 +  }
 +
 +  public void setFieldValue(_Fields field, Object value) {
 +    switch (field) {
 +    case CODE:
 +      if (value == null) {
 +        unsetCode();
 +      } else {
 +        setCode((RemoteReplicationErrorCode)value);
 +      }
 +      break;
 +
 +    case REASON:
 +      if (value == null) {
 +        unsetReason();
 +      } else {
 +        setReason((String)value);
 +      }
 +      break;
 +
 +    }
 +  }
 +
 +  public Object getFieldValue(_Fields field) {
 +    switch (field) {
 +    case CODE:
 +      return getCode();
 +
 +    case REASON:
 +      return getReason();
 +
 +    }
 +    throw new IllegalStateException();
 +  }
 +
 +  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
 +  public boolean isSet(_Fields field) {
 +    if (field == null) {
 +      throw new IllegalArgumentException();
 +    }
 +
 +    switch (field) {
 +    case CODE:
 +      return isSetCode();
 +    case REASON:
 +      return isSetReason();
 +    }
 +    throw new IllegalStateException();
 +  }
 +
 +  @Override
 +  public boolean equals(Object that) {
 +    if (that == null)
 +      return false;
 +    if (that instanceof RemoteReplicationException)
 +      return this.equals((RemoteReplicationException)that);
 +    return false;
 +  }
 +
 +  public boolean equals(RemoteReplicationException that) {
 +    if (that == null)
 +      return false;
 +
 +    boolean this_present_code = true && this.isSetCode();
 +    boolean that_present_code = true && that.isSetCode();
 +    if (this_present_code || that_present_code) {
 +      if (!(this_present_code && that_present_code))
 +        return false;
 +      if (!this.code.equals(that.code))
 +        return false;
 +    }
 +
 +    boolean this_present_reason = true && this.isSetReason();
 +    boolean that_present_reason = true && that.isSetReason();
 +    if (this_present_reason || that_present_reason) {
 +      if (!(this_present_reason && that_present_reason))
 +        return false;
 +      if (!this.reason.equals(that.reason))
 +        return false;
 +    }
 +
 +    return true;
 +  }
 +
 +  @Override
 +  public int hashCode() {
 +    return 0;
 +  }
 +
++  @Override
 +  public int compareTo(RemoteReplicationException other) {
 +    if (!getClass().equals(other.getClass())) {
 +      return getClass().getName().compareTo(other.getClass().getName());
 +    }
 +
 +    int lastComparison = 0;
-     RemoteReplicationException typedOther = (RemoteReplicationException)other;
 +
-     lastComparison = Boolean.valueOf(isSetCode()).compareTo(typedOther.isSetCode());
++    lastComparison = Boolean.valueOf(isSetCode()).compareTo(other.isSetCode());
 +    if (lastComparison != 0) {
 +      return lastComparison;
 +    }
 +    if (isSetCode()) {
-       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, typedOther.code);
++      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.code, other.code);
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +    }
-     lastComparison = Boolean.valueOf(isSetReason()).compareTo(typedOther.isSetReason());
++    lastComparison = Boolean.valueOf(isSetReason()).compareTo(other.isSetReason());
 +    if (lastComparison != 0) {
 +      return lastComparison;
 +    }
 +    if (isSetReason()) {
-       lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reason, typedOther.reason);
++      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reason, other.reason);
 +      if (lastComparison != 0) {
 +        return lastComparison;
 +      }
 +    }
 +    return 0;
 +  }
 +
 +  public _Fields fieldForId(int fieldId) {
 +    return _Fields.findByThriftId(fieldId);
 +  }
 +
 +  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
 +    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
 +  }
 +
 +  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
 +    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
 +  }
 +
 +  @Override
 +  public String toString() {
 +    StringBuilder sb = new StringBuilder("RemoteReplicationException(");
 +    boolean first = true;
 +
 +    sb.append("code:");
 +    if (this.code == null) {
 +      sb.append("null");
 +    } else {
 +      sb.append(this.code);
 +    }
 +    first = false;
 +    if (!first) sb.append(", ");
 +    sb.append("reason:");
 +    if (this.reason == null) {
 +      sb.append("null");
 +    } else {
 +      sb.append(this.reason);
 +    }
 +    first = false;
 +    sb.append(")");
 +    return sb.toString();
 +  }
 +
 +  public void validate() throws org.apache.thrift.TException {
 +    // check for required fields
 +    // check for sub-struct validity
 +  }
 +
 +  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
 +    try {
 +      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
 +    } catch (org.apache.thrift.TException te) {
 +      throw new java.io.IOException(te);
 +    }
 +  }
 +
 +  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
 +    try {
 +      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
 +    } catch (org.apache.thrift.TException te) {
 +      throw new java.io.IOException(te);
 +    }
 +  }
 +
 +  private static class RemoteReplicationExceptionStandardSchemeFactory implements SchemeFactory {
 +    public RemoteReplicationExceptionStandardScheme getScheme() {
 +      return new RemoteReplicationExceptionStandardScheme();
 +    }
 +  }
 +
 +  private static class RemoteReplicationExceptionStandardScheme extends StandardScheme<RemoteReplicationException> {
 +
 +    public void read(org.apache.thrift.protocol.TProtocol iprot, RemoteReplicationException struct) throws org.apache.thrift.TException {
 +      org.apache.thrift.protocol.TField schemeField;
 +      iprot.readStructBegin();
 +      while (true)
 +      {
 +        schemeField = iprot.readFieldBegin();
 +        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
 +          break;
 +        }
 +        switch (schemeField.id) {
 +          case 1: // CODE
 +            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
 +              struct.code = RemoteReplicationErrorCode.findByValue(iprot.readI32());
 +              struct.setCodeIsSet(true);
 +            } else { 
 +              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +            }
 +            break;
 +          case 2: // REASON
 +            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
 +              struct.reason = iprot.readString();
 +              struct.setReasonIsSet(true);
 +            } else { 
 +              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +            }
 +            break;
 +          default:
 +            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
 +        }
 +        iprot.readFieldEnd();
 +      }
 +      iprot.readStructEnd();
 +
 +      // check for required fields of primitive type, which can't be checked in the validate method
 +      struct.validate();
 +    }
 +
 +    public void write(org.apache.thrift.protocol.TProtocol oprot, RemoteReplicationException struct) throws org.apache.thrift.TException {
 +      struct.validate();
 +
 +      oprot.writeStructBegin(STRUCT_DESC);
 +      if (struct.code != null) {
 +        oprot.writeFieldBegin(CODE_FIELD_DESC);
 +        oprot.writeI32(struct.code.getValue());
 +        oprot.writeFieldEnd();
 +      }
 +      if (struct.reason != null) {
 +        oprot.writeFieldBegin(REASON_FIELD_DESC);
 +        oprot.writeString(struct.reason);
 +        oprot.writeFieldEnd();
 +      }
 +      oprot.writeFieldStop();
 +      oprot.writeStructEnd();
 +    }
 +
 +  }
 +
 +  private static class RemoteReplicationExceptionTupleSchemeFactory implements SchemeFactory {
 +    public RemoteReplicationExceptionTupleScheme getScheme() {
 +      return new RemoteReplicationExceptionTupleScheme();
 +    }
 +  }
 +
 +  private static class RemoteReplicationExceptionTupleScheme extends TupleScheme<RemoteReplicationException> {
 +
 +    @Override
 +    public void write(org.apache.thrift.protocol.TProtocol prot, RemoteReplicationException struct) throws org.apache.thrift.TException {
 +      TTupleProtocol oprot = (TTupleProtocol) prot;
 +      BitSet optionals = new BitSet();
 +      if (struct.isSetCode()) {
 +        optionals.set(0);
 +      }
 +      if (struct.isSetReason()) {
 +        optionals.set(1);
 +      }
 +      oprot.writeBitSet(optionals, 2);
 +      if (struct.isSetCode()) {
 +        oprot.writeI32(struct.code.getValue());
 +      }
 +      if (struct.isSetReason()) {
 +        oprot.writeString(struct.reason);
 +      }
 +    }
 +
 +    @Override
 +    public void read(org.apache.thrift.protocol.TProtocol prot, RemoteReplicationException struct) throws org.apache.thrift.TException {
 +      TTupleProtocol iprot = (TTupleProtocol) prot;
 +      BitSet incoming = iprot.readBitSet(2);
 +      if (incoming.get(0)) {
 +        struct.code = RemoteReplicationErrorCode.findByValue(iprot.readI32());
 +        struct.setCodeIsSet(true);
 +      }
 +      if (incoming.get(1)) {
 +        struct.reason = iprot.readString();
 +        struct.setReasonIsSet(true);
 +      }
 +    }
 +  }
 +
 +}
 +


Mime
View raw message