hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From syuanji...@apache.org
Subject [16/26] hbase git commit: HBASE-14172 Upgrade existing thrift binding using thrift 0.9.2 compiler.(Josh Elser)
Date Thu, 19 Nov 2015 07:33:50 GMT
http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TScan.java
----------------------------------------------------------------------
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 3fbf970..f4c4d77 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,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.hbase.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,14 +29,17 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
 /**
  * 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<TScan, TScan._Fields>, java.io.Serializable,
Cloneable {
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
+public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>, java.io.Serializable,
Cloneable, Comparable<TScan> {
   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);
@@ -162,7 +166,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
   private static final int __BATCHSIZE_ISSET_ID = 2;
   private static final int __REVERSED_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.START_ROW,_Fields.STOP_ROW,_Fields.COLUMNS,_Fields.CACHING,_Fields.MAX_VERSIONS,_Fields.TIME_RANGE,_Fields.FILTER_STRING,_Fields.BATCH_SIZE,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS,_Fields.REVERSED};
+  private static final _Fields optionals[] = {_Fields.START_ROW,_Fields.STOP_ROW,_Fields.COLUMNS,_Fields.CACHING,_Fields.MAX_VERSIONS,_Fields.TIME_RANGE,_Fields.FILTER_STRING,_Fields.BATCH_SIZE,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS,_Fields.REVERSED};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -207,14 +211,12 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetStartRow()) {
       this.startRow = org.apache.thrift.TBaseHelper.copyBinary(other.startRow);
-;
     }
     if (other.isSetStopRow()) {
       this.stopRow = org.apache.thrift.TBaseHelper.copyBinary(other.stopRow);
-;
     }
     if (other.isSetColumns()) {
-      List<TColumn> __this__columns = new ArrayList<TColumn>();
+      List<TColumn> __this__columns = new ArrayList<TColumn>(other.columns.size());
       for (TColumn other_element : other.columns) {
         __this__columns.add(new TColumn(other_element));
       }
@@ -227,24 +229,10 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
     }
     if (other.isSetFilterString()) {
       this.filterString = org.apache.thrift.TBaseHelper.copyBinary(other.filterString);
-;
     }
     this.batchSize = other.batchSize;
     if (other.isSetAttributes()) {
-      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);
-      }
+      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
       this.attributes = __this__attributes;
     }
     if (other.isSetAuthorizations()) {
@@ -282,16 +270,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
   }
 
   public ByteBuffer bufferForStartRow() {
-    return startRow;
+    return org.apache.thrift.TBaseHelper.copyBinary(startRow);
   }
 
   public TScan setStartRow(byte[] startRow) {
-    setStartRow(startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(startRow));
+    this.startRow = startRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(startRow,
startRow.length));
     return this;
   }
 
   public TScan setStartRow(ByteBuffer startRow) {
-    this.startRow = startRow;
+    this.startRow = org.apache.thrift.TBaseHelper.copyBinary(startRow);
     return this;
   }
 
@@ -316,16 +304,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
   }
 
   public ByteBuffer bufferForStopRow() {
-    return stopRow;
+    return org.apache.thrift.TBaseHelper.copyBinary(stopRow);
   }
 
   public TScan setStopRow(byte[] stopRow) {
-    setStopRow(stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(stopRow));
+    this.stopRow = stopRow == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(stopRow,
stopRow.length));
     return this;
   }
 
   public TScan setStopRow(ByteBuffer stopRow) {
-    this.stopRow = stopRow;
+    this.stopRow = org.apache.thrift.TBaseHelper.copyBinary(stopRow);
     return this;
   }
 
@@ -459,16 +447,16 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
   }
 
   public ByteBuffer bufferForFilterString() {
-    return filterString;
+    return org.apache.thrift.TBaseHelper.copyBinary(filterString);
   }
 
   public TScan setFilterString(byte[] filterString) {
-    setFilterString(filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(filterString));
+    this.filterString = filterString == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(filterString,
filterString.length));
     return this;
   }
 
   public TScan setFilterString(ByteBuffer filterString) {
-    this.filterString = filterString;
+    this.filterString = org.apache.thrift.TBaseHelper.copyBinary(filterString);
     return this;
   }
 
@@ -697,10 +685,10 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
       return getColumns();
 
     case CACHING:
-      return Integer.valueOf(getCaching());
+      return getCaching();
 
     case MAX_VERSIONS:
-      return Integer.valueOf(getMaxVersions());
+      return getMaxVersions();
 
     case TIME_RANGE:
       return getTimeRange();
@@ -709,7 +697,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
       return getFilterString();
 
     case BATCH_SIZE:
-      return Integer.valueOf(getBatchSize());
+      return getBatchSize();
 
     case ATTRIBUTES:
       return getAttributes();
@@ -718,7 +706,7 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
       return getAuthorizations();
 
     case REVERSED:
-      return Boolean.valueOf(isReversed());
+      return isReversed();
 
     }
     throw new IllegalStateException();
@@ -874,180 +862,180 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_startRow = true && (isSetStartRow());
-    builder.append(present_startRow);
+    list.add(present_startRow);
     if (present_startRow)
-      builder.append(startRow);
+      list.add(startRow);
 
     boolean present_stopRow = true && (isSetStopRow());
-    builder.append(present_stopRow);
+    list.add(present_stopRow);
     if (present_stopRow)
-      builder.append(stopRow);
+      list.add(stopRow);
 
     boolean present_columns = true && (isSetColumns());
-    builder.append(present_columns);
+    list.add(present_columns);
     if (present_columns)
-      builder.append(columns);
+      list.add(columns);
 
     boolean present_caching = true && (isSetCaching());
-    builder.append(present_caching);
+    list.add(present_caching);
     if (present_caching)
-      builder.append(caching);
+      list.add(caching);
 
     boolean present_maxVersions = true && (isSetMaxVersions());
-    builder.append(present_maxVersions);
+    list.add(present_maxVersions);
     if (present_maxVersions)
-      builder.append(maxVersions);
+      list.add(maxVersions);
 
     boolean present_timeRange = true && (isSetTimeRange());
-    builder.append(present_timeRange);
+    list.add(present_timeRange);
     if (present_timeRange)
-      builder.append(timeRange);
+      list.add(timeRange);
 
     boolean present_filterString = true && (isSetFilterString());
-    builder.append(present_filterString);
+    list.add(present_filterString);
     if (present_filterString)
-      builder.append(filterString);
+      list.add(filterString);
 
     boolean present_batchSize = true && (isSetBatchSize());
-    builder.append(present_batchSize);
+    list.add(present_batchSize);
     if (present_batchSize)
-      builder.append(batchSize);
+      list.add(batchSize);
 
     boolean present_attributes = true && (isSetAttributes());
-    builder.append(present_attributes);
+    list.add(present_attributes);
     if (present_attributes)
-      builder.append(attributes);
+      list.add(attributes);
 
     boolean present_authorizations = true && (isSetAuthorizations());
-    builder.append(present_authorizations);
+    list.add(present_authorizations);
     if (present_authorizations)
-      builder.append(authorizations);
+      list.add(authorizations);
 
     boolean present_reversed = true && (isSetReversed());
-    builder.append(present_reversed);
+    list.add(present_reversed);
     if (present_reversed)
-      builder.append(reversed);
+      list.add(reversed);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @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(typedOther.isSetStartRow());
+    lastComparison = Boolean.valueOf(isSetStartRow()).compareTo(other.isSetStartRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStartRow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, typedOther.startRow);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRow, other.startRow);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStopRow()).compareTo(typedOther.isSetStopRow());
+    lastComparison = Boolean.valueOf(isSetStopRow()).compareTo(other.isSetStopRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStopRow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, typedOther.stopRow);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stopRow, other.stopRow);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
+    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCaching()).compareTo(typedOther.isSetCaching());
+    lastComparison = Boolean.valueOf(isSetCaching()).compareTo(other.isSetCaching());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCaching()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, typedOther.caching);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.caching, other.caching);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(typedOther.isSetMaxVersions());
+    lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(other.isSetMaxVersions());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMaxVersions()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, typedOther.maxVersions);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, other.maxVersions);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(typedOther.isSetTimeRange());
+    lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(other.isSetTimeRange());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTimeRange()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, typedOther.timeRange);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, other.timeRange);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(typedOther.isSetFilterString());
+    lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(other.isSetFilterString());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFilterString()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, other.filterString);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(typedOther.isSetBatchSize());
+    lastComparison = Boolean.valueOf(isSetBatchSize()).compareTo(other.isSetBatchSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetBatchSize()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, typedOther.batchSize);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.batchSize, other.batchSize);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes());
+    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(typedOther.isSetAuthorizations());
+    lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAuthorizations()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, typedOther.authorizations);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetReversed()).compareTo(typedOther.isSetReversed());
+    lastComparison = Boolean.valueOf(isSetReversed()).compareTo(other.isSetReversed());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetReversed()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, typedOther.reversed);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reversed, other.reversed);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1237,12 +1225,12 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
               {
                 org.apache.thrift.protocol.TList _list106 = iprot.readListBegin();
                 struct.columns = new ArrayList<TColumn>(_list106.size);
-                for (int _i107 = 0; _i107 < _list106.size; ++_i107)
+                TColumn _elem107;
+                for (int _i108 = 0; _i108 < _list106.size; ++_i108)
                 {
-                  TColumn _elem108; // required
-                  _elem108 = new TColumn();
-                  _elem108.read(iprot);
-                  struct.columns.add(_elem108);
+                  _elem107 = new TColumn();
+                  _elem107.read(iprot);
+                  struct.columns.add(_elem107);
                 }
                 iprot.readListEnd();
               }
@@ -1297,13 +1285,13 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
               {
                 org.apache.thrift.protocol.TMap _map109 = iprot.readMapBegin();
                 struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map109.size);
-                for (int _i110 = 0; _i110 < _map109.size; ++_i110)
+                ByteBuffer _key110;
+                ByteBuffer _val111;
+                for (int _i112 = 0; _i112 < _map109.size; ++_i112)
                 {
-                  ByteBuffer _key111; // required
-                  ByteBuffer _val112; // required
-                  _key111 = iprot.readBinary();
-                  _val112 = iprot.readBinary();
-                  struct.attributes.put(_key111, _val112);
+                  _key110 = iprot.readBinary();
+                  _val111 = iprot.readBinary();
+                  struct.attributes.put(_key110, _val111);
                 }
                 iprot.readMapEnd();
               }
@@ -1544,12 +1532,12 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
         {
           org.apache.thrift.protocol.TList _list117 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
iprot.readI32());
           struct.columns = new ArrayList<TColumn>(_list117.size);
-          for (int _i118 = 0; _i118 < _list117.size; ++_i118)
+          TColumn _elem118;
+          for (int _i119 = 0; _i119 < _list117.size; ++_i119)
           {
-            TColumn _elem119; // required
-            _elem119 = new TColumn();
-            _elem119.read(iprot);
-            struct.columns.add(_elem119);
+            _elem118 = new TColumn();
+            _elem118.read(iprot);
+            struct.columns.add(_elem118);
           }
         }
         struct.setColumnsIsSet(true);
@@ -1579,13 +1567,13 @@ public class TScan implements org.apache.thrift.TBase<TScan, TScan._Fields>,
jav
         {
           org.apache.thrift.protocol.TMap _map120 = 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*_map120.size);
-          for (int _i121 = 0; _i121 < _map120.size; ++_i121)
+          ByteBuffer _key121;
+          ByteBuffer _val122;
+          for (int _i123 = 0; _i123 < _map120.size; ++_i123)
           {
-            ByteBuffer _key122; // required
-            ByteBuffer _val123; // required
-            _key122 = iprot.readBinary();
-            _val123 = iprot.readBinary();
-            struct.attributes.put(_key122, _val123);
+            _key121 = iprot.readBinary();
+            _val122 = iprot.readBinary();
+            struct.attributes.put(_key121, _val122);
           }
         }
         struct.setAttributesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
----------------------------------------------------------------------
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
index 652fa3f..0682675 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TServerName.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.hbase.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TServerName implements org.apache.thrift.TBase<TServerName, TServerName._Fields>,
java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
+public class TServerName implements org.apache.thrift.TBase<TServerName, TServerName._Fields>,
java.io.Serializable, Cloneable, Comparable<TServerName> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TServerName");
 
   private static final org.apache.thrift.protocol.TField HOST_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostName",
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -116,7 +120,7 @@ public class TServerName implements org.apache.thrift.TBase<TServerName,
TServer
   private static final int __PORT_ISSET_ID = 0;
   private static final int __STARTCODE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.PORT,_Fields.START_CODE};
+  private static final _Fields optionals[] = {_Fields.PORT,_Fields.START_CODE};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields,
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -270,10 +274,10 @@ public class TServerName implements org.apache.thrift.TBase<TServerName,
TServer
       return getHostName();
 
     case PORT:
-      return Integer.valueOf(getPort());
+      return getPort();
 
     case START_CODE:
-      return Long.valueOf(getStartCode());
+      return getStartCode();
 
     }
     throw new IllegalStateException();
@@ -341,60 +345,60 @@ public class TServerName implements org.apache.thrift.TBase<TServerName,
TServer
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_hostName = true && (isSetHostName());
-    builder.append(present_hostName);
+    list.add(present_hostName);
     if (present_hostName)
-      builder.append(hostName);
+      list.add(hostName);
 
     boolean present_port = true && (isSetPort());
-    builder.append(present_port);
+    list.add(present_port);
     if (present_port)
-      builder.append(port);
+      list.add(port);
 
     boolean present_startCode = true && (isSetStartCode());
-    builder.append(present_startCode);
+    list.add(present_startCode);
     if (present_startCode)
-      builder.append(startCode);
+      list.add(startCode);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TServerName other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TServerName typedOther = (TServerName)other;
 
-    lastComparison = Boolean.valueOf(isSetHostName()).compareTo(typedOther.isSetHostName());
+    lastComparison = Boolean.valueOf(isSetHostName()).compareTo(other.isSetHostName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetHostName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostName, typedOther.hostName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hostName, other.hostName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartCode()).compareTo(typedOther.isSetStartCode());
+    lastComparison = Boolean.valueOf(isSetStartCode()).compareTo(other.isSetStartCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStartCode()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startCode, typedOther.startCode);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startCode, other.startCode);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TTimeRange.java
----------------------------------------------------------------------
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 cc7a15b..63c91f5 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
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hadoop.hbase.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;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TTimeRange implements org.apache.thrift.TBase<TTimeRange, TTimeRange._Fields>,
java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-11-17")
+public class TTimeRange implements org.apache.thrift.TBase<TTimeRange, TTimeRange._Fields>,
java.io.Serializable, Cloneable, Comparable<TTimeRange> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTimeRange");
 
   private static final org.apache.thrift.protocol.TField MIN_STAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("minStamp",
org.apache.thrift.protocol.TType.I64, (short)1);
@@ -227,10 +231,10 @@ public class TTimeRange implements org.apache.thrift.TBase<TTimeRange,
TTimeRang
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case MIN_STAMP:
-      return Long.valueOf(getMinStamp());
+      return getMinStamp();
 
     case MAX_STAMP:
-      return Long.valueOf(getMaxStamp());
+      return getMaxStamp();
 
     }
     throw new IllegalStateException();
@@ -287,45 +291,45 @@ public class TTimeRange implements org.apache.thrift.TBase<TTimeRange,
TTimeRang
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_minStamp = true;
-    builder.append(present_minStamp);
+    list.add(present_minStamp);
     if (present_minStamp)
-      builder.append(minStamp);
+      list.add(minStamp);
 
     boolean present_maxStamp = true;
-    builder.append(present_maxStamp);
+    list.add(present_maxStamp);
     if (present_maxStamp)
-      builder.append(maxStamp);
+      list.add(maxStamp);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TTimeRange other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TTimeRange typedOther = (TTimeRange)other;
 
-    lastComparison = Boolean.valueOf(isSetMinStamp()).compareTo(typedOther.isSetMinStamp());
+    lastComparison = Boolean.valueOf(isSetMinStamp()).compareTo(other.isSetMinStamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMinStamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minStamp, typedOther.minStamp);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minStamp, other.minStamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxStamp()).compareTo(typedOther.isSetMaxStamp());
+    lastComparison = Boolean.valueOf(isSetMaxStamp()).compareTo(other.isSetMaxStamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMaxStamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxStamp, typedOther.maxStamp);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxStamp, other.maxStamp);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hbase/blob/3aa3fae1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cb01cea..fa7400e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1195,7 +1195,7 @@
     <mockito-all.version>1.10.8</mockito-all.version>
     <protobuf.version>2.5.0</protobuf.version>
     <thrift.path>thrift</thrift.path>
-    <thrift.version>0.9.2</thrift.version>
+    <thrift.version>0.9.3</thrift.version>
     <zookeeper.version>3.4.6</zookeeper.version>
     <slf4j.version>1.7.7</slf4j.version>
     <clover.version>4.0.3</clover.version>


Mime
View raw message