You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/11/08 03:35:13 UTC
[05/13] hbase git commit: HBASE-12279 Generated thrift files were
generated with the wrong parameters (Niels Basjes)
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAuthorization.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAuthorization.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAuthorization.java
index e46f5b5..f217f87 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAuthorization.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TAuthorization.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;
@@ -239,7 +240,14 @@ public class TAuthorization implements org.apache.thrift.TBase<TAuthorization, T
@Override
public int hashCode() {
- return 0;
+ HashCodeBuilder builder = new HashCodeBuilder();
+
+ boolean present_labels = true && (isSetLabels());
+ builder.append(present_labels);
+ if (present_labels)
+ builder.append(labels);
+
+ return builder.toHashCode();
}
public int compareTo(TAuthorization other) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCellVisibility.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCellVisibility.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCellVisibility.java
index 972a472..59c7ef7 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCellVisibility.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCellVisibility.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;
@@ -219,7 +220,14 @@ public class TCellVisibility implements org.apache.thrift.TBase<TCellVisibility,
@Override
public int hashCode() {
- return 0;
+ HashCodeBuilder builder = new HashCodeBuilder();
+
+ boolean present_expression = true && (isSetExpression());
+ builder.append(present_expression);
+ if (present_expression)
+ builder.append(expression);
+
+ return builder.toHashCode();
}
public int compareTo(TCellVisibility other) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java
index 4cd514c..fbf08e3 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumn.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;
@@ -368,7 +369,24 @@ public class TColumn implements org.apache.thrift.TBase<TColumn, TColumn._Fields
@Override
public int hashCode() {
- return 0;
+ HashCodeBuilder builder = new HashCodeBuilder();
+
+ 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_timestamp = true && (isSetTimestamp());
+ builder.append(present_timestamp);
+ if (present_timestamp)
+ builder.append(timestamp);
+
+ return builder.toHashCode();
}
public int compareTo(TColumn other) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java
index 728b50d..0a2833b 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.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;
@@ -370,7 +371,24 @@ public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncremen
@Override
public int hashCode() {
- return 0;
+ HashCodeBuilder builder = new HashCodeBuilder();
+
+ 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_amount = true && (isSetAmount());
+ builder.append(present_amount);
+ if (present_amount)
+ builder.append(amount);
+
+ return builder.toHashCode();
}
public int compareTo(TColumnIncrement other) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java
index 3f014cf..d1cca13 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.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;
@@ -506,7 +507,34 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu
@Override
public int hashCode() {
- return 0;
+ HashCodeBuilder builder = new HashCodeBuilder();
+
+ 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_timestamp = true && (isSetTimestamp());
+ builder.append(present_timestamp);
+ if (present_timestamp)
+ builder.append(timestamp);
+
+ boolean present_tags = true && (isSetTags());
+ builder.append(present_tags);
+ if (present_tags)
+ builder.append(tags);
+
+ return builder.toHashCode();
}
public int compareTo(TColumnValue other) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java
index 16ef3f9..a4d7777 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.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;
@@ -631,7 +632,39 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
@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_deleteType = true && (isSetDeleteType());
+ builder.append(present_deleteType);
+ if (present_deleteType)
+ builder.append(deleteType.getValue());
+
+ 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());
+
+ return builder.toHashCode();
}
public int compareTo(TDelete other) {
@@ -834,14 +867,14 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
case 2: // COLUMNS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list44 = iprot.readListBegin();
- struct.columns = new ArrayList<TColumn>(_list44.size);
- for (int _i45 = 0; _i45 < _list44.size; ++_i45)
+ org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
+ struct.columns = new ArrayList<TColumn>(_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<TDelete, TDelete._Fields
case 6: // ATTRIBUTES
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map47 = iprot.readMapBegin();
- struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map47.size);
- for (int _i48 = 0; _i48 < _map47.size; ++_i48)
+ org.apache.thrift.protocol.TMap _map55 = iprot.readMapBegin();
+ struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(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<TDelete, TDelete._Fields
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
- for (TColumn _iter51 : struct.columns)
+ for (TColumn _iter59 : struct.columns)
{
- _iter51.write(oprot);
+ _iter59.write(oprot);
}
oprot.writeListEnd();
}
@@ -945,10 +978,10 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
oprot.writeFieldBegin(ATTRIBUTES_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.attributes.size()));
- for (Map.Entry<ByteBuffer, ByteBuffer> _iter52 : struct.attributes.entrySet())
+ for (Map.Entry<ByteBuffer, ByteBuffer> _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<TDelete, TDelete._Fields
if (struct.isSetColumns()) {
{
oprot.writeI32(struct.columns.size());
- for (TColumn _iter53 : struct.columns)
+ for (TColumn _iter61 : struct.columns)
{
- _iter53.write(oprot);
+ _iter61.write(oprot);
}
}
}
@@ -1015,10 +1048,10 @@ public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields
if (struct.isSetAttributes()) {
{
oprot.writeI32(struct.attributes.size());
- for (Map.Entry<ByteBuffer, ByteBuffer> _iter54 : struct.attributes.entrySet())
+ for (Map.Entry<ByteBuffer, ByteBuffer> _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<TDelete, TDelete._Fields
BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list55 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.columns = new ArrayList<TColumn>(_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<TColumn>(_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<TDelete, TDelete._Fields
}
if (incoming.get(3)) {
{
- org.apache.thrift.protocol.TMap _map58 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(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<ByteBuffer,ByteBuffer>(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);
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java
----------------------------------------------------------------------
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 2e6646b..7e93341 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<TGet, TGet._Fields>, java.io.Serializable, Cloneable, Comparable<TGet> {
+public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, 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<TGet, TGet._Fields>, java.i
;
}
if (other.isSetColumns()) {
- List<TColumn> __this__columns = new ArrayList<TColumn>(other.columns.size());
+ List<TColumn> __this__columns = new ArrayList<TColumn>();
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<TGet, TGet._Fields>, java.i
;
}
if (other.isSetAttributes()) {
- Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
+ Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>();
+ for (Map.Entry<ByteBuffer, ByteBuffer> 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<TGet, TGet._Fields>, 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<TGet, TGet._Fields>, java.i
struct.columns = new ArrayList<TColumn>(_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<TGet, TGet._Fields>, java.i
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(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<TGet, TGet._Fields>, java.i
struct.columns = new ArrayList<TColumn>(_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<TGet, TGet._Fields>, java.i
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(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);
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/THBaseService.java
----------------------------------------------------------------------
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 1337a44..f2a5845 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<TGet>(_list124.size);
- for (int _i125 = 0; _i125 < _list124.size; ++_i125)
+ org.apache.thrift.protocol.TList _list132 = iprot.readListBegin();
+ struct.gets = new ArrayList<TGet>(_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<TGet>(_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<TGet>(_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<TResult>(_list132.size);
- for (int _i133 = 0; _i133 < _list132.size; ++_i133)
+ org.apache.thrift.protocol.TList _list140 = iprot.readListBegin();
+ struct.success = new ArrayList<TResult>(_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<TResult>(_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<TResult>(_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<TPut>(_list140.size);
- for (int _i141 = 0; _i141 < _list140.size; ++_i141)
+ org.apache.thrift.protocol.TList _list148 = iprot.readListBegin();
+ struct.puts = new ArrayList<TPut>(_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<TPut>(_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<TPut>(_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<TDelete>(_list148.size);
- for (int _i149 = 0; _i149 < _list148.size; ++_i149)
+ org.apache.thrift.protocol.TList _list156 = iprot.readListBegin();
+ struct.deletes = new ArrayList<TDelete>(_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<TDelete>(_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<TDelete>(_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<TDelete>(_list156.size);
- for (int _i157 = 0; _i157 < _list156.size; ++_i157)
+ org.apache.thrift.protocol.TList _list164 = iprot.readListBegin();
+ struct.success = new ArrayList<TDelete>(_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<TDelete>(_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<TDelete>(_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<TResult>(_list164.size);
- for (int _i165 = 0; _i165 < _list164.size; ++_i165)
+ org.apache.thrift.protocol.TList _list172 = iprot.readListBegin();
+ struct.success = new ArrayList<TResult>(_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<TResult>(_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<TResult>(_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<TResult>(_list172.size);
- for (int _i173 = 0; _i173 < _list172.size; ++_i173)
+ org.apache.thrift.protocol.TList _list180 = iprot.readListBegin();
+ struct.success = new ArrayList<TResult>(_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<TResult>(_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<TResult>(_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);
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIOError.java
----------------------------------------------------------------------
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 55797b1..d79eb3f 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<TIOE
@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(TIOError other) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
index 949f5a4..b18ce43 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIllegalArgument.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;
@@ -223,7 +224,14 @@ public class TIllegalArgument extends TException implements org.apache.thrift.TB
@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(TIllegalArgument other) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
index 6032994..358a9fc 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.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;
@@ -537,7 +538,34 @@ public class TIncrement implements org.apache.thrift.TBase<TIncrement, TIncremen
@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_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();
}
public int compareTo(TIncrement other) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java
index ac93d27..b08a6af 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TMutation.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;
@@ -331,14 +332,22 @@ public class TMutation extends org.apache.thrift.TUnion<TMutation, TMutation._Fi
}
- /**
- * If you'd like this to perform more respectably, use the hashcode generator option.
- */
@Override
public int hashCode() {
- return 0;
+ HashCodeBuilder hcb = new HashCodeBuilder();
+ hcb.append(this.getClass().getName());
+ org.apache.thrift.TFieldIdEnum setField = getSetField();
+ if (setField != null) {
+ hcb.append(setField.getThriftFieldId());
+ Object value = getFieldValue();
+ if (value instanceof org.apache.thrift.TEnum) {
+ hcb.append(((org.apache.thrift.TEnum)getFieldValue()).getValue());
+ } else {
+ hcb.append(value);
+ }
+ }
+ return hcb.toHashCode();
}
-
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
try {
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8734c3a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
index 4f903f9..c9a122c 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.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;
@@ -44,7 +43,7 @@ import org.slf4j.LoggerFactory;
* by changing the durability. If you don't provide durability, it defaults to
* column family's default setting for durability.
*/
-public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.io.Serializable, Cloneable, Comparable<TPut> {
+public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, 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<TPut, TPut._Fields>, java.i
;
}
if (other.isSetColumnValues()) {
- List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>(other.columnValues.size());
+ List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>();
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<TPut, TPut._Fields>, java.i
}
this.timestamp = other.timestamp;
if (other.isSetAttributes()) {
- Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
+ Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>();
+ for (Map.Entry<ByteBuffer, ByteBuffer> 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<TPut, TPut._Fields>, 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<TPut, TPut._Fields>, java.i
struct.columnValues = new ArrayList<TColumnValue>(_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<TPut, TPut._Fields>, java.i
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(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<TPut, TPut._Fields>, java.i
struct.columnValues = new ArrayList<TColumnValue>(_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<TPut, TPut._Fields>, java.i
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(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);