http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java index 28b1e6c..a3f9a06 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.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 AccumuloSecurityException extends TException implements org.apache.thrift.TBase<AccumuloSecurityException, AccumuloSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloSecurityException> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class AccumuloSecurityException extends TException implements org.apache.thrift.TBase<AccumuloSecurityException, AccumuloSecurityException._Fields>, java.io.Serializable, Cloneable, Comparable<AccumuloSecurityException> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AccumuloSecurityException"); private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new org.apache.thrift.protocol.TField("msg", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -243,7 +246,14 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_msg = true && (isSetMsg()); + list.add(present_msg); + if (present_msg) + list.add(msg); + + return list.hashCode(); } @Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java index 58e1321..40f3435 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.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 ActiveCompaction implements org.apache.thrift.TBase<ActiveCompaction, ActiveCompaction._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveCompaction> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompaction, ActiveCompaction._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveCompaction> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveCompaction"); private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -676,7 +679,7 @@ import org.slf4j.LoggerFactory; return getExtent(); case AGE: - return Long.valueOf(getAge()); + return getAge(); case INPUT_FILES: return getInputFiles(); @@ -694,10 +697,10 @@ import org.slf4j.LoggerFactory; return getLocalityGroup(); case ENTRIES_READ: - return Long.valueOf(getEntriesRead()); + return getEntriesRead(); case ENTRIES_WRITTEN: - return Long.valueOf(getEntriesWritten()); + return getEntriesWritten(); case ITERATORS: return getIterators(); @@ -845,7 +848,59 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_extent = true && (isSetExtent()); + list.add(present_extent); + if (present_extent) + list.add(extent); + + boolean present_age = true; + list.add(present_age); + if (present_age) + list.add(age); + + boolean present_inputFiles = true && (isSetInputFiles()); + list.add(present_inputFiles); + if (present_inputFiles) + list.add(inputFiles); + + boolean present_outputFile = true && (isSetOutputFile()); + list.add(present_outputFile); + if (present_outputFile) + list.add(outputFile); + + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type.getValue()); + + boolean present_reason = true && (isSetReason()); + list.add(present_reason); + if (present_reason) + list.add(reason.getValue()); + + boolean present_localityGroup = true && (isSetLocalityGroup()); + list.add(present_localityGroup); + if (present_localityGroup) + list.add(localityGroup); + + boolean present_entriesRead = true; + list.add(present_entriesRead); + if (present_entriesRead) + list.add(entriesRead); + + boolean present_entriesWritten = true; + list.add(present_entriesWritten); + if (present_entriesWritten) + list.add(entriesWritten); + + boolean present_iterators = true && (isSetIterators()); + list.add(present_iterators); + if (present_iterators) + list.add(iterators); + + return list.hashCode(); } @Override @@ -1113,11 +1168,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list138 = iprot.readListBegin(); struct.inputFiles = new ArrayList<String>(_list138.size); - for (int _i139 = 0; _i139 < _list138.size; ++_i139) + String _elem139; + for (int _i140 = 0; _i140 < _list138.size; ++_i140) { - String _elem140; - _elem140 = iprot.readString(); - struct.inputFiles.add(_elem140); + _elem139 = iprot.readString(); + struct.inputFiles.add(_elem139); } iprot.readListEnd(); } @@ -1136,7 +1191,7 @@ import org.slf4j.LoggerFactory; break; case 5: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = CompactionType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.proxy.thrift.CompactionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1144,7 +1199,7 @@ import org.slf4j.LoggerFactory; break; case 6: // REASON if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.reason = CompactionReason.findByValue(iprot.readI32()); + struct.reason = org.apache.accumulo.proxy.thrift.CompactionReason.findByValue(iprot.readI32()); struct.setReasonIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1179,12 +1234,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list141 = iprot.readListBegin(); struct.iterators = new ArrayList<IteratorSetting>(_list141.size); - for (int _i142 = 0; _i142 < _list141.size; ++_i142) + IteratorSetting _elem142; + for (int _i143 = 0; _i143 < _list141.size; ++_i143) { - IteratorSetting _elem143; - _elem143 = new IteratorSetting(); - _elem143.read(iprot); - struct.iterators.add(_elem143); + _elem142 = new IteratorSetting(); + _elem142.read(iprot); + struct.iterators.add(_elem142); } iprot.readListEnd(); } @@ -1376,11 +1431,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list148 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.inputFiles = new ArrayList<String>(_list148.size); - for (int _i149 = 0; _i149 < _list148.size; ++_i149) + String _elem149; + for (int _i150 = 0; _i150 < _list148.size; ++_i150) { - String _elem150; - _elem150 = iprot.readString(); - struct.inputFiles.add(_elem150); + _elem149 = iprot.readString(); + struct.inputFiles.add(_elem149); } } struct.setInputFilesIsSet(true); @@ -1390,11 +1445,11 @@ import org.slf4j.LoggerFactory; struct.setOutputFileIsSet(true); } if (incoming.get(4)) { - struct.type = CompactionType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.proxy.thrift.CompactionType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } if (incoming.get(5)) { - struct.reason = CompactionReason.findByValue(iprot.readI32()); + struct.reason = org.apache.accumulo.proxy.thrift.CompactionReason.findByValue(iprot.readI32()); struct.setReasonIsSet(true); } if (incoming.get(6)) { @@ -1413,12 +1468,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list151 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.iterators = new ArrayList<IteratorSetting>(_list151.size); - for (int _i152 = 0; _i152 < _list151.size; ++_i152) + IteratorSetting _elem152; + for (int _i153 = 0; _i153 < _list151.size; ++_i153) { - IteratorSetting _elem153; - _elem153 = new IteratorSetting(); - _elem153.read(iprot); - struct.iterators.add(_elem153); + _elem152 = new IteratorSetting(); + _elem152.read(iprot); + struct.iterators.add(_elem152); } } struct.setIteratorsIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java index bc9ad51..c45387c 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveScan.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 ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveScan"); private static final org.apache.thrift.protocol.TField CLIENT_FIELD_DESC = new org.apache.thrift.protocol.TField("client", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -747,10 +750,10 @@ import org.slf4j.LoggerFactory; return getTable(); case AGE: - return Long.valueOf(getAge()); + return getAge(); case IDLE_TIME: - return Long.valueOf(getIdleTime()); + return getIdleTime(); case TYPE: return getType(); @@ -924,7 +927,64 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_client = true && (isSetClient()); + list.add(present_client); + if (present_client) + list.add(client); + + boolean present_user = true && (isSetUser()); + list.add(present_user); + if (present_user) + list.add(user); + + boolean present_table = true && (isSetTable()); + list.add(present_table); + if (present_table) + list.add(table); + + boolean present_age = true; + list.add(present_age); + if (present_age) + list.add(age); + + boolean present_idleTime = true; + list.add(present_idleTime); + if (present_idleTime) + list.add(idleTime); + + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type.getValue()); + + boolean present_state = true && (isSetState()); + list.add(present_state); + if (present_state) + list.add(state.getValue()); + + boolean present_extent = true && (isSetExtent()); + list.add(present_extent); + if (present_extent) + list.add(extent); + + boolean present_columns = true && (isSetColumns()); + list.add(present_columns); + if (present_columns) + list.add(columns); + + boolean present_iterators = true && (isSetIterators()); + list.add(present_iterators); + if (present_iterators) + list.add(iterators); + + boolean present_authorizations = true && (isSetAuthorizations()); + list.add(present_authorizations); + if (present_authorizations) + list.add(authorizations); + + return list.hashCode(); } @Override @@ -1141,7 +1201,7 @@ import org.slf4j.LoggerFactory; if (this.authorizations == null) { sb.append("null"); } else { - sb.append(this.authorizations); + org.apache.thrift.TBaseHelper.toString(this.authorizations, sb); } first = false; sb.append(")"); @@ -1234,7 +1294,7 @@ import org.slf4j.LoggerFactory; break; case 6: // TYPE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.type = ScanType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.proxy.thrift.ScanType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1242,7 +1302,7 @@ import org.slf4j.LoggerFactory; break; case 7: // STATE if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.state = ScanState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.proxy.thrift.ScanState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1262,12 +1322,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list114 = iprot.readListBegin(); struct.columns = new ArrayList<Column>(_list114.size); - for (int _i115 = 0; _i115 < _list114.size; ++_i115) + Column _elem115; + for (int _i116 = 0; _i116 < _list114.size; ++_i116) { - Column _elem116; - _elem116 = new Column(); - _elem116.read(iprot); - struct.columns.add(_elem116); + _elem115 = new Column(); + _elem115.read(iprot); + struct.columns.add(_elem115); } iprot.readListEnd(); } @@ -1281,12 +1341,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list117 = iprot.readListBegin(); struct.iterators = new ArrayList<IteratorSetting>(_list117.size); - for (int _i118 = 0; _i118 < _list117.size; ++_i118) + IteratorSetting _elem118; + for (int _i119 = 0; _i119 < _list117.size; ++_i119) { - IteratorSetting _elem119; - _elem119 = new IteratorSetting(); - _elem119.read(iprot); - struct.iterators.add(_elem119); + _elem118 = new IteratorSetting(); + _elem118.read(iprot); + struct.iterators.add(_elem118); } iprot.readListEnd(); } @@ -1300,11 +1360,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list120 = iprot.readListBegin(); struct.authorizations = new ArrayList<ByteBuffer>(_list120.size); - for (int _i121 = 0; _i121 < _list120.size; ++_i121) + ByteBuffer _elem121; + for (int _i122 = 0; _i122 < _list120.size; ++_i122) { - ByteBuffer _elem122; - _elem122 = iprot.readBinary(); - struct.authorizations.add(_elem122); + _elem121 = iprot.readBinary(); + struct.authorizations.add(_elem121); } iprot.readListEnd(); } @@ -1530,11 +1590,11 @@ import org.slf4j.LoggerFactory; struct.setIdleTimeIsSet(true); } if (incoming.get(5)) { - struct.type = ScanType.findByValue(iprot.readI32()); + struct.type = org.apache.accumulo.proxy.thrift.ScanType.findByValue(iprot.readI32()); struct.setTypeIsSet(true); } if (incoming.get(6)) { - struct.state = ScanState.findByValue(iprot.readI32()); + struct.state = org.apache.accumulo.proxy.thrift.ScanState.findByValue(iprot.readI32()); struct.setStateIsSet(true); } if (incoming.get(7)) { @@ -1546,12 +1606,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.columns = new ArrayList<Column>(_list129.size); - for (int _i130 = 0; _i130 < _list129.size; ++_i130) + Column _elem130; + for (int _i131 = 0; _i131 < _list129.size; ++_i131) { - Column _elem131; - _elem131 = new Column(); - _elem131.read(iprot); - struct.columns.add(_elem131); + _elem130 = new Column(); + _elem130.read(iprot); + struct.columns.add(_elem130); } } struct.setColumnsIsSet(true); @@ -1560,12 +1620,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list132 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.iterators = new ArrayList<IteratorSetting>(_list132.size); - for (int _i133 = 0; _i133 < _list132.size; ++_i133) + IteratorSetting _elem133; + for (int _i134 = 0; _i134 < _list132.size; ++_i134) { - IteratorSetting _elem134; - _elem134 = new IteratorSetting(); - _elem134.read(iprot); - struct.iterators.add(_elem134); + _elem133 = new IteratorSetting(); + _elem133.read(iprot); + struct.iterators.add(_elem133); } } struct.setIteratorsIsSet(true); @@ -1574,11 +1634,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list135 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.authorizations = new ArrayList<ByteBuffer>(_list135.size); - for (int _i136 = 0; _i136 < _list135.size; ++_i136) + ByteBuffer _elem136; + for (int _i137 = 0; _i137 < _list135.size; ++_i137) { - ByteBuffer _elem137; - _elem137 = iprot.readBinary(); - struct.authorizations.add(_elem137); + _elem136 = iprot.readBinary(); + struct.authorizations.add(_elem136); } } struct.setAuthorizationsIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java index 948d822..af492e2 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.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 BatchScanOptions implements org.apache.thrift.TBase<BatchScanOptions, BatchScanOptions._Fields>, java.io.Serializable, Cloneable, Comparable<BatchScanOptions> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOptions, BatchScanOptions._Fields>, java.io.Serializable, Cloneable, Comparable<BatchScanOptions> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchScanOptions"); private static final org.apache.thrift.protocol.TField AUTHORIZATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("authorizations", org.apache.thrift.protocol.TType.SET, (short)1); @@ -142,7 +145,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __THREADS_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.AUTHORIZATIONS,_Fields.RANGES,_Fields.COLUMNS,_Fields.ITERATORS,_Fields.THREADS}; + private static final _Fields optionals[] = {_Fields.AUTHORIZATIONS,_Fields.RANGES,_Fields.COLUMNS,_Fields.ITERATORS,_Fields.THREADS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -453,7 +456,7 @@ import org.slf4j.LoggerFactory; return getIterators(); case THREADS: - return Integer.valueOf(getThreads()); + return getThreads(); } throw new IllegalStateException(); @@ -543,7 +546,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_authorizations = true && (isSetAuthorizations()); + list.add(present_authorizations); + if (present_authorizations) + list.add(authorizations); + + boolean present_ranges = true && (isSetRanges()); + list.add(present_ranges); + if (present_ranges) + list.add(ranges); + + boolean present_columns = true && (isSetColumns()); + list.add(present_columns); + if (present_columns) + list.add(columns); + + boolean present_iterators = true && (isSetIterators()); + list.add(present_iterators); + if (present_iterators) + list.add(iterators); + + boolean present_threads = true && (isSetThreads()); + list.add(present_threads); + if (present_threads) + list.add(threads); + + return list.hashCode(); } @Override @@ -629,7 +659,7 @@ import org.slf4j.LoggerFactory; if (this.authorizations == null) { sb.append("null"); } else { - sb.append(this.authorizations); + org.apache.thrift.TBaseHelper.toString(this.authorizations, sb); } first = false; } @@ -719,11 +749,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set50 = iprot.readSetBegin(); struct.authorizations = new HashSet<ByteBuffer>(2*_set50.size); - for (int _i51 = 0; _i51 < _set50.size; ++_i51) + ByteBuffer _elem51; + for (int _i52 = 0; _i52 < _set50.size; ++_i52) { - ByteBuffer _elem52; - _elem52 = iprot.readBinary(); - struct.authorizations.add(_elem52); + _elem51 = iprot.readBinary(); + struct.authorizations.add(_elem51); } iprot.readSetEnd(); } @@ -737,12 +767,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list53 = iprot.readListBegin(); struct.ranges = new ArrayList<Range>(_list53.size); - for (int _i54 = 0; _i54 < _list53.size; ++_i54) + Range _elem54; + for (int _i55 = 0; _i55 < _list53.size; ++_i55) { - Range _elem55; - _elem55 = new Range(); - _elem55.read(iprot); - struct.ranges.add(_elem55); + _elem54 = new Range(); + _elem54.read(iprot); + struct.ranges.add(_elem54); } iprot.readListEnd(); } @@ -756,12 +786,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list56 = iprot.readListBegin(); struct.columns = new ArrayList<ScanColumn>(_list56.size); - for (int _i57 = 0; _i57 < _list56.size; ++_i57) + ScanColumn _elem57; + for (int _i58 = 0; _i58 < _list56.size; ++_i58) { - ScanColumn _elem58; - _elem58 = new ScanColumn(); - _elem58.read(iprot); - struct.columns.add(_elem58); + _elem57 = new ScanColumn(); + _elem57.read(iprot); + struct.columns.add(_elem57); } iprot.readListEnd(); } @@ -775,12 +805,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list59 = iprot.readListBegin(); struct.iterators = new ArrayList<IteratorSetting>(_list59.size); - for (int _i60 = 0; _i60 < _list59.size; ++_i60) + IteratorSetting _elem60; + for (int _i61 = 0; _i61 < _list59.size; ++_i61) { - IteratorSetting _elem61; - _elem61 = new IteratorSetting(); - _elem61.read(iprot); - struct.iterators.add(_elem61); + _elem60 = new IteratorSetting(); + _elem60.read(iprot); + struct.iterators.add(_elem60); } iprot.readListEnd(); } @@ -956,11 +986,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set70 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.authorizations = new HashSet<ByteBuffer>(2*_set70.size); - for (int _i71 = 0; _i71 < _set70.size; ++_i71) + ByteBuffer _elem71; + for (int _i72 = 0; _i72 < _set70.size; ++_i72) { - ByteBuffer _elem72; - _elem72 = iprot.readBinary(); - struct.authorizations.add(_elem72); + _elem71 = iprot.readBinary(); + struct.authorizations.add(_elem71); } } struct.setAuthorizationsIsSet(true); @@ -969,12 +999,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.ranges = new ArrayList<Range>(_list73.size); - for (int _i74 = 0; _i74 < _list73.size; ++_i74) + Range _elem74; + for (int _i75 = 0; _i75 < _list73.size; ++_i75) { - Range _elem75; - _elem75 = new Range(); - _elem75.read(iprot); - struct.ranges.add(_elem75); + _elem74 = new Range(); + _elem74.read(iprot); + struct.ranges.add(_elem74); } } struct.setRangesIsSet(true); @@ -983,12 +1013,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list76 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.columns = new ArrayList<ScanColumn>(_list76.size); - for (int _i77 = 0; _i77 < _list76.size; ++_i77) + ScanColumn _elem77; + for (int _i78 = 0; _i78 < _list76.size; ++_i78) { - ScanColumn _elem78; - _elem78 = new ScanColumn(); - _elem78.read(iprot); - struct.columns.add(_elem78); + _elem77 = new ScanColumn(); + _elem77.read(iprot); + struct.columns.add(_elem77); } } struct.setColumnsIsSet(true); @@ -997,12 +1027,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.iterators = new ArrayList<IteratorSetting>(_list79.size); - for (int _i80 = 0; _i80 < _list79.size; ++_i80) + IteratorSetting _elem80; + for (int _i81 = 0; _i81 < _list79.size; ++_i81) { - IteratorSetting _elem81; - _elem81 = new IteratorSetting(); - _elem81.read(iprot); - struct.iterators.add(_elem81); + _elem80 = new IteratorSetting(); + _elem80.read(iprot); + struct.iterators.add(_elem80); } } struct.setIteratorsIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java index 007eb53..7eb09fb 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.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 Column implements org.apache.thrift.TBase<Column, Column._Fields>, java.io.Serializable, Cloneable, Comparable<Column> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class Column implements org.apache.thrift.TBase<Column, Column._Fields>, java.io.Serializable, Cloneable, Comparable<Column> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Column"); private static final org.apache.thrift.protocol.TField COL_FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("colFamily", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -152,9 +155,9 @@ import org.slf4j.LoggerFactory; ByteBuffer colVisibility) { this(); - this.colFamily = colFamily; - this.colQualifier = colQualifier; - this.colVisibility = colVisibility; + this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily); + this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier); + this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility); } /** @@ -163,15 +166,12 @@ import org.slf4j.LoggerFactory; public Column(Column other) { if (other.isSetColFamily()) { this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(other.colFamily); -; } if (other.isSetColQualifier()) { this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(other.colQualifier); -; } if (other.isSetColVisibility()) { this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(other.colVisibility); -; } } @@ -192,16 +192,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColFamily() { - return colFamily; + return org.apache.thrift.TBaseHelper.copyBinary(colFamily); } public Column setColFamily(byte[] colFamily) { - setColFamily(colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(colFamily)); + this.colFamily = colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colFamily, colFamily.length)); return this; } public Column setColFamily(ByteBuffer colFamily) { - this.colFamily = colFamily; + this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily); return this; } @@ -226,16 +226,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColQualifier() { - return colQualifier; + return org.apache.thrift.TBaseHelper.copyBinary(colQualifier); } public Column setColQualifier(byte[] colQualifier) { - setColQualifier(colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(colQualifier)); + this.colQualifier = colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colQualifier, colQualifier.length)); return this; } public Column setColQualifier(ByteBuffer colQualifier) { - this.colQualifier = colQualifier; + this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier); return this; } @@ -260,16 +260,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColVisibility() { - return colVisibility; + return org.apache.thrift.TBaseHelper.copyBinary(colVisibility); } public Column setColVisibility(byte[] colVisibility) { - setColVisibility(colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(colVisibility)); + this.colVisibility = colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colVisibility, colVisibility.length)); return this; } public Column setColVisibility(ByteBuffer colVisibility) { - this.colVisibility = colVisibility; + this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility); return this; } @@ -394,7 +394,24 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_colFamily = true && (isSetColFamily()); + list.add(present_colFamily); + if (present_colFamily) + list.add(colFamily); + + boolean present_colQualifier = true && (isSetColQualifier()); + list.add(present_colQualifier); + if (present_colQualifier) + list.add(colQualifier); + + boolean present_colVisibility = true && (isSetColVisibility()); + list.add(present_colVisibility); + if (present_colVisibility) + list.add(colVisibility); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java index 97d9542..15c9ef1 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.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 ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, ColumnUpdate._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnUpdate> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, ColumnUpdate._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnUpdate> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnUpdate"); private static final org.apache.thrift.protocol.TField COL_FAMILY_FIELD_DESC = new org.apache.thrift.protocol.TField("colFamily", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -148,7 +151,7 @@ import org.slf4j.LoggerFactory; private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __DELETECELL_ISSET_ID = 1; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.COL_VISIBILITY,_Fields.TIMESTAMP,_Fields.VALUE,_Fields.DELETE_CELL}; + private static final _Fields optionals[] = {_Fields.COL_VISIBILITY,_Fields.TIMESTAMP,_Fields.VALUE,_Fields.DELETE_CELL}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -176,8 +179,8 @@ import org.slf4j.LoggerFactory; ByteBuffer colQualifier) { this(); - this.colFamily = colFamily; - this.colQualifier = colQualifier; + this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily); + this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier); } /** @@ -187,20 +190,16 @@ import org.slf4j.LoggerFactory; __isset_bitfield = other.__isset_bitfield; if (other.isSetColFamily()) { this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(other.colFamily); -; } if (other.isSetColQualifier()) { this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(other.colQualifier); -; } if (other.isSetColVisibility()) { this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(other.colVisibility); -; } this.timestamp = other.timestamp; if (other.isSetValue()) { this.value = org.apache.thrift.TBaseHelper.copyBinary(other.value); -; } this.deleteCell = other.deleteCell; } @@ -227,16 +226,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColFamily() { - return colFamily; + return org.apache.thrift.TBaseHelper.copyBinary(colFamily); } public ColumnUpdate setColFamily(byte[] colFamily) { - setColFamily(colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(colFamily)); + this.colFamily = colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colFamily, colFamily.length)); return this; } public ColumnUpdate setColFamily(ByteBuffer colFamily) { - this.colFamily = colFamily; + this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily); return this; } @@ -261,16 +260,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColQualifier() { - return colQualifier; + return org.apache.thrift.TBaseHelper.copyBinary(colQualifier); } public ColumnUpdate setColQualifier(byte[] colQualifier) { - setColQualifier(colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(colQualifier)); + this.colQualifier = colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colQualifier, colQualifier.length)); return this; } public ColumnUpdate setColQualifier(ByteBuffer colQualifier) { - this.colQualifier = colQualifier; + this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier); return this; } @@ -295,16 +294,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColVisibility() { - return colVisibility; + return org.apache.thrift.TBaseHelper.copyBinary(colVisibility); } public ColumnUpdate setColVisibility(byte[] colVisibility) { - setColVisibility(colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(colVisibility)); + this.colVisibility = colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colVisibility, colVisibility.length)); return this; } public ColumnUpdate setColVisibility(ByteBuffer colVisibility) { - this.colVisibility = colVisibility; + this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility); return this; } @@ -352,16 +351,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForValue() { - return value; + return org.apache.thrift.TBaseHelper.copyBinary(value); } public ColumnUpdate setValue(byte[] value) { - setValue(value == null ? (ByteBuffer)null : ByteBuffer.wrap(value)); + this.value = value == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(value, value.length)); return this; } public ColumnUpdate setValue(ByteBuffer value) { - this.value = value; + this.value = org.apache.thrift.TBaseHelper.copyBinary(value); return this; } @@ -468,13 +467,13 @@ import org.slf4j.LoggerFactory; return getColVisibility(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return getTimestamp(); case VALUE: return getValue(); case DELETE_CELL: - return Boolean.valueOf(isDeleteCell()); + return isDeleteCell(); } throw new IllegalStateException(); @@ -575,7 +574,39 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_colFamily = true && (isSetColFamily()); + list.add(present_colFamily); + if (present_colFamily) + list.add(colFamily); + + boolean present_colQualifier = true && (isSetColQualifier()); + list.add(present_colQualifier); + if (present_colQualifier) + list.add(colQualifier); + + boolean present_colVisibility = true && (isSetColVisibility()); + list.add(present_colVisibility); + if (present_colVisibility) + list.add(colVisibility); + + boolean present_timestamp = true && (isSetTimestamp()); + list.add(present_timestamp); + if (present_timestamp) + list.add(timestamp); + + boolean present_value = true && (isSetValue()); + list.add(present_value); + if (present_value) + list.add(value); + + boolean present_deleteCell = true && (isSetDeleteCell()); + list.add(present_deleteCell); + if (present_deleteCell) + list.add(deleteCell); + + return list.hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java index 1875275..77cf53d 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java index 2e74e39..419353a 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.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 CompactionStrategyConfig implements org.apache.thrift.TBase<CompactionStrategyConfig, CompactionStrategyConfig._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionStrategyConfig> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class CompactionStrategyConfig implements org.apache.thrift.TBase<CompactionStrategyConfig, CompactionStrategyConfig._Fields>, java.io.Serializable, Cloneable, Comparable<CompactionStrategyConfig> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompactionStrategyConfig"); private static final org.apache.thrift.protocol.TField CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("className", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -316,7 +319,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_className = true && (isSetClassName()); + list.add(present_className); + if (present_className) + list.add(className); + + boolean present_options = true && (isSetOptions()); + list.add(present_options); + if (present_options) + list.add(options); + + return list.hashCode(); } @Override @@ -438,13 +453,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map154 = iprot.readMapBegin(); struct.options = new HashMap<String,String>(2*_map154.size); - for (int _i155 = 0; _i155 < _map154.size; ++_i155) + String _key155; + String _val156; + for (int _i157 = 0; _i157 < _map154.size; ++_i157) { - String _key156; - String _val157; - _key156 = iprot.readString(); - _val157 = iprot.readString(); - struct.options.put(_key156, _val157); + _key155 = iprot.readString(); + _val156 = iprot.readString(); + struct.options.put(_key155, _val156); } iprot.readMapEnd(); } @@ -538,13 +553,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map160 = 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*_map160.size); - for (int _i161 = 0; _i161 < _map160.size; ++_i161) + String _key161; + String _val162; + for (int _i163 = 0; _i163 < _map160.size; ++_i163) { - String _key162; - String _val163; - _key162 = iprot.readString(); - _val163 = iprot.readString(); - struct.options.put(_key162, _val163); + _key161 = iprot.readString(); + _val162 = iprot.readString(); + struct.options.put(_key161, _val162); } } struct.setOptionsIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java index 1b82951..d561796 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionType.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java index c4b3c07..f39a08c 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.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 Condition implements org.apache.thrift.TBase<Condition, Condition._Fields>, java.io.Serializable, Cloneable, Comparable<Condition> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class Condition implements org.apache.thrift.TBase<Condition, Condition._Fields>, java.io.Serializable, Cloneable, Comparable<Condition> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Condition"); private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = new org.apache.thrift.protocol.TField("column", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -137,7 +140,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __TIMESTAMP_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.VALUE,_Fields.ITERATORS}; + private static final _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.VALUE,_Fields.ITERATORS}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -175,7 +178,6 @@ import org.slf4j.LoggerFactory; this.timestamp = other.timestamp; if (other.isSetValue()) { this.value = org.apache.thrift.TBaseHelper.copyBinary(other.value); -; } if (other.isSetIterators()) { List<IteratorSetting> __this__iterators = new ArrayList<IteratorSetting>(other.iterators.size()); @@ -252,16 +254,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForValue() { - return value; + return org.apache.thrift.TBaseHelper.copyBinary(value); } public Condition setValue(byte[] value) { - setValue(value == null ? (ByteBuffer)null : ByteBuffer.wrap(value)); + this.value = value == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(value, value.length)); return this; } public Condition setValue(ByteBuffer value) { - this.value = value; + this.value = org.apache.thrift.TBaseHelper.copyBinary(value); return this; } @@ -362,7 +364,7 @@ import org.slf4j.LoggerFactory; return getColumn(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return getTimestamp(); case VALUE: return getValue(); @@ -447,7 +449,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_column = true && (isSetColumn()); + list.add(present_column); + if (present_column) + list.add(column); + + boolean present_timestamp = true && (isSetTimestamp()); + list.add(present_timestamp); + if (present_timestamp) + list.add(timestamp); + + boolean present_value = true && (isSetValue()); + list.add(present_value); + if (present_value) + list.add(value); + + boolean present_iterators = true && (isSetIterators()); + list.add(present_iterators); + if (present_iterators) + list.add(iterators); + + return list.hashCode(); } @Override @@ -629,12 +653,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list82 = iprot.readListBegin(); struct.iterators = new ArrayList<IteratorSetting>(_list82.size); - for (int _i83 = 0; _i83 < _list82.size; ++_i83) + IteratorSetting _elem83; + for (int _i84 = 0; _i84 < _list82.size; ++_i84) { - IteratorSetting _elem84; - _elem84 = new IteratorSetting(); - _elem84.read(iprot); - struct.iterators.add(_elem84); + _elem83 = new IteratorSetting(); + _elem83.read(iprot); + struct.iterators.add(_elem83); } iprot.readListEnd(); } @@ -761,12 +785,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list87 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.iterators = new ArrayList<IteratorSetting>(_list87.size); - for (int _i88 = 0; _i88 < _list87.size; ++_i88) + IteratorSetting _elem88; + for (int _i89 = 0; _i89 < _list87.size; ++_i89) { - IteratorSetting _elem89; - _elem89 = new IteratorSetting(); - _elem89.read(iprot); - struct.iterators.add(_elem89); + _elem88 = new IteratorSetting(); + _elem88.read(iprot); + struct.iterators.add(_elem88); } } struct.setIteratorsIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java index 515c416..c8626a5 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java index 551e996..1de42a7 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.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 ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUpdates, ConditionalUpdates._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalUpdates> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ConditionalUpdates implements org.apache.thrift.TBase<ConditionalUpdates, ConditionalUpdates._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalUpdates> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConditionalUpdates"); private static final org.apache.thrift.protocol.TField CONDITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("conditions", org.apache.thrift.protocol.TType.LIST, (short)2); @@ -342,7 +345,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_conditions = true && (isSetConditions()); + list.add(present_conditions); + if (present_conditions) + list.add(conditions); + + boolean present_updates = true && (isSetUpdates()); + list.add(present_updates); + if (present_updates) + list.add(updates); + + return list.hashCode(); } @Override @@ -456,12 +471,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list90 = iprot.readListBegin(); struct.conditions = new ArrayList<Condition>(_list90.size); - for (int _i91 = 0; _i91 < _list90.size; ++_i91) + Condition _elem91; + for (int _i92 = 0; _i92 < _list90.size; ++_i92) { - Condition _elem92; - _elem92 = new Condition(); - _elem92.read(iprot); - struct.conditions.add(_elem92); + _elem91 = new Condition(); + _elem91.read(iprot); + struct.conditions.add(_elem91); } iprot.readListEnd(); } @@ -475,12 +490,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list93 = iprot.readListBegin(); struct.updates = new ArrayList<ColumnUpdate>(_list93.size); - for (int _i94 = 0; _i94 < _list93.size; ++_i94) + ColumnUpdate _elem94; + for (int _i95 = 0; _i95 < _list93.size; ++_i95) { - ColumnUpdate _elem95; - _elem95 = new ColumnUpdate(); - _elem95.read(iprot); - struct.updates.add(_elem95); + _elem94 = new ColumnUpdate(); + _elem94.read(iprot); + struct.updates.add(_elem94); } iprot.readListEnd(); } @@ -581,12 +596,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list100 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.conditions = new ArrayList<Condition>(_list100.size); - for (int _i101 = 0; _i101 < _list100.size; ++_i101) + Condition _elem101; + for (int _i102 = 0; _i102 < _list100.size; ++_i102) { - Condition _elem102; - _elem102 = new Condition(); - _elem102.read(iprot); - struct.conditions.add(_elem102); + _elem101 = new Condition(); + _elem101.read(iprot); + struct.conditions.add(_elem101); } } struct.setConditionsIsSet(true); @@ -595,12 +610,12 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.updates = new ArrayList<ColumnUpdate>(_list103.size); - for (int _i104 = 0; _i104 < _list103.size; ++_i104) + ColumnUpdate _elem104; + for (int _i105 = 0; _i105 < _list103.size; ++_i105) { - ColumnUpdate _elem105; - _elem105 = new ColumnUpdate(); - _elem105.read(iprot); - struct.updates.add(_elem105); + _elem104 = new ColumnUpdate(); + _elem104.read(iprot); + struct.updates.add(_elem104); } } struct.setUpdatesIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java index 16b21fc..bfcc214 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.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 ConditionalWriterOptions implements org.apache.thrift.TBase<ConditionalWriterOptions, ConditionalWriterOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalWriterOptions> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class ConditionalWriterOptions implements org.apache.thrift.TBase<ConditionalWriterOptions, ConditionalWriterOptions._Fields>, java.io.Serializable, Cloneable, Comparable<ConditionalWriterOptions> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConditionalWriterOptions"); private static final org.apache.thrift.protocol.TField MAX_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("maxMemory", org.apache.thrift.protocol.TType.I64, (short)1); @@ -152,7 +155,7 @@ import org.slf4j.LoggerFactory; private static final int __TIMEOUTMS_ISSET_ID = 1; private static final int __THREADS_ISSET_ID = 2; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.MAX_MEMORY,_Fields.TIMEOUT_MS,_Fields.THREADS,_Fields.AUTHORIZATIONS,_Fields.DURABILITY}; + private static final _Fields optionals[] = {_Fields.MAX_MEMORY,_Fields.TIMEOUT_MS,_Fields.THREADS,_Fields.AUTHORIZATIONS,_Fields.DURABILITY}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -395,13 +398,13 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case MAX_MEMORY: - return Long.valueOf(getMaxMemory()); + return getMaxMemory(); case TIMEOUT_MS: - return Long.valueOf(getTimeoutMs()); + return getTimeoutMs(); case THREADS: - return Integer.valueOf(getThreads()); + return getThreads(); case AUTHORIZATIONS: return getAuthorizations(); @@ -497,7 +500,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_maxMemory = true && (isSetMaxMemory()); + list.add(present_maxMemory); + if (present_maxMemory) + list.add(maxMemory); + + boolean present_timeoutMs = true && (isSetTimeoutMs()); + list.add(present_timeoutMs); + if (present_timeoutMs) + list.add(timeoutMs); + + boolean present_threads = true && (isSetThreads()); + list.add(present_threads); + if (present_threads) + list.add(threads); + + boolean present_authorizations = true && (isSetAuthorizations()); + list.add(present_authorizations); + if (present_authorizations) + list.add(authorizations); + + boolean present_durability = true && (isSetDurability()); + list.add(present_durability); + if (present_durability) + list.add(durability.getValue()); + + return list.hashCode(); } @Override @@ -601,7 +631,7 @@ import org.slf4j.LoggerFactory; if (this.authorizations == null) { sb.append("null"); } else { - sb.append(this.authorizations); + org.apache.thrift.TBaseHelper.toString(this.authorizations, sb); } first = false; } @@ -689,11 +719,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set106 = iprot.readSetBegin(); struct.authorizations = new HashSet<ByteBuffer>(2*_set106.size); - for (int _i107 = 0; _i107 < _set106.size; ++_i107) + ByteBuffer _elem107; + for (int _i108 = 0; _i108 < _set106.size; ++_i108) { - ByteBuffer _elem108; - _elem108 = iprot.readBinary(); - struct.authorizations.add(_elem108); + _elem107 = iprot.readBinary(); + struct.authorizations.add(_elem107); } iprot.readSetEnd(); } @@ -704,7 +734,7 @@ import org.slf4j.LoggerFactory; break; case 5: // DURABILITY if (schemeField.type == org.apache.thrift.protocol.TType.I32) { - struct.durability = Durability.findByValue(iprot.readI32()); + struct.durability = org.apache.accumulo.proxy.thrift.Durability.findByValue(iprot.readI32()); struct.setDurabilityIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -838,17 +868,17 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TSet _set111 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.authorizations = new HashSet<ByteBuffer>(2*_set111.size); - for (int _i112 = 0; _i112 < _set111.size; ++_i112) + ByteBuffer _elem112; + for (int _i113 = 0; _i113 < _set111.size; ++_i113) { - ByteBuffer _elem113; - _elem113 = iprot.readBinary(); - struct.authorizations.add(_elem113); + _elem112 = iprot.readBinary(); + struct.authorizations.add(_elem112); } } struct.setAuthorizationsIsSet(true); } if (incoming.get(4)) { - struct.durability = Durability.findByValue(iprot.readI32()); + struct.durability = org.apache.accumulo.proxy.thrift.Durability.findByValue(iprot.readI32()); struct.setDurabilityIsSet(true); } } http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java index 82a886d..bc0b087 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/DiskUsage.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 DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<DiskUsage> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class DiskUsage implements org.apache.thrift.TBase<DiskUsage, DiskUsage._Fields>, java.io.Serializable, Cloneable, Comparable<DiskUsage> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DiskUsage"); private static final org.apache.thrift.protocol.TField TABLES_FIELD_DESC = new org.apache.thrift.protocol.TField("tables", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -264,7 +267,7 @@ import org.slf4j.LoggerFactory; return getTables(); case USAGE: - return Long.valueOf(getUsage()); + return getUsage(); } throw new IllegalStateException(); @@ -321,7 +324,19 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_tables = true && (isSetTables()); + list.add(present_tables); + if (present_tables) + list.add(tables); + + boolean present_usage = true; + list.add(present_usage); + if (present_usage) + list.add(usage); + + return list.hashCode(); } @Override @@ -433,11 +448,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list0 = iprot.readListBegin(); struct.tables = new ArrayList<String>(_list0.size); - for (int _i1 = 0; _i1 < _list0.size; ++_i1) + String _elem1; + for (int _i2 = 0; _i2 < _list0.size; ++_i2) { - String _elem2; - _elem2 = iprot.readString(); - struct.tables.add(_elem2); + _elem1 = iprot.readString(); + struct.tables.add(_elem1); } iprot.readListEnd(); } @@ -531,11 +546,11 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.tables = new ArrayList<String>(_list5.size); - for (int _i6 = 0; _i6 < _list5.size; ++_i6) + String _elem6; + for (int _i7 = 0; _i7 < _list5.size; ++_i7) { - String _elem7; - _elem7 = iprot.readString(); - struct.tables.add(_elem7); + _elem6 = iprot.readString(); + struct.tables.add(_elem6); } } struct.setTablesIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java index fb4612a..daa16c8 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Durability.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java index 0fc8de8..65408bd 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorScope.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/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java index eabc686..8381bf5 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/IteratorSetting.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 IteratorSetting implements org.apache.thrift.TBase<IteratorSetting, IteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorSetting> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class IteratorSetting implements org.apache.thrift.TBase<IteratorSetting, IteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorSetting> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IteratorSetting"); private static final org.apache.thrift.protocol.TField PRIORITY_FIELD_DESC = new org.apache.thrift.protocol.TField("priority", org.apache.thrift.protocol.TType.I32, (short)1); @@ -348,7 +351,7 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { case PRIORITY: - return Integer.valueOf(getPriority()); + return getPriority(); case NAME: return getName(); @@ -436,7 +439,29 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_priority = true; + list.add(present_priority); + if (present_priority) + list.add(priority); + + boolean present_name = true && (isSetName()); + list.add(present_name); + if (present_name) + list.add(name); + + boolean present_iteratorClass = true && (isSetIteratorClass()); + list.add(present_iteratorClass); + if (present_iteratorClass) + list.add(iteratorClass); + + boolean present_properties = true && (isSetProperties()); + list.add(present_properties); + if (present_properties) + list.add(properties); + + return list.hashCode(); } @Override @@ -608,13 +633,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin(); struct.properties = new HashMap<String,String>(2*_map16.size); - for (int _i17 = 0; _i17 < _map16.size; ++_i17) + String _key17; + String _val18; + for (int _i19 = 0; _i19 < _map16.size; ++_i19) { - String _key18; - String _val19; - _key18 = iprot.readString(); - _val19 = iprot.readString(); - struct.properties.put(_key18, _val19); + _key17 = iprot.readString(); + _val18 = iprot.readString(); + struct.properties.put(_key17, _val18); } iprot.readMapEnd(); } @@ -736,13 +761,13 @@ import org.slf4j.LoggerFactory; { org.apache.thrift.protocol.TMap _map22 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.properties = new HashMap<String,String>(2*_map22.size); - for (int _i23 = 0; _i23 < _map22.size; ++_i23) + String _key23; + String _val24; + for (int _i25 = 0; _i25 < _map22.size; ++_i25) { - String _key24; - String _val25; - _key24 = iprot.readString(); - _val25 = iprot.readString(); - struct.properties.put(_key24, _val25); + _key23 = iprot.readString(); + _val24 = iprot.readString(); + struct.properties.put(_key23, _val24); } } struct.setPropertiesIsSet(true); http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java ---------------------------------------------------------------------- diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java index 6984cf2..331ac0c 100644 --- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java +++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.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 Key implements org.apache.thrift.TBase<Key, Key._Fields>, java.io.Serializable, Cloneable, Comparable<Key> { +@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16") +public class Key implements org.apache.thrift.TBase<Key, Key._Fields>, java.io.Serializable, Cloneable, Comparable<Key> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Key"); private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -142,7 +145,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __TIMESTAMP_ISSET_ID = 0; private byte __isset_bitfield = 0; - private _Fields optionals[] = {_Fields.TIMESTAMP}; + private static final _Fields optionals[] = {_Fields.TIMESTAMP}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -172,10 +175,10 @@ import org.slf4j.LoggerFactory; ByteBuffer colVisibility) { this(); - this.row = row; - this.colFamily = colFamily; - this.colQualifier = colQualifier; - this.colVisibility = colVisibility; + this.row = org.apache.thrift.TBaseHelper.copyBinary(row); + this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily); + this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier); + this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility); } /** @@ -185,19 +188,15 @@ import org.slf4j.LoggerFactory; __isset_bitfield = other.__isset_bitfield; if (other.isSetRow()) { this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row); -; } if (other.isSetColFamily()) { this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(other.colFamily); -; } if (other.isSetColQualifier()) { this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(other.colQualifier); -; } if (other.isSetColVisibility()) { this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(other.colVisibility); -; } this.timestamp = other.timestamp; } @@ -222,16 +221,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForRow() { - return row; + return org.apache.thrift.TBaseHelper.copyBinary(row); } public Key setRow(byte[] row) { - setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row)); + this.row = row == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(row, row.length)); return this; } public Key setRow(ByteBuffer row) { - this.row = row; + this.row = org.apache.thrift.TBaseHelper.copyBinary(row); return this; } @@ -256,16 +255,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColFamily() { - return colFamily; + return org.apache.thrift.TBaseHelper.copyBinary(colFamily); } public Key setColFamily(byte[] colFamily) { - setColFamily(colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(colFamily)); + this.colFamily = colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colFamily, colFamily.length)); return this; } public Key setColFamily(ByteBuffer colFamily) { - this.colFamily = colFamily; + this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily); return this; } @@ -290,16 +289,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColQualifier() { - return colQualifier; + return org.apache.thrift.TBaseHelper.copyBinary(colQualifier); } public Key setColQualifier(byte[] colQualifier) { - setColQualifier(colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(colQualifier)); + this.colQualifier = colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colQualifier, colQualifier.length)); return this; } public Key setColQualifier(ByteBuffer colQualifier) { - this.colQualifier = colQualifier; + this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier); return this; } @@ -324,16 +323,16 @@ import org.slf4j.LoggerFactory; } public ByteBuffer bufferForColVisibility() { - return colVisibility; + return org.apache.thrift.TBaseHelper.copyBinary(colVisibility); } public Key setColVisibility(byte[] colVisibility) { - setColVisibility(colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(colVisibility)); + this.colVisibility = colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colVisibility, colVisibility.length)); return this; } public Key setColVisibility(ByteBuffer colVisibility) { - this.colVisibility = colVisibility; + this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility); return this; } @@ -435,7 +434,7 @@ import org.slf4j.LoggerFactory; return getColVisibility(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return getTimestamp(); } throw new IllegalStateException(); @@ -525,7 +524,34 @@ import org.slf4j.LoggerFactory; @Override public int hashCode() { - return 0; + List<Object> list = new ArrayList<Object>(); + + boolean present_row = true && (isSetRow()); + list.add(present_row); + if (present_row) + list.add(row); + + boolean present_colFamily = true && (isSetColFamily()); + list.add(present_colFamily); + if (present_colFamily) + list.add(colFamily); + + boolean present_colQualifier = true && (isSetColQualifier()); + list.add(present_colQualifier); + if (present_colQualifier) + list.add(colQualifier); + + boolean present_colVisibility = true && (isSetColVisibility()); + list.add(present_colVisibility); + if (present_colVisibility) + list.add(colVisibility); + + boolean present_timestamp = true && (isSetTimestamp()); + list.add(present_timestamp); + if (present_timestamp) + list.add(timestamp); + + return list.hashCode(); } @Override
