From 5ffa457940bd7a299202469242478489b13ef1b9 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Fri, 7 Nov 2014 16:19:42 -0800 Subject: [PATCH] HBASE-12279 Generated thrift files were generated with the wrong parameters (Niels Basjes) --- .../hbase/thrift/generated/AlreadyExists.java | 10 +- .../hbase/thrift/generated/BatchMutation.java | 15 +- .../thrift/generated/ColumnDescriptor.java | 50 +- .../hadoop/hbase/thrift/generated/Hbase.java | 1486 +++++++++++++++-- .../hbase/thrift/generated/IOError.java | 10 +- .../thrift/generated/IllegalArgument.java | 10 +- .../hbase/thrift/generated/Mutation.java | 25 +- .../hbase/thrift/generated/TAppend.java | 25 +- .../hadoop/hbase/thrift/generated/TCell.java | 15 +- .../hbase/thrift/generated/TColumn.java | 15 +- .../hbase/thrift/generated/TIncrement.java | 25 +- .../hbase/thrift/generated/TRegionInfo.java | 40 +- .../hbase/thrift/generated/TRowResult.java | 20 +- .../hadoop/hbase/thrift/generated/TScan.java | 50 +- .../hbase/thrift2/generated/TAppend.java | 30 +- .../thrift2/generated/TAuthorization.java | 10 +- .../thrift2/generated/TCellVisibility.java | 10 +- .../hbase/thrift2/generated/TColumn.java | 20 +- .../thrift2/generated/TColumnIncrement.java | 20 +- .../hbase/thrift2/generated/TColumnValue.java | 30 +- .../hbase/thrift2/generated/TDelete.java | 115 +- .../hadoop/hbase/thrift2/generated/TGet.java | 114 +- .../thrift2/generated/THBaseService.java | 726 ++++++-- .../hbase/thrift2/generated/TIOError.java | 10 +- .../thrift2/generated/TIllegalArgument.java | 10 +- .../hbase/thrift2/generated/TIncrement.java | 30 +- .../hbase/thrift2/generated/TMutation.java | 19 +- .../hadoop/hbase/thrift2/generated/TPut.java | 96 +- .../hbase/thrift2/generated/TResult.java | 15 +- .../thrift2/generated/TRowMutations.java | 51 +- .../hadoop/hbase/thrift2/generated/TScan.java | 141 +- .../hbase/thrift2/generated/TTimeRange.java | 15 +- 32 files changed, 2824 insertions(+), 434 deletions(-) diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java index 029645c4864..091a42b1047 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java @@ -6,6 +6,7 @@ */ 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; @@ -229,7 +230,14 @@ public class AlreadyExists extends TException implements org.apache.thrift.TBase @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_message = true && (isSetMessage()); + builder.append(present_message); + if (present_message) + builder.append(message); + + return builder.toHashCode(); } public int compareTo(AlreadyExists other) { diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java index 8566ea40b70..fd038b3e07e 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java @@ -6,6 +6,7 @@ */ 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; @@ -317,7 +318,19 @@ public class BatchMutation implements org.apache.thrift.TBase, jav @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_value = true && (isSetValue()); + builder.append(present_value); + if (present_value) + builder.append(value); + + boolean present_timestamp = true; + builder.append(present_timestamp); + if (present_timestamp) + builder.append(timestamp); + + return builder.toHashCode(); } public int compareTo(TCell other) { 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 53c64cc7c9f..22a137efdb9 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 @@ -6,6 +6,7 @@ */ 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; @@ -297,7 +298,19 @@ public class TColumn implements org.apache.thrift.TBase, jav @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_startRow = true && (isSetStartRow()); + builder.append(present_startRow); + if (present_startRow) + builder.append(startRow); + + boolean present_stopRow = true && (isSetStopRow()); + builder.append(present_stopRow); + if (present_stopRow) + builder.append(stopRow); + + boolean present_timestamp = true && (isSetTimestamp()); + builder.append(present_timestamp); + if (present_timestamp) + builder.append(timestamp); + + boolean present_columns = true && (isSetColumns()); + builder.append(present_columns); + if (present_columns) + builder.append(columns); + + boolean present_caching = true && (isSetCaching()); + builder.append(present_caching); + if (present_caching) + builder.append(caching); + + boolean present_filterString = true && (isSetFilterString()); + builder.append(present_filterString); + if (present_filterString) + builder.append(filterString); + + boolean present_batchSize = true && (isSetBatchSize()); + builder.append(present_batchSize); + if (present_batchSize) + builder.append(batchSize); + + boolean present_sortColumns = true && (isSetSortColumns()); + builder.append(present_sortColumns); + if (present_sortColumns) + builder.append(sortColumns); + + boolean present_reversed = true && (isSetReversed()); + builder.append(present_reversed); + if (present_reversed) + builder.append(reversed); + + return builder.toHashCode(); } public int compareTo(TScan other) { diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAppend.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAppend.java index b945085df50..49d0e75a87c 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAppend.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAppend.java @@ -6,6 +6,7 @@ */ package org.apache.hadoop.hbase.thrift2.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; @@ -530,7 +531,34 @@ public class TAppend implements org.apache.thrift.TBase(_list44.size); - for (int _i45 = 0; _i45 < _list44.size; ++_i45) + org.apache.thrift.protocol.TList _list52 = iprot.readListBegin(); + struct.columns = new ArrayList(_list52.size); + for (int _i53 = 0; _i53 < _list52.size; ++_i53) { - TColumn _elem46; // optional - _elem46 = new TColumn(); - _elem46.read(iprot); - struct.columns.add(_elem46); + TColumn _elem54; // required + _elem54 = new TColumn(); + _elem54.read(iprot); + struct.columns.add(_elem54); } iprot.readListEnd(); } @@ -869,15 +902,15 @@ public class TDelete implements org.apache.thrift.TBase(2*_map47.size); - for (int _i48 = 0; _i48 < _map47.size; ++_i48) + org.apache.thrift.protocol.TMap _map55 = iprot.readMapBegin(); + struct.attributes = new HashMap(2*_map55.size); + for (int _i56 = 0; _i56 < _map55.size; ++_i56) { - ByteBuffer _key49; // required - ByteBuffer _val50; // required - _key49 = iprot.readBinary(); - _val50 = iprot.readBinary(); - struct.attributes.put(_key49, _val50); + ByteBuffer _key57; // required + ByteBuffer _val58; // required + _key57 = iprot.readBinary(); + _val58 = iprot.readBinary(); + struct.attributes.put(_key57, _val58); } iprot.readMapEnd(); } @@ -919,9 +952,9 @@ public class TDelete implements org.apache.thrift.TBase _iter52 : struct.attributes.entrySet()) + for (Map.Entry _iter60 : struct.attributes.entrySet()) { - oprot.writeBinary(_iter52.getKey()); - oprot.writeBinary(_iter52.getValue()); + oprot.writeBinary(_iter60.getKey()); + oprot.writeBinary(_iter60.getValue()); } oprot.writeMapEnd(); } @@ -1000,9 +1033,9 @@ public class TDelete implements org.apache.thrift.TBase _iter54 : struct.attributes.entrySet()) + for (Map.Entry _iter62 : struct.attributes.entrySet()) { - oprot.writeBinary(_iter54.getKey()); - oprot.writeBinary(_iter54.getValue()); + oprot.writeBinary(_iter62.getKey()); + oprot.writeBinary(_iter62.getValue()); } } } @@ -1035,14 +1068,14 @@ public class TDelete implements org.apache.thrift.TBase(_list55.size); - for (int _i56 = 0; _i56 < _list55.size; ++_i56) + org.apache.thrift.protocol.TList _list63 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.columns = new ArrayList(_list63.size); + for (int _i64 = 0; _i64 < _list63.size; ++_i64) { - TColumn _elem57; // optional - _elem57 = new TColumn(); - _elem57.read(iprot); - struct.columns.add(_elem57); + TColumn _elem65; // required + _elem65 = new TColumn(); + _elem65.read(iprot); + struct.columns.add(_elem65); } } struct.setColumnsIsSet(true); @@ -1057,15 +1090,15 @@ public class TDelete implements org.apache.thrift.TBase(2*_map58.size); - for (int _i59 = 0; _i59 < _map58.size; ++_i59) + org.apache.thrift.protocol.TMap _map66 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.attributes = new HashMap(2*_map66.size); + for (int _i67 = 0; _i67 < _map66.size; ++_i67) { - ByteBuffer _key60; // required - ByteBuffer _val61; // required - _key60 = iprot.readBinary(); - _val61 = iprot.readBinary(); - struct.attributes.put(_key60, _val61); + ByteBuffer _key68; // required + ByteBuffer _val69; // required + _key68 = iprot.readBinary(); + _val69 = iprot.readBinary(); + struct.attributes.put(_key68, _val69); } } struct.setAttributesIsSet(true); diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java index 2e6646bea69..7e9334165c7 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java @@ -1,11 +1,12 @@ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift2.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; @@ -15,8 +16,6 @@ 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; @@ -45,7 +44,7 @@ import org.slf4j.LoggerFactory; * If you specify a time range and a timestamp the range is ignored. * Timestamps on TColumns are ignored. */ -public class TGet implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +public class TGet implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGet"); 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); @@ -202,7 +201,7 @@ public class TGet implements org.apache.thrift.TBase, java.i ; } if (other.isSetColumns()) { - List __this__columns = new ArrayList(other.columns.size()); + List __this__columns = new ArrayList(); for (TColumn other_element : other.columns) { __this__columns.add(new TColumn(other_element)); } @@ -218,7 +217,20 @@ public class TGet implements org.apache.thrift.TBase, java.i ; } if (other.isSetAttributes()) { - Map __this__attributes = new HashMap(other.attributes); + Map __this__attributes = new HashMap(); + for (Map.Entry other_element : other.attributes.entrySet()) { + + ByteBuffer other_element_key = other_element.getKey(); + ByteBuffer other_element_value = other_element.getValue(); + + ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key); +; + + ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value); +; + + __this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value); + } this.attributes = __this__attributes; } if (other.isSetAuthorizations()) { @@ -696,93 +708,135 @@ public class TGet implements org.apache.thrift.TBase, java.i @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_row = true && (isSetRow()); + builder.append(present_row); + if (present_row) + builder.append(row); + + boolean present_columns = true && (isSetColumns()); + builder.append(present_columns); + if (present_columns) + builder.append(columns); + + boolean present_timestamp = true && (isSetTimestamp()); + builder.append(present_timestamp); + if (present_timestamp) + builder.append(timestamp); + + boolean present_timeRange = true && (isSetTimeRange()); + builder.append(present_timeRange); + if (present_timeRange) + builder.append(timeRange); + + boolean present_maxVersions = true && (isSetMaxVersions()); + builder.append(present_maxVersions); + if (present_maxVersions) + builder.append(maxVersions); + + boolean present_filterString = true && (isSetFilterString()); + builder.append(present_filterString); + if (present_filterString) + builder.append(filterString); + + boolean present_attributes = true && (isSetAttributes()); + builder.append(present_attributes); + if (present_attributes) + builder.append(attributes); + + boolean present_authorizations = true && (isSetAuthorizations()); + builder.append(present_authorizations); + if (present_authorizations) + builder.append(authorizations); + + return builder.toHashCode(); } - @Override public int compareTo(TGet other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; + TGet typedOther = (TGet)other; - lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow()); + lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); if (lastComparison != 0) { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); + lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); if (lastComparison != 0) { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp()); + lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); if (lastComparison != 0) { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(other.isSetTimeRange()); + lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(typedOther.isSetTimeRange()); if (lastComparison != 0) { return lastComparison; } if (isSetTimeRange()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, other.timeRange); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, typedOther.timeRange); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(other.isSetMaxVersions()); + lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(typedOther.isSetMaxVersions()); if (lastComparison != 0) { return lastComparison; } if (isSetMaxVersions()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, other.maxVersions); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, typedOther.maxVersions); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(other.isSetFilterString()); + lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(typedOther.isSetFilterString()); if (lastComparison != 0) { return lastComparison; } if (isSetFilterString()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, other.filterString); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes()); + lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); if (lastComparison != 0) { return lastComparison; } if (isSetAttributes()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations()); + lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations()); if (lastComparison != 0) { return lastComparison; } if (isSetAuthorizations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations); if (lastComparison != 0) { return lastComparison; } @@ -945,7 +999,7 @@ public class TGet implements org.apache.thrift.TBase, java.i struct.columns = new ArrayList(_list16.size); for (int _i17 = 0; _i17 < _list16.size; ++_i17) { - TColumn _elem18; + TColumn _elem18; // required _elem18 = new TColumn(); _elem18.read(iprot); struct.columns.add(_elem18); @@ -997,8 +1051,8 @@ public class TGet implements org.apache.thrift.TBase, java.i struct.attributes = new HashMap(2*_map19.size); for (int _i20 = 0; _i20 < _map19.size; ++_i20) { - ByteBuffer _key21; - ByteBuffer _val22; + ByteBuffer _key21; // required + ByteBuffer _val22; // required _key21 = iprot.readBinary(); _val22 = iprot.readBinary(); struct.attributes.put(_key21, _val22); @@ -1188,7 +1242,7 @@ public class TGet implements org.apache.thrift.TBase, java.i struct.columns = new ArrayList(_list27.size); for (int _i28 = 0; _i28 < _list27.size; ++_i28) { - TColumn _elem29; + TColumn _elem29; // required _elem29 = new TColumn(); _elem29.read(iprot); struct.columns.add(_elem29); @@ -1219,8 +1273,8 @@ public class TGet implements org.apache.thrift.TBase, java.i struct.attributes = new HashMap(2*_map30.size); for (int _i31 = 0; _i31 < _map30.size; ++_i31) { - ByteBuffer _key32; - ByteBuffer _val33; + ByteBuffer _key32; // required + ByteBuffer _val33; // required _key32 = iprot.readBinary(); _val33 = iprot.readBinary(); struct.attributes.put(_key32, _val33); diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java index 1337a444e57..f2a5845edae 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java @@ -6,6 +6,7 @@ */ package org.apache.hadoop.hbase.thrift2.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; @@ -2027,7 +2028,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_get = true && (isSetGet()); + builder.append(present_get); + if (present_get) + builder.append(get); + + return builder.toHashCode(); } public int compareTo(exists_args other) { @@ -2477,7 +2490,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true; + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(exists_result other) { @@ -2966,7 +2991,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_get = true && (isSetGet()); + builder.append(present_get); + if (present_get) + builder.append(get); + + return builder.toHashCode(); } public int compareTo(get_args other) { @@ -3414,7 +3451,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true && (isSetSuccess()); + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(get_result other) { @@ -3938,7 +3987,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_gets = true && (isSetGets()); + builder.append(present_gets); + if (present_gets) + builder.append(gets); + + return builder.toHashCode(); } public int compareTo(getMultiple_args other) { @@ -4064,14 +4125,14 @@ public class THBaseService { case 2: // GETS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list124 = iprot.readListBegin(); - struct.gets = new ArrayList(_list124.size); - for (int _i125 = 0; _i125 < _list124.size; ++_i125) + org.apache.thrift.protocol.TList _list132 = iprot.readListBegin(); + struct.gets = new ArrayList(_list132.size); + for (int _i133 = 0; _i133 < _list132.size; ++_i133) { - TGet _elem126; // required - _elem126 = new TGet(); - _elem126.read(iprot); - struct.gets.add(_elem126); + TGet _elem134; // required + _elem134 = new TGet(); + _elem134.read(iprot); + struct.gets.add(_elem134); } iprot.readListEnd(); } @@ -4104,9 +4165,9 @@ public class THBaseService { oprot.writeFieldBegin(GETS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.gets.size())); - for (TGet _iter127 : struct.gets) + for (TGet _iter135 : struct.gets) { - _iter127.write(oprot); + _iter135.write(oprot); } oprot.writeListEnd(); } @@ -4132,9 +4193,9 @@ public class THBaseService { oprot.writeBinary(struct.table); { oprot.writeI32(struct.gets.size()); - for (TGet _iter128 : struct.gets) + for (TGet _iter136 : struct.gets) { - _iter128.write(oprot); + _iter136.write(oprot); } } } @@ -4145,14 +4206,14 @@ public class THBaseService { struct.table = iprot.readBinary(); struct.setTableIsSet(true); { - org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.gets = new ArrayList(_list129.size); - for (int _i130 = 0; _i130 < _list129.size; ++_i130) + org.apache.thrift.protocol.TList _list137 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.gets = new ArrayList(_list137.size); + for (int _i138 = 0; _i138 < _list137.size; ++_i138) { - TGet _elem131; // required - _elem131 = new TGet(); - _elem131.read(iprot); - struct.gets.add(_elem131); + TGet _elem139; // required + _elem139 = new TGet(); + _elem139.read(iprot); + struct.gets.add(_elem139); } } struct.setGetsIsSet(true); @@ -4435,7 +4496,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true && (isSetSuccess()); + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(getMultiple_result other) { @@ -4547,14 +4620,14 @@ public class THBaseService { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list132 = iprot.readListBegin(); - struct.success = new ArrayList(_list132.size); - for (int _i133 = 0; _i133 < _list132.size; ++_i133) + org.apache.thrift.protocol.TList _list140 = iprot.readListBegin(); + struct.success = new ArrayList(_list140.size); + for (int _i141 = 0; _i141 < _list140.size; ++_i141) { - TResult _elem134; // required - _elem134 = new TResult(); - _elem134.read(iprot); - struct.success.add(_elem134); + TResult _elem142; // required + _elem142 = new TResult(); + _elem142.read(iprot); + struct.success.add(_elem142); } iprot.readListEnd(); } @@ -4591,9 +4664,9 @@ public class THBaseService { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (TResult _iter135 : struct.success) + for (TResult _iter143 : struct.success) { - _iter135.write(oprot); + _iter143.write(oprot); } oprot.writeListEnd(); } @@ -4632,9 +4705,9 @@ public class THBaseService { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (TResult _iter136 : struct.success) + for (TResult _iter144 : struct.success) { - _iter136.write(oprot); + _iter144.write(oprot); } } } @@ -4649,14 +4722,14 @@ public class THBaseService { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list137 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list137.size); - for (int _i138 = 0; _i138 < _list137.size; ++_i138) + org.apache.thrift.protocol.TList _list145 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list145.size); + for (int _i146 = 0; _i146 < _list145.size; ++_i146) { - TResult _elem139; // required - _elem139 = new TResult(); - _elem139.read(iprot); - struct.success.add(_elem139); + TResult _elem147; // required + _elem147 = new TResult(); + _elem147.read(iprot); + struct.success.add(_elem147); } } struct.setSuccessIsSet(true); @@ -4960,7 +5033,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_put = true && (isSetPut()); + builder.append(present_put); + if (present_put) + builder.append(put); + + return builder.toHashCode(); } public int compareTo(put_args other) { @@ -5349,7 +5434,14 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(put_result other) { @@ -6135,7 +6227,39 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_row = true && (isSetRow()); + builder.append(present_row); + if (present_row) + builder.append(row); + + boolean present_family = true && (isSetFamily()); + builder.append(present_family); + if (present_family) + builder.append(family); + + boolean present_qualifier = true && (isSetQualifier()); + builder.append(present_qualifier); + if (present_qualifier) + builder.append(qualifier); + + boolean present_value = true && (isSetValue()); + builder.append(present_value); + if (present_value) + builder.append(value); + + boolean present_put = true && (isSetPut()); + builder.append(present_put); + if (present_put) + builder.append(put); + + return builder.toHashCode(); } public int compareTo(checkAndPut_args other) { @@ -6740,7 +6864,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true; + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(checkAndPut_result other) { @@ -7249,7 +7385,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_puts = true && (isSetPuts()); + builder.append(present_puts); + if (present_puts) + builder.append(puts); + + return builder.toHashCode(); } public int compareTo(putMultiple_args other) { @@ -7375,14 +7523,14 @@ public class THBaseService { case 2: // PUTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list140 = iprot.readListBegin(); - struct.puts = new ArrayList(_list140.size); - for (int _i141 = 0; _i141 < _list140.size; ++_i141) + org.apache.thrift.protocol.TList _list148 = iprot.readListBegin(); + struct.puts = new ArrayList(_list148.size); + for (int _i149 = 0; _i149 < _list148.size; ++_i149) { - TPut _elem142; // required - _elem142 = new TPut(); - _elem142.read(iprot); - struct.puts.add(_elem142); + TPut _elem150; // required + _elem150 = new TPut(); + _elem150.read(iprot); + struct.puts.add(_elem150); } iprot.readListEnd(); } @@ -7415,9 +7563,9 @@ public class THBaseService { oprot.writeFieldBegin(PUTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.puts.size())); - for (TPut _iter143 : struct.puts) + for (TPut _iter151 : struct.puts) { - _iter143.write(oprot); + _iter151.write(oprot); } oprot.writeListEnd(); } @@ -7443,9 +7591,9 @@ public class THBaseService { oprot.writeBinary(struct.table); { oprot.writeI32(struct.puts.size()); - for (TPut _iter144 : struct.puts) + for (TPut _iter152 : struct.puts) { - _iter144.write(oprot); + _iter152.write(oprot); } } } @@ -7456,14 +7604,14 @@ public class THBaseService { struct.table = iprot.readBinary(); struct.setTableIsSet(true); { - org.apache.thrift.protocol.TList _list145 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.puts = new ArrayList(_list145.size); - for (int _i146 = 0; _i146 < _list145.size; ++_i146) + org.apache.thrift.protocol.TList _list153 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.puts = new ArrayList(_list153.size); + for (int _i154 = 0; _i154 < _list153.size; ++_i154) { - TPut _elem147; // required - _elem147 = new TPut(); - _elem147.read(iprot); - struct.puts.add(_elem147); + TPut _elem155; // required + _elem155 = new TPut(); + _elem155.read(iprot); + struct.puts.add(_elem155); } } struct.setPutsIsSet(true); @@ -7667,7 +7815,14 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(putMultiple_result other) { @@ -8117,7 +8272,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_deleteSingle = true && (isSetDeleteSingle()); + builder.append(present_deleteSingle); + if (present_deleteSingle) + builder.append(deleteSingle); + + return builder.toHashCode(); } public int compareTo(deleteSingle_args other) { @@ -8506,7 +8673,14 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(deleteSingle_result other) { @@ -8976,7 +9150,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_deletes = true && (isSetDeletes()); + builder.append(present_deletes); + if (present_deletes) + builder.append(deletes); + + return builder.toHashCode(); } public int compareTo(deleteMultiple_args other) { @@ -9102,14 +9288,14 @@ public class THBaseService { case 2: // DELETES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list148 = iprot.readListBegin(); - struct.deletes = new ArrayList(_list148.size); - for (int _i149 = 0; _i149 < _list148.size; ++_i149) + org.apache.thrift.protocol.TList _list156 = iprot.readListBegin(); + struct.deletes = new ArrayList(_list156.size); + for (int _i157 = 0; _i157 < _list156.size; ++_i157) { - TDelete _elem150; // required - _elem150 = new TDelete(); - _elem150.read(iprot); - struct.deletes.add(_elem150); + TDelete _elem158; // required + _elem158 = new TDelete(); + _elem158.read(iprot); + struct.deletes.add(_elem158); } iprot.readListEnd(); } @@ -9142,9 +9328,9 @@ public class THBaseService { oprot.writeFieldBegin(DELETES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.deletes.size())); - for (TDelete _iter151 : struct.deletes) + for (TDelete _iter159 : struct.deletes) { - _iter151.write(oprot); + _iter159.write(oprot); } oprot.writeListEnd(); } @@ -9170,9 +9356,9 @@ public class THBaseService { oprot.writeBinary(struct.table); { oprot.writeI32(struct.deletes.size()); - for (TDelete _iter152 : struct.deletes) + for (TDelete _iter160 : struct.deletes) { - _iter152.write(oprot); + _iter160.write(oprot); } } } @@ -9183,14 +9369,14 @@ public class THBaseService { struct.table = iprot.readBinary(); struct.setTableIsSet(true); { - org.apache.thrift.protocol.TList _list153 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.deletes = new ArrayList(_list153.size); - for (int _i154 = 0; _i154 < _list153.size; ++_i154) + org.apache.thrift.protocol.TList _list161 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.deletes = new ArrayList(_list161.size); + for (int _i162 = 0; _i162 < _list161.size; ++_i162) { - TDelete _elem155; // required - _elem155 = new TDelete(); - _elem155.read(iprot); - struct.deletes.add(_elem155); + TDelete _elem163; // required + _elem163 = new TDelete(); + _elem163.read(iprot); + struct.deletes.add(_elem163); } } struct.setDeletesIsSet(true); @@ -9473,7 +9659,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true && (isSetSuccess()); + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(deleteMultiple_result other) { @@ -9585,14 +9783,14 @@ public class THBaseService { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list156 = iprot.readListBegin(); - struct.success = new ArrayList(_list156.size); - for (int _i157 = 0; _i157 < _list156.size; ++_i157) + org.apache.thrift.protocol.TList _list164 = iprot.readListBegin(); + struct.success = new ArrayList(_list164.size); + for (int _i165 = 0; _i165 < _list164.size; ++_i165) { - TDelete _elem158; // required - _elem158 = new TDelete(); - _elem158.read(iprot); - struct.success.add(_elem158); + TDelete _elem166; // required + _elem166 = new TDelete(); + _elem166.read(iprot); + struct.success.add(_elem166); } iprot.readListEnd(); } @@ -9629,9 +9827,9 @@ public class THBaseService { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (TDelete _iter159 : struct.success) + for (TDelete _iter167 : struct.success) { - _iter159.write(oprot); + _iter167.write(oprot); } oprot.writeListEnd(); } @@ -9670,9 +9868,9 @@ public class THBaseService { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (TDelete _iter160 : struct.success) + for (TDelete _iter168 : struct.success) { - _iter160.write(oprot); + _iter168.write(oprot); } } } @@ -9687,14 +9885,14 @@ public class THBaseService { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list161 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list161.size); - for (int _i162 = 0; _i162 < _list161.size; ++_i162) + org.apache.thrift.protocol.TList _list169 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list169.size); + for (int _i170 = 0; _i170 < _list169.size; ++_i170) { - TDelete _elem163; // required - _elem163 = new TDelete(); - _elem163.read(iprot); - struct.success.add(_elem163); + TDelete _elem171; // required + _elem171 = new TDelete(); + _elem171.read(iprot); + struct.success.add(_elem171); } } struct.setSuccessIsSet(true); @@ -10334,7 +10532,39 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_row = true && (isSetRow()); + builder.append(present_row); + if (present_row) + builder.append(row); + + boolean present_family = true && (isSetFamily()); + builder.append(present_family); + if (present_family) + builder.append(family); + + boolean present_qualifier = true && (isSetQualifier()); + builder.append(present_qualifier); + if (present_qualifier) + builder.append(qualifier); + + boolean present_value = true && (isSetValue()); + builder.append(present_value); + if (present_value) + builder.append(value); + + boolean present_deleteSingle = true && (isSetDeleteSingle()); + builder.append(present_deleteSingle); + if (present_deleteSingle) + builder.append(deleteSingle); + + return builder.toHashCode(); } public int compareTo(checkAndDelete_args other) { @@ -10939,7 +11169,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true; + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(checkAndDelete_result other) { @@ -11428,7 +11670,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_increment = true && (isSetIncrement()); + builder.append(present_increment); + if (present_increment) + builder.append(increment); + + return builder.toHashCode(); } public int compareTo(increment_args other) { @@ -11876,7 +12130,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true && (isSetSuccess()); + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(increment_result other) { @@ -12372,7 +12638,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_append = true && (isSetAppend()); + builder.append(present_append); + if (present_append) + builder.append(append); + + return builder.toHashCode(); } public int compareTo(append_args other) { @@ -12820,7 +13098,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true && (isSetSuccess()); + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(append_result other) { @@ -13316,7 +13606,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_scan = true && (isSetScan()); + builder.append(present_scan); + if (present_scan) + builder.append(scan); + + return builder.toHashCode(); } public int compareTo(openScanner_args other) { @@ -13766,7 +14068,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true; + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(openScanner_result other) { @@ -14248,7 +14562,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_scannerId = true; + builder.append(present_scannerId); + if (present_scannerId) + builder.append(scannerId); + + boolean present_numRows = true; + builder.append(present_numRows); + if (present_numRows) + builder.append(numRows); + + return builder.toHashCode(); } public int compareTo(getScannerRows_args other) { @@ -14780,7 +15106,24 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true && (isSetSuccess()); + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + boolean present_ia = true && (isSetIa()); + builder.append(present_ia); + if (present_ia) + builder.append(ia); + + return builder.toHashCode(); } public int compareTo(getScannerRows_result other) { @@ -14910,14 +15253,14 @@ public class THBaseService { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list164 = iprot.readListBegin(); - struct.success = new ArrayList(_list164.size); - for (int _i165 = 0; _i165 < _list164.size; ++_i165) + org.apache.thrift.protocol.TList _list172 = iprot.readListBegin(); + struct.success = new ArrayList(_list172.size); + for (int _i173 = 0; _i173 < _list172.size; ++_i173) { - TResult _elem166; // required - _elem166 = new TResult(); - _elem166.read(iprot); - struct.success.add(_elem166); + TResult _elem174; // required + _elem174 = new TResult(); + _elem174.read(iprot); + struct.success.add(_elem174); } iprot.readListEnd(); } @@ -14963,9 +15306,9 @@ public class THBaseService { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (TResult _iter167 : struct.success) + for (TResult _iter175 : struct.success) { - _iter167.write(oprot); + _iter175.write(oprot); } oprot.writeListEnd(); } @@ -15012,9 +15355,9 @@ public class THBaseService { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (TResult _iter168 : struct.success) + for (TResult _iter176 : struct.success) { - _iter168.write(oprot); + _iter176.write(oprot); } } } @@ -15032,14 +15375,14 @@ public class THBaseService { BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list169 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list169.size); - for (int _i170 = 0; _i170 < _list169.size; ++_i170) + org.apache.thrift.protocol.TList _list177 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list177.size); + for (int _i178 = 0; _i178 < _list177.size; ++_i178) { - TResult _elem171; // required - _elem171 = new TResult(); - _elem171.read(iprot); - struct.success.add(_elem171); + TResult _elem179; // required + _elem179 = new TResult(); + _elem179.read(iprot); + struct.success.add(_elem179); } } struct.setSuccessIsSet(true); @@ -15268,7 +15611,14 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_scannerId = true; + builder.append(present_scannerId); + if (present_scannerId) + builder.append(scannerId); + + return builder.toHashCode(); } public int compareTo(closeScanner_args other) { @@ -15683,7 +16033,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + boolean present_ia = true && (isSetIa()); + builder.append(present_ia); + if (present_ia) + builder.append(ia); + + return builder.toHashCode(); } public int compareTo(closeScanner_result other) { @@ -16176,7 +16538,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_rowMutations = true && (isSetRowMutations()); + builder.append(present_rowMutations); + if (present_rowMutations) + builder.append(rowMutations); + + return builder.toHashCode(); } public int compareTo(mutateRow_args other) { @@ -16565,7 +16939,14 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(mutateRow_result other) { @@ -17090,7 +17471,24 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_table = true && (isSetTable()); + builder.append(present_table); + if (present_table) + builder.append(table); + + boolean present_scan = true && (isSetScan()); + builder.append(present_scan); + if (present_scan) + builder.append(scan); + + boolean present_numRows = true; + builder.append(present_numRows); + if (present_numRows) + builder.append(numRows); + + return builder.toHashCode(); } public int compareTo(getScannerResults_args other) { @@ -17598,7 +17996,19 @@ public class THBaseService { @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_success = true && (isSetSuccess()); + builder.append(present_success); + if (present_success) + builder.append(success); + + boolean present_io = true && (isSetIo()); + builder.append(present_io); + if (present_io) + builder.append(io); + + return builder.toHashCode(); } public int compareTo(getScannerResults_result other) { @@ -17710,14 +18120,14 @@ public class THBaseService { case 0: // SUCCESS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list172 = iprot.readListBegin(); - struct.success = new ArrayList(_list172.size); - for (int _i173 = 0; _i173 < _list172.size; ++_i173) + org.apache.thrift.protocol.TList _list180 = iprot.readListBegin(); + struct.success = new ArrayList(_list180.size); + for (int _i181 = 0; _i181 < _list180.size; ++_i181) { - TResult _elem174; // required - _elem174 = new TResult(); - _elem174.read(iprot); - struct.success.add(_elem174); + TResult _elem182; // required + _elem182 = new TResult(); + _elem182.read(iprot); + struct.success.add(_elem182); } iprot.readListEnd(); } @@ -17754,9 +18164,9 @@ public class THBaseService { oprot.writeFieldBegin(SUCCESS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size())); - for (TResult _iter175 : struct.success) + for (TResult _iter183 : struct.success) { - _iter175.write(oprot); + _iter183.write(oprot); } oprot.writeListEnd(); } @@ -17795,9 +18205,9 @@ public class THBaseService { if (struct.isSetSuccess()) { { oprot.writeI32(struct.success.size()); - for (TResult _iter176 : struct.success) + for (TResult _iter184 : struct.success) { - _iter176.write(oprot); + _iter184.write(oprot); } } } @@ -17812,14 +18222,14 @@ public class THBaseService { BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list177 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.success = new ArrayList(_list177.size); - for (int _i178 = 0; _i178 < _list177.size; ++_i178) + org.apache.thrift.protocol.TList _list185 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.success = new ArrayList(_list185.size); + for (int _i186 = 0; _i186 < _list185.size; ++_i186) { - TResult _elem179; // required - _elem179 = new TResult(); - _elem179.read(iprot); - struct.success.add(_elem179); + TResult _elem187; // required + _elem187 = new TResult(); + _elem187.read(iprot); + struct.success.add(_elem187); } } struct.setSuccessIsSet(true); diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java index 55797b172c6..d79eb3f1a5b 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java @@ -6,6 +6,7 @@ */ package org.apache.hadoop.hbase.thrift2.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; @@ -224,7 +225,14 @@ public class TIOError extends TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +public class TPut implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TPut"); 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); @@ -196,7 +195,7 @@ public class TPut implements org.apache.thrift.TBase, java.i ; } if (other.isSetColumnValues()) { - List __this__columnValues = new ArrayList(other.columnValues.size()); + List __this__columnValues = new ArrayList(); for (TColumnValue other_element : other.columnValues) { __this__columnValues.add(new TColumnValue(other_element)); } @@ -204,7 +203,20 @@ public class TPut implements org.apache.thrift.TBase, java.i } this.timestamp = other.timestamp; if (other.isSetAttributes()) { - Map __this__attributes = new HashMap(other.attributes); + Map __this__attributes = new HashMap(); + for (Map.Entry other_element : other.attributes.entrySet()) { + + ByteBuffer other_element_key = other_element.getKey(); + ByteBuffer other_element_value = other_element.getValue(); + + ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key); +; + + ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value); +; + + __this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value); + } this.attributes = __this__attributes; } if (other.isSetDurability()) { @@ -589,73 +601,105 @@ public class TPut implements org.apache.thrift.TBase, java.i @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_row = true && (isSetRow()); + builder.append(present_row); + if (present_row) + builder.append(row); + + boolean present_columnValues = true && (isSetColumnValues()); + builder.append(present_columnValues); + if (present_columnValues) + builder.append(columnValues); + + boolean present_timestamp = true && (isSetTimestamp()); + builder.append(present_timestamp); + if (present_timestamp) + builder.append(timestamp); + + boolean present_attributes = true && (isSetAttributes()); + builder.append(present_attributes); + if (present_attributes) + builder.append(attributes); + + boolean present_durability = true && (isSetDurability()); + builder.append(present_durability); + if (present_durability) + builder.append(durability.getValue()); + + boolean present_cellVisibility = true && (isSetCellVisibility()); + builder.append(present_cellVisibility); + if (present_cellVisibility) + builder.append(cellVisibility); + + return builder.toHashCode(); } - @Override public int compareTo(TPut other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; + TPut typedOther = (TPut)other; - lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow()); + lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); if (lastComparison != 0) { return lastComparison; } if (isSetRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(other.isSetColumnValues()); + lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(typedOther.isSetColumnValues()); if (lastComparison != 0) { return lastComparison; } if (isSetColumnValues()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, other.columnValues); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, typedOther.columnValues); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp()); + lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp()); if (lastComparison != 0) { return lastComparison; } if (isSetTimestamp()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes()); + lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); if (lastComparison != 0) { return lastComparison; } if (isSetAttributes()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability()); + lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability()); if (lastComparison != 0) { return lastComparison; } if (isSetDurability()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, other.durability); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(other.isSetCellVisibility()); + lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(typedOther.isSetCellVisibility()); if (lastComparison != 0) { return lastComparison; } if (isSetCellVisibility()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, other.cellVisibility); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, typedOther.cellVisibility); if (lastComparison != 0) { return lastComparison; } @@ -800,7 +844,7 @@ public class TPut implements org.apache.thrift.TBase, java.i struct.columnValues = new ArrayList(_list34.size); for (int _i35 = 0; _i35 < _list34.size; ++_i35) { - TColumnValue _elem36; + TColumnValue _elem36; // required _elem36 = new TColumnValue(); _elem36.read(iprot); struct.columnValues.add(_elem36); @@ -827,8 +871,8 @@ public class TPut implements org.apache.thrift.TBase, java.i struct.attributes = new HashMap(2*_map37.size); for (int _i38 = 0; _i38 < _map37.size; ++_i38) { - ByteBuffer _key39; - ByteBuffer _val40; + ByteBuffer _key39; // required + ByteBuffer _val40; // required _key39 = iprot.readBinary(); _val40 = iprot.readBinary(); struct.attributes.put(_key39, _val40); @@ -993,7 +1037,7 @@ public class TPut implements org.apache.thrift.TBase, java.i struct.columnValues = new ArrayList(_list45.size); for (int _i46 = 0; _i46 < _list45.size; ++_i46) { - TColumnValue _elem47; + TColumnValue _elem47; // required _elem47 = new TColumnValue(); _elem47.read(iprot); struct.columnValues.add(_elem47); @@ -1011,8 +1055,8 @@ public class TPut implements org.apache.thrift.TBase, java.i struct.attributes = new HashMap(2*_map48.size); for (int _i49 = 0; _i49 < _map48.size; ++_i49) { - ByteBuffer _key50; - ByteBuffer _val51; + ByteBuffer _key50; // required + ByteBuffer _val51; // required _key50 = iprot.readBinary(); _val51 = iprot.readBinary(); struct.attributes.put(_key50, _val51); diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java index b6051593a40..182f94779d3 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TResult.java @@ -6,6 +6,7 @@ */ package org.apache.hadoop.hbase.thrift2.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; @@ -317,7 +318,19 @@ public class TResult implements org.apache.thrift.TBase(_list98.size); - for (int _i99 = 0; _i99 < _list98.size; ++_i99) + org.apache.thrift.protocol.TList _list124 = iprot.readListBegin(); + struct.mutations = new ArrayList(_list124.size); + for (int _i125 = 0; _i125 < _list124.size; ++_i125) { - TMutation _elem100; // optional - _elem100 = new TMutation(); - _elem100.read(iprot); - struct.mutations.add(_elem100); + TMutation _elem126; // required + _elem126 = new TMutation(); + _elem126.read(iprot); + struct.mutations.add(_elem126); } iprot.readListEnd(); } @@ -484,9 +497,9 @@ public class TRowMutations implements org.apache.thrift.TBase(_list103.size); - for (int _i104 = 0; _i104 < _list103.size; ++_i104) + org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.mutations = new ArrayList(_list129.size); + for (int _i130 = 0; _i130 < _list129.size; ++_i130) { - TMutation _elem105; // optional - _elem105 = new TMutation(); - _elem105.read(iprot); - struct.mutations.add(_elem105); + TMutation _elem131; // required + _elem131 = new TMutation(); + _elem131.read(iprot); + struct.mutations.add(_elem131); } } struct.setMutationsIsSet(true); diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java index 21e8731e5aa..3fbf970be02 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java @@ -1,11 +1,12 @@ /** - * Autogenerated by Thrift Compiler (0.9.1) + * Autogenerated by Thrift Compiler (0.9.0) * * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING * @generated */ package org.apache.hadoop.hbase.thrift2.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; @@ -15,8 +16,6 @@ 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; @@ -36,7 +35,7 @@ import org.slf4j.LoggerFactory; * Any timestamps in the columns are ignored, use timeRange to select by timestamp. * Max versions defaults to 1. */ -public class TScan implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { +public class TScan implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TScan"); private static final org.apache.thrift.protocol.TField START_ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("startRow", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -215,7 +214,7 @@ public class TScan implements org.apache.thrift.TBase, jav ; } if (other.isSetColumns()) { - List __this__columns = new ArrayList(other.columns.size()); + List __this__columns = new ArrayList(); for (TColumn other_element : other.columns) { __this__columns.add(new TColumn(other_element)); } @@ -232,7 +231,20 @@ public class TScan implements org.apache.thrift.TBase, jav } this.batchSize = other.batchSize; if (other.isSetAttributes()) { - Map __this__attributes = new HashMap(other.attributes); + Map __this__attributes = new HashMap(); + for (Map.Entry other_element : other.attributes.entrySet()) { + + ByteBuffer other_element_key = other_element.getKey(); + ByteBuffer other_element_value = other_element.getValue(); + + ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key); +; + + ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value); +; + + __this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value); + } this.attributes = __this__attributes; } if (other.isSetAuthorizations()) { @@ -862,123 +874,180 @@ public class TScan implements org.apache.thrift.TBase, jav @Override public int hashCode() { - return 0; + HashCodeBuilder builder = new HashCodeBuilder(); + + boolean present_startRow = true && (isSetStartRow()); + builder.append(present_startRow); + if (present_startRow) + builder.append(startRow); + + boolean present_stopRow = true && (isSetStopRow()); + builder.append(present_stopRow); + if (present_stopRow) + builder.append(stopRow); + + boolean present_columns = true && (isSetColumns()); + builder.append(present_columns); + if (present_columns) + builder.append(columns); + + boolean present_caching = true && (isSetCaching()); + builder.append(present_caching); + if (present_caching) + builder.append(caching); + + boolean present_maxVersions = true && (isSetMaxVersions()); + builder.append(present_maxVersions); + if (present_maxVersions) + builder.append(maxVersions); + + boolean present_timeRange = true && (isSetTimeRange()); + builder.append(present_timeRange); + if (present_timeRange) + builder.append(timeRange); + + boolean present_filterString = true && (isSetFilterString()); + builder.append(present_filterString); + if (present_filterString) + builder.append(filterString); + + boolean present_batchSize = true && (isSetBatchSize()); + builder.append(present_batchSize); + if (present_batchSize) + builder.append(batchSize); + + boolean present_attributes = true && (isSetAttributes()); + builder.append(present_attributes); + if (present_attributes) + builder.append(attributes); + + boolean present_authorizations = true && (isSetAuthorizations()); + builder.append(present_authorizations); + if (present_authorizations) + builder.append(authorizations); + + boolean present_reversed = true && (isSetReversed()); + builder.append(present_reversed); + if (present_reversed) + builder.append(reversed); + + return builder.toHashCode(); } - @Override public int compareTo(TScan other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; + TScan typedOther = (TScan)other; - lastComparison = Boolean.valueOf(isSetStartRow()).compareTo(other.isSetStartRow()); + lastComparison = Boolean.valueOf(isSetStartRow()).compareTo(typedOther.isSetStartRow()); if (lastComparison != 0) { return lastComparison; } if (isSetStartRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, other.startRow); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetStopRow()).compareTo(other.isSetStopRow()); + lastComparison = Boolean.valueOf(isSetStopRow()).compareTo(typedOther.isSetStopRow()); if (lastComparison != 0) { return lastComparison; } if (isSetStopRow()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, other.stopRow); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, typedOther.stopRow); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns()); + lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns()); if (lastComparison != 0) { return lastComparison; } if (isSetColumns()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetCaching()).compareTo(other.isSetCaching()); + lastComparison = Boolean.valueOf(isSetCaching()).compareTo(typedOther.isSetCaching()); if (lastComparison != 0) { return lastComparison; } if (isSetCaching()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, other.caching); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, typedOther.caching); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(other.isSetMaxVersions()); + lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(typedOther.isSetMaxVersions()); if (lastComparison != 0) { return lastComparison; } if (isSetMaxVersions()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, other.maxVersions); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, typedOther.maxVersions); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(other.isSetTimeRange()); + lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(typedOther.isSetTimeRange()); if (lastComparison != 0) { return lastComparison; } if (isSetTimeRange()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, other.timeRange); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, typedOther.timeRange); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(other.isSetFilterString()); + lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(typedOther.isSetFilterString()); if (lastComparison != 0) { return lastComparison; } if (isSetFilterString()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, other.filterString); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(other.isSetBatchSize()); + lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(typedOther.isSetBatchSize()); if (lastComparison != 0) { return lastComparison; } if (isSetBatchSize()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, other.batchSize); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, typedOther.batchSize); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes()); + lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes()); if (lastComparison != 0) { return lastComparison; } if (isSetAttributes()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations()); + lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations()); if (lastComparison != 0) { return lastComparison; } if (isSetAuthorizations()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetReversed()).compareTo(other.isSetReversed()); + lastComparison = Boolean.valueOf(isSetReversed()).compareTo(typedOther.isSetReversed()); if (lastComparison != 0) { return lastComparison; } if (isSetReversed()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, other.reversed); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, typedOther.reversed); if (lastComparison != 0) { return lastComparison; } @@ -1170,7 +1239,7 @@ public class TScan implements org.apache.thrift.TBase, jav struct.columns = new ArrayList(_list106.size); for (int _i107 = 0; _i107 < _list106.size; ++_i107) { - TColumn _elem108; + TColumn _elem108; // required _elem108 = new TColumn(); _elem108.read(iprot); struct.columns.add(_elem108); @@ -1230,8 +1299,8 @@ public class TScan implements org.apache.thrift.TBase, jav struct.attributes = new HashMap(2*_map109.size); for (int _i110 = 0; _i110 < _map109.size; ++_i110) { - ByteBuffer _key111; - ByteBuffer _val112; + ByteBuffer _key111; // required + ByteBuffer _val112; // required _key111 = iprot.readBinary(); _val112 = iprot.readBinary(); struct.attributes.put(_key111, _val112); @@ -1477,7 +1546,7 @@ public class TScan implements org.apache.thrift.TBase, jav struct.columns = new ArrayList(_list117.size); for (int _i118 = 0; _i118 < _list117.size; ++_i118) { - TColumn _elem119; + TColumn _elem119; // required _elem119 = new TColumn(); _elem119.read(iprot); struct.columns.add(_elem119); @@ -1512,8 +1581,8 @@ public class TScan implements org.apache.thrift.TBase, jav struct.attributes = new HashMap(2*_map120.size); for (int _i121 = 0; _i121 < _map120.size; ++_i121) { - ByteBuffer _key122; - ByteBuffer _val123; + ByteBuffer _key122; // required + ByteBuffer _val123; // required _key122 = iprot.readBinary(); _val123 = iprot.readBinary(); struct.attributes.put(_key122, _val123); diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java index ffac493466e..cc7a15b7995 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java @@ -6,6 +6,7 @@ */ package org.apache.hadoop.hbase.thrift2.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; @@ -286,7 +287,19 @@ public class TTimeRange implements org.apache.thrift.TBase