http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java index 4cd5eb9..3624f6c 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IOError.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,15 +29,18 @@ 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"}) /** * An IOError exception signals that an error occurred communicating * to the Hbase master or an Hbase region server. Also used to return * more general Hbase error conditions. */ -public class IOError extends TException implements org.apache.thrift.TBase<IOError, IOError._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class IOError extends TException implements org.apache.thrift.TBase<IOError, IOError._Fields>, java.io.Serializable, Cloneable, Comparable<IOError> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IOError"); private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -231,30 +235,30 @@ public class IOError extends TException implements org.apache.thrift.TBase<IOErr @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_message = true && (isSetMessage()); - builder.append(present_message); + list.add(present_message); if (present_message) - builder.append(message); + list.add(message); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(IOError other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - IOError typedOther = (IOError)other; - lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); if (lastComparison != 0) { return lastComparison; } if (isSetMessage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); if (lastComparison != 0) { return lastComparison; }
http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java index c1b0b7e..099098e 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,14 +29,17 @@ 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"}) /** * An IllegalArgument exception indicates an illegal or invalid * argument was passed into a procedure. */ -public class IllegalArgument extends TException implements org.apache.thrift.TBase<IllegalArgument, IllegalArgument._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class IllegalArgument extends TException implements org.apache.thrift.TBase<IllegalArgument, IllegalArgument._Fields>, java.io.Serializable, Cloneable, Comparable<IllegalArgument> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IllegalArgument"); private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -230,30 +234,30 @@ public class IllegalArgument extends TException implements org.apache.thrift.TBa @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_message = true && (isSetMessage()); - builder.append(present_message); + list.add(present_message); if (present_message) - builder.append(message); + list.add(message); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(IllegalArgument other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - IllegalArgument typedOther = (IllegalArgument)other; - lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage()); + lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage()); if (lastComparison != 0) { return lastComparison; } if (isSetMessage()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message); if (lastComparison != 0) { return lastComparison; } http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java index 98ad68f..5e91281 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,13 +29,16 @@ 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"}) /** * A Mutation object is used to either update or delete a column-value. */ -public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fields>, java.io.Serializable, Cloneable, Comparable<Mutation> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Mutation"); private static final org.apache.thrift.protocol.TField IS_DELETE_FIELD_DESC = new org.apache.thrift.protocol.TField("isDelete", org.apache.thrift.protocol.TType.BOOL, (short)1); @@ -155,8 +159,8 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie this(); this.isDelete = isDelete; setIsDeleteIsSet(true); - this.column = column; - this.value = value; + this.column = org.apache.thrift.TBaseHelper.copyBinary(column); + this.value = org.apache.thrift.TBaseHelper.copyBinary(value); this.writeToWAL = writeToWAL; setWriteToWALIsSet(true); } @@ -219,16 +223,16 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie } public ByteBuffer bufferForColumn() { - return column; + return org.apache.thrift.TBaseHelper.copyBinary(column); } public Mutation setColumn(byte[] column) { - setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); + this.column = column == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(column, column.length)); return this; } public Mutation setColumn(ByteBuffer column) { - this.column = column; + this.column = org.apache.thrift.TBaseHelper.copyBinary(column); return this; } @@ -253,16 +257,16 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie } public ByteBuffer bufferForValue() { - return value; + return org.apache.thrift.TBaseHelper.copyBinary(value); } public Mutation 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 Mutation setValue(ByteBuffer value) { - this.value = value; + this.value = org.apache.thrift.TBaseHelper.copyBinary(value); return this; } @@ -344,7 +348,7 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie public Object getFieldValue(_Fields field) { switch (field) { case IS_DELETE: - return Boolean.valueOf(isIsDelete()); + return isIsDelete(); case COLUMN: return getColumn(); @@ -353,7 +357,7 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie return getValue(); case WRITE_TO_WAL: - return Boolean.valueOf(isWriteToWAL()); + return isWriteToWAL(); } throw new IllegalStateException(); @@ -432,75 +436,75 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_isDelete = true; - builder.append(present_isDelete); + list.add(present_isDelete); if (present_isDelete) - builder.append(isDelete); + list.add(isDelete); boolean present_column = true && (isSetColumn()); - builder.append(present_column); + list.add(present_column); if (present_column) - builder.append(column); + list.add(column); boolean present_value = true && (isSetValue()); - builder.append(present_value); + list.add(present_value); if (present_value) - builder.append(value); + list.add(value); boolean present_writeToWAL = true; - builder.append(present_writeToWAL); + list.add(present_writeToWAL); if (present_writeToWAL) - builder.append(writeToWAL); + list.add(writeToWAL); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(Mutation other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - Mutation typedOther = (Mutation)other; - lastComparison = Boolean.valueOf(isSetIsDelete()).compareTo(typedOther.isSetIsDelete()); + lastComparison = Boolean.valueOf(isSetIsDelete()).compareTo(other.isSetIsDelete()); if (lastComparison != 0) { return lastComparison; } if (isSetIsDelete()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isDelete, typedOther.isDelete); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isDelete, other.isDelete); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn()); + lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn()); if (lastComparison != 0) { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue()); + lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue()); if (lastComparison != 0) { return lastComparison; } if (isSetValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetWriteToWAL()).compareTo(typedOther.isSetWriteToWAL()); + lastComparison = Boolean.valueOf(isSetWriteToWAL()).compareTo(other.isSetWriteToWAL()); if (lastComparison != 0) { return lastComparison; } if (isSetWriteToWAL()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.writeToWAL, typedOther.writeToWAL); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.writeToWAL, other.writeToWAL); if (lastComparison != 0) { return lastComparison; } @@ -533,7 +537,7 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie if (this.column == null) { sb.append("null"); } else { - sb.append(this.column); + org.apache.thrift.TBaseHelper.toString(this.column, sb); } first = false; if (!first) sb.append(", "); @@ -541,7 +545,7 @@ public class Mutation implements org.apache.thrift.TBase<Mutation, Mutation._Fie if (this.value == null) { sb.append("null"); } else { - sb.append(this.value); + org.apache.thrift.TBaseHelper.toString(this.value, sb); } first = false; if (!first) sb.append(", "); http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TAppend.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TAppend.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TAppend.java index 85e0cf4..92a6e2b 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TAppend.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TAppend.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,13 +29,16 @@ 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"}) /** * An Append object is used to specify the parameters for performing the append operation. */ -public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields>, java.io.Serializable, Cloneable, Comparable<TAppend> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAppend"); private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -148,8 +152,8 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields List<ByteBuffer> values) { this(); - this.table = table; - this.row = row; + this.table = org.apache.thrift.TBaseHelper.copyBinary(table); + this.row = org.apache.thrift.TBaseHelper.copyBinary(row); this.columns = columns; this.values = values; } @@ -165,14 +169,14 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields this.row = other.row; } if (other.isSetColumns()) { - List<ByteBuffer> __this__columns = new ArrayList<ByteBuffer>(); + List<ByteBuffer> __this__columns = new ArrayList<ByteBuffer>(other.columns.size()); for (ByteBuffer other_element : other.columns) { __this__columns.add(other_element); } this.columns = __this__columns; } if (other.isSetValues()) { - List<ByteBuffer> __this__values = new ArrayList<ByteBuffer>(); + List<ByteBuffer> __this__values = new ArrayList<ByteBuffer>(other.values.size()); for (ByteBuffer other_element : other.values) { __this__values.add(other_element); } @@ -198,16 +202,16 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields } public ByteBuffer bufferForTable() { - return table; + return org.apache.thrift.TBaseHelper.copyBinary(table); } public TAppend setTable(byte[] table) { - setTable(table == null ? (ByteBuffer)null : ByteBuffer.wrap(table)); + this.table = table == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(table, table.length)); return this; } public TAppend setTable(ByteBuffer table) { - this.table = table; + this.table = org.apache.thrift.TBaseHelper.copyBinary(table); return this; } @@ -232,16 +236,16 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields } public ByteBuffer bufferForRow() { - return row; + return org.apache.thrift.TBaseHelper.copyBinary(row); } public TAppend 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 TAppend setRow(ByteBuffer row) { - this.row = row; + this.row = org.apache.thrift.TBaseHelper.copyBinary(row); return this; } @@ -466,75 +470,75 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_table = true && (isSetTable()); - builder.append(present_table); + list.add(present_table); if (present_table) - builder.append(table); + list.add(table); boolean present_row = true && (isSetRow()); - builder.append(present_row); + list.add(present_row); if (present_row) - builder.append(row); + list.add(row); boolean present_columns = true && (isSetColumns()); - builder.append(present_columns); + list.add(present_columns); if (present_columns) - builder.append(columns); + list.add(columns); boolean present_values = true && (isSetValues()); - builder.append(present_values); + list.add(present_values); if (present_values) - builder.append(values); + list.add(values); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(TAppend other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TAppend typedOther = (TAppend)other; - lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable()); + lastComparison = Boolean.valueOf(isSetTable()).compareTo(other.isSetTable()); if (lastComparison != 0) { return lastComparison; } if (isSetTable()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, typedOther.table); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, other.table); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); + lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow()); if (lastComparison != 0) { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); + lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); if (lastComparison != 0) { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetValues()).compareTo(typedOther.isSetValues()); + lastComparison = Boolean.valueOf(isSetValues()).compareTo(other.isSetValues()); if (lastComparison != 0) { return lastComparison; } if (isSetValues()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.values, typedOther.values); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.values, other.values); if (lastComparison != 0) { return lastComparison; } @@ -563,7 +567,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields if (this.table == null) { sb.append("null"); } else { - sb.append(this.table); + org.apache.thrift.TBaseHelper.toString(this.table, sb); } first = false; if (!first) sb.append(", "); @@ -571,7 +575,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields if (this.row == null) { sb.append("null"); } else { - sb.append(this.row); + org.apache.thrift.TBaseHelper.toString(this.row, sb); } first = false; if (!first) sb.append(", "); @@ -579,7 +583,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields if (this.columns == null) { sb.append("null"); } else { - sb.append(this.columns); + org.apache.thrift.TBaseHelper.toString(this.columns, sb); } first = false; if (!first) sb.append(", "); @@ -587,7 +591,7 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields if (this.values == null) { sb.append("null"); } else { - sb.append(this.values); + org.apache.thrift.TBaseHelper.toString(this.values, sb); } first = false; sb.append(")"); @@ -654,11 +658,11 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields { org.apache.thrift.protocol.TList _list34 = iprot.readListBegin(); struct.columns = new ArrayList<ByteBuffer>(_list34.size); - for (int _i35 = 0; _i35 < _list34.size; ++_i35) + ByteBuffer _elem35; + for (int _i36 = 0; _i36 < _list34.size; ++_i36) { - ByteBuffer _elem36; // required - _elem36 = iprot.readBinary(); - struct.columns.add(_elem36); + _elem35 = iprot.readBinary(); + struct.columns.add(_elem35); } iprot.readListEnd(); } @@ -672,11 +676,11 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields { org.apache.thrift.protocol.TList _list37 = iprot.readListBegin(); struct.values = new ArrayList<ByteBuffer>(_list37.size); - for (int _i38 = 0; _i38 < _list37.size; ++_i38) + ByteBuffer _elem38; + for (int _i39 = 0; _i39 < _list37.size; ++_i39) { - ByteBuffer _elem39; // required - _elem39 = iprot.readBinary(); - struct.values.add(_elem39); + _elem38 = iprot.readBinary(); + struct.values.add(_elem38); } iprot.readListEnd(); } @@ -807,11 +811,11 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields { org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.columns = new ArrayList<ByteBuffer>(_list44.size); - for (int _i45 = 0; _i45 < _list44.size; ++_i45) + ByteBuffer _elem45; + for (int _i46 = 0; _i46 < _list44.size; ++_i46) { - ByteBuffer _elem46; // required - _elem46 = iprot.readBinary(); - struct.columns.add(_elem46); + _elem45 = iprot.readBinary(); + struct.columns.add(_elem45); } } struct.setColumnsIsSet(true); @@ -820,11 +824,11 @@ public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields { org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); struct.values = new ArrayList<ByteBuffer>(_list47.size); - for (int _i48 = 0; _i48 < _list47.size; ++_i48) + ByteBuffer _elem48; + for (int _i49 = 0; _i49 < _list47.size; ++_i49) { - ByteBuffer _elem49; // required - _elem49 = iprot.readBinary(); - struct.values.add(_elem49); + _elem48 = iprot.readBinary(); + struct.values.add(_elem48); } } struct.setValuesIsSet(true); http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java index ea29935..c63939e 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TCell.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,16 +29,19 @@ 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"}) /** * TCell - Used to transport a cell value (byte[]) and the timestamp it was * stored with together as a result for get and getRow methods. This promotes * the timestamp of a cell to a first-class value, making it easy to take * note of temporal data. Cell is used all the way from HStore up to HTable. */ -public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, java.io.Serializable, Cloneable, Comparable<TCell> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TCell"); private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -135,7 +139,7 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav long timestamp) { this(); - this.value = value; + this.value = org.apache.thrift.TBaseHelper.copyBinary(value); this.timestamp = timestamp; setTimestampIsSet(true); } @@ -168,16 +172,16 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav } public ByteBuffer bufferForValue() { - return value; + return org.apache.thrift.TBaseHelper.copyBinary(value); } public TCell 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 TCell setValue(ByteBuffer value) { - this.value = value; + this.value = org.apache.thrift.TBaseHelper.copyBinary(value); return this; } @@ -246,7 +250,7 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav return getValue(); case TIMESTAMP: - return Long.valueOf(getTimestamp()); + return getTimestamp(); } throw new IllegalStateException(); @@ -303,45 +307,45 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_value = true && (isSetValue()); - builder.append(present_value); + list.add(present_value); if (present_value) - builder.append(value); + list.add(value); boolean present_timestamp = true; - builder.append(present_timestamp); + list.add(present_timestamp); if (present_timestamp) - builder.append(timestamp); + list.add(timestamp); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(TCell other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TCell typedOther = (TCell)other; - lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue()); + lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue()); if (lastComparison != 0) { return lastComparison; } if (isSetValue()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, typedOther.value); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.value, other.value); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); + lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp()); if (lastComparison != 0) { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp); if (lastComparison != 0) { return lastComparison; } @@ -370,7 +374,7 @@ public class TCell implements org.apache.thrift.TBase<TCell, TCell._Fields>, jav if (this.value == null) { sb.append("null"); } else { - sb.append(this.value); + org.apache.thrift.TBaseHelper.toString(this.value, sb); } first = false; if (!first) sb.append(", "); http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TColumn.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TColumn.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TColumn.java index 22a137e..4e92dc6 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TColumn.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TColumn.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,13 +29,16 @@ 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"}) /** * Holds column name and the cell. */ -public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields>, java.io.Serializable, Cloneable, Comparable<TColumn> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumn"); private static final org.apache.thrift.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("columnName", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -130,7 +134,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields TCell cell) { this(); - this.columnName = columnName; + this.columnName = org.apache.thrift.TBaseHelper.copyBinary(columnName); this.cell = cell; } @@ -162,16 +166,16 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields } public ByteBuffer bufferForColumnName() { - return columnName; + return org.apache.thrift.TBaseHelper.copyBinary(columnName); } public TColumn setColumnName(byte[] columnName) { - setColumnName(columnName == null ? (ByteBuffer)null : ByteBuffer.wrap(columnName)); + this.columnName = columnName == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(columnName, columnName.length)); return this; } public TColumn setColumnName(ByteBuffer columnName) { - this.columnName = columnName; + this.columnName = org.apache.thrift.TBaseHelper.copyBinary(columnName); return this; } @@ -298,45 +302,45 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_columnName = true && (isSetColumnName()); - builder.append(present_columnName); + list.add(present_columnName); if (present_columnName) - builder.append(columnName); + list.add(columnName); boolean present_cell = true && (isSetCell()); - builder.append(present_cell); + list.add(present_cell); if (present_cell) - builder.append(cell); + list.add(cell); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(TColumn other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TColumn typedOther = (TColumn)other; - lastComparison = Boolean.valueOf(isSetColumnName()).compareTo(typedOther.isSetColumnName()); + lastComparison = Boolean.valueOf(isSetColumnName()).compareTo(other.isSetColumnName()); if (lastComparison != 0) { return lastComparison; } if (isSetColumnName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnName, typedOther.columnName); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnName, other.columnName); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCell()).compareTo(typedOther.isSetCell()); + lastComparison = Boolean.valueOf(isSetCell()).compareTo(other.isSetCell()); if (lastComparison != 0) { return lastComparison; } if (isSetCell()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cell, typedOther.cell); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cell, other.cell); if (lastComparison != 0) { return lastComparison; } @@ -365,7 +369,7 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields if (this.columnName == null) { sb.append("null"); } else { - sb.append(this.columnName); + org.apache.thrift.TBaseHelper.toString(this.columnName, sb); } first = false; if (!first) sb.append(", "); http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java index 6200279..10ef656 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TIncrement.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,14 +29,17 @@ 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"}) /** * For increments that are not incrementColumnValue * equivalents. */ -public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncrement._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncrement._Fields>, java.io.Serializable, Cloneable, Comparable<TIncrement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIncrement"); private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -149,9 +153,9 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen long ammount) { this(); - this.table = table; - this.row = row; - this.column = column; + this.table = org.apache.thrift.TBaseHelper.copyBinary(table); + this.row = org.apache.thrift.TBaseHelper.copyBinary(row); + this.column = org.apache.thrift.TBaseHelper.copyBinary(column); this.ammount = ammount; setAmmountIsSet(true); } @@ -192,16 +196,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen } public ByteBuffer bufferForTable() { - return table; + return org.apache.thrift.TBaseHelper.copyBinary(table); } public TIncrement setTable(byte[] table) { - setTable(table == null ? (ByteBuffer)null : ByteBuffer.wrap(table)); + this.table = table == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(table, table.length)); return this; } public TIncrement setTable(ByteBuffer table) { - this.table = table; + this.table = org.apache.thrift.TBaseHelper.copyBinary(table); return this; } @@ -226,16 +230,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen } public ByteBuffer bufferForRow() { - return row; + return org.apache.thrift.TBaseHelper.copyBinary(row); } public TIncrement 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 TIncrement setRow(ByteBuffer row) { - this.row = row; + this.row = org.apache.thrift.TBaseHelper.copyBinary(row); return this; } @@ -260,16 +264,16 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen } public ByteBuffer bufferForColumn() { - return column; + return org.apache.thrift.TBaseHelper.copyBinary(column); } public TIncrement setColumn(byte[] column) { - setColumn(column == null ? (ByteBuffer)null : ByteBuffer.wrap(column)); + this.column = column == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(column, column.length)); return this; } public TIncrement setColumn(ByteBuffer column) { - this.column = column; + this.column = org.apache.thrift.TBaseHelper.copyBinary(column); return this; } @@ -360,7 +364,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen return getColumn(); case AMMOUNT: - return Long.valueOf(getAmmount()); + return getAmmount(); } throw new IllegalStateException(); @@ -439,75 +443,75 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_table = true && (isSetTable()); - builder.append(present_table); + list.add(present_table); if (present_table) - builder.append(table); + list.add(table); boolean present_row = true && (isSetRow()); - builder.append(present_row); + list.add(present_row); if (present_row) - builder.append(row); + list.add(row); boolean present_column = true && (isSetColumn()); - builder.append(present_column); + list.add(present_column); if (present_column) - builder.append(column); + list.add(column); boolean present_ammount = true; - builder.append(present_ammount); + list.add(present_ammount); if (present_ammount) - builder.append(ammount); + list.add(ammount); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(TIncrement other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TIncrement typedOther = (TIncrement)other; - lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable()); + lastComparison = Boolean.valueOf(isSetTable()).compareTo(other.isSetTable()); if (lastComparison != 0) { return lastComparison; } if (isSetTable()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, typedOther.table); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, other.table); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); + lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow()); if (lastComparison != 0) { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumn()).compareTo(typedOther.isSetColumn()); + lastComparison = Boolean.valueOf(isSetColumn()).compareTo(other.isSetColumn()); if (lastComparison != 0) { return lastComparison; } if (isSetColumn()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, typedOther.column); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.column, other.column); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAmmount()).compareTo(typedOther.isSetAmmount()); + lastComparison = Boolean.valueOf(isSetAmmount()).compareTo(other.isSetAmmount()); if (lastComparison != 0) { return lastComparison; } if (isSetAmmount()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ammount, typedOther.ammount); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ammount, other.ammount); if (lastComparison != 0) { return lastComparison; } @@ -536,7 +540,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen if (this.table == null) { sb.append("null"); } else { - sb.append(this.table); + org.apache.thrift.TBaseHelper.toString(this.table, sb); } first = false; if (!first) sb.append(", "); @@ -544,7 +548,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen if (this.row == null) { sb.append("null"); } else { - sb.append(this.row); + org.apache.thrift.TBaseHelper.toString(this.row, sb); } first = false; if (!first) sb.append(", "); @@ -552,7 +556,7 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen if (this.column == null) { sb.append("null"); } else { - sb.append(this.column); + org.apache.thrift.TBaseHelper.toString(this.column, sb); } first = false; if (!first) sb.append(", "); http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java index 278ef3a..760908c 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRegionInfo.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,13 +29,16 @@ 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"}) /** * A TRegionInfo contains information about an HTable region. */ -public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegionInfo._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegionInfo._Fields>, java.io.Serializable, Cloneable, Comparable<TRegionInfo> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRegionInfo"); private static final org.apache.thrift.protocol.TField START_KEY_FIELD_DESC = new org.apache.thrift.protocol.TField("startKey", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -174,14 +178,14 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion int port) { this(); - this.startKey = startKey; - this.endKey = endKey; + this.startKey = org.apache.thrift.TBaseHelper.copyBinary(startKey); + this.endKey = org.apache.thrift.TBaseHelper.copyBinary(endKey); this.id = id; setIdIsSet(true); - this.name = name; + this.name = org.apache.thrift.TBaseHelper.copyBinary(name); this.version = version; setVersionIsSet(true); - this.serverName = serverName; + this.serverName = org.apache.thrift.TBaseHelper.copyBinary(serverName); this.port = port; setPortIsSet(true); } @@ -232,16 +236,16 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion } public ByteBuffer bufferForStartKey() { - return startKey; + return org.apache.thrift.TBaseHelper.copyBinary(startKey); } public TRegionInfo setStartKey(byte[] startKey) { - setStartKey(startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(startKey)); + this.startKey = startKey == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(startKey, startKey.length)); return this; } public TRegionInfo setStartKey(ByteBuffer startKey) { - this.startKey = startKey; + this.startKey = org.apache.thrift.TBaseHelper.copyBinary(startKey); return this; } @@ -266,16 +270,16 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion } public ByteBuffer bufferForEndKey() { - return endKey; + return org.apache.thrift.TBaseHelper.copyBinary(endKey); } public TRegionInfo setEndKey(byte[] endKey) { - setEndKey(endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(endKey)); + this.endKey = endKey == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(endKey, endKey.length)); return this; } public TRegionInfo setEndKey(ByteBuffer endKey) { - this.endKey = endKey; + this.endKey = org.apache.thrift.TBaseHelper.copyBinary(endKey); return this; } @@ -323,16 +327,16 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion } public ByteBuffer bufferForName() { - return name; + return org.apache.thrift.TBaseHelper.copyBinary(name); } public TRegionInfo setName(byte[] name) { - setName(name == null ? (ByteBuffer)null : ByteBuffer.wrap(name)); + this.name = name == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(name, name.length)); return this; } public TRegionInfo setName(ByteBuffer name) { - this.name = name; + this.name = org.apache.thrift.TBaseHelper.copyBinary(name); return this; } @@ -380,16 +384,16 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion } public ByteBuffer bufferForServerName() { - return serverName; + return org.apache.thrift.TBaseHelper.copyBinary(serverName); } public TRegionInfo setServerName(byte[] serverName) { - setServerName(serverName == null ? (ByteBuffer)null : ByteBuffer.wrap(serverName)); + this.serverName = serverName == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(serverName, serverName.length)); return this; } public TRegionInfo setServerName(ByteBuffer serverName) { - this.serverName = serverName; + this.serverName = org.apache.thrift.TBaseHelper.copyBinary(serverName); return this; } @@ -501,19 +505,19 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion return getEndKey(); case ID: - return Long.valueOf(getId()); + return getId(); case NAME: return getName(); case VERSION: - return Byte.valueOf(getVersion()); + return getVersion(); case SERVER_NAME: return getServerName(); case PORT: - return Integer.valueOf(getPort()); + return getPort(); } throw new IllegalStateException(); @@ -625,120 +629,120 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_startKey = true && (isSetStartKey()); - builder.append(present_startKey); + list.add(present_startKey); if (present_startKey) - builder.append(startKey); + list.add(startKey); boolean present_endKey = true && (isSetEndKey()); - builder.append(present_endKey); + list.add(present_endKey); if (present_endKey) - builder.append(endKey); + list.add(endKey); boolean present_id = true; - builder.append(present_id); + list.add(present_id); if (present_id) - builder.append(id); + list.add(id); boolean present_name = true && (isSetName()); - builder.append(present_name); + list.add(present_name); if (present_name) - builder.append(name); + list.add(name); boolean present_version = true; - builder.append(present_version); + list.add(present_version); if (present_version) - builder.append(version); + list.add(version); boolean present_serverName = true && (isSetServerName()); - builder.append(present_serverName); + list.add(present_serverName); if (present_serverName) - builder.append(serverName); + list.add(serverName); boolean present_port = true; - builder.append(present_port); + list.add(present_port); if (present_port) - builder.append(port); + list.add(port); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(TRegionInfo other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TRegionInfo typedOther = (TRegionInfo)other; - lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(typedOther.isSetStartKey()); + lastComparison = Boolean.valueOf(isSetStartKey()).compareTo(other.isSetStartKey()); if (lastComparison != 0) { return lastComparison; } if (isSetStartKey()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, typedOther.startKey); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startKey, other.startKey); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(typedOther.isSetEndKey()); + lastComparison = Boolean.valueOf(isSetEndKey()).compareTo(other.isSetEndKey()); if (lastComparison != 0) { return lastComparison; } if (isSetEndKey()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, typedOther.endKey); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endKey, other.endKey); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetId()).compareTo(typedOther.isSetId()); + lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId()); if (lastComparison != 0) { return lastComparison; } if (isSetId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName()); + lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); if (lastComparison != 0) { return lastComparison; } if (isSetName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetVersion()).compareTo(typedOther.isSetVersion()); + lastComparison = Boolean.valueOf(isSetVersion()).compareTo(other.isSetVersion()); if (lastComparison != 0) { return lastComparison; } if (isSetVersion()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, typedOther.version); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.version, other.version); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetServerName()).compareTo(typedOther.isSetServerName()); + lastComparison = Boolean.valueOf(isSetServerName()).compareTo(other.isSetServerName()); if (lastComparison != 0) { return lastComparison; } if (isSetServerName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, typedOther.serverName); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverName, other.serverName); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort()); + lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort()); if (lastComparison != 0) { return lastComparison; } if (isSetPort()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port); if (lastComparison != 0) { return lastComparison; } @@ -767,7 +771,7 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion if (this.startKey == null) { sb.append("null"); } else { - sb.append(this.startKey); + org.apache.thrift.TBaseHelper.toString(this.startKey, sb); } first = false; if (!first) sb.append(", "); @@ -775,7 +779,7 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion if (this.endKey == null) { sb.append("null"); } else { - sb.append(this.endKey); + org.apache.thrift.TBaseHelper.toString(this.endKey, sb); } first = false; if (!first) sb.append(", "); @@ -787,7 +791,7 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion if (this.name == null) { sb.append("null"); } else { - sb.append(this.name); + org.apache.thrift.TBaseHelper.toString(this.name, sb); } first = false; if (!first) sb.append(", "); @@ -799,7 +803,7 @@ public class TRegionInfo implements org.apache.thrift.TBase<TRegionInfo, TRegion if (this.serverName == null) { sb.append("null"); } else { - sb.append(this.serverName); + org.apache.thrift.TBaseHelper.toString(this.serverName, sb); } first = false; if (!first) sb.append(", "); http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java index 3bb244d..842e803 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/TRowResult.java @@ -1,12 +1,11 @@ /** - * Autogenerated by Thrift Compiler (0.9.0) + * Autogenerated by Thrift Compiler (0.9.3) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift.generated; -import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.thrift.scheme.IScheme; import org.apache.thrift.scheme.SchemeFactory; import org.apache.thrift.scheme.StandardScheme; @@ -16,6 +15,8 @@ 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; @@ -28,13 +29,16 @@ 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"}) /** * Holds row name and then a map of columns to cells. */ -public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResult._Fields>, java.io.Serializable, Cloneable { +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17") +public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResult._Fields>, java.io.Serializable, Cloneable, Comparable<TRowResult> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowResult"); 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); @@ -116,7 +120,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul } // isset id assignments - private _Fields optionals[] = {_Fields.COLUMNS,_Fields.SORTED_COLUMNS}; + private static final _Fields optionals[] = {_Fields.COLUMNS,_Fields.SORTED_COLUMNS}; 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); @@ -140,7 +144,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul ByteBuffer row) { this(); - this.row = row; + this.row = org.apache.thrift.TBaseHelper.copyBinary(row); } /** @@ -151,7 +155,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul this.row = other.row; } if (other.isSetColumns()) { - Map<ByteBuffer,TCell> __this__columns = new HashMap<ByteBuffer,TCell>(); + Map<ByteBuffer,TCell> __this__columns = new HashMap<ByteBuffer,TCell>(other.columns.size()); for (Map.Entry<ByteBuffer, TCell> other_element : other.columns.entrySet()) { ByteBuffer other_element_key = other_element.getKey(); @@ -166,7 +170,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul this.columns = __this__columns; } if (other.isSetSortedColumns()) { - List<TColumn> __this__sortedColumns = new ArrayList<TColumn>(); + List<TColumn> __this__sortedColumns = new ArrayList<TColumn>(other.sortedColumns.size()); for (TColumn other_element : other.sortedColumns) { __this__sortedColumns.add(new TColumn(other_element)); } @@ -191,16 +195,16 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul } public ByteBuffer bufferForRow() { - return row; + return org.apache.thrift.TBaseHelper.copyBinary(row); } public TRowResult 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 TRowResult setRow(ByteBuffer row) { - this.row = row; + this.row = org.apache.thrift.TBaseHelper.copyBinary(row); return this; } @@ -399,60 +403,60 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); + List<Object> list = new ArrayList<Object>(); boolean present_row = true && (isSetRow()); - builder.append(present_row); + list.add(present_row); if (present_row) - builder.append(row); + list.add(row); boolean present_columns = true && (isSetColumns()); - builder.append(present_columns); + list.add(present_columns); if (present_columns) - builder.append(columns); + list.add(columns); boolean present_sortedColumns = true && (isSetSortedColumns()); - builder.append(present_sortedColumns); + list.add(present_sortedColumns); if (present_sortedColumns) - builder.append(sortedColumns); + list.add(sortedColumns); - return builder.toHashCode(); + return list.hashCode(); } + @Override public int compareTo(TRowResult other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - TRowResult typedOther = (TRowResult)other; - lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); + lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow()); if (lastComparison != 0) { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); + lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); if (lastComparison != 0) { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetSortedColumns()).compareTo(typedOther.isSetSortedColumns()); + lastComparison = Boolean.valueOf(isSetSortedColumns()).compareTo(other.isSetSortedColumns()); if (lastComparison != 0) { return lastComparison; } if (isSetSortedColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sortedColumns, typedOther.sortedColumns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sortedColumns, other.sortedColumns); if (lastComparison != 0) { return lastComparison; } @@ -481,7 +485,7 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul if (this.row == null) { sb.append("null"); } else { - sb.append(this.row); + org.apache.thrift.TBaseHelper.toString(this.row, sb); } first = false; if (isSetColumns()) { @@ -560,14 +564,14 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul { org.apache.thrift.protocol.TMap _map8 = iprot.readMapBegin(); struct.columns = new HashMap<ByteBuffer,TCell>(2*_map8.size); - for (int _i9 = 0; _i9 < _map8.size; ++_i9) + ByteBuffer _key9; + TCell _val10; + for (int _i11 = 0; _i11 < _map8.size; ++_i11) { - ByteBuffer _key10; // required - TCell _val11; // required - _key10 = iprot.readBinary(); - _val11 = new TCell(); - _val11.read(iprot); - struct.columns.put(_key10, _val11); + _key9 = iprot.readBinary(); + _val10 = new TCell(); + _val10.read(iprot); + struct.columns.put(_key9, _val10); } iprot.readMapEnd(); } @@ -581,12 +585,12 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul { org.apache.thrift.protocol.TList _list12 = iprot.readListBegin(); struct.sortedColumns = new ArrayList<TColumn>(_list12.size); - for (int _i13 = 0; _i13 < _list12.size; ++_i13) + TColumn _elem13; + for (int _i14 = 0; _i14 < _list12.size; ++_i14) { - TColumn _elem14; // required - _elem14 = new TColumn(); - _elem14.read(iprot); - struct.sortedColumns.add(_elem14); + _elem13 = new TColumn(); + _elem13.read(iprot); + struct.sortedColumns.add(_elem13); } iprot.readListEnd(); } @@ -708,14 +712,14 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul { org.apache.thrift.protocol.TMap _map19 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.columns = new HashMap<ByteBuffer,TCell>(2*_map19.size); - for (int _i20 = 0; _i20 < _map19.size; ++_i20) + ByteBuffer _key20; + TCell _val21; + for (int _i22 = 0; _i22 < _map19.size; ++_i22) { - ByteBuffer _key21; // required - TCell _val22; // required - _key21 = iprot.readBinary(); - _val22 = new TCell(); - _val22.read(iprot); - struct.columns.put(_key21, _val22); + _key20 = iprot.readBinary(); + _val21 = new TCell(); + _val21.read(iprot); + struct.columns.put(_key20, _val21); } } struct.setColumnsIsSet(true); @@ -724,12 +728,12 @@ public class TRowResult implements org.apache.thrift.TBase<TRowResult, TRowResul { org.apache.thrift.protocol.TList _list23 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); struct.sortedColumns = new ArrayList<TColumn>(_list23.size); - for (int _i24 = 0; _i24 < _list23.size; ++_i24) + TColumn _elem24; + for (int _i25 = 0; _i25 < _list23.size; ++_i25) { - TColumn _elem25; // required - _elem25 = new TColumn(); - _elem25.read(iprot); - struct.sortedColumns.add(_elem25); + _elem24 = new TColumn(); + _elem24.read(iprot); + struct.sortedColumns.add(_elem24); } } struct.setSortedColumnsIsSet(true);
