http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 5c385d7..d122cf4 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,42 +15,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.accumulo.core.master.thrift; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") 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"); @@ -67,11 +40,8 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ private static final org.apache.thrift.protocol.TField SCANS_FIELD_DESC = new org.apache.thrift.protocol.TField("scans", org.apache.thrift.protocol.TType.STRUCT, (short)11); private static final org.apache.thrift.protocol.TField SCAN_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("scanRate", org.apache.thrift.protocol.TType.DOUBLE, (short)12); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new TableInfoStandardSchemeFactory()); - schemes.put(TupleScheme.class, new TableInfoTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TableInfoStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TableInfoTupleSchemeFactory(); public long recs; // required public long recsInMemory; // required @@ -101,10 +71,10 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ SCANS((short)11, "scans"), SCAN_RATE((short)12, "scanRate"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -149,21 +119,21 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } /** * Find the _Fields constant that matches name, or null if its not found. */ - public static _Fields findByName(String name) { + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -172,7 +142,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -188,9 +158,9 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ private static final int __QUERYBYTERATE_ISSET_ID = 7; private static final int __SCANRATE_ISSET_ID = 8; private short __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.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); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.RECS, new org.apache.thrift.meta_data.FieldMetaData("recs", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.RECS_IN_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("recsInMemory", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -215,7 +185,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Compacting.class))); tmpMap.put(_Fields.SCAN_RATE, new org.apache.thrift.meta_data.FieldMetaData("scanRate", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TableInfo.class, metaDataMap); } @@ -325,16 +295,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetRecs() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __RECS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RECS_ISSET_ID); } /** Returns true if field recs is set (has been assigned a value) and false otherwise */ public boolean isSetRecs() { - return EncodingUtils.testBit(__isset_bitfield, __RECS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RECS_ISSET_ID); } public void setRecsIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RECS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RECS_ISSET_ID, value); } public long getRecsInMemory() { @@ -348,16 +318,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetRecsInMemory() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __RECSINMEMORY_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RECSINMEMORY_ISSET_ID); } /** Returns true if field recsInMemory is set (has been assigned a value) and false otherwise */ public boolean isSetRecsInMemory() { - return EncodingUtils.testBit(__isset_bitfield, __RECSINMEMORY_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RECSINMEMORY_ISSET_ID); } public void setRecsInMemoryIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RECSINMEMORY_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RECSINMEMORY_ISSET_ID, value); } public int getTablets() { @@ -371,16 +341,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetTablets() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TABLETS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TABLETS_ISSET_ID); } /** Returns true if field tablets is set (has been assigned a value) and false otherwise */ public boolean isSetTablets() { - return EncodingUtils.testBit(__isset_bitfield, __TABLETS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TABLETS_ISSET_ID); } public void setTabletsIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TABLETS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TABLETS_ISSET_ID, value); } public int getOnlineTablets() { @@ -394,16 +364,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetOnlineTablets() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ONLINETABLETS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ONLINETABLETS_ISSET_ID); } /** Returns true if field onlineTablets is set (has been assigned a value) and false otherwise */ public boolean isSetOnlineTablets() { - return EncodingUtils.testBit(__isset_bitfield, __ONLINETABLETS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ONLINETABLETS_ISSET_ID); } public void setOnlineTabletsIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ONLINETABLETS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ONLINETABLETS_ISSET_ID, value); } public double getIngestRate() { @@ -417,16 +387,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetIngestRate() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INGESTRATE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INGESTRATE_ISSET_ID); } /** Returns true if field ingestRate is set (has been assigned a value) and false otherwise */ public boolean isSetIngestRate() { - return EncodingUtils.testBit(__isset_bitfield, __INGESTRATE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INGESTRATE_ISSET_ID); } public void setIngestRateIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INGESTRATE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INGESTRATE_ISSET_ID, value); } public double getIngestByteRate() { @@ -440,16 +410,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetIngestByteRate() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INGESTBYTERATE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INGESTBYTERATE_ISSET_ID); } /** Returns true if field ingestByteRate is set (has been assigned a value) and false otherwise */ public boolean isSetIngestByteRate() { - return EncodingUtils.testBit(__isset_bitfield, __INGESTBYTERATE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INGESTBYTERATE_ISSET_ID); } public void setIngestByteRateIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INGESTBYTERATE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INGESTBYTERATE_ISSET_ID, value); } public double getQueryRate() { @@ -463,16 +433,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetQueryRate() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __QUERYRATE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __QUERYRATE_ISSET_ID); } /** Returns true if field queryRate is set (has been assigned a value) and false otherwise */ public boolean isSetQueryRate() { - return EncodingUtils.testBit(__isset_bitfield, __QUERYRATE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __QUERYRATE_ISSET_ID); } public void setQueryRateIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUERYRATE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __QUERYRATE_ISSET_ID, value); } public double getQueryByteRate() { @@ -486,16 +456,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetQueryByteRate() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __QUERYBYTERATE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __QUERYBYTERATE_ISSET_ID); } /** Returns true if field queryByteRate is set (has been assigned a value) and false otherwise */ public boolean isSetQueryByteRate() { - return EncodingUtils.testBit(__isset_bitfield, __QUERYBYTERATE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __QUERYBYTERATE_ISSET_ID); } public void setQueryByteRateIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUERYBYTERATE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __QUERYBYTERATE_ISSET_ID, value); } public Compacting getMinors() { @@ -581,25 +551,25 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void unsetScanRate() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCANRATE_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SCANRATE_ISSET_ID); } /** Returns true if field scanRate is set (has been assigned a value) and false otherwise */ public boolean isSetScanRate() { - return EncodingUtils.testBit(__isset_bitfield, __SCANRATE_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SCANRATE_ISSET_ID); } public void setScanRateIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCANRATE_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SCANRATE_ISSET_ID, value); } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case RECS: if (value == null) { unsetRecs(); } else { - setRecs((Long)value); + setRecs((java.lang.Long)value); } break; @@ -607,7 +577,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ if (value == null) { unsetRecsInMemory(); } else { - setRecsInMemory((Long)value); + setRecsInMemory((java.lang.Long)value); } break; @@ -615,7 +585,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ if (value == null) { unsetTablets(); } else { - setTablets((Integer)value); + setTablets((java.lang.Integer)value); } break; @@ -623,7 +593,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ if (value == null) { unsetOnlineTablets(); } else { - setOnlineTablets((Integer)value); + setOnlineTablets((java.lang.Integer)value); } break; @@ -631,7 +601,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ if (value == null) { unsetIngestRate(); } else { - setIngestRate((Double)value); + setIngestRate((java.lang.Double)value); } break; @@ -639,7 +609,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ if (value == null) { unsetIngestByteRate(); } else { - setIngestByteRate((Double)value); + setIngestByteRate((java.lang.Double)value); } break; @@ -647,7 +617,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ if (value == null) { unsetQueryRate(); } else { - setQueryRate((Double)value); + setQueryRate((java.lang.Double)value); } break; @@ -655,7 +625,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ if (value == null) { unsetQueryByteRate(); } else { - setQueryByteRate((Double)value); + setQueryByteRate((java.lang.Double)value); } break; @@ -687,14 +657,14 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ if (value == null) { unsetScanRate(); } else { - setScanRate((Double)value); + setScanRate((java.lang.Double)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case RECS: return getRecs(); @@ -733,13 +703,13 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return getScanRate(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -768,11 +738,11 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ case SCAN_RATE: return isSetScanRate(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { + public boolean equals(java.lang.Object that) { if (that == null) return false; if (that instanceof TableInfo) @@ -783,6 +753,8 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ public boolean equals(TableInfo that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_recs = true; boolean that_present_recs = true; @@ -897,69 +869,39 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ @Override public int hashCode() { - 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(); + int hashCode = 1; + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(recs); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(recsInMemory); + + hashCode = hashCode * 8191 + tablets; + + hashCode = hashCode * 8191 + onlineTablets; + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(ingestRate); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(ingestByteRate); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(queryRate); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(queryByteRate); + + hashCode = hashCode * 8191 + ((isSetMinors()) ? 131071 : 524287); + if (isSetMinors()) + hashCode = hashCode * 8191 + minors.hashCode(); + + hashCode = hashCode * 8191 + ((isSetMajors()) ? 131071 : 524287); + if (isSetMajors()) + hashCode = hashCode * 8191 + majors.hashCode(); + + hashCode = hashCode * 8191 + ((isSetScans()) ? 131071 : 524287); + if (isSetScans()) + hashCode = hashCode * 8191 + scans.hashCode(); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(scanRate); + + return hashCode; } @Override @@ -970,7 +912,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetRecs()).compareTo(other.isSetRecs()); + lastComparison = java.lang.Boolean.valueOf(isSetRecs()).compareTo(other.isSetRecs()); if (lastComparison != 0) { return lastComparison; } @@ -980,7 +922,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRecsInMemory()).compareTo(other.isSetRecsInMemory()); + lastComparison = java.lang.Boolean.valueOf(isSetRecsInMemory()).compareTo(other.isSetRecsInMemory()); if (lastComparison != 0) { return lastComparison; } @@ -990,7 +932,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTablets()).compareTo(other.isSetTablets()); + lastComparison = java.lang.Boolean.valueOf(isSetTablets()).compareTo(other.isSetTablets()); if (lastComparison != 0) { return lastComparison; } @@ -1000,7 +942,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOnlineTablets()).compareTo(other.isSetOnlineTablets()); + lastComparison = java.lang.Boolean.valueOf(isSetOnlineTablets()).compareTo(other.isSetOnlineTablets()); if (lastComparison != 0) { return lastComparison; } @@ -1010,7 +952,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIngestRate()).compareTo(other.isSetIngestRate()); + lastComparison = java.lang.Boolean.valueOf(isSetIngestRate()).compareTo(other.isSetIngestRate()); if (lastComparison != 0) { return lastComparison; } @@ -1020,7 +962,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIngestByteRate()).compareTo(other.isSetIngestByteRate()); + lastComparison = java.lang.Boolean.valueOf(isSetIngestByteRate()).compareTo(other.isSetIngestByteRate()); if (lastComparison != 0) { return lastComparison; } @@ -1030,7 +972,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetQueryRate()).compareTo(other.isSetQueryRate()); + lastComparison = java.lang.Boolean.valueOf(isSetQueryRate()).compareTo(other.isSetQueryRate()); if (lastComparison != 0) { return lastComparison; } @@ -1040,7 +982,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetQueryByteRate()).compareTo(other.isSetQueryByteRate()); + lastComparison = java.lang.Boolean.valueOf(isSetQueryByteRate()).compareTo(other.isSetQueryByteRate()); if (lastComparison != 0) { return lastComparison; } @@ -1050,7 +992,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMinors()).compareTo(other.isSetMinors()); + lastComparison = java.lang.Boolean.valueOf(isSetMinors()).compareTo(other.isSetMinors()); if (lastComparison != 0) { return lastComparison; } @@ -1060,7 +1002,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMajors()).compareTo(other.isSetMajors()); + lastComparison = java.lang.Boolean.valueOf(isSetMajors()).compareTo(other.isSetMajors()); if (lastComparison != 0) { return lastComparison; } @@ -1070,7 +1012,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetScans()).compareTo(other.isSetScans()); + lastComparison = java.lang.Boolean.valueOf(isSetScans()).compareTo(other.isSetScans()); if (lastComparison != 0) { return lastComparison; } @@ -1080,7 +1022,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ return lastComparison; } } - lastComparison = Boolean.valueOf(isSetScanRate()).compareTo(other.isSetScanRate()); + lastComparison = java.lang.Boolean.valueOf(isSetScanRate()).compareTo(other.isSetScanRate()); if (lastComparison != 0) { return lastComparison; } @@ -1098,16 +1040,16 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + scheme(iprot).read(iprot, this); } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("TableInfo("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("TableInfo("); boolean first = true; sb.append("recs:"); @@ -1195,7 +1137,7 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; @@ -1205,13 +1147,13 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } } - private static class TableInfoStandardSchemeFactory implements SchemeFactory { + private static class TableInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public TableInfoStandardScheme getScheme() { return new TableInfoStandardScheme(); } } - private static class TableInfoStandardScheme extends StandardScheme<TableInfo> { + private static class TableInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<TableInfo> { public void read(org.apache.thrift.protocol.TProtocol iprot, TableInfo struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1385,18 +1327,18 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } - private static class TableInfoTupleSchemeFactory implements SchemeFactory { + private static class TableInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public TableInfoTupleScheme getScheme() { return new TableInfoTupleScheme(); } } - private static class TableInfoTupleScheme extends TupleScheme<TableInfo> { + private static class TableInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<TableInfo> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, TableInfo struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetRecs()) { optionals.set(0); } @@ -1474,8 +1416,8 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ @Override public void read(org.apache.thrift.protocol.TProtocol prot, TableInfo struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(12); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(12); if (incoming.get(0)) { struct.recs = iprot.readI64(); struct.setRecsIsSet(true); @@ -1530,5 +1472,9 @@ public class TableInfo implements org.apache.thrift.TBase<TableInfo, TableInfo._ } } + private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } + private static void unusedMethod() {} }
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 1a3a80c..5f1adf1 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.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated @@ -23,11 +23,8 @@ package org.apache.accumulo.core.master.thrift; -import java.util.Map; -import java.util.HashMap; -import org.apache.thrift.TEnum; -@SuppressWarnings({"unused"}) public enum TabletLoadState implements org.apache.thrift.TEnum { +public enum TabletLoadState implements org.apache.thrift.TEnum { LOADED(0), LOAD_FAILURE(1), UNLOADED(2), http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 07444b5..c0756cd 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,42 +15,15 @@ * limitations under the License. */ /** - * Autogenerated by Thrift Compiler (0.9.3) + * Autogenerated by Thrift Compiler (0.10.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.accumulo.core.master.thrift; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -import java.util.List; -import java.util.ArrayList; -import java.util.Map; -import java.util.HashMap; -import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; -import java.util.EnumSet; -import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import javax.annotation.Generated; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)") 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"); @@ -69,15 +42,12 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS private static final org.apache.thrift.protocol.TField SYNCS_FIELD_DESC = new org.apache.thrift.protocol.TField("syncs", org.apache.thrift.protocol.TType.I64, (short)16); private static final org.apache.thrift.protocol.TField BULK_IMPORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("bulkImports", org.apache.thrift.protocol.TType.LIST, (short)17); - private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); - static { - schemes.put(StandardScheme.class, new TabletServerStatusStandardSchemeFactory()); - schemes.put(TupleScheme.class, new TabletServerStatusTupleSchemeFactory()); - } + private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TabletServerStatusStandardSchemeFactory(); + private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TabletServerStatusTupleSchemeFactory(); - public Map<String,TableInfo> tableMap; // required + public java.util.Map<java.lang.String,TableInfo> tableMap; // required public long lastContact; // required - public String name; // required + public java.lang.String name; // required public double osLoad; // required public long holdTime; // required public long lookups; // required @@ -85,10 +55,10 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS public long indexCacheRequest; // required public long dataCacheHits; // required public long dataCacheRequest; // required - public List<RecoveryStatus> logSorts; // required + public java.util.List<RecoveryStatus> logSorts; // required public long flushs; // required public long syncs; // required - public List<BulkImportStatus> bulkImports; // required + public java.util.List<BulkImportStatus> bulkImports; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -107,10 +77,10 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS SYNCS((short)16, "syncs"), BULK_IMPORTS((short)17, "bulkImports"); - private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); + private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>(); static { - for (_Fields field : EnumSet.allOf(_Fields.class)) { + for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) { byName.put(field.getFieldName(), field); } } @@ -159,21 +129,21 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS */ public static _Fields findByThriftIdOrThrow(int fieldId) { _Fields fields = findByThriftId(fieldId); - if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!"); + if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!"); return fields; } /** * Find the _Fields constant that matches name, or null if its not found. */ - public static _Fields findByName(String name) { + public static _Fields findByName(java.lang.String name) { return byName.get(name); } private final short _thriftId; - private final String _fieldName; + private final java.lang.String _fieldName; - _Fields(short thriftId, String fieldName) { + _Fields(short thriftId, java.lang.String fieldName) { _thriftId = thriftId; _fieldName = fieldName; } @@ -182,7 +152,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return _thriftId; } - public String getFieldName() { + public java.lang.String getFieldName() { return _fieldName; } } @@ -199,9 +169,9 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS private static final int __FLUSHS_ISSET_ID = 8; private static final int __SYNCS_ISSET_ID = 9; private short __isset_bitfield = 0; - public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; + public static final java.util.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); + java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.TABLE_MAP, new org.apache.thrift.meta_data.FieldMetaData("tableMap", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), @@ -234,7 +204,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS tmpMap.put(_Fields.BULK_IMPORTS, new org.apache.thrift.meta_data.FieldMetaData("bulkImports", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, BulkImportStatus.class)))); - metaDataMap = Collections.unmodifiableMap(tmpMap); + metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TabletServerStatus.class, metaDataMap); } @@ -242,9 +212,9 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public TabletServerStatus( - Map<String,TableInfo> tableMap, + java.util.Map<java.lang.String,TableInfo> tableMap, long lastContact, - String name, + java.lang.String name, double osLoad, long holdTime, long lookups, @@ -252,10 +222,10 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS long indexCacheRequest, long dataCacheHits, long dataCacheRequest, - List<RecoveryStatus> logSorts, + java.util.List<RecoveryStatus> logSorts, long flushs, long syncs, - List<BulkImportStatus> bulkImports) + java.util.List<BulkImportStatus> bulkImports) { this(); this.tableMap = tableMap; @@ -290,13 +260,13 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS public TabletServerStatus(TabletServerStatus other) { __isset_bitfield = other.__isset_bitfield; if (other.isSetTableMap()) { - Map<String,TableInfo> __this__tableMap = new HashMap<String,TableInfo>(other.tableMap.size()); - for (Map.Entry<String, TableInfo> other_element : other.tableMap.entrySet()) { + java.util.Map<java.lang.String,TableInfo> __this__tableMap = new java.util.HashMap<java.lang.String,TableInfo>(other.tableMap.size()); + for (java.util.Map.Entry<java.lang.String, TableInfo> other_element : other.tableMap.entrySet()) { - String other_element_key = other_element.getKey(); + java.lang.String other_element_key = other_element.getKey(); TableInfo other_element_value = other_element.getValue(); - String __this__tableMap_copy_key = other_element_key; + java.lang.String __this__tableMap_copy_key = other_element_key; TableInfo __this__tableMap_copy_value = new TableInfo(other_element_value); @@ -316,7 +286,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS this.dataCacheHits = other.dataCacheHits; this.dataCacheRequest = other.dataCacheRequest; if (other.isSetLogSorts()) { - List<RecoveryStatus> __this__logSorts = new ArrayList<RecoveryStatus>(other.logSorts.size()); + java.util.List<RecoveryStatus> __this__logSorts = new java.util.ArrayList<RecoveryStatus>(other.logSorts.size()); for (RecoveryStatus other_element : other.logSorts) { __this__logSorts.add(new RecoveryStatus(other_element)); } @@ -325,7 +295,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS this.flushs = other.flushs; this.syncs = other.syncs; if (other.isSetBulkImports()) { - List<BulkImportStatus> __this__bulkImports = new ArrayList<BulkImportStatus>(other.bulkImports.size()); + java.util.List<BulkImportStatus> __this__bulkImports = new java.util.ArrayList<BulkImportStatus>(other.bulkImports.size()); for (BulkImportStatus other_element : other.bulkImports) { __this__bulkImports.add(new BulkImportStatus(other_element)); } @@ -369,18 +339,18 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return (this.tableMap == null) ? 0 : this.tableMap.size(); } - public void putToTableMap(String key, TableInfo val) { + public void putToTableMap(java.lang.String key, TableInfo val) { if (this.tableMap == null) { - this.tableMap = new HashMap<String,TableInfo>(); + this.tableMap = new java.util.HashMap<java.lang.String,TableInfo>(); } this.tableMap.put(key, val); } - public Map<String,TableInfo> getTableMap() { + public java.util.Map<java.lang.String,TableInfo> getTableMap() { return this.tableMap; } - public TabletServerStatus setTableMap(Map<String,TableInfo> tableMap) { + public TabletServerStatus setTableMap(java.util.Map<java.lang.String,TableInfo> tableMap) { this.tableMap = tableMap; return this; } @@ -411,23 +381,23 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetLastContact() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LASTCONTACT_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LASTCONTACT_ISSET_ID); } /** Returns true if field lastContact is set (has been assigned a value) and false otherwise */ public boolean isSetLastContact() { - return EncodingUtils.testBit(__isset_bitfield, __LASTCONTACT_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LASTCONTACT_ISSET_ID); } public void setLastContactIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTCONTACT_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTCONTACT_ISSET_ID, value); } - public String getName() { + public java.lang.String getName() { return this.name; } - public TabletServerStatus setName(String name) { + public TabletServerStatus setName(java.lang.String name) { this.name = name; return this; } @@ -458,16 +428,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetOsLoad() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OSLOAD_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OSLOAD_ISSET_ID); } /** Returns true if field osLoad is set (has been assigned a value) and false otherwise */ public boolean isSetOsLoad() { - return EncodingUtils.testBit(__isset_bitfield, __OSLOAD_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OSLOAD_ISSET_ID); } public void setOsLoadIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OSLOAD_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OSLOAD_ISSET_ID, value); } public long getHoldTime() { @@ -481,16 +451,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetHoldTime() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HOLDTIME_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HOLDTIME_ISSET_ID); } /** Returns true if field holdTime is set (has been assigned a value) and false otherwise */ public boolean isSetHoldTime() { - return EncodingUtils.testBit(__isset_bitfield, __HOLDTIME_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HOLDTIME_ISSET_ID); } public void setHoldTimeIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HOLDTIME_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HOLDTIME_ISSET_ID, value); } public long getLookups() { @@ -504,16 +474,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetLookups() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOOKUPS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LOOKUPS_ISSET_ID); } /** Returns true if field lookups is set (has been assigned a value) and false otherwise */ public boolean isSetLookups() { - return EncodingUtils.testBit(__isset_bitfield, __LOOKUPS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LOOKUPS_ISSET_ID); } public void setLookupsIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOOKUPS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOOKUPS_ISSET_ID, value); } public long getIndexCacheHits() { @@ -527,16 +497,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetIndexCacheHits() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INDEXCACHEHITS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INDEXCACHEHITS_ISSET_ID); } /** Returns true if field indexCacheHits is set (has been assigned a value) and false otherwise */ public boolean isSetIndexCacheHits() { - return EncodingUtils.testBit(__isset_bitfield, __INDEXCACHEHITS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INDEXCACHEHITS_ISSET_ID); } public void setIndexCacheHitsIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INDEXCACHEHITS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INDEXCACHEHITS_ISSET_ID, value); } public long getIndexCacheRequest() { @@ -550,16 +520,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetIndexCacheRequest() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __INDEXCACHEREQUEST_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __INDEXCACHEREQUEST_ISSET_ID); } /** Returns true if field indexCacheRequest is set (has been assigned a value) and false otherwise */ public boolean isSetIndexCacheRequest() { - return EncodingUtils.testBit(__isset_bitfield, __INDEXCACHEREQUEST_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __INDEXCACHEREQUEST_ISSET_ID); } public void setIndexCacheRequestIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __INDEXCACHEREQUEST_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __INDEXCACHEREQUEST_ISSET_ID, value); } public long getDataCacheHits() { @@ -573,16 +543,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetDataCacheHits() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DATACACHEHITS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DATACACHEHITS_ISSET_ID); } /** Returns true if field dataCacheHits is set (has been assigned a value) and false otherwise */ public boolean isSetDataCacheHits() { - return EncodingUtils.testBit(__isset_bitfield, __DATACACHEHITS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DATACACHEHITS_ISSET_ID); } public void setDataCacheHitsIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DATACACHEHITS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DATACACHEHITS_ISSET_ID, value); } public long getDataCacheRequest() { @@ -596,16 +566,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetDataCacheRequest() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DATACACHEREQUEST_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DATACACHEREQUEST_ISSET_ID); } /** Returns true if field dataCacheRequest is set (has been assigned a value) and false otherwise */ public boolean isSetDataCacheRequest() { - return EncodingUtils.testBit(__isset_bitfield, __DATACACHEREQUEST_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DATACACHEREQUEST_ISSET_ID); } public void setDataCacheRequestIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DATACACHEREQUEST_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DATACACHEREQUEST_ISSET_ID, value); } public int getLogSortsSize() { @@ -618,16 +588,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS public void addToLogSorts(RecoveryStatus elem) { if (this.logSorts == null) { - this.logSorts = new ArrayList<RecoveryStatus>(); + this.logSorts = new java.util.ArrayList<RecoveryStatus>(); } this.logSorts.add(elem); } - public List<RecoveryStatus> getLogSorts() { + public java.util.List<RecoveryStatus> getLogSorts() { return this.logSorts; } - public TabletServerStatus setLogSorts(List<RecoveryStatus> logSorts) { + public TabletServerStatus setLogSorts(java.util.List<RecoveryStatus> logSorts) { this.logSorts = logSorts; return this; } @@ -658,16 +628,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetFlushs() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FLUSHS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FLUSHS_ISSET_ID); } /** Returns true if field flushs is set (has been assigned a value) and false otherwise */ public boolean isSetFlushs() { - return EncodingUtils.testBit(__isset_bitfield, __FLUSHS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FLUSHS_ISSET_ID); } public void setFlushsIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FLUSHS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FLUSHS_ISSET_ID, value); } public long getSyncs() { @@ -681,16 +651,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void unsetSyncs() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SYNCS_ISSET_ID); + __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SYNCS_ISSET_ID); } /** Returns true if field syncs is set (has been assigned a value) and false otherwise */ public boolean isSetSyncs() { - return EncodingUtils.testBit(__isset_bitfield, __SYNCS_ISSET_ID); + return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SYNCS_ISSET_ID); } public void setSyncsIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SYNCS_ISSET_ID, value); + __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SYNCS_ISSET_ID, value); } public int getBulkImportsSize() { @@ -703,16 +673,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS public void addToBulkImports(BulkImportStatus elem) { if (this.bulkImports == null) { - this.bulkImports = new ArrayList<BulkImportStatus>(); + this.bulkImports = new java.util.ArrayList<BulkImportStatus>(); } this.bulkImports.add(elem); } - public List<BulkImportStatus> getBulkImports() { + public java.util.List<BulkImportStatus> getBulkImports() { return this.bulkImports; } - public TabletServerStatus setBulkImports(List<BulkImportStatus> bulkImports) { + public TabletServerStatus setBulkImports(java.util.List<BulkImportStatus> bulkImports) { this.bulkImports = bulkImports; return this; } @@ -732,13 +702,13 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } } - public void setFieldValue(_Fields field, Object value) { + public void setFieldValue(_Fields field, java.lang.Object value) { switch (field) { case TABLE_MAP: if (value == null) { unsetTableMap(); } else { - setTableMap((Map<String,TableInfo>)value); + setTableMap((java.util.Map<java.lang.String,TableInfo>)value); } break; @@ -746,7 +716,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetLastContact(); } else { - setLastContact((Long)value); + setLastContact((java.lang.Long)value); } break; @@ -754,7 +724,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetName(); } else { - setName((String)value); + setName((java.lang.String)value); } break; @@ -762,7 +732,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetOsLoad(); } else { - setOsLoad((Double)value); + setOsLoad((java.lang.Double)value); } break; @@ -770,7 +740,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetHoldTime(); } else { - setHoldTime((Long)value); + setHoldTime((java.lang.Long)value); } break; @@ -778,7 +748,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetLookups(); } else { - setLookups((Long)value); + setLookups((java.lang.Long)value); } break; @@ -786,7 +756,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetIndexCacheHits(); } else { - setIndexCacheHits((Long)value); + setIndexCacheHits((java.lang.Long)value); } break; @@ -794,7 +764,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetIndexCacheRequest(); } else { - setIndexCacheRequest((Long)value); + setIndexCacheRequest((java.lang.Long)value); } break; @@ -802,7 +772,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetDataCacheHits(); } else { - setDataCacheHits((Long)value); + setDataCacheHits((java.lang.Long)value); } break; @@ -810,7 +780,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetDataCacheRequest(); } else { - setDataCacheRequest((Long)value); + setDataCacheRequest((java.lang.Long)value); } break; @@ -818,7 +788,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetLogSorts(); } else { - setLogSorts((List<RecoveryStatus>)value); + setLogSorts((java.util.List<RecoveryStatus>)value); } break; @@ -826,7 +796,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetFlushs(); } else { - setFlushs((Long)value); + setFlushs((java.lang.Long)value); } break; @@ -834,7 +804,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetSyncs(); } else { - setSyncs((Long)value); + setSyncs((java.lang.Long)value); } break; @@ -842,14 +812,14 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (value == null) { unsetBulkImports(); } else { - setBulkImports((List<BulkImportStatus>)value); + setBulkImports((java.util.List<BulkImportStatus>)value); } break; } } - public Object getFieldValue(_Fields field) { + public java.lang.Object getFieldValue(_Fields field) { switch (field) { case TABLE_MAP: return getTableMap(); @@ -894,13 +864,13 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return getBulkImports(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */ public boolean isSet(_Fields field) { if (field == null) { - throw new IllegalArgumentException(); + throw new java.lang.IllegalArgumentException(); } switch (field) { @@ -933,11 +903,11 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS case BULK_IMPORTS: return isSetBulkImports(); } - throw new IllegalStateException(); + throw new java.lang.IllegalStateException(); } @Override - public boolean equals(Object that) { + public boolean equals(java.lang.Object that) { if (that == null) return false; if (that instanceof TabletServerStatus) @@ -948,6 +918,8 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS public boolean equals(TabletServerStatus that) { if (that == null) return false; + if (this == that) + return true; boolean this_present_tableMap = true && this.isSetTableMap(); boolean that_present_tableMap = true && that.isSetTableMap(); @@ -1080,79 +1052,45 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS @Override public int hashCode() { - 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(); + int hashCode = 1; + + hashCode = hashCode * 8191 + ((isSetTableMap()) ? 131071 : 524287); + if (isSetTableMap()) + hashCode = hashCode * 8191 + tableMap.hashCode(); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lastContact); + + hashCode = hashCode * 8191 + ((isSetName()) ? 131071 : 524287); + if (isSetName()) + hashCode = hashCode * 8191 + name.hashCode(); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(osLoad); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(holdTime); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lookups); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(indexCacheHits); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(indexCacheRequest); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(dataCacheHits); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(dataCacheRequest); + + hashCode = hashCode * 8191 + ((isSetLogSorts()) ? 131071 : 524287); + if (isSetLogSorts()) + hashCode = hashCode * 8191 + logSorts.hashCode(); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(flushs); + + hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(syncs); + + hashCode = hashCode * 8191 + ((isSetBulkImports()) ? 131071 : 524287); + if (isSetBulkImports()) + hashCode = hashCode * 8191 + bulkImports.hashCode(); + + return hashCode; } @Override @@ -1163,7 +1101,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS int lastComparison = 0; - lastComparison = Boolean.valueOf(isSetTableMap()).compareTo(other.isSetTableMap()); + lastComparison = java.lang.Boolean.valueOf(isSetTableMap()).compareTo(other.isSetTableMap()); if (lastComparison != 0) { return lastComparison; } @@ -1173,7 +1111,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLastContact()).compareTo(other.isSetLastContact()); + lastComparison = java.lang.Boolean.valueOf(isSetLastContact()).compareTo(other.isSetLastContact()); if (lastComparison != 0) { return lastComparison; } @@ -1183,7 +1121,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); + lastComparison = java.lang.Boolean.valueOf(isSetName()).compareTo(other.isSetName()); if (lastComparison != 0) { return lastComparison; } @@ -1193,7 +1131,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetOsLoad()).compareTo(other.isSetOsLoad()); + lastComparison = java.lang.Boolean.valueOf(isSetOsLoad()).compareTo(other.isSetOsLoad()); if (lastComparison != 0) { return lastComparison; } @@ -1203,7 +1141,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetHoldTime()).compareTo(other.isSetHoldTime()); + lastComparison = java.lang.Boolean.valueOf(isSetHoldTime()).compareTo(other.isSetHoldTime()); if (lastComparison != 0) { return lastComparison; } @@ -1213,7 +1151,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLookups()).compareTo(other.isSetLookups()); + lastComparison = java.lang.Boolean.valueOf(isSetLookups()).compareTo(other.isSetLookups()); if (lastComparison != 0) { return lastComparison; } @@ -1223,7 +1161,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIndexCacheHits()).compareTo(other.isSetIndexCacheHits()); + lastComparison = java.lang.Boolean.valueOf(isSetIndexCacheHits()).compareTo(other.isSetIndexCacheHits()); if (lastComparison != 0) { return lastComparison; } @@ -1233,7 +1171,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetIndexCacheRequest()).compareTo(other.isSetIndexCacheRequest()); + lastComparison = java.lang.Boolean.valueOf(isSetIndexCacheRequest()).compareTo(other.isSetIndexCacheRequest()); if (lastComparison != 0) { return lastComparison; } @@ -1243,7 +1181,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDataCacheHits()).compareTo(other.isSetDataCacheHits()); + lastComparison = java.lang.Boolean.valueOf(isSetDataCacheHits()).compareTo(other.isSetDataCacheHits()); if (lastComparison != 0) { return lastComparison; } @@ -1253,7 +1191,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDataCacheRequest()).compareTo(other.isSetDataCacheRequest()); + lastComparison = java.lang.Boolean.valueOf(isSetDataCacheRequest()).compareTo(other.isSetDataCacheRequest()); if (lastComparison != 0) { return lastComparison; } @@ -1263,7 +1201,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetLogSorts()).compareTo(other.isSetLogSorts()); + lastComparison = java.lang.Boolean.valueOf(isSetLogSorts()).compareTo(other.isSetLogSorts()); if (lastComparison != 0) { return lastComparison; } @@ -1273,7 +1211,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFlushs()).compareTo(other.isSetFlushs()); + lastComparison = java.lang.Boolean.valueOf(isSetFlushs()).compareTo(other.isSetFlushs()); if (lastComparison != 0) { return lastComparison; } @@ -1283,7 +1221,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSyncs()).compareTo(other.isSetSyncs()); + lastComparison = java.lang.Boolean.valueOf(isSetSyncs()).compareTo(other.isSetSyncs()); if (lastComparison != 0) { return lastComparison; } @@ -1293,7 +1231,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS return lastComparison; } } - lastComparison = Boolean.valueOf(isSetBulkImports()).compareTo(other.isSetBulkImports()); + lastComparison = java.lang.Boolean.valueOf(isSetBulkImports()).compareTo(other.isSetBulkImports()); if (lastComparison != 0) { return lastComparison; } @@ -1311,16 +1249,16 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException { - schemes.get(iprot.getScheme()).getScheme().read(iprot, this); + scheme(iprot).read(iprot, this); } public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException { - schemes.get(oprot.getScheme()).getScheme().write(oprot, this); + scheme(oprot).write(oprot, this); } @Override - public String toString() { - StringBuilder sb = new StringBuilder("TabletServerStatus("); + public java.lang.String toString() { + java.lang.StringBuilder sb = new java.lang.StringBuilder("TabletServerStatus("); boolean first = true; sb.append("tableMap:"); @@ -1411,7 +1349,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; @@ -1421,13 +1359,13 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } } - private static class TabletServerStatusStandardSchemeFactory implements SchemeFactory { + private static class TabletServerStatusStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public TabletServerStatusStandardScheme getScheme() { return new TabletServerStatusStandardScheme(); } } - private static class TabletServerStatusStandardScheme extends StandardScheme<TabletServerStatus> { + private static class TabletServerStatusStandardScheme extends org.apache.thrift.scheme.StandardScheme<TabletServerStatus> { public void read(org.apache.thrift.protocol.TProtocol iprot, TabletServerStatus struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TField schemeField; @@ -1443,8 +1381,8 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin(); - struct.tableMap = new HashMap<String,TableInfo>(2*_map0.size); - String _key1; + struct.tableMap = new java.util.HashMap<java.lang.String,TableInfo>(2*_map0.size); + java.lang.String _key1; TableInfo _val2; for (int _i3 = 0; _i3 < _map0.size; ++_i3) { @@ -1536,7 +1474,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list4 = iprot.readListBegin(); - struct.logSorts = new ArrayList<RecoveryStatus>(_list4.size); + struct.logSorts = new java.util.ArrayList<RecoveryStatus>(_list4.size); RecoveryStatus _elem5; for (int _i6 = 0; _i6 < _list4.size; ++_i6) { @@ -1571,7 +1509,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { org.apache.thrift.protocol.TList _list7 = iprot.readListBegin(); - struct.bulkImports = new ArrayList<BulkImportStatus>(_list7.size); + struct.bulkImports = new java.util.ArrayList<BulkImportStatus>(_list7.size); BulkImportStatus _elem8; for (int _i9 = 0; _i9 < _list7.size; ++_i9) { @@ -1605,7 +1543,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.tableMap.size())); - for (Map.Entry<String, TableInfo> _iter10 : struct.tableMap.entrySet()) + for (java.util.Map.Entry<java.lang.String, TableInfo> _iter10 : struct.tableMap.entrySet()) { oprot.writeString(_iter10.getKey()); _iter10.getValue().write(oprot); @@ -1679,18 +1617,18 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } - private static class TabletServerStatusTupleSchemeFactory implements SchemeFactory { + private static class TabletServerStatusTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory { public TabletServerStatusTupleScheme getScheme() { return new TabletServerStatusTupleScheme(); } } - private static class TabletServerStatusTupleScheme extends TupleScheme<TabletServerStatus> { + private static class TabletServerStatusTupleScheme extends org.apache.thrift.scheme.TupleScheme<TabletServerStatus> { @Override public void write(org.apache.thrift.protocol.TProtocol prot, TabletServerStatus struct) throws org.apache.thrift.TException { - TTupleProtocol oprot = (TTupleProtocol) prot; - BitSet optionals = new BitSet(); + org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet optionals = new java.util.BitSet(); if (struct.isSetTableMap()) { optionals.set(0); } @@ -1737,7 +1675,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (struct.isSetTableMap()) { { oprot.writeI32(struct.tableMap.size()); - for (Map.Entry<String, TableInfo> _iter13 : struct.tableMap.entrySet()) + for (java.util.Map.Entry<java.lang.String, TableInfo> _iter13 : struct.tableMap.entrySet()) { oprot.writeString(_iter13.getKey()); _iter13.getValue().write(oprot); @@ -1799,13 +1737,13 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS @Override public void read(org.apache.thrift.protocol.TProtocol prot, TabletServerStatus struct) throws org.apache.thrift.TException { - TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(14); + org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; + java.util.BitSet incoming = iprot.readBitSet(14); if (incoming.get(0)) { { 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); - String _key17; + struct.tableMap = new java.util.HashMap<java.lang.String,TableInfo>(2*_map16.size); + java.lang.String _key17; TableInfo _val18; for (int _i19 = 0; _i19 < _map16.size; ++_i19) { @@ -1856,7 +1794,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (incoming.get(10)) { { 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); + struct.logSorts = new java.util.ArrayList<RecoveryStatus>(_list20.size); RecoveryStatus _elem21; for (int _i22 = 0; _i22 < _list20.size; ++_i22) { @@ -1878,7 +1816,7 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS if (incoming.get(13)) { { 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); + struct.bulkImports = new java.util.ArrayList<BulkImportStatus>(_list23.size); BulkImportStatus _elem24; for (int _i25 = 0; _i25 < _list23.size; ++_i25) { @@ -1892,5 +1830,9 @@ public class TabletServerStatus implements org.apache.thrift.TBase<TabletServerS } } + private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) { + return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme(); + } + private static void unusedMethod() {} }