http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java index bf9befb..1b8ed46 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.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 MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorInfo, MasterMonitorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MasterMonitorInfo> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class MasterMonitorInfo implements org.apache.thrift.TBase<MasterMonitorInfo, MasterMonitorInfo._Fields>, java.io.Serializable, Cloneable, Comparable<MasterMonitorInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MasterMonitorInfo"); private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("tableMap", org.apache.thrift.protocol.TType.MAP, (short)1); @@ -722,7 +725,7 @@ import org.slf4j.LoggerFactory; return getGoalState(); case UNASSIGNED_TABLETS: - return Integer.valueOf(getUnassignedTablets()); + return getUnassignedTablets(); case SERVERS_SHUTTING_DOWN: return getServersShuttingDown(); @@ -865,7 +868,54 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tableMap = true && (isSetTableMap()); + list.add(present_tableMap); + if (present_tableMap) + list.add(tableMap); + + boolean present_tServerInfo = true && (isSetTServerInfo()); + list.add(present_tServerInfo); + if (present_tServerInfo) + list.add(tServerInfo); + + boolean present_badTServers = true && (isSetBadTServers()); + list.add(present_badTServers); + if (present_badTServers) + list.add(badTServers); + + boolean present_state = true && (isSetState()); + list.add(present_state); + if (present_state) + list.add(state.getValue()); + + boolean present_goalState = true && (isSetGoalState()); + list.add(present_goalState); + if (present_goalState) + list.add(goalState.getValue()); + + boolean present_unassignedTablets = true; + list.add(present_unassignedTablets); + if (present_unassignedTablets) + list.add(unassignedTablets); + + boolean present_serversShuttingDown = true && (isSetServersShuttingDown()); + list.add(present_serversShuttingDown); + if (present_serversShuttingDown) + list.add(serversShuttingDown); + + boolean present_deadTabletServers = true && (isSetDeadTabletServers()); + list.add(present_deadTabletServers); + if (present_deadTabletServers) + list.add(deadTabletServers); + + boolean present_bulkImports = true && (isSetBulkImports()); + list.add(present_bulkImports); + if (present_bulkImports) + list.add(bulkImports); + + return list.hashCode(); } @Override @@ -1103,14 +1153,14 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin(); struct.tableMap = new HashMap<String,TableInfo>(2*_map26.size); - for (int _i27 = 0; _i27 < _map26.size; ++_i27) + String _key27; + TableInfo _val28; + for (int _i29 = 0; _i29 < _map26.size; ++_i29) { - String _key28; - TableInfo _val29; - _key28 = iprot.readString(); - _val29 = new TableInfo(); - _val29.read(iprot); - struct.tableMap.put(_key28, _val29); + _key27 = iprot.readString(); + _val28 = new TableInfo(); + _val28.read(iprot); + struct.tableMap.put(_key27, _val28); } iprot.readMapEnd(); } @@ -1124,12 +1174,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list30 = iprot.readListBegin(); struct.tServerInfo = new ArrayList<TabletServerStatus>(_list30.size); - for (int _i31 = 0; _i31 < _list30.size; ++_i31) + TabletServerStatus _elem31; + for (int _i32 = 0; _i32 < _list30.size; ++_i32) { - TabletServerStatus _elem32; - _elem32 = new TabletServerStatus(); - _elem32.read(iprot); - struct.tServerInfo.add(_elem32); + _elem31 = new TabletServerStatus(); + _elem31.read(iprot); + struct.tServerInfo.add(_elem31); } iprot.readListEnd(); } @@ -1143,13 +1193,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map33 = iprot.readMapBegin(); struct.badTServers = new HashMap<String,Byte>(2*_map33.size); - for (int _i34 = 0; _i34 < _map33.size; ++_i34) + String _key34; + byte _val35; + for (int _i36 = 0; _i36 < _map33.size; ++_i36) { - String _key35; - byte _val36; - _key35 = iprot.readString(); - _val36 = iprot.readByte(); - struct.badTServers.put(_key35, _val36); + _key34 = iprot.readString(); + _val35 = iprot.readByte(); + struct.badTServers.put(_key34, _val35); } iprot.readMapEnd(); } @@ -1160,7 +1210,7 @@ import org.slf4j.LoggerFactory; break; case 6: // STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.state = MasterState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.master.thrift.MasterState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1168,7 +1218,7 @@ import org.slf4j.LoggerFactory; break; case 8: // GOAL_STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.goalState = MasterGoalState.findByValue(iprot.readI32()); + struct.goalState = org.apache.accumulo.core.master.thrift.MasterGoalState.findByValue(iprot.readI32()); struct.setGoalStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1187,11 +1237,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set37 = iprot.readSetBegin(); struct.serversShuttingDown = new HashSet<String>(2*_set37.size); - for (int _i38 = 0; _i38 < _set37.size; ++_i38) + String _elem38; + for (int _i39 = 0; _i39 < _set37.size; ++_i39) { - String _elem39; - _elem39 = iprot.readString(); - struct.serversShuttingDown.add(_elem39); + _elem38 = iprot.readString(); + struct.serversShuttingDown.add(_elem38); } iprot.readSetEnd(); } @@ -1205,12 +1255,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list40 = iprot.readListBegin(); struct.deadTabletServers = new ArrayList<DeadServer>(_list40.size); - for (int _i41 = 0; _i41 < _list40.size; ++_i41) + DeadServer _elem41; + for (int _i42 = 0; _i42 < _list40.size; ++_i42) { - DeadServer _elem42; - _elem42 = new DeadServer(); - _elem42.read(iprot); - struct.deadTabletServers.add(_elem42); + _elem41 = new DeadServer(); + _elem41.read(iprot); + struct.deadTabletServers.add(_elem41); } iprot.readListEnd(); } @@ -1224,12 +1274,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list43 = iprot.readListBegin(); struct.bulkImports = new ArrayList<BulkImportStatus>(_list43.size); - for (int _i44 = 0; _i44 < _list43.size; ++_i44) + BulkImportStatus _elem44; + for (int _i45 = 0; _i45 < _list43.size; ++_i45) { - BulkImportStatus _elem45; - _elem45 = new BulkImportStatus(); - _elem45.read(iprot); - struct.bulkImports.add(_elem45); + _elem44 = new BulkImportStatus(); + _elem44.read(iprot); + struct.bulkImports.add(_elem44); } iprot.readListEnd(); } @@ -1461,14 +1511,14 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map58 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.tableMap = new HashMap<String,TableInfo>(2*_map58.size); - for (int _i59 = 0; _i59 < _map58.size; ++_i59) + String _key59; + TableInfo _val60; + for (int _i61 = 0; _i61 < _map58.size; ++_i61) { - String _key60; - TableInfo _val61; - _key60 = iprot.readString(); - _val61 = new TableInfo(); - _val61.read(iprot); - struct.tableMap.put(_key60, _val61); + _key59 = iprot.readString(); + _val60 = new TableInfo(); + _val60.read(iprot); + struct.tableMap.put(_key59, _val60); } } struct.setTableMapIsSet(true); @@ -1477,12 +1527,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list62 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.tServerInfo = new ArrayList<TabletServerStatus>(_list62.size); - for (int _i63 = 0; _i63 < _list62.size; ++_i63) + TabletServerStatus _elem63; + for (int _i64 = 0; _i64 < _list62.size; ++_i64) { - TabletServerStatus _elem64; - _elem64 = new TabletServerStatus(); - _elem64.read(iprot); - struct.tServerInfo.add(_elem64); + _elem63 = new TabletServerStatus(); + _elem63.read(iprot); + struct.tServerInfo.add(_elem63); } } struct.setTServerInfoIsSet(true); @@ -1491,23 +1541,23 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map65 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE, iprot.readI32()); struct.badTServers = new HashMap<String,Byte>(2*_map65.size); - for (int _i66 = 0; _i66 < _map65.size; ++_i66) + String _key66; + byte _val67; + for (int _i68 = 0; _i68 < _map65.size; ++_i68) { - String _key67; - byte _val68; - _key67 = iprot.readString(); - _val68 = iprot.readByte(); - struct.badTServers.put(_key67, _val68); + _key66 = iprot.readString(); + _val67 = iprot.readByte(); + struct.badTServers.put(_key66, _val67); } } struct.setBadTServersIsSet(true); } if (incoming.get(3)) { - struct.state = MasterState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.master.thrift.MasterState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } if (incoming.get(4)) { - struct.goalState = MasterGoalState.findByValue(iprot.readI32()); + struct.goalState = org.apache.accumulo.core.master.thrift.MasterGoalState.findByValue(iprot.readI32()); struct.setGoalStateIsSet(true); } if (incoming.get(5)) { @@ -1518,11 +1568,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set69 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.serversShuttingDown = new HashSet<String>(2*_set69.size); - for (int _i70 = 0; _i70 < _set69.size; ++_i70) + String _elem70; + for (int _i71 = 0; _i71 < _set69.size; ++_i71) { - String _elem71; - _elem71 = iprot.readString(); - struct.serversShuttingDown.add(_elem71); + _elem70 = iprot.readString(); + struct.serversShuttingDown.add(_elem70); } } struct.setServersShuttingDownIsSet(true); @@ -1531,12 +1581,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list72 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.deadTabletServers = new ArrayList<DeadServer>(_list72.size); - for (int _i73 = 0; _i73 < _list72.size; ++_i73) + DeadServer _elem73; + for (int _i74 = 0; _i74 < _list72.size; ++_i74) { - DeadServer _elem74; - _elem74 = new DeadServer(); - _elem74.read(iprot); - struct.deadTabletServers.add(_elem74); + _elem73 = new DeadServer(); + _elem73.read(iprot); + struct.deadTabletServers.add(_elem73); } } struct.setDeadTabletServersIsSet(true); @@ -1545,12 +1595,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list75 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.bulkImports = new ArrayList<BulkImportStatus>(_list75.size); - for (int _i76 = 0; _i76 < _list75.size; ++_i76) + BulkImportStatus _elem76; + for (int _i77 = 0; _i77 < _list75.size; ++_i77) { - BulkImportStatus _elem77; - _elem77 = new BulkImportStatus(); - _elem77.read(iprot); - struct.bulkImports.add(_elem77); + _elem76 = new BulkImportStatus(); + _elem76.read(iprot); + struct.bulkImports.add(_elem76); } } struct.setBulkImportsIsSet(true);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java index 1d63305..29548d3 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterState.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/master/thrift/RecoveryException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java index 025cced..f19bf63 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryException.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 RecoveryException extends TException implements org.apache.thrift.TBase<RecoveryException, RecoveryException._Fields>, java.io.Serializable, Cloneable, Comparable<RecoveryException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class RecoveryException extends TException implements org.apache.thrift.TBase<RecoveryException, RecoveryException._Fields>, java.io.Serializable, Cloneable, Comparable<RecoveryException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RecoveryException"); private static final org.apache.thrift.protocol.TField WHY_FIELD_DESC = new org.apache.thrift.protocol.TField("why", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -243,7 +246,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_why = true && (isSetWhy()); + list.add(present_why); + if (present_why) + list.add(why); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java index 3ffcb03..72b6058 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.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 RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, RecoveryStatus._Fields>, java.io.Serializable, Cloneable, Comparable<RecoveryStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, RecoveryStatus._Fields>, java.io.Serializable, Cloneable, Comparable<RecoveryStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RecoveryStatus"); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2); @@ -292,10 +295,10 @@ import org.slf4j.LoggerFactory; return getName(); case RUNTIME: - return Integer.valueOf(getRuntime()); + return getRuntime(); case PROGRESS: - return Double.valueOf(getProgress()); + return getProgress(); } throw new IllegalStateException(); @@ -363,7 +366,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_name = true && (isSetName()); + list.add(present_name); + if (present_name) + list.add(name); + + boolean present_runtime = true; + list.add(present_runtime); + if (present_runtime) + list.add(runtime); + + boolean present_progress = true; + list.add(present_progress); + if (present_progress) + list.add(progress); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java index 3c919cd..126369d 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.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 TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TableInfo> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TableInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableInfo"); private static final org.apache.thrift.protocol.TField RECS_FIELD_DESC = new org.apache.thrift.protocol.TField("recs", org.apache.thrift.protocol.TType.I64, (short)1); @@ -694,28 +697,28 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case RECS: - return Long.valueOf(getRecs()); + return getRecs(); case RECS_IN_MEMORY: - return Long.valueOf(getRecsInMemory()); + return getRecsInMemory(); case TABLETS: - return Integer.valueOf(getTablets()); + return getTablets(); case ONLINE_TABLETS: - return Integer.valueOf(getOnlineTablets()); + return getOnlineTablets(); case INGEST_RATE: - return Double.valueOf(getIngestRate()); + return getIngestRate(); case INGEST_BYTE_RATE: - return Double.valueOf(getIngestByteRate()); + return getIngestByteRate(); case QUERY_RATE: - return Double.valueOf(getQueryRate()); + return getQueryRate(); case QUERY_BYTE_RATE: - return Double.valueOf(getQueryByteRate()); + return getQueryByteRate(); case MINORS: return getMinors(); @@ -727,7 +730,7 @@ import org.slf4j.LoggerFactory; return getScans(); case SCAN_RATE: - return Double.valueOf(getScanRate()); + return getScanRate(); } throw new IllegalStateException(); @@ -894,7 +897,69 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_recs = true; + list.add(present_recs); + if (present_recs) + list.add(recs); + + boolean present_recsInMemory = true; + list.add(present_recsInMemory); + if (present_recsInMemory) + list.add(recsInMemory); + + boolean present_tablets = true; + list.add(present_tablets); + if (present_tablets) + list.add(tablets); + + boolean present_onlineTablets = true; + list.add(present_onlineTablets); + if (present_onlineTablets) + list.add(onlineTablets); + + boolean present_ingestRate = true; + list.add(present_ingestRate); + if (present_ingestRate) + list.add(ingestRate); + + boolean present_ingestByteRate = true; + list.add(present_ingestByteRate); + if (present_ingestByteRate) + list.add(ingestByteRate); + + boolean present_queryRate = true; + list.add(present_queryRate); + if (present_queryRate) + list.add(queryRate); + + boolean present_queryByteRate = true; + list.add(present_queryByteRate); + if (present_queryByteRate) + list.add(queryByteRate); + + boolean present_minors = true && (isSetMinors()); + list.add(present_minors); + if (present_minors) + list.add(minors); + + boolean present_majors = true && (isSetMajors()); + list.add(present_majors); + if (present_majors) + list.add(majors); + + boolean present_scans = true && (isSetScans()); + list.add(present_scans); + if (present_scans) + list.add(scans); + + boolean present_scanRate = true; + list.add(present_scanRate); + if (present_scanRate) + list.add(scanRate); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java index 97338cc..1a3a80c 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletLoadState.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/master/thrift/TabletServerStatus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java index 0c7416f..f88a569 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.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 TabletServerStatus implements org.apache.thrift.TBase<TabletServerStatus, TabletServerStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TabletServerStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerStatus, TabletServerStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TabletServerStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletServerStatus"); private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("tableMap", org.apache.thrift.protocol.TType.MAP, (short)1); @@ -852,40 +855,40 @@ import org.slf4j.LoggerFactory; return getTableMap(); case LAST_CONTACT: - return Long.valueOf(getLastContact()); + return getLastContact(); case NAME: return getName(); case OS_LOAD: - return Double.valueOf(getOsLoad()); + return getOsLoad(); case HOLD_TIME: - return Long.valueOf(getHoldTime()); + return getHoldTime(); case LOOKUPS: - return Long.valueOf(getLookups()); + return getLookups(); case INDEX_CACHE_HITS: - return Long.valueOf(getIndexCacheHits()); + return getIndexCacheHits(); case INDEX_CACHE_REQUEST: - return Long.valueOf(getIndexCacheRequest()); + return getIndexCacheRequest(); case DATA_CACHE_HITS: - return Long.valueOf(getDataCacheHits()); + return getDataCacheHits(); case DATA_CACHE_REQUEST: - return Long.valueOf(getDataCacheRequest()); + return getDataCacheRequest(); case LOG_SORTS: return getLogSorts(); case FLUSHS: - return Long.valueOf(getFlushs()); + return getFlushs(); case SYNCS: - return Long.valueOf(getSyncs()); + return getSyncs(); case BULK_IMPORTS: return getBulkImports(); @@ -1077,7 +1080,79 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tableMap = true && (isSetTableMap()); + list.add(present_tableMap); + if (present_tableMap) + list.add(tableMap); + + boolean present_lastContact = true; + list.add(present_lastContact); + if (present_lastContact) + list.add(lastContact); + + boolean present_name = true && (isSetName()); + list.add(present_name); + if (present_name) + list.add(name); + + boolean present_osLoad = true; + list.add(present_osLoad); + if (present_osLoad) + list.add(osLoad); + + boolean present_holdTime = true; + list.add(present_holdTime); + if (present_holdTime) + list.add(holdTime); + + boolean present_lookups = true; + list.add(present_lookups); + if (present_lookups) + list.add(lookups); + + boolean present_indexCacheHits = true; + list.add(present_indexCacheHits); + if (present_indexCacheHits) + list.add(indexCacheHits); + + boolean present_indexCacheRequest = true; + list.add(present_indexCacheRequest); + if (present_indexCacheRequest) + list.add(indexCacheRequest); + + boolean present_dataCacheHits = true; + list.add(present_dataCacheHits); + if (present_dataCacheHits) + list.add(dataCacheHits); + + boolean present_dataCacheRequest = true; + list.add(present_dataCacheRequest); + if (present_dataCacheRequest) + list.add(dataCacheRequest); + + boolean present_logSorts = true && (isSetLogSorts()); + list.add(present_logSorts); + if (present_logSorts) + list.add(logSorts); + + boolean present_flushs = true; + list.add(present_flushs); + if (present_flushs) + list.add(flushs); + + boolean present_syncs = true; + list.add(present_syncs); + if (present_syncs) + list.add(syncs); + + boolean present_bulkImports = true && (isSetBulkImports()); + list.add(present_bulkImports); + if (present_bulkImports) + list.add(bulkImports); + + return list.hashCode(); } @Override @@ -1369,14 +1444,14 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin(); struct.tableMap = new HashMap<String,TableInfo>(2*_map0.size); - for (int _i1 = 0; _i1 < _map0.size; ++_i1) + String _key1; + TableInfo _val2; + for (int _i3 = 0; _i3 < _map0.size; ++_i3) { - String _key2; - TableInfo _val3; - _key2 = iprot.readString(); - _val3 = new TableInfo(); - _val3.read(iprot); - struct.tableMap.put(_key2, _val3); + _key1 = iprot.readString(); + _val2 = new TableInfo(); + _val2.read(iprot); + struct.tableMap.put(_key1, _val2); } iprot.readMapEnd(); } @@ -1462,12 +1537,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list4 = iprot.readListBegin(); struct.logSorts = new ArrayList<RecoveryStatus>(_list4.size); - for (int _i5 = 0; _i5 < _list4.size; ++_i5) + RecoveryStatus _elem5; + for (int _i6 = 0; _i6 < _list4.size; ++_i6) { - RecoveryStatus _elem6; - _elem6 = new RecoveryStatus(); - _elem6.read(iprot); - struct.logSorts.add(_elem6); + _elem5 = new RecoveryStatus(); + _elem5.read(iprot); + struct.logSorts.add(_elem5); } iprot.readListEnd(); } @@ -1497,12 +1572,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list7 = iprot.readListBegin(); struct.bulkImports = new ArrayList<BulkImportStatus>(_list7.size); - for (int _i8 = 0; _i8 < _list7.size; ++_i8) + BulkImportStatus _elem8; + for (int _i9 = 0; _i9 < _list7.size; ++_i9) { - BulkImportStatus _elem9; - _elem9 = new BulkImportStatus(); - _elem9.read(iprot); - struct.bulkImports.add(_elem9); + _elem8 = new BulkImportStatus(); + _elem8.read(iprot); + struct.bulkImports.add(_elem8); } iprot.readListEnd(); } @@ -1730,14 +1805,14 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.tableMap = new HashMap<String,TableInfo>(2*_map16.size); - for (int _i17 = 0; _i17 < _map16.size; ++_i17) + String _key17; + TableInfo _val18; + for (int _i19 = 0; _i19 < _map16.size; ++_i19) { - String _key18; - TableInfo _val19; - _key18 = iprot.readString(); - _val19 = new TableInfo(); - _val19.read(iprot); - struct.tableMap.put(_key18, _val19); + _key17 = iprot.readString(); + _val18 = new TableInfo(); + _val18.read(iprot); + struct.tableMap.put(_key17, _val18); } } struct.setTableMapIsSet(true); @@ -1782,12 +1857,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list20 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.logSorts = new ArrayList<RecoveryStatus>(_list20.size); - for (int _i21 = 0; _i21 < _list20.size; ++_i21) + RecoveryStatus _elem21; + for (int _i22 = 0; _i22 < _list20.size; ++_i22) { - RecoveryStatus _elem22; - _elem22 = new RecoveryStatus(); - _elem22.read(iprot); - struct.logSorts.add(_elem22); + _elem21 = new RecoveryStatus(); + _elem21.read(iprot); + struct.logSorts.add(_elem21); } } struct.setLogSortsIsSet(true); @@ -1804,12 +1879,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.bulkImports = new ArrayList<BulkImportStatus>(_list23.size); - for (int _i24 = 0; _i24 < _list23.size; ++_i24) + BulkImportStatus _elem24; + for (int _i25 = 0; _i25 < _list23.size; ++_i25) { - BulkImportStatus _elem25; - _elem25 = new BulkImportStatus(); - _elem25.read(iprot); - struct.bulkImports.add(_elem25); + _elem24 = new BulkImportStatus(); + _elem24.read(iprot); + struct.bulkImports.add(_elem24); } } struct.setBulkImportsIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java index 6c26129..d0eb6f2 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.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 TabletSplit implements org.apache.thrift.TBase<TabletSplit, TabletSplit._Fields>, java.io.Serializable, Cloneable, Comparable<TabletSplit> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TabletSplit implements org.apache.thrift.TBase<TabletSplit, TabletSplit._Fields>, java.io.Serializable, Cloneable, Comparable<TabletSplit> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletSplit"); private static final org.apache.thrift.protocol.TField OLD_TABLET_FIELD_DESC = new org.apache.thrift.protocol.TField("oldTablet", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -322,7 +325,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_oldTablet = true && (isSetOldTablet()); + list.add(present_oldTablet); + if (present_oldTablet) + list.add(oldTablet); + + boolean present_newTablets = true && (isSetNewTablets()); + list.add(present_newTablets); + if (present_newTablets) + list.add(newTablets); + + return list.hashCode(); } @Override @@ -448,12 +463,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list78 = iprot.readListBegin(); struct.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list78.size); - for (int _i79 = 0; _i79 < _list78.size; ++_i79) + org.apache.accumulo.core.data.thrift.TKeyExtent _elem79; + for (int _i80 = 0; _i80 < _list78.size; ++_i80) { - org.apache.accumulo.core.data.thrift.TKeyExtent _elem80; - _elem80 = new org.apache.accumulo.core.data.thrift.TKeyExtent(); - _elem80.read(iprot); - struct.newTablets.add(_elem80); + _elem79 = new org.apache.accumulo.core.data.thrift.TKeyExtent(); + _elem79.read(iprot); + struct.newTablets.add(_elem79); } iprot.readListEnd(); } @@ -546,12 +561,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list83 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list83.size); - for (int _i84 = 0; _i84 < _list83.size; ++_i84) + org.apache.accumulo.core.data.thrift.TKeyExtent _elem84; + for (int _i85 = 0; _i85 < _list83.size; ++_i85) { - org.apache.accumulo.core.data.thrift.TKeyExtent _elem85; - _elem85 = new org.apache.accumulo.core.data.thrift.TKeyExtent(); - _elem85.read(iprot); - struct.newTablets.add(_elem85); + _elem84 = new org.apache.accumulo.core.data.thrift.TKeyExtent(); + _elem84.read(iprot); + struct.newTablets.add(_elem84); } } struct.setNewTabletsIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/replication/thrift/KeyValues.java ---------------------------------------------------------------------- diff --git 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 index 3c6f6ed..7a083fa 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 @@ -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 KeyValues implements org.apache.thrift.TBase<KeyValues, KeyValues._Fields>, java.io.Serializable, Cloneable, Comparable<KeyValues> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +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); @@ -263,7 +266,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_keyValues = true && (isSetKeyValues()); + list.add(present_keyValues); + if (present_keyValues) + list.add(keyValues); + + return list.hashCode(); } @Override @@ -359,12 +369,12 @@ import org.slf4j.LoggerFactory; { 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 _elem9; + for (int _i10 = 0; _i10 < _list8.size; ++_i10) { - org.apache.accumulo.core.data.thrift.TKeyValue _elem10; - _elem10 = new org.apache.accumulo.core.data.thrift.TKeyValue(); - _elem10.read(iprot); - struct.keyValues.add(_elem10); + _elem9 = new org.apache.accumulo.core.data.thrift.TKeyValue(); + _elem9.read(iprot); + struct.keyValues.add(_elem9); } iprot.readListEnd(); } @@ -441,12 +451,12 @@ import org.slf4j.LoggerFactory; { 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 _elem14; + for (int _i15 = 0; _i15 < _list13.size; ++_i15) { - org.apache.accumulo.core.data.thrift.TKeyValue _elem15; - _elem15 = new org.apache.accumulo.core.data.thrift.TKeyValue(); - _elem15.read(iprot); - struct.keyValues.add(_elem15); + _elem14 = new org.apache.accumulo.core.data.thrift.TKeyValue(); + _elem14.read(iprot); + struct.keyValues.add(_elem14); } } struct.setKeyValuesIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/replication/thrift/RemoteReplicationErrorCode.java ---------------------------------------------------------------------- diff --git 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 index 75dd28c..2ec6a15 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 @@ -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/replication/thrift/RemoteReplicationException.java ---------------------------------------------------------------------- diff --git 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 index 331d767..18e2155 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 @@ -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 RemoteReplicationException extends TException implements org.apache.thrift.TBase<RemoteReplicationException, RemoteReplicationException._Fields>, java.io.Serializable, Cloneable, Comparable<RemoteReplicationException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +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); @@ -318,7 +321,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_code = true && (isSetCode()); + list.add(present_code); + if (present_code) + list.add(code.getValue()); + + boolean present_reason = true && (isSetReason()); + list.add(present_reason); + if (present_reason) + list.add(reason); + + return list.hashCode(); } @Override @@ -429,7 +444,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // CODE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.code = RemoteReplicationErrorCode.findByValue(iprot.readI32()); + struct.code = org.apache.accumulo.core.replication.thrift.RemoteReplicationErrorCode.findByValue(iprot.readI32()); struct.setCodeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -506,7 +521,7 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.code = RemoteReplicationErrorCode.findByValue(iprot.readI32()); + struct.code = org.apache.accumulo.core.replication.thrift.RemoteReplicationErrorCode.findByValue(iprot.readI32()); struct.setCodeIsSet(true); } if (incoming.get(1)) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java index 1314802..38385ba 100644 --- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java +++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.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 ReplicationCoordinator { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ReplicationCoordinator { public interface Iface { @@ -533,7 +536,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_remoteTableId = true && (isSetRemoteTableId()); + list.add(present_remoteTableId); + if (present_remoteTableId) + list.add(remoteTableId); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + return list.hashCode(); } @Override @@ -992,7 +1007,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_e = true && (isSetE()); + list.add(present_e); + if (present_e) + list.add(e); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java index 8c56d61..545656b 100644 --- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.java +++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorErrorCode.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/replication/thrift/ReplicationCoordinatorException.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java index 5e1feae..f7536c4 100644 --- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.java +++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinatorException.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 ReplicationCoordinatorException extends TException implements org.apache.thrift.TBase<ReplicationCoordinatorException, ReplicationCoordinatorException._Fields>, java.io.Serializable, Cloneable, Comparable<ReplicationCoordinatorException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ReplicationCoordinatorException extends TException implements org.apache.thrift.TBase<ReplicationCoordinatorException, ReplicationCoordinatorException._Fields>, java.io.Serializable, Cloneable, Comparable<ReplicationCoordinatorException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ReplicationCoordinatorException"); 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); @@ -318,7 +321,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_code = true && (isSetCode()); + list.add(present_code); + if (present_code) + list.add(code.getValue()); + + boolean present_reason = true && (isSetReason()); + list.add(present_reason); + if (present_reason) + list.add(reason); + + return list.hashCode(); } @Override @@ -429,7 +444,7 @@ import org.slf4j.LoggerFactory; switch (schemeField.id) { case 1: // CODE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.code = ReplicationCoordinatorErrorCode.findByValue(iprot.readI32()); + struct.code = org.apache.accumulo.core.replication.thrift.ReplicationCoordinatorErrorCode.findByValue(iprot.readI32()); struct.setCodeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -506,7 +521,7 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { - struct.code = ReplicationCoordinatorErrorCode.findByValue(iprot.readI32()); + struct.code = org.apache.accumulo.core.replication.thrift.ReplicationCoordinatorErrorCode.findByValue(iprot.readI32()); struct.setCodeIsSet(true); } if (incoming.get(1)) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java index d2ff11b..853e9d4 100644 --- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java +++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.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 ReplicationServicer { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ReplicationServicer { public interface Iface { @@ -753,7 +756,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_remoteTableId = true && (isSetRemoteTableId()); + list.add(present_remoteTableId); + if (present_remoteTableId) + list.add(remoteTableId); + + boolean present_data = true && (isSetData()); + list.add(present_data); + if (present_data) + list.add(data); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + return list.hashCode(); } @Override @@ -1200,7 +1220,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Long.valueOf(getSuccess()); + return getSuccess(); case E: return getE(); @@ -1260,7 +1280,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_e = true && (isSetE()); + list.add(present_e); + if (present_e) + list.add(e); + + return list.hashCode(); } @Override @@ -1773,7 +1805,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_remoteTableId = true && (isSetRemoteTableId()); + list.add(present_remoteTableId); + if (present_remoteTableId) + list.add(remoteTableId); + + boolean present_data = true && (isSetData()); + list.add(present_data); + if (present_data) + list.add(data); + + boolean present_credentials = true && (isSetCredentials()); + list.add(present_credentials); + if (present_credentials) + list.add(credentials); + + return list.hashCode(); } @Override @@ -2220,7 +2269,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Long.valueOf(getSuccess()); + return getSuccess(); case E: return getE(); @@ -2280,7 +2329,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_e = true && (isSetE()); + list.add(present_e); + if (present_e) + list.add(e); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java b/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java index 4459dcd..3d0b2e3 100644 --- a/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.java +++ b/core/src/main/java/org/apache/accumulo/core/replication/thrift/WalEdits.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 WalEdits implements org.apache.thrift.TBase<WalEdits, WalEdits._Fields>, java.io.Serializable, Cloneable, Comparable<WalEdits> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class WalEdits implements org.apache.thrift.TBase<WalEdits, WalEdits._Fields>, java.io.Serializable, Cloneable, Comparable<WalEdits> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WalEdits"); private static final org.apache.thrift.protocol.TField EDITS_FIELD_DESC = new org.apache.thrift.protocol.TField("edits", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -260,7 +263,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_edits = true && (isSetEdits()); + list.add(present_edits); + if (present_edits) + list.add(edits); + + return list.hashCode(); } @Override @@ -305,7 +315,7 @@ import org.slf4j.LoggerFactory; if (this.edits == null) { sb.append("null"); } else { - sb.append(this.edits); + org.apache.thrift.TBaseHelper.toString(this.edits, sb); } first = false; sb.append(")"); @@ -356,11 +366,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); struct.edits = new ArrayList<ByteBuffer>(_list0.size); - for (int _i1 = 0; _i1 < _list0.size; ++_i1) + ByteBuffer _elem1; + for (int _i2 = 0; _i2 < _list0.size; ++_i2) { - ByteBuffer _elem2; - _elem2 = iprot.readBinary(); - struct.edits.add(_elem2); + _elem1 = iprot.readBinary(); + struct.edits.add(_elem1); } iprot.readListEnd(); } @@ -437,11 +447,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.edits = new ArrayList<ByteBuffer>(_list5.size); - for (int _i6 = 0; _i6 < _list5.size; ++_i6) + ByteBuffer _elem6; + for (int _i7 = 0; _i7 < _list5.size; ++_i7) { - ByteBuffer _elem7; - _elem7 = iprot.readBinary(); - struct.edits.add(_elem7); + _elem6 = iprot.readBinary(); + struct.edits.add(_elem6); } } struct.setEditsIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.java index 4da2bb2..f9b82a5 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.java +++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationKey.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 TAuthenticationKey implements org.apache.thrift.TBase<TAuthenticationKey, TAuthenticationKey._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthenticationKey> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TAuthenticationKey implements org.apache.thrift.TBase<TAuthenticationKey, TAuthenticationKey._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthenticationKey> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAuthenticationKey"); private static final org.apache.thrift.protocol.TField SECRET_FIELD_DESC = new org.apache.thrift.protocol.TField("secret", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -139,7 +142,7 @@ import org.slf4j.LoggerFactory; private static final int __EXPIRATIONDATE_ISSET_ID = 1; private static final int __CREATIONDATE_ISSET_ID = 2; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.KEY_ID,_Fields.EXPIRATION_DATE,_Fields.CREATION_DATE}; + private static final _Fields optionals[] = {_Fields.KEY_ID,_Fields.EXPIRATION_DATE,_Fields.CREATION_DATE}; 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); @@ -162,7 +165,7 @@ import org.slf4j.LoggerFactory; ByteBuffer secret) { this(); - this.secret = secret; + this.secret = org.apache.thrift.TBaseHelper.copyBinary(secret); } /** @@ -172,7 +175,6 @@ import org.slf4j.LoggerFactory; __isset_bitfield = other.__isset_bitfield; if (other.isSetSecret()) { this.secret = org.apache.thrift.TBaseHelper.copyBinary(other.secret); -; } this.keyId = other.keyId; this.expirationDate = other.expirationDate; @@ -200,16 +202,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForSecret() { - return secret; + return org.apache.thrift.TBaseHelper.copyBinary(secret); } public TAuthenticationKey setSecret(byte[] secret) { - setSecret(secret == null ? (ByteBuffer)null : ByteBuffer.wrap(secret)); + this.secret = secret == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(secret, secret.length)); return this; } public TAuthenticationKey setSecret(ByteBuffer secret) { - this.secret = secret; + this.secret = org.apache.thrift.TBaseHelper.copyBinary(secret); return this; } @@ -340,13 +342,13 @@ import org.slf4j.LoggerFactory; return getSecret(); case KEY_ID: - return Integer.valueOf(getKeyId()); + return getKeyId(); case EXPIRATION_DATE: - return Long.valueOf(getExpirationDate()); + return getExpirationDate(); case CREATION_DATE: - return Long.valueOf(getCreationDate()); + return getCreationDate(); } throw new IllegalStateException(); @@ -425,7 +427,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_secret = true && (isSetSecret()); + list.add(present_secret); + if (present_secret) + list.add(secret); + + boolean present_keyId = true && (isSetKeyId()); + list.add(present_keyId); + if (present_keyId) + list.add(keyId); + + boolean present_expirationDate = true && (isSetExpirationDate()); + list.add(present_expirationDate); + if (present_expirationDate) + list.add(expirationDate); + + boolean present_creationDate = true && (isSetCreationDate()); + list.add(present_creationDate); + if (present_creationDate) + list.add(creationDate); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationTokenIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationTokenIdentifier.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationTokenIdentifier.java index d4e75f0..e84c492 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationTokenIdentifier.java +++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TAuthenticationTokenIdentifier.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 TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<TAuthenticationTokenIdentifier, TAuthenticationTokenIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthenticationTokenIdentifier> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TAuthenticationTokenIdentifier implements org.apache.thrift.TBase<TAuthenticationTokenIdentifier, TAuthenticationTokenIdentifier._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthenticationTokenIdentifier> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAuthenticationTokenIdentifier"); private static final org.apache.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.thrift.protocol.TField("principal", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -144,7 +147,7 @@ import org.slf4j.LoggerFactory; private static final int __ISSUEDATE_ISSET_ID = 1; private static final int __EXPIRATIONDATE_ISSET_ID = 2; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.KEY_ID,_Fields.ISSUE_DATE,_Fields.EXPIRATION_DATE,_Fields.INSTANCE_ID}; + private static final _Fields optionals[] = {_Fields.KEY_ID,_Fields.ISSUE_DATE,_Fields.EXPIRATION_DATE,_Fields.INSTANCE_ID}; 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); @@ -372,13 +375,13 @@ import org.slf4j.LoggerFactory; return getPrincipal(); case KEY_ID: - return Integer.valueOf(getKeyId()); + return getKeyId(); case ISSUE_DATE: - return Long.valueOf(getIssueDate()); + return getIssueDate(); case EXPIRATION_DATE: - return Long.valueOf(getExpirationDate()); + return getExpirationDate(); case INSTANCE_ID: return getInstanceId(); @@ -471,7 +474,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_keyId = true && (isSetKeyId()); + list.add(present_keyId); + if (present_keyId) + list.add(keyId); + + boolean present_issueDate = true && (isSetIssueDate()); + list.add(present_issueDate); + if (present_issueDate) + list.add(issueDate); + + boolean present_expirationDate = true && (isSetExpirationDate()); + list.add(present_expirationDate); + if (present_expirationDate) + list.add(expirationDate); + + boolean present_instanceId = true && (isSetInstanceId()); + list.add(present_instanceId); + if (present_instanceId) + list.add(instanceId); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java index 0bbd241..ba0567b 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.java +++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TCredentials.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 TCredentials implements org.apache.thrift.TBase<TCredentials, TCredentials._Fields>, java.io.Serializable, Cloneable, Comparable<TCredentials> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TCredentials implements org.apache.thrift.TBase<TCredentials, TCredentials._Fields>, java.io.Serializable, Cloneable, Comparable<TCredentials> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCredentials"); private static final org.apache.thrift.protocol.TField PRINCIPAL_FIELD_DESC = new org.apache.thrift.protocol.TField("principal", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -162,7 +165,7 @@ import org.slf4j.LoggerFactory; this(); this.principal = principal; this.tokenClassName = tokenClassName; - this.token = token; + this.token = org.apache.thrift.TBaseHelper.copyBinary(token); this.instanceId = instanceId; } @@ -178,7 +181,6 @@ import org.slf4j.LoggerFactory; } if (other.isSetToken()) { this.token = org.apache.thrift.TBaseHelper.copyBinary(other.token); -; } if (other.isSetInstanceId()) { this.instanceId = other.instanceId; @@ -251,16 +253,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForToken() { - return token; + return org.apache.thrift.TBaseHelper.copyBinary(token); } public TCredentials setToken(byte[] token) { - setToken(token == null ? (ByteBuffer)null : ByteBuffer.wrap(token)); + this.token = token == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(token, token.length)); return this; } public TCredentials setToken(ByteBuffer token) { - this.token = token; + this.token = org.apache.thrift.TBaseHelper.copyBinary(token); return this; } @@ -431,7 +433,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_principal = true && (isSetPrincipal()); + list.add(present_principal); + if (present_principal) + list.add(principal); + + boolean present_tokenClassName = true && (isSetTokenClassName()); + list.add(present_tokenClassName); + if (present_tokenClassName) + list.add(tokenClassName); + + boolean present_token = true && (isSetToken()); + list.add(present_token); + if (present_token) + list.add(token); + + boolean present_instanceId = true && (isSetInstanceId()); + list.add(present_instanceId); + if (present_instanceId) + list.add(instanceId); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java index 904d195..9efa4f5 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java +++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.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 TDelegationToken implements org.apache.thrift.TBase<TDelegationToken, TDelegationToken._Fields>, java.io.Serializable, Cloneable, Comparable<TDelegationToken> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TDelegationToken implements org.apache.thrift.TBase<TDelegationToken, TDelegationToken._Fields>, java.io.Serializable, Cloneable, Comparable<TDelegationToken> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelegationToken"); private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -144,7 +147,7 @@ import org.slf4j.LoggerFactory; TAuthenticationTokenIdentifier identifier) { this(); - this.password = password; + this.password = org.apache.thrift.TBaseHelper.copyBinary(password); this.identifier = identifier; } @@ -154,7 +157,6 @@ import org.slf4j.LoggerFactory; public TDelegationToken(TDelegationToken other) { if (other.isSetPassword()) { this.password = org.apache.thrift.TBaseHelper.copyBinary(other.password); -; } if (other.isSetIdentifier()) { this.identifier = new TAuthenticationTokenIdentifier(other.identifier); @@ -177,16 +179,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForPassword() { - return password; + return org.apache.thrift.TBaseHelper.copyBinary(password); } public TDelegationToken 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 TDelegationToken setPassword(ByteBuffer password) { - this.password = password; + this.password = org.apache.thrift.TBaseHelper.copyBinary(password); return this; } @@ -313,7 +315,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_password = true && (isSetPassword()); + list.add(present_password); + if (present_password) + list.add(password); + + boolean present_identifier = true && (isSetIdentifier()); + list.add(present_identifier); + if (present_identifier) + list.add(identifier); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java index cdde83e..3d4a254 100644 --- a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.java +++ b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationTokenConfig.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 TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegationTokenConfig, TDelegationTokenConfig._Fields>, java.io.Serializable, Cloneable, Comparable<TDelegationTokenConfig> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class TDelegationTokenConfig implements org.apache.thrift.TBase<TDelegationTokenConfig, TDelegationTokenConfig._Fields>, java.io.Serializable, Cloneable, Comparable<TDelegationTokenConfig> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelegationTokenConfig"); private static final org.apache.thrift.protocol.TField LIFETIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lifetime", org.apache.thrift.protocol.TType.I64, (short)1); @@ -122,7 +125,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __LIFETIME_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.LIFETIME}; + private static final _Fields optionals[] = {_Fields.LIFETIME}; 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); @@ -192,7 +195,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case LIFETIME: - return Long.valueOf(getLifetime()); + return getLifetime(); } throw new IllegalStateException(); @@ -238,7 +241,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_lifetime = true && (isSetLifetime()); + list.add(present_lifetime); + if (present_lifetime) + list.add(lifetime); + + return list.hashCode(); } @Override
