http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java index 58f2f02..865b3e5 100644 --- a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java +++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java @@ -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 UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, UpdateErrors._Fields>, java.io.Serializable, Cloneable, Comparable<UpdateErrors> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class UpdateErrors implements org.apache.thrift.TBase<UpdateErrors, UpdateErrors._Fields>, java.io.Serializable, Cloneable, Comparable<UpdateErrors> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UpdateErrors"); private static final org.apache.thrift.protocol.TField FAILED_EXTENTS_FIELD_DESC = new org.apache.thrift.protocol.TField("failedExtents", org.apache.thrift.protocol.TType.MAP, (short)1); @@ -431,7 +434,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_failedExtents = true && (isSetFailedExtents()); + list.add(present_failedExtents); + if (present_failedExtents) + list.add(failedExtents); + + boolean present_violationSummaries = true && (isSetViolationSummaries()); + list.add(present_violationSummaries); + if (present_violationSummaries) + list.add(violationSummaries); + + boolean present_authorizationFailures = true && (isSetAuthorizationFailures()); + list.add(present_authorizationFailures); + if (present_authorizationFailures) + list.add(authorizationFailures); + + return list.hashCode(); } @Override @@ -563,14 +583,14 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map58 = iprot.readMapBegin(); struct.failedExtents = new HashMap<TKeyExtent,Long>(2*_map58.size); - for (int _i59 = 0; _i59 < _map58.size; ++_i59) + TKeyExtent _key59; + long _val60; + for (int _i61 = 0; _i61 < _map58.size; ++_i61) { - TKeyExtent _key60; - long _val61; - _key60 = new TKeyExtent(); - _key60.read(iprot); - _val61 = iprot.readI64(); - struct.failedExtents.put(_key60, _val61); + _key59 = new TKeyExtent(); + _key59.read(iprot); + _val60 = iprot.readI64(); + struct.failedExtents.put(_key59, _val60); } iprot.readMapEnd(); } @@ -584,12 +604,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list62 = iprot.readListBegin(); struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list62.size); - for (int _i63 = 0; _i63 < _list62.size; ++_i63) + TConstraintViolationSummary _elem63; + for (int _i64 = 0; _i64 < _list62.size; ++_i64) { - TConstraintViolationSummary _elem64; - _elem64 = new TConstraintViolationSummary(); - _elem64.read(iprot); - struct.violationSummaries.add(_elem64); + _elem63 = new TConstraintViolationSummary(); + _elem63.read(iprot); + struct.violationSummaries.add(_elem63); } iprot.readListEnd(); } @@ -603,14 +623,14 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin(); struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map65.size); - for (int _i66 = 0; _i66 < _map65.size; ++_i66) + TKeyExtent _key66; + org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val67; + for (int _i68 = 0; _i68 < _map65.size; ++_i68) { - TKeyExtent _key67; - org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val68; - _key67 = new TKeyExtent(); - _key67.read(iprot); - _val68 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32()); - struct.authorizationFailures.put(_key67, _val68); + _key66 = new TKeyExtent(); + _key66.read(iprot); + _val67 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32()); + struct.authorizationFailures.put(_key66, _val67); } iprot.readMapEnd(); } @@ -739,14 +759,14 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map75 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I64, iprot.readI32()); struct.failedExtents = new HashMap<TKeyExtent,Long>(2*_map75.size); - for (int _i76 = 0; _i76 < _map75.size; ++_i76) + TKeyExtent _key76; + long _val77; + for (int _i78 = 0; _i78 < _map75.size; ++_i78) { - TKeyExtent _key77; - long _val78; - _key77 = new TKeyExtent(); - _key77.read(iprot); - _val78 = iprot.readI64(); - struct.failedExtents.put(_key77, _val78); + _key76 = new TKeyExtent(); + _key76.read(iprot); + _val77 = iprot.readI64(); + struct.failedExtents.put(_key76, _val77); } } struct.setFailedExtentsIsSet(true); @@ -755,12 +775,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list79 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.violationSummaries = new ArrayList<TConstraintViolationSummary>(_list79.size); - for (int _i80 = 0; _i80 < _list79.size; ++_i80) + TConstraintViolationSummary _elem80; + for (int _i81 = 0; _i81 < _list79.size; ++_i81) { - TConstraintViolationSummary _elem81; - _elem81 = new TConstraintViolationSummary(); - _elem81.read(iprot); - struct.violationSummaries.add(_elem81); + _elem80 = new TConstraintViolationSummary(); + _elem80.read(iprot); + struct.violationSummaries.add(_elem80); } } struct.setViolationSummariesIsSet(true); @@ -769,14 +789,14 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map82 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRUCT, org.apache.thrift.protocol.TType.I32, iprot.readI32()); struct.authorizationFailures = new HashMap<TKeyExtent,org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode>(2*_map82.size); - for (int _i83 = 0; _i83 < _map82.size; ++_i83) + TKeyExtent _key83; + org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val84; + for (int _i85 = 0; _i85 < _map82.size; ++_i85) { - TKeyExtent _key84; - org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode _val85; - _key84 = new TKeyExtent(); - _key84.read(iprot); - _val85 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32()); - struct.authorizationFailures.put(_key84, _val85); + _key83 = new TKeyExtent(); + _key83.read(iprot); + _val84 = org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.findByValue(iprot.readI32()); + struct.authorizationFailures.put(_key83, _val84); } } struct.setAuthorizationFailuresIsSet(true);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java index a5c47ff..6f2329c 100644 --- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java +++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.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 GCMonitorService { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class GCMonitorService { 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_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 @@ -997,7 +1012,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 http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java index 9d6ade6..45211e7 100644 --- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java +++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.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 GCStatus implements org.apache.thrift.TBase<GCStatus, GCStatus._Fields>, java.io.Serializable, Cloneable, Comparable<GCStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class GCStatus implements org.apache.thrift.TBase<GCStatus, GCStatus._Fields>, java.io.Serializable, Cloneable, Comparable<GCStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GCStatus"); private static final org.apache.thrift.protocol.TField LAST_FIELD_DESC = new org.apache.thrift.protocol.TField("last", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -420,7 +423,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_last = true && (isSetLast()); + list.add(present_last); + if (present_last) + list.add(last); + + boolean present_lastLog = true && (isSetLastLog()); + list.add(present_lastLog); + if (present_lastLog) + list.add(lastLog); + + boolean present_current = true && (isSetCurrent()); + list.add(present_current); + if (present_current) + list.add(current); + + boolean present_currentLog = true && (isSetCurrentLog()); + list.add(present_currentLog); + if (present_currentLog) + list.add(currentLog); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java index 83dc826..b74f4ce 100644 --- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java +++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.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 GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCycleStats._Fields>, java.io.Serializable, Cloneable, Comparable<GcCycleStats> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class GcCycleStats implements org.apache.thrift.TBase<GcCycleStats, GcCycleStats._Fields>, java.io.Serializable, Cloneable, Comparable<GcCycleStats> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GcCycleStats"); private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = new org.apache.thrift.protocol.TField("started", org.apache.thrift.protocol.TType.I64, (short)1); @@ -424,22 +427,22 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case STARTED: - return Long.valueOf(getStarted()); + return getStarted(); case FINISHED: - return Long.valueOf(getFinished()); + return getFinished(); case CANDIDATES: - return Long.valueOf(getCandidates()); + return getCandidates(); case IN_USE: - return Long.valueOf(getInUse()); + return getInUse(); case DELETED: - return Long.valueOf(getDeleted()); + return getDeleted(); case ERRORS: - return Long.valueOf(getErrors()); + return getErrors(); } throw new IllegalStateException(); @@ -540,7 +543,39 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_started = true; + list.add(present_started); + if (present_started) + list.add(started); + + boolean present_finished = true; + list.add(present_finished); + if (present_finished) + list.add(finished); + + boolean present_candidates = true; + list.add(present_candidates); + if (present_candidates) + list.add(candidates); + + boolean present_inUse = true; + list.add(present_inUse); + if (present_inUse) + list.add(inUse); + + boolean present_deleted = true; + list.add(present_deleted); + if (present_deleted) + list.add(deleted); + + boolean present_errors = true; + list.add(present_errors); + if (present_errors) + list.add(errors); + + 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/BulkImportState.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportState.java index 861d3b9..a4f2efe 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportState.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportState.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/BulkImportStatus.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java index 36b3d8e..6c58618 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/BulkImportStatus.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 BulkImportStatus implements org.apache.thrift.TBase<BulkImportStatus, BulkImportStatus._Fields>, java.io.Serializable, Cloneable, Comparable<BulkImportStatus> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class BulkImportStatus implements org.apache.thrift.TBase<BulkImportStatus, BulkImportStatus._Fields>, java.io.Serializable, Cloneable, Comparable<BulkImportStatus> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BulkImportStatus"); private static final org.apache.thrift.protocol.TField START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("startTime", org.apache.thrift.protocol.TType.I64, (short)1); @@ -305,7 +308,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case START_TIME: - return Long.valueOf(getStartTime()); + return getStartTime(); case FILENAME: return getFilename(); @@ -379,7 +382,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_startTime = true; + list.add(present_startTime); + if (present_startTime) + list.add(startTime); + + boolean present_filename = true && (isSetFilename()); + list.add(present_filename); + if (present_filename) + list.add(filename); + + boolean present_state = true && (isSetState()); + list.add(present_state); + if (present_state) + list.add(state.getValue()); + + return list.hashCode(); } @Override @@ -522,7 +542,7 @@ import org.slf4j.LoggerFactory; break; case 3: // STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.state = BulkImportState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.master.thrift.BulkImportState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -608,7 +628,7 @@ import org.slf4j.LoggerFactory; struct.setFilenameIsSet(true); } if (incoming.get(2)) { - struct.state = BulkImportState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.master.thrift.BulkImportState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java index 5b1b9cc..707b9e8 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/Compacting.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 Compacting implements org.apache.thrift.TBase<Compacting, Compacting._Fields>, java.io.Serializable, Cloneable, Comparable<Compacting> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class Compacting implements org.apache.thrift.TBase<Compacting, Compacting._Fields>, java.io.Serializable, Cloneable, Comparable<Compacting> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Compacting"); private static final org.apache.thrift.protocol.TField RUNNING_FIELD_DESC = new org.apache.thrift.protocol.TField("running", org.apache.thrift.protocol.TType.I32, (short)1); @@ -244,10 +247,10 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case RUNNING: - return Integer.valueOf(getRunning()); + return getRunning(); case QUEUED: - return Integer.valueOf(getQueued()); + return getQueued(); } throw new IllegalStateException(); @@ -304,7 +307,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_running = true; + list.add(present_running); + if (present_running) + list.add(running); + + boolean present_queued = true; + list.add(present_queued); + if (present_queued) + list.add(queued); + + 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/DeadServer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java index 1cbe5f7..1881085 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/DeadServer.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 DeadServer implements org.apache.thrift.TBase<DeadServer, DeadServer._Fields>, java.io.Serializable, Cloneable, Comparable<DeadServer> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class DeadServer implements org.apache.thrift.TBase<DeadServer, DeadServer._Fields>, java.io.Serializable, Cloneable, Comparable<DeadServer> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DeadServer"); private static final org.apache.thrift.protocol.TField SERVER_FIELD_DESC = new org.apache.thrift.protocol.TField("server", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -292,7 +295,7 @@ import org.slf4j.LoggerFactory; return getServer(); case LAST_STATUS: - return Long.valueOf(getLastStatus()); + return getLastStatus(); case STATUS: return getStatus(); @@ -363,7 +366,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_server = true && (isSetServer()); + list.add(present_server); + if (present_server) + list.add(server); + + boolean present_lastStatus = true; + list.add(present_lastStatus); + if (present_lastStatus) + list.add(lastStatus); + + boolean present_status = true && (isSetStatus()); + list.add(present_status); + if (present_status) + list.add(status); + + 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/FateOperation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java index c726469..866d6f6 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateOperation.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/FateService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java index 352d891..615e89a 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.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 FateService { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class FateService { public interface Iface { @@ -1022,7 +1025,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 @@ -1428,7 +1443,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Long.valueOf(getSuccess()); + return getSuccess(); case SEC: return getSec(); @@ -1488,7 +1503,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 @@ -2162,7 +2189,7 @@ import org.slf4j.LoggerFactory; return getCredentials(); case OPID: - return Long.valueOf(getOpid()); + return getOpid(); case OP: return getOp(); @@ -2174,7 +2201,7 @@ import org.slf4j.LoggerFactory; return getOptions(); case AUTO_CLEAN: - return Boolean.valueOf(isAutoClean()); + return isAutoClean(); } throw new IllegalStateException(); @@ -2286,7 +2313,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_opid = true; + list.add(present_opid); + if (present_opid) + list.add(opid); + + boolean present_op = true && (isSetOp()); + list.add(present_op); + if (present_op) + list.add(op.getValue()); + + boolean present_arguments = true && (isSetArguments()); + list.add(present_arguments); + if (present_arguments) + list.add(arguments); + + boolean present_options = true && (isSetOptions()); + list.add(present_options); + if (present_options) + list.add(options); + + boolean present_autoClean = true; + list.add(present_autoClean); + if (present_autoClean) + list.add(autoClean); + + return list.hashCode(); } @Override @@ -2419,7 +2483,7 @@ import org.slf4j.LoggerFactory; if (this.arguments == null) { sb.append("null"); } else { - sb.append(this.arguments); + org.apache.thrift.TBaseHelper.toString(this.arguments, sb); } first = false; if (!first) sb.append(", "); @@ -2513,7 +2577,7 @@ import org.slf4j.LoggerFactory; break; case 3: // OP if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.op = FateOperation.findByValue(iprot.readI32()); + struct.op = org.apache.accumulo.core.master.thrift.FateOperation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -2524,11 +2588,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list86 = iprot.readListBegin(); struct.arguments = new ArrayList<ByteBuffer>(_list86.size); - for (int _i87 = 0; _i87 < _list86.size; ++_i87) + ByteBuffer _elem87; + for (int _i88 = 0; _i88 < _list86.size; ++_i88) { - ByteBuffer _elem88; - _elem88 = iprot.readBinary(); - struct.arguments.add(_elem88); + _elem87 = iprot.readBinary(); + struct.arguments.add(_elem87); } iprot.readListEnd(); } @@ -2542,13 +2606,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map89 = iprot.readMapBegin(); struct.options = new HashMap<String,String>(2*_map89.size); - for (int _i90 = 0; _i90 < _map89.size; ++_i90) + String _key90; + String _val91; + for (int _i92 = 0; _i92 < _map89.size; ++_i92) { - String _key91; - String _val92; - _key91 = iprot.readString(); - _val92 = iprot.readString(); - struct.options.put(_key91, _val92); + _key90 = iprot.readString(); + _val91 = iprot.readString(); + struct.options.put(_key90, _val91); } iprot.readMapEnd(); } @@ -2721,18 +2785,18 @@ import org.slf4j.LoggerFactory; struct.setOpidIsSet(true); } if (incoming.get(3)) { - struct.op = FateOperation.findByValue(iprot.readI32()); + struct.op = org.apache.accumulo.core.master.thrift.FateOperation.findByValue(iprot.readI32()); struct.setOpIsSet(true); } if (incoming.get(4)) { { org.apache.thrift.protocol.TList _list97 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.arguments = new ArrayList<ByteBuffer>(_list97.size); - for (int _i98 = 0; _i98 < _list97.size; ++_i98) + ByteBuffer _elem98; + for (int _i99 = 0; _i99 < _list97.size; ++_i99) { - ByteBuffer _elem99; - _elem99 = iprot.readBinary(); - struct.arguments.add(_elem99); + _elem98 = iprot.readBinary(); + struct.arguments.add(_elem98); } } struct.setArgumentsIsSet(true); @@ -2741,13 +2805,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map100 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.options = new HashMap<String,String>(2*_map100.size); - for (int _i101 = 0; _i101 < _map100.size; ++_i101) + String _key101; + String _val102; + for (int _i103 = 0; _i103 < _map100.size; ++_i103) { - String _key102; - String _val103; - _key102 = iprot.readString(); - _val103 = iprot.readString(); - struct.options.put(_key102, _val103); + _key101 = iprot.readString(); + _val102 = iprot.readString(); + struct.options.put(_key101, _val102); } } struct.setOptionsIsSet(true); @@ -3015,7 +3079,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 @@ -3466,7 +3542,7 @@ import org.slf4j.LoggerFactory; return getCredentials(); case OPID: - return Long.valueOf(getOpid()); + return getOpid(); } throw new IllegalStateException(); @@ -3534,7 +3610,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_opid = true; + list.add(present_opid); + if (present_opid) + list.add(opid); + + return list.hashCode(); } @Override @@ -4094,7 +4187,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 @@ -4586,7 +4696,7 @@ import org.slf4j.LoggerFactory; return getCredentials(); case OPID: - return Long.valueOf(getOpid()); + return getOpid(); } throw new IllegalStateException(); @@ -4654,7 +4764,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_opid = true; + list.add(present_opid); + if (present_opid) + list.add(opid); + + return list.hashCode(); } @Override @@ -5096,7 +5223,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 http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java index 0885d4c..59d3432 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.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 MasterClientService { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class MasterClientService { public interface Iface extends FateService.Iface { @@ -517,7 +520,7 @@ import org.slf4j.LoggerFactory; args.setCredentials(credentials); args.setServerName(serverName); args.setSplit(split); - sendBase("reportSplitExtent", args); + sendBaseOneway("reportSplitExtent", args); } public void reportTabletStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, String serverName, TabletLoadState status, org.apache.accumulo.core.data.thrift.TKeyExtent tablet) throws org.apache.thrift.TException @@ -533,7 +536,7 @@ import org.slf4j.LoggerFactory; args.setServerName(serverName); args.setStatus(status); args.setTablet(tablet); - sendBase("reportTabletStatus", args); + sendBaseOneway("reportTabletStatus", args); } public List<String> getActiveTservers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, org.apache.thrift.TException @@ -1177,7 +1180,7 @@ import org.slf4j.LoggerFactory; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("reportSplitExtent", org.apache.thrift.protocol.TMessageType.CALL, 0)); + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("reportSplitExtent", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); reportSplitExtent_args args = new reportSplitExtent_args(); args.setTinfo(tinfo); args.setCredentials(credentials); @@ -1219,7 +1222,7 @@ import org.slf4j.LoggerFactory; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { - prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("reportTabletStatus", org.apache.thrift.protocol.TMessageType.CALL, 0)); + prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("reportTabletStatus", org.apache.thrift.protocol.TMessageType.ONEWAY, 0)); reportTabletStatus_args args = new reportTabletStatus_args(); args.setTinfo(tinfo); args.setCredentials(credentials); @@ -3141,7 +3144,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 @@ -3633,7 +3653,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Long.valueOf(getSuccess()); + return getSuccess(); case SEC: return getSec(); @@ -3707,7 +3727,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 @@ -4092,8 +4129,8 @@ import org.slf4j.LoggerFactory; this.tinfo = tinfo; this.credentials = credentials; this.tableName = tableName; - this.startRow = startRow; - this.endRow = endRow; + this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow); + this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow); this.flushID = flushID; setFlushIDIsSet(true); this.maxLoops = maxLoops; @@ -4116,11 +4153,9 @@ import org.slf4j.LoggerFactory; } if (other.isSetStartRow()) { this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow); -; } if (other.isSetEndRow()) { this.endRow = org.apache.thrift.TBaseHelper.copyBinary(other.endRow); -; } this.flushID = other.flushID; this.maxLoops = other.maxLoops; @@ -4221,16 +4256,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForStartRow() { - return startRow; + return org.apache.thrift.TBaseHelper.copyBinary(startRow); } public waitForFlush_args setStartRow(byte[] startRow) { - setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow)); + this.startRow = startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(startRow, startRow.length)); return this; } public waitForFlush_args setStartRow(ByteBuffer startRow) { - this.startRow = startRow; + this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow); return this; } @@ -4255,16 +4290,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForEndRow() { - return endRow; + return org.apache.thrift.TBaseHelper.copyBinary(endRow); } public waitForFlush_args setEndRow(byte[] endRow) { - setEndRow(endRow == null ? (ByteBuffer)null : ByteBuffer.wrap(endRow)); + this.endRow = endRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(endRow, endRow.length)); return this; } public waitForFlush_args setEndRow(ByteBuffer endRow) { - this.endRow = endRow; + this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow); return this; } @@ -4408,10 +4443,10 @@ import org.slf4j.LoggerFactory; return getEndRow(); case FLUSH_ID: - return Long.valueOf(getFlushID()); + return getFlushID(); case MAX_LOOPS: - return Long.valueOf(getMaxLoops()); + return getMaxLoops(); } throw new IllegalStateException(); @@ -4523,7 +4558,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_tableName = true && (isSetTableName()); + list.add(present_tableName); + if (present_tableName) + list.add(tableName); + + boolean present_startRow = true && (isSetStartRow()); + list.add(present_startRow); + if (present_startRow) + list.add(startRow); + + boolean present_endRow = true && (isSetEndRow()); + list.add(present_endRow); + if (present_endRow) + list.add(endRow); + + boolean present_flushID = true; + list.add(present_flushID); + if (present_flushID) + list.add(flushID); + + boolean present_maxLoops = true; + list.add(present_maxLoops); + if (present_maxLoops) + list.add(maxLoops); + + return list.hashCode(); } @Override @@ -5182,7 +5254,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 @@ -5817,7 +5901,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_tableName = true && (isSetTableName()); + list.add(present_tableName); + if (present_tableName) + list.add(tableName); + + boolean present_property = true && (isSetProperty()); + list.add(present_property); + if (present_property) + list.add(property); + + boolean present_value = true && (isSetValue()); + list.add(present_value); + if (present_value) + list.add(value); + + return list.hashCode(); } @Override @@ -6404,7 +6515,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 @@ -6980,7 +7103,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_tableName = true && (isSetTableName()); + list.add(present_tableName); + if (present_tableName) + list.add(tableName); + + boolean present_property = true && (isSetProperty()); + list.add(present_property); + if (present_property) + list.add(property); + + return list.hashCode(); } @Override @@ -7526,7 +7671,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 @@ -8161,7 +8318,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_ns = true && (isSetNs()); + list.add(present_ns); + if (present_ns) + list.add(ns); + + boolean present_property = true && (isSetProperty()); + list.add(present_property); + if (present_property) + list.add(property); + + boolean present_value = true && (isSetValue()); + list.add(present_value); + if (present_value) + list.add(value); + + return list.hashCode(); } @Override @@ -8748,7 +8932,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 @@ -9324,7 +9520,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_ns = true && (isSetNs()); + list.add(present_ns); + if (present_ns) + list.add(ns); + + boolean present_property = true && (isSetProperty()); + list.add(present_property); + if (present_property) + list.add(property); + + return list.hashCode(); } @Override @@ -9870,7 +10088,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 @@ -10403,7 +10633,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_state = true && (isSetState()); + list.add(present_state); + if (present_state) + list.add(state.getValue()); + + return list.hashCode(); } @Override @@ -10556,7 +10803,7 @@ import org.slf4j.LoggerFactory; break; case 2: // STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.state = MasterGoalState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.master.thrift.MasterGoalState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -10646,7 +10893,7 @@ import org.slf4j.LoggerFactory; struct.setCredentialsIsSet(true); } if (incoming.get(2)) { - struct.state = MasterGoalState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.core.master.thrift.MasterGoalState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } } @@ -10849,7 +11096,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 @@ -11257,7 +11511,7 @@ import org.slf4j.LoggerFactory; return getCredentials(); case STOP_TABLET_SERVERS: - return Boolean.valueOf(isStopTabletServers()); + return isStopTabletServers(); } throw new IllegalStateException(); @@ -11325,7 +11579,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_stopTabletServers = true; + list.add(present_stopTabletServers); + if (present_stopTabletServers) + list.add(stopTabletServers); + + return list.hashCode(); } @Override @@ -11767,7 +12038,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 @@ -12223,7 +12501,7 @@ import org.slf4j.LoggerFactory; return getTabletServer(); case FORCE: - return Boolean.valueOf(isForce()); + return isForce(); } throw new IllegalStateException(); @@ -12302,7 +12580,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_tabletServer = true && (isSetTabletServer()); + list.add(present_tabletServer); + if (present_tabletServer) + list.add(tabletServer); + + boolean present_force = true; + list.add(present_force); + if (present_force) + list.add(force); + + return list.hashCode(); } @Override @@ -12785,7 +13085,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 @@ -13318,7 +13625,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_property = true && (isSetProperty()); + list.add(present_property); + if (present_property) + list.add(property); + + boolean present_value = true && (isSetValue()); + list.add(present_value); + if (present_value) + list.add(value); + + return list.hashCode(); } @Override @@ -13805,7 +14134,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 @@ -14279,7 +14615,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_property = true && (isSetProperty()); + list.add(present_property); + if (present_property) + list.add(property); + + return list.hashCode(); } @Override @@ -14725,7 +15078,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 @@ -15140,7 +15500,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 @@ -15604,7 +15976,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 @@ -16006,7 +16390,14 @@ 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); + + return list.hashCode(); } @Override @@ -16300,7 +16691,9 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + return list.hashCode(); } @Override @@ -16788,7 +17181,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_serverName = true && (isSetServerName()); + list.add(present_serverName); + if (present_serverName) + list.add(serverName); + + boolean present_split = true && (isSetSplit()); + list.add(present_split); + if (present_split) + list.add(split); + + return list.hashCode(); } @Override @@ -17532,7 +17947,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_serverName = true && (isSetServerName()); + list.add(present_serverName); + if (present_serverName) + list.add(serverName); + + boolean present_status = true && (isSetStatus()); + list.add(present_status); + if (present_status) + list.add(status.getValue()); + + boolean present_tablet = true && (isSetTablet()); + list.add(present_tablet); + if (present_tablet) + list.add(tablet); + + return list.hashCode(); } @Override @@ -17732,7 +18174,7 @@ import org.slf4j.LoggerFactory; break; case 3: // STATUS if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.status = TabletLoadState.findByValue(iprot.readI32()); + struct.status = org.apache.accumulo.core.master.thrift.TabletLoadState.findByValue(iprot.readI32()); struct.setStatusIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -17857,7 +18299,7 @@ import org.slf4j.LoggerFactory; struct.setServerNameIsSet(true); } if (incoming.get(3)) { - struct.status = TabletLoadState.findByValue(iprot.readI32()); + struct.status = org.apache.accumulo.core.master.thrift.TabletLoadState.findByValue(iprot.readI32()); struct.setStatusIsSet(true); } if (incoming.get(4)) { @@ -18124,7 +18566,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 @@ -18605,7 +19059,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 @@ -18719,11 +19185,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list104 = iprot.readListBegin(); struct.success = new ArrayList<String>(_list104.size); - for (int _i105 = 0; _i105 < _list104.size; ++_i105) + String _elem105; + for (int _i106 = 0; _i106 < _list104.size; ++_i106) { - String _elem106; - _elem106 = iprot.readString(); - struct.success.add(_elem106); + _elem105 = iprot.readString(); + struct.success.add(_elem105); } iprot.readListEnd(); } @@ -18820,11 +19286,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list109 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.success = new ArrayList<String>(_list109.size); - for (int _i110 = 0; _i110 < _list109.size; ++_i110) + String _elem110; + for (int _i111 = 0; _i111 < _list109.size; ++_i111) { - String _elem111; - _elem111 = iprot.readString(); - struct.success.add(_elem111); + _elem110 = iprot.readString(); + struct.success.add(_elem110); } } struct.setSuccessIsSet(true); @@ -19152,7 +19618,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_cfg = true && (isSetCfg()); + list.add(present_cfg); + if (present_cfg) + list.add(cfg); + + return list.hashCode(); } @Override @@ -19662,7 +20145,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 @@ -20258,7 +20753,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tfino = true && (isSetTfino()); + list.add(present_tfino); + if (present_tfino) + list.add(tfino); + + 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); + + boolean present_logsToWatch = true && (isSetLogsToWatch()); + list.add(present_logsToWatch); + if (present_logsToWatch) + list.add(logsToWatch); + + return list.hashCode(); } @Override @@ -20440,11 +20957,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set112 = iprot.readSetBegin(); struct.logsToWatch = new HashSet<String>(2*_set112.size); - for (int _i113 = 0; _i113 < _set112.size; ++_i113) + String _elem113; + for (int _i114 = 0; _i114 < _set112.size; ++_i114) { - String _elem114; - _elem114 = iprot.readString(); - struct.logsToWatch.add(_elem114); + _elem113 = iprot.readString(); + struct.logsToWatch.add(_elem113); } iprot.readSetEnd(); } @@ -20568,11 +21085,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set117 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.logsToWatch = new HashSet<String>(2*_set117.size); - for (int _i118 = 0; _i118 < _set117.size; ++_i118) + String _elem118; + for (int _i119 = 0; _i119 < _set117.size; ++_i119) { - String _elem119; - _elem119 = iprot.readString(); - struct.logsToWatch.add(_elem119); + _elem118 = iprot.readString(); + struct.logsToWatch.add(_elem118); } } struct.setLogsToWatchIsSet(true); @@ -20733,7 +21250,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case SUCCESS: - return Boolean.valueOf(isSuccess()); + return isSuccess(); } throw new IllegalStateException(); @@ -20779,7 +21296,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 http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java index f436454..2891727 100644 --- a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java +++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.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
