ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3af75fc6 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3af75fc6 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3af75fc6 Branch: refs/heads/master Commit: 3af75fc685d6e2a90a9f68c204122a87ac90e781 Parents: c7b27e0 Author: Eric C. Newton <eric.new...@gmail.com> Authored: Wed Dec 16 16:08:33 2015 -0500 Committer: Eric C. Newton <eric.new...@gmail.com> Committed: Wed Dec 16 16:08:33 2015 -0500 ---------------------------------------------------------------------- .../core/client/impl/thrift/ClientService.java | 1278 +- .../client/impl/thrift/ConfigurationType.java | 2 +- .../client/impl/thrift/SecurityErrorCode.java | 2 +- .../core/client/impl/thrift/TDiskUsage.java | 39 +- .../core/client/impl/thrift/TableOperation.java | 2 +- .../thrift/TableOperationExceptionType.java | 2 +- .../impl/thrift/ThriftSecurityException.java | 25 +- .../thrift/ThriftTableOperationException.java | 44 +- .../core/client/impl/thrift/ThriftTest.java | 57 +- .../core/data/thrift/InitialMultiScan.java | 23 +- .../accumulo/core/data/thrift/InitialScan.java | 23 +- .../accumulo/core/data/thrift/IterInfo.java | 28 +- .../accumulo/core/data/thrift/MapFileInfo.java | 18 +- .../core/data/thrift/MultiScanResult.java | 138 +- .../accumulo/core/data/thrift/ScanResult.java | 43 +- .../accumulo/core/data/thrift/TCMResult.java | 27 +- .../accumulo/core/data/thrift/TCMStatus.java | 2 +- .../accumulo/core/data/thrift/TColumn.java | 53 +- .../accumulo/core/data/thrift/TCondition.java | 95 +- .../core/data/thrift/TConditionalMutation.java | 48 +- .../core/data/thrift/TConditionalSession.java | 30 +- .../thrift/TConstraintViolationSummary.java | 35 +- .../apache/accumulo/core/data/thrift/TKey.java | 74 +- .../accumulo/core/data/thrift/TKeyExtent.java | 53 +- .../accumulo/core/data/thrift/TKeyValue.java | 30 +- .../accumulo/core/data/thrift/TMutation.java | 92 +- .../accumulo/core/data/thrift/TRange.java | 49 +- .../accumulo/core/data/thrift/UpdateErrors.java | 102 +- .../core/gc/thrift/GCMonitorService.java | 35 +- .../accumulo/core/gc/thrift/GCStatus.java | 31 +- .../accumulo/core/gc/thrift/GcCycleStats.java | 53 +- .../core/master/thrift/BulkImportState.java | 2 +- .../core/master/thrift/BulkImportStatus.java | 32 +- .../accumulo/core/master/thrift/Compacting.java | 25 +- .../accumulo/core/master/thrift/DeadServer.java | 28 +- .../core/master/thrift/FateOperation.java | 2 +- .../core/master/thrift/FateService.java | 210 +- .../core/master/thrift/MasterClientService.java | 676 +- .../core/master/thrift/MasterGoalState.java | 2 +- .../core/master/thrift/MasterMonitorInfo.java | 194 +- .../core/master/thrift/MasterState.java | 2 +- .../core/master/thrift/RecoveryException.java | 16 +- .../core/master/thrift/RecoveryStatus.java | 30 +- .../accumulo/core/master/thrift/TableInfo.java | 89 +- .../core/master/thrift/TabletLoadState.java | 2 +- .../core/master/thrift/TabletServerStatus.java | 169 +- .../core/master/thrift/TabletSplit.java | 41 +- .../core/replication/thrift/KeyValues.java | 36 +- .../thrift/RemoteReplicationErrorCode.java | 2 +- .../thrift/RemoteReplicationException.java | 25 +- .../thrift/ReplicationCoordinator.java | 35 +- .../thrift/ReplicationCoordinatorErrorCode.java | 2 +- .../thrift/ReplicationCoordinatorException.java | 25 +- .../replication/thrift/ReplicationServicer.java | 77 +- .../core/replication/thrift/WalEdits.java | 34 +- .../security/thrift/TAuthenticationKey.java | 48 +- .../thrift/TAuthenticationTokenIdentifier.java | 44 +- .../core/security/thrift/TCredentials.java | 40 +- .../core/security/thrift/TDelegationToken.java | 30 +- .../security/thrift/TDelegationTokenConfig.java | 20 +- .../core/tabletserver/thrift/ActionStats.java | 67 +- .../tabletserver/thrift/ActiveCompaction.java | 164 +- .../core/tabletserver/thrift/ActiveScan.java | 203 +- .../tabletserver/thrift/CompactionReason.java | 2 +- .../tabletserver/thrift/CompactionType.java | 2 +- .../thrift/ConstraintViolationException.java | 36 +- .../tabletserver/thrift/IteratorConfig.java | 36 +- .../thrift/NoSuchScanIDException.java | 11 +- .../thrift/NotServingTabletException.java | 16 +- .../core/tabletserver/thrift/ScanState.java | 2 +- .../core/tabletserver/thrift/ScanType.java | 2 +- .../core/tabletserver/thrift/TDurability.java | 2 +- .../tabletserver/thrift/TIteratorSetting.java | 57 +- .../thrift/TSampleNotPresentException.java | 16 +- .../thrift/TSamplerConfiguration.java | 45 +- .../thrift/TabletClientService.java | 1732 ++- .../core/tabletserver/thrift/TabletStats.java | 59 +- .../thrift/TooManyFilesException.java | 16 +- .../accumulo/core/trace/thrift/TInfo.java | 25 +- core/src/main/scripts/generate-thrift.sh | 4 +- pom.xml | 13 +- proxy/src/main/cpp/AccumuloProxy.cpp | 10424 +++++++++++++++-- proxy/src/main/cpp/AccumuloProxy.h | 4573 ++++---- proxy/src/main/cpp/proxy_constants.cpp | 2 +- proxy/src/main/cpp/proxy_constants.h | 2 +- proxy/src/main/cpp/proxy_types.cpp | 1808 ++- proxy/src/main/cpp/proxy_types.h | 1073 +- .../proxy/thrift/AccumuloException.java | 16 +- .../accumulo/proxy/thrift/AccumuloProxy.java | 4385 +++++-- .../proxy/thrift/AccumuloSecurityException.java | 16 +- .../accumulo/proxy/thrift/ActiveCompaction.java | 111 +- .../accumulo/proxy/thrift/ActiveScan.java | 136 +- .../accumulo/proxy/thrift/BatchScanOptions.java | 118 +- .../apache/accumulo/proxy/thrift/Column.java | 53 +- .../accumulo/proxy/thrift/ColumnUpdate.java | 79 +- .../accumulo/proxy/thrift/CompactionReason.java | 2 +- .../proxy/thrift/CompactionStrategyConfig.java | 45 +- .../accumulo/proxy/thrift/CompactionType.java | 2 +- .../apache/accumulo/proxy/thrift/Condition.java | 62 +- .../proxy/thrift/ConditionalStatus.java | 2 +- .../proxy/thrift/ConditionalUpdates.java | 61 +- .../proxy/thrift/ConditionalWriterOptions.java | 66 +- .../apache/accumulo/proxy/thrift/DiskUsage.java | 39 +- .../accumulo/proxy/thrift/Durability.java | 2 +- .../accumulo/proxy/thrift/IteratorScope.java | 2 +- .../accumulo/proxy/thrift/IteratorSetting.java | 57 +- .../org/apache/accumulo/proxy/thrift/Key.java | 76 +- .../apache/accumulo/proxy/thrift/KeyExtent.java | 44 +- .../apache/accumulo/proxy/thrift/KeyValue.java | 30 +- .../accumulo/proxy/thrift/KeyValueAndPeek.java | 23 +- .../thrift/MutationsRejectedException.java | 16 +- .../proxy/thrift/NoMoreEntriesException.java | 16 +- .../accumulo/proxy/thrift/PartialKey.java | 2 +- .../org/apache/accumulo/proxy/thrift/Range.java | 35 +- .../accumulo/proxy/thrift/ScanColumn.java | 39 +- .../accumulo/proxy/thrift/ScanOptions.java | 98 +- .../accumulo/proxy/thrift/ScanResult.java | 43 +- .../apache/accumulo/proxy/thrift/ScanState.java | 2 +- .../apache/accumulo/proxy/thrift/ScanType.java | 2 +- .../accumulo/proxy/thrift/SystemPermission.java | 2 +- .../proxy/thrift/TableExistsException.java | 16 +- .../proxy/thrift/TableNotFoundException.java | 16 +- .../accumulo/proxy/thrift/TablePermission.java | 2 +- .../apache/accumulo/proxy/thrift/TimeType.java | 2 +- .../accumulo/proxy/thrift/UnknownScanner.java | 16 +- .../accumulo/proxy/thrift/UnknownWriter.java | 16 +- .../accumulo/proxy/thrift/WriterOptions.java | 50 +- proxy/src/main/python/AccumuloProxy-remote | 330 +- proxy/src/main/python/AccumuloProxy.py | 3713 ++++-- proxy/src/main/python/constants.py | 2 +- proxy/src/main/python/ttypes.py | 354 +- proxy/src/main/ruby/accumulo_proxy.rb | 4 +- proxy/src/main/ruby/proxy_constants.rb | 2 +- proxy/src/main/ruby/proxy_types.rb | 2 +- .../server/rpc/CustomNonBlockingServer.java | 234 +- .../server/rpc/TNonblockingServerSocket.java | 156 - .../accumulo/server/rpc/TServerUtils.java | 7 +- .../accumulo/tracer/thrift/Annotation.java | 23 +- .../accumulo/tracer/thrift/RemoteSpan.java | 115 +- .../accumulo/tracer/thrift/SpanReceiver.java | 20 +- .../accumulo/tracer/thrift/TestService.java | 32 +- test/pom.xml | 4 + 142 files changed, 26986 insertions(+), 8675 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java index 40b28fd..44df667 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -45,10 +45,13 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ClientService { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ClientService { public interface Iface { @@ -4894,7 +4897,9 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + return list.hashCode(); } @Override @@ -5205,7 +5210,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override @@ -5494,7 +5506,9 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + return list.hashCode(); } @Override @@ -5805,7 +5819,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override @@ -6094,7 +6115,9 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + return list.hashCode(); } @Override @@ -6405,7 +6428,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override @@ -7008,7 +7038,7 @@ import org.slf4j.LoggerFactory; return getCredentials(); case TID: - return Long.valueOf(getTid()); + return getTid(); case TABLE_ID: return getTableId(); @@ -7020,7 +7050,7 @@ import org.slf4j.LoggerFactory; return getErrorDir(); case SET_TIME: - return Boolean.valueOf(isSetTime()); + return isSetTime(); } throw new IllegalStateException(); @@ -7132,7 +7162,44 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_tid = true; + list.add(present_tid); + if (present_tid) + list.add(tid); + + boolean present_tableId = true && (isSetTableId()); + list.add(present_tableId); + if (present_tableId) + list.add(tableId); + + boolean present_files = true && (isSetFiles()); + list.add(present_files); + if (present_files) + list.add(files); + + boolean present_errorDir = true && (isSetErrorDir()); + list.add(present_errorDir); + if (present_errorDir) + list.add(errorDir); + + boolean present_setTime = true; + list.add(present_setTime); + if (present_setTime) + list.add(setTime); + + return list.hashCode(); } @Override @@ -7370,11 +7437,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list8 = iprot.readListBegin(); struct.files = new ArrayList<String>(_list8.size); - for (int _i9 = 0; _i9 < _list8.size; ++_i9) + String _elem9; + for (int _i10 = 0; _i10 < _list8.size; ++_i10) { - String _elem10; - _elem10 = iprot.readString(); - struct.files.add(_elem10); + _elem9 = iprot.readString(); + struct.files.add(_elem9); } iprot.readListEnd(); } @@ -7547,11 +7614,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.files = new ArrayList<String>(_list13.size); - for (int _i14 = 0; _i14 < _list13.size; ++_i14) + String _elem14; + for (int _i15 = 0; _i15 < _list13.size; ++_i15) { - String _elem15; - _elem15 = iprot.readString(); - struct.files.add(_elem15); + _elem14 = iprot.readString(); + struct.files.add(_elem14); } } struct.setFilesIsSet(true); @@ -7899,7 +7966,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -8031,11 +8115,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list16 = iprot.readListBegin(); struct.success = new ArrayList<String>(_list16.size); - for (int _i17 = 0; _i17 < _list16.size; ++_i17) + String _elem17; + for (int _i18 = 0; _i18 < _list16.size; ++_i18) { - String _elem18; - _elem18 = iprot.readString(); - struct.success.add(_elem18); + _elem17 = iprot.readString(); + struct.success.add(_elem17); } iprot.readListEnd(); } @@ -8152,11 +8236,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.success = new ArrayList<String>(_list21.size); - for (int _i22 = 0; _i22 < _list21.size; ++_i22) + String _elem22; + for (int _i23 = 0; _i23 < _list21.size; ++_i23) { - String _elem23; - _elem23 = iprot.readString(); - struct.success.add(_elem23); + _elem22 = iprot.readString(); + struct.success.add(_elem22); } } struct.setSuccessIsSet(true); @@ -8375,7 +8459,7 @@ import org.slf4j.LoggerFactory; return getTinfo(); case TID: - return Long.valueOf(getTid()); + return getTid(); } throw new IllegalStateException(); @@ -8432,7 +8516,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_tid = true; + list.add(present_tid); + if (present_tid) + list.add(tid); + + return list.hashCode(); } @Override @@ -8784,7 +8880,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); } throw new IllegalStateException(); @@ -8830,7 +8926,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override @@ -9182,7 +9285,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + return list.hashCode(); } @Override @@ -9541,7 +9651,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -9973,7 +10090,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tables = true && (isSetTables()); + list.add(present_tables); + if (present_tables) + list.add(tables); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + return list.hashCode(); } @Override @@ -10090,11 +10219,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set24 = iprot.readSetBegin(); struct.tables = new HashSet<String>(2*_set24.size); - for (int _i25 = 0; _i25 < _set24.size; ++_i25) + String _elem25; + for (int _i26 = 0; _i26 < _set24.size; ++_i26) { - String _elem26; - _elem26 = iprot.readString(); - struct.tables.add(_elem26); + _elem25 = iprot.readString(); + struct.tables.add(_elem25); } iprot.readSetEnd(); } @@ -10191,11 +10320,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set29 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.tables = new HashSet<String>(2*_set29.size); - for (int _i30 = 0; _i30 < _set29.size; ++_i30) + String _elem30; + for (int _i31 = 0; _i31 < _set29.size; ++_i31) { - String _elem31; - _elem31 = iprot.readString(); - struct.tables.add(_elem31); + _elem30 = iprot.readString(); + struct.tables.add(_elem30); } } struct.setTablesIsSet(true); @@ -10543,7 +10672,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_toe = true && (isSetToe()); + list.add(present_toe); + if (present_toe) + list.add(toe); + + return list.hashCode(); } @Override @@ -10675,12 +10821,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list32 = iprot.readListBegin(); struct.success = new ArrayList<TDiskUsage>(_list32.size); - for (int _i33 = 0; _i33 < _list32.size; ++_i33) + TDiskUsage _elem33; + for (int _i34 = 0; _i34 < _list32.size; ++_i34) { - TDiskUsage _elem34; - _elem34 = new TDiskUsage(); - _elem34.read(iprot); - struct.success.add(_elem34); + _elem33 = new TDiskUsage(); + _elem33.read(iprot); + struct.success.add(_elem33); } iprot.readListEnd(); } @@ -10797,12 +10943,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.success = new ArrayList<TDiskUsage>(_list37.size); - for (int _i38 = 0; _i38 < _list37.size; ++_i38) + TDiskUsage _elem38; + for (int _i39 = 0; _i39 < _list37.size; ++_i39) { - TDiskUsage _elem39; - _elem39 = new TDiskUsage(); - _elem39.read(iprot); - struct.success.add(_elem39); + _elem38 = new TDiskUsage(); + _elem38.read(iprot); + struct.success.add(_elem38); } } struct.setSuccessIsSet(true); @@ -11076,7 +11222,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + return list.hashCode(); } @Override @@ -11557,7 +11715,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -11671,11 +11841,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set40 = iprot.readSetBegin(); struct.success = new HashSet<String>(2*_set40.size); - for (int _i41 = 0; _i41 < _set40.size; ++_i41) + String _elem41; + for (int _i42 = 0; _i42 < _set40.size; ++_i42) { - String _elem42; - _elem42 = iprot.readString(); - struct.success.add(_elem42); + _elem41 = iprot.readString(); + struct.success.add(_elem41); } iprot.readSetEnd(); } @@ -11772,11 +11942,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set45 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.success = new HashSet<String>(2*_set45.size); - for (int _i46 = 0; _i46 < _set45.size; ++_i46) + String _elem46; + for (int _i47 = 0; _i47 < _set45.size; ++_i47) { - String _elem47; - _elem47 = iprot.readString(); - struct.success.add(_elem47); + _elem46 = iprot.readString(); + struct.success.add(_elem46); } } struct.setSuccessIsSet(true); @@ -11906,7 +12076,7 @@ import org.slf4j.LoggerFactory; this.tinfo = tinfo; this.credentials = credentials; this.principal = principal; - this.password = password; + this.password = org.apache.thrift.TBaseHelper.copyBinary(password); } /** @@ -11924,7 +12094,6 @@ import org.slf4j.LoggerFactory; } if (other.isSetPassword()) { this.password = org.apache.thrift.TBaseHelper.copyBinary(other.password); -; } } @@ -12018,16 +12187,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForPassword() { - return password; + return org.apache.thrift.TBaseHelper.copyBinary(password); } public createLocalUser_args setPassword(byte[] password) { - setPassword(password == null ? (ByteBuffer)null : ByteBuffer.wrap(password)); + this.password = password == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(password, password.length)); return this; } public createLocalUser_args setPassword(ByteBuffer password) { - this.password = password; + this.password = org.apache.thrift.TBaseHelper.copyBinary(password); return this; } @@ -12174,7 +12343,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_password = true && (isSetPassword()); + list.add(present_password); + if (present_password) + list.add(password); + + return list.hashCode(); } @Override @@ -12661,7 +12852,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -13135,7 +13333,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + return list.hashCode(); } @Override @@ -13581,7 +13796,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -13857,7 +14079,7 @@ import org.slf4j.LoggerFactory; this.tinfo = tinfo; this.credentials = credentials; this.principal = principal; - this.password = password; + this.password = org.apache.thrift.TBaseHelper.copyBinary(password); } /** @@ -13875,7 +14097,6 @@ import org.slf4j.LoggerFactory; } if (other.isSetPassword()) { this.password = org.apache.thrift.TBaseHelper.copyBinary(other.password); -; } } @@ -13969,16 +14190,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForPassword() { - return password; + return org.apache.thrift.TBaseHelper.copyBinary(password); } public changeLocalUserPassword_args setPassword(byte[] password) { - setPassword(password == null ? (ByteBuffer)null : ByteBuffer.wrap(password)); + this.password = password == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(password, password.length)); return this; } public changeLocalUserPassword_args setPassword(ByteBuffer password) { - this.password = password; + this.password = org.apache.thrift.TBaseHelper.copyBinary(password); return this; } @@ -14125,7 +14346,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_password = true && (isSetPassword()); + list.add(present_password); + if (present_password) + list.add(password); + + return list.hashCode(); } @Override @@ -14612,7 +14855,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -15027,7 +15277,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + return list.hashCode(); } @Override @@ -15433,7 +15695,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); case SEC: return getSec(); @@ -15493,7 +15755,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -16006,7 +16280,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_toAuth = true && (isSetToAuth()); + list.add(present_toAuth); + if (present_toAuth) + list.add(toAuth); + + return list.hashCode(); } @Override @@ -16458,7 +16749,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); case SEC: return getSec(); @@ -16518,7 +16809,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -17107,7 +17410,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_authorizations = true && (isSetAuthorizations()); + list.add(present_authorizations); + if (present_authorizations) + list.add(authorizations); + + return list.hashCode(); } @Override @@ -17206,7 +17531,7 @@ import org.slf4j.LoggerFactory; if (this.authorizations == null) { sb.append("null"); } else { - sb.append(this.authorizations); + org.apache.thrift.TBaseHelper.toString(this.authorizations, sb); } first = false; sb.append(")"); @@ -17289,11 +17614,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list48 = iprot.readListBegin(); struct.authorizations = new ArrayList<ByteBuffer>(_list48.size); - for (int _i49 = 0; _i49 < _list48.size; ++_i49) + ByteBuffer _elem49; + for (int _i50 = 0; _i50 < _list48.size; ++_i50) { - ByteBuffer _elem50; - _elem50 = iprot.readBinary(); - struct.authorizations.add(_elem50); + _elem49 = iprot.readBinary(); + struct.authorizations.add(_elem49); } iprot.readListEnd(); } @@ -17417,11 +17742,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list53 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.authorizations = new ArrayList<ByteBuffer>(_list53.size); - for (int _i54 = 0; _i54 < _list53.size; ++_i54) + ByteBuffer _elem54; + for (int _i55 = 0; _i55 < _list53.size; ++_i55) { - ByteBuffer _elem55; - _elem55 = iprot.readBinary(); - struct.authorizations.add(_elem55); + _elem54 = iprot.readBinary(); + struct.authorizations.add(_elem54); } } struct.setAuthorizationsIsSet(true); @@ -17626,7 +17951,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -18100,7 +18432,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + return list.hashCode(); } @Override @@ -18622,7 +18971,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -18677,7 +19038,7 @@ import org.slf4j.LoggerFactory; if (this.success == null) { sb.append("null"); } else { - sb.append(this.success); + org.apache.thrift.TBaseHelper.toString(this.success, sb); } first = false; if (!first) sb.append(", "); @@ -18736,11 +19097,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list56 = iprot.readListBegin(); struct.success = new ArrayList<ByteBuffer>(_list56.size); - for (int _i57 = 0; _i57 < _list56.size; ++_i57) + ByteBuffer _elem57; + for (int _i58 = 0; _i58 < _list56.size; ++_i58) { - ByteBuffer _elem58; - _elem58 = iprot.readBinary(); - struct.success.add(_elem58); + _elem57 = iprot.readBinary(); + struct.success.add(_elem57); } iprot.readListEnd(); } @@ -18837,11 +19198,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list61 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.success = new ArrayList<ByteBuffer>(_list61.size); - for (int _i62 = 0; _i62 < _list61.size; ++_i62) + ByteBuffer _elem62; + for (int _i63 = 0; _i63 < _list61.size; ++_i63) { - ByteBuffer _elem63; - _elem63 = iprot.readBinary(); - struct.success.add(_elem63); + _elem62 = iprot.readBinary(); + struct.success.add(_elem62); } } struct.setSuccessIsSet(true); @@ -19151,7 +19512,7 @@ import org.slf4j.LoggerFactory; return getPrincipal(); case SYS_PERM: - return Byte.valueOf(getSysPerm()); + return getSysPerm(); } throw new IllegalStateException(); @@ -19230,7 +19591,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_sysPerm = true; + list.add(present_sysPerm); + if (present_sysPerm) + list.add(sysPerm); + + return list.hashCode(); } @Override @@ -19714,7 +20097,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); case SEC: return getSec(); @@ -19774,7 +20157,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -20317,7 +20712,7 @@ import org.slf4j.LoggerFactory; return getTableName(); case TBL_PERM: - return Byte.valueOf(getTblPerm()); + return getTblPerm(); } throw new IllegalStateException(); @@ -20407,7 +20802,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_tableName = true && (isSetTableName()); + list.add(present_tableName); + if (present_tableName) + list.add(tableName); + + boolean present_tblPerm = true; + list.add(present_tblPerm); + if (present_tblPerm) + list.add(tblPerm); + + return list.hashCode(); } @Override @@ -20977,7 +21399,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); case SEC: return getSec(); @@ -21051,7 +21473,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -21637,7 +22076,7 @@ import org.slf4j.LoggerFactory; return getNs(); case TBL_NSPC_PERM: - return Byte.valueOf(getTblNspcPerm()); + return getTblNspcPerm(); } throw new IllegalStateException(); @@ -21727,7 +22166,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_ns = true && (isSetNs()); + list.add(present_ns); + if (present_ns) + list.add(ns); + + boolean present_tblNspcPerm = true; + list.add(present_tblNspcPerm); + if (present_tblNspcPerm) + list.add(tblNspcPerm); + + return list.hashCode(); } @Override @@ -22297,7 +22763,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); case SEC: return getSec(); @@ -22371,7 +22837,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -22909,7 +23392,7 @@ import org.slf4j.LoggerFactory; return getPrincipal(); case PERMISSION: - return Byte.valueOf(getPermission()); + return getPermission(); } throw new IllegalStateException(); @@ -22988,7 +23471,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_permission = true; + list.add(present_permission); + if (present_permission) + list.add(permission); + + return list.hashCode(); } @Override @@ -23471,7 +23976,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -23927,7 +24439,7 @@ import org.slf4j.LoggerFactory; return getPrincipal(); case PERMISSION: - return Byte.valueOf(getPermission()); + return getPermission(); } throw new IllegalStateException(); @@ -24006,7 +24518,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_permission = true; + list.add(present_permission); + if (present_permission) + list.add(permission); + + return list.hashCode(); } @Override @@ -24489,7 +25023,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + return list.hashCode(); } @Override @@ -24993,7 +25534,7 @@ import org.slf4j.LoggerFactory; return getTableName(); case PERMISSION: - return Byte.valueOf(getPermission()); + return getPermission(); } throw new IllegalStateException(); @@ -25083,7 +25624,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_tableName = true && (isSetTableName()); + list.add(present_tableName); + if (present_tableName) + list.add(tableName); + + boolean present_permission = true; + list.add(present_permission); + if (present_permission) + list.add(permission); + + return list.hashCode(); } @Override @@ -25666,7 +26234,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -26213,7 +26793,7 @@ import org.slf4j.LoggerFactory; return getTableName(); case PERMISSION: - return Byte.valueOf(getPermission()); + return getPermission(); } throw new IllegalStateException(); @@ -26303,7 +26883,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_tableName = true && (isSetTableName()); + list.add(present_tableName); + if (present_tableName) + list.add(tableName); + + boolean present_permission = true; + list.add(present_permission); + if (present_permission) + list.add(permission); + + return list.hashCode(); } @Override @@ -26886,7 +27493,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -27433,7 +28052,7 @@ import org.slf4j.LoggerFactory; return getNs(); case PERMISSION: - return Byte.valueOf(getPermission()); + return getPermission(); } throw new IllegalStateException(); @@ -27523,7 +28142,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_ns = true && (isSetNs()); + list.add(present_ns); + if (present_ns) + list.add(ns); + + boolean present_permission = true; + list.add(present_permission); + if (present_permission) + list.add(permission); + + return list.hashCode(); } @Override @@ -28106,7 +28752,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -28653,7 +29311,7 @@ import org.slf4j.LoggerFactory; return getNs(); case PERMISSION: - return Byte.valueOf(getPermission()); + return getPermission(); } throw new IllegalStateException(); @@ -28743,7 +29401,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_ns = true && (isSetNs()); + list.add(present_ns); + if (present_ns) + list.add(ns); + + boolean present_permission = true; + list.add(present_permission); + if (present_permission) + list.add(permission); + + return list.hashCode(); } @Override @@ -29326,7 +30011,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -29859,7 +30556,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type.getValue()); + + return list.hashCode(); } @Override @@ -30012,7 +30726,7 @@ import org.slf4j.LoggerFactory; break; case 1: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = ConfigurationType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.core.client.impl.thrift.ConfigurationType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -30102,7 +30816,7 @@ import org.slf4j.LoggerFactory; struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.type = ConfigurationType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.core.client.impl.thrift.ConfigurationType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } } @@ -30319,7 +31033,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override @@ -30415,13 +31136,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map64 = iprot.readMapBegin(); struct.success = new HashMap<String,String>(2*_map64.size); - for (int _i65 = 0; _i65 < _map64.size; ++_i65) + String _key65; + String _val66; + for (int _i67 = 0; _i67 < _map64.size; ++_i67) { - String _key66; - String _val67; - _key66 = iprot.readString(); - _val67 = iprot.readString(); - struct.success.put(_key66, _val67); + _key65 = iprot.readString(); + _val66 = iprot.readString(); + struct.success.put(_key65, _val66); } iprot.readMapEnd(); } @@ -30500,13 +31221,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map70 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.success = new HashMap<String,String>(2*_map70.size); - for (int _i71 = 0; _i71 < _map70.size; ++_i71) + String _key71; + String _val72; + for (int _i73 = 0; _i73 < _map70.size; ++_i73) { - String _key72; - String _val73; - _key72 = iprot.readString(); - _val73 = iprot.readString(); - struct.success.put(_key72, _val73); + _key71 = iprot.readString(); + _val72 = iprot.readString(); + struct.success.put(_key71, _val72); } } struct.setSuccessIsSet(true); @@ -30829,7 +31550,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_tableName = true && (isSetTableName()); + list.add(present_tableName); + if (present_tableName) + list.add(tableName); + + return list.hashCode(); } @Override @@ -31348,7 +32086,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -31462,13 +32212,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map74 = iprot.readMapBegin(); struct.success = new HashMap<String,String>(2*_map74.size); - for (int _i75 = 0; _i75 < _map74.size; ++_i75) + String _key75; + String _val76; + for (int _i77 = 0; _i77 < _map74.size; ++_i77) { - String _key76; - String _val77; - _key76 = iprot.readString(); - _val77 = iprot.readString(); - struct.success.put(_key76, _val77); + _key75 = iprot.readString(); + _val76 = iprot.readString(); + struct.success.put(_key75, _val76); } iprot.readMapEnd(); } @@ -31567,13 +32317,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.success = new HashMap<String,String>(2*_map80.size); - for (int _i81 = 0; _i81 < _map80.size; ++_i81) + String _key81; + String _val82; + for (int _i83 = 0; _i83 < _map80.size; ++_i83) { - String _key82; - String _val83; - _key82 = iprot.readString(); - _val83 = iprot.readString(); - struct.success.put(_key82, _val83); + _key81 = iprot.readString(); + _val82 = iprot.readString(); + struct.success.put(_key81, _val82); } } struct.setSuccessIsSet(true); @@ -31901,7 +32651,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_ns = true && (isSetNs()); + list.add(present_ns); + if (present_ns) + list.add(ns); + + return list.hashCode(); } @Override @@ -32420,7 +33187,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true && (isSetSuccess()); + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -32534,13 +33313,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map84 = iprot.readMapBegin(); struct.success = new HashMap<String,String>(2*_map84.size); - for (int _i85 = 0; _i85 < _map84.size; ++_i85) + String _key85; + String _val86; + for (int _i87 = 0; _i87 < _map84.size; ++_i87) { - String _key86; - String _val87; - _key86 = iprot.readString(); - _val87 = iprot.readString(); - struct.success.put(_key86, _val87); + _key85 = iprot.readString(); + _val86 = iprot.readString(); + struct.success.put(_key85, _val86); } iprot.readMapEnd(); } @@ -32639,13 +33418,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map90 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.success = new HashMap<String,String>(2*_map90.size); - for (int _i91 = 0; _i91 < _map90.size; ++_i91) + String _key91; + String _val92; + for (int _i93 = 0; _i93 < _map90.size; ++_i93) { - String _key92; - String _val93; - _key92 = iprot.readString(); - _val93 = iprot.readString(); - struct.success.put(_key92, _val93); + _key91 = iprot.readString(); + _val92 = iprot.readString(); + struct.success.put(_key91, _val92); } } struct.setSuccessIsSet(true); @@ -33032,7 +33811,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_className = true && (isSetClassName()); + list.add(present_className); + if (present_className) + list.add(className); + + boolean present_interfaceMatch = true && (isSetInterfaceMatch()); + list.add(present_interfaceMatch); + if (present_interfaceMatch) + list.add(interfaceMatch); + + return list.hashCode(); } @Override @@ -33475,7 +34276,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); } throw new IllegalStateException(); @@ -33521,7 +34322,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + return list.hashCode(); } @Override @@ -34109,7 +34917,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_tableId = true && (isSetTableId()); + list.add(present_tableId); + if (present_tableId) + list.add(tableId); + + boolean present_className = true && (isSetClassName()); + list.add(present_className); + if (present_className) + list.add(className); + + boolean present_interfaceMatch = true && (isSetInterfaceMatch()); + list.add(present_interfaceMatch); + if (present_interfaceMatch) + list.add(interfaceMatch); + + return list.hashCode(); } @Override @@ -34683,7 +35518,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); case SEC: return getSec(); @@ -34757,7 +35592,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override @@ -35431,7 +36283,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tinfo = true && (isSetTinfo()); + list.add(present_tinfo); + if (present_tinfo) + list.add(tinfo); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + boolean present_namespaceId = true && (isSetNamespaceId()); + list.add(present_namespaceId); + if (present_namespaceId) + list.add(namespaceId); + + boolean present_className = true && (isSetClassName()); + list.add(present_className); + if (present_className) + list.add(className); + + boolean present_interfaceMatch = true && (isSetInterfaceMatch()); + list.add(present_interfaceMatch); + if (present_interfaceMatch) + list.add(interfaceMatch); + + return list.hashCode(); } @Override @@ -36005,7 +36884,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); case SEC: return getSec(); @@ -36079,7 +36958,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_success = true; + list.add(present_success); + if (present_success) + list.add(success); + + boolean present_sec = true && (isSetSec()); + list.add(present_sec); + if (present_sec) + list.add(sec); + + boolean present_tope = true && (isSetTope()); + list.add(present_tope); + if (present_tope) + list.add(tope); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java index 7399802..143393e 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java index 754f24e..8bc1964 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java index 1ae011b..fd5a76f 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -45,10 +45,13 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<TDiskUsage> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TDiskUsage implements org.apache.thrift.TBase<TDiskUsage, TDiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<TDiskUsage> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDiskUsage"); private static final org.apache.thrift.protocol.TField TABLES_FIELD_DESC = new org.apache.thrift.protocol.TField("tables", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -264,7 +267,7 @@ import org.slf4j.LoggerFactory; return getTables(); case USAGE: - return Long.valueOf(getUsage()); + return getUsage(); } throw new IllegalStateException(); @@ -321,7 +324,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tables = true && (isSetTables()); + list.add(present_tables); + if (present_tables) + list.add(tables); + + boolean present_usage = true; + list.add(present_usage); + if (present_usage) + list.add(usage); + + return list.hashCode(); } @Override @@ -433,11 +448,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); struct.tables = new ArrayList<String>(_list0.size); - for (int _i1 = 0; _i1 < _list0.size; ++_i1) + String _elem1; + for (int _i2 = 0; _i2 < _list0.size; ++_i2) { - String _elem2; - _elem2 = iprot.readString(); - struct.tables.add(_elem2); + _elem1 = iprot.readString(); + struct.tables.add(_elem1); } iprot.readListEnd(); } @@ -531,11 +546,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.tables = new ArrayList<String>(_list5.size); - for (int _i6 = 0; _i6 < _list5.size; ++_i6) + String _elem6; + for (int _i7 = 0; _i7 < _list5.size; ++_i7) { - String _elem7; - _elem7 = iprot.readString(); - struct.tables.add(_elem7); + _elem6 = iprot.readString(); + struct.tables.add(_elem6); } } struct.setTablesIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java index 4730276..5b49952 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java index 48b5619..52ec63f 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java index 9e94830..c9d7d27 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftSecurityException.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -45,10 +45,13 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ThriftSecurityException extends TException implements org.apache.thrift.TBase<ThriftSecurityException, ThriftSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftSecurityException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ThriftSecurityException extends TException implements org.apache.thrift.TBase<ThriftSecurityException, ThriftSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftSecurityException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftSecurityException"); private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -318,7 +321,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_user = true && (isSetUser()); + list.add(present_user); + if (present_user) + list.add(user); + + boolean present_code = true && (isSetCode()); + list.add(present_code); + if (present_code) + list.add(code.getValue()); + + return list.hashCode(); } @Override @@ -437,7 +452,7 @@ import org.slf4j.LoggerFactory; break; case 2: // CODE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.code = SecurityErrorCode.findByValue(iprot.readI32()); + struct.code = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32()); struct.setCodeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -510,7 +525,7 @@ import org.slf4j.LoggerFactory; struct.setUserIsSet(true); } if (incoming.get(1)) { - struct.code = SecurityErrorCode.findByValue(iprot.readI32()); + struct.code = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32()); struct.setCodeIsSet(true); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java index fad7ea7..5516901 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java @@ -15,7 +15,7 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -45,10 +45,13 @@ import java.util.Collections; import java.util.BitSet; import java.nio.ByteBuffer; import java.util.Arrays; +import javax.annotation.Generated; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ThriftTableOperationException extends TException implements org.apache.thrift.TBase<ThriftTableOperationException, ThriftTableOperationException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftTableOperationException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ThriftTableOperationException extends TException implements org.apache.thrift.TBase<ThriftTableOperationException, ThriftTableOperationException._Fields>, java.io.Serializable, Cloneable, Comparable<ThriftTableOperationException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ThriftTableOperationException"); private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("tableId", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -511,7 +514,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tableId = true && (isSetTableId()); + list.add(present_tableId); + if (present_tableId) + list.add(tableId); + + boolean present_tableName = true && (isSetTableName()); + list.add(present_tableName); + if (present_tableName) + list.add(tableName); + + boolean present_op = true && (isSetOp()); + list.add(present_op); + if (present_op) + list.add(op.getValue()); + + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type.getValue()); + + boolean present_description = true && (isSetDescription()); + list.add(present_description); + if (present_description) + list.add(description); + + return list.hashCode(); } @Override @@ -692,7 +722,7 @@ import org.slf4j.LoggerFactory; break; case 3: // OP if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.op = TableOperation.findByValue(iprot.readI32()); + struct.op = org.apache.accumulo.core.client.impl.thrift.TableOperation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -700,7 +730,7 @@ import org.slf4j.LoggerFactory; break; case 4: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = TableOperationExceptionType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -818,11 +848,11 @@ import org.slf4j.LoggerFactory; struct.setTableNameIsSet(true); } if (incoming.get(2)) { - struct.op = TableOperation.findByValue(iprot.readI32()); + struct.op = org.apache.accumulo.core.client.impl.thrift.TableOperation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } if (incoming.get(3)) { - struct.type = TableOperationExceptionType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } if (incoming.get(4)) {
