hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [10/13] hbase git commit: HBASE-12279 Generated thrift files were generated with the wrong parameters (Niels Basjes)
Date Sat, 08 Nov 2014 02:35:18 GMT
HBASE-12279 Generated thrift files were generated with the wrong parameters (Niels Basjes)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c526bf98
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c526bf98
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c526bf98

Branch: refs/heads/0.98
Commit: c526bf98c35f0418b5df6b4827e9681879eb5f04
Parents: d2eb3cf
Author: Andrew Purtell <apurtell@apache.org>
Authored: Fri Nov 7 16:20:44 2014 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Fri Nov 7 16:20:44 2014 -0800

----------------------------------------------------------------------
 .../hbase/thrift/generated/AlreadyExists.java   |   10 +-
 .../hbase/thrift/generated/BatchMutation.java   |   15 +-
 .../thrift/generated/ColumnDescriptor.java      |   50 +-
 .../hadoop/hbase/thrift/generated/Hbase.java    | 3745 ++++++++++++------
 .../hadoop/hbase/thrift/generated/IOError.java  |   10 +-
 .../hbase/thrift/generated/IllegalArgument.java |   10 +-
 .../hadoop/hbase/thrift/generated/Mutation.java |   25 +-
 .../hadoop/hbase/thrift/generated/TCell.java    |   15 +-
 .../hadoop/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    |   45 +-
 .../hadoop/hbase/thrift2/generated/TAppend.java |   30 +-
 .../hbase/thrift2/generated/TAuthorization.java |   10 +-
 .../thrift2/generated/TCellVisibility.java      |   10 +-
 .../hadoop/hbase/thrift2/generated/TColumn.java |   20 +-
 .../thrift2/generated/TColumnIncrement.java     |   20 +-
 .../hbase/thrift2/generated/TColumnValue.java   |   30 +-
 .../hadoop/hbase/thrift2/generated/TDelete.java |  115 +-
 .../hadoop/hbase/thrift2/generated/TGet.java    |  114 +-
 .../hbase/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 +-
 .../hadoop/hbase/thrift2/generated/TResult.java |   15 +-
 .../hbase/thrift2/generated/TRowMutations.java  |   51 +-
 .../hadoop/hbase/thrift2/generated/TScan.java   |  200 +-
 .../hbase/thrift2/generated/TTimeRange.java     |   15 +-
 31 files changed, 3912 insertions(+), 1634 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c526bf98/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java
----------------------------------------------------------------------
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 029645c..091a42b 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) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/c526bf98/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java
----------------------------------------------------------------------
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 8566ea4..fd038b3 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<BatchMutation,
Bat
 
   @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_mutations = true && (isSetMutations());
+    builder.append(present_mutations);
+    if (present_mutations)
+      builder.append(mutations);
+
+    return builder.toHashCode();
   }
 
   public int compareTo(BatchMutation other) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/c526bf98/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
index 080c145..fe018be 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.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;
@@ -732,7 +733,54 @@ public class ColumnDescriptor implements org.apache.thrift.TBase<ColumnDescripto
 
   @Override
   public int hashCode() {
-    return 0;
+    HashCodeBuilder builder = new HashCodeBuilder();
+
+    boolean present_name = true && (isSetName());
+    builder.append(present_name);
+    if (present_name)
+      builder.append(name);
+
+    boolean present_maxVersions = true;
+    builder.append(present_maxVersions);
+    if (present_maxVersions)
+      builder.append(maxVersions);
+
+    boolean present_compression = true && (isSetCompression());
+    builder.append(present_compression);
+    if (present_compression)
+      builder.append(compression);
+
+    boolean present_inMemory = true;
+    builder.append(present_inMemory);
+    if (present_inMemory)
+      builder.append(inMemory);
+
+    boolean present_bloomFilterType = true && (isSetBloomFilterType());
+    builder.append(present_bloomFilterType);
+    if (present_bloomFilterType)
+      builder.append(bloomFilterType);
+
+    boolean present_bloomFilterVectorSize = true;
+    builder.append(present_bloomFilterVectorSize);
+    if (present_bloomFilterVectorSize)
+      builder.append(bloomFilterVectorSize);
+
+    boolean present_bloomFilterNbHashes = true;
+    builder.append(present_bloomFilterNbHashes);
+    if (present_bloomFilterNbHashes)
+      builder.append(bloomFilterNbHashes);
+
+    boolean present_blockCacheEnabled = true;
+    builder.append(present_blockCacheEnabled);
+    if (present_blockCacheEnabled)
+      builder.append(blockCacheEnabled);
+
+    boolean present_timeToLive = true;
+    builder.append(present_timeToLive);
+    if (present_timeToLive)
+      builder.append(timeToLive);
+
+    return builder.toHashCode();
   }
 
   public int compareTo(ColumnDescriptor other) {


Mime
View raw message