accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [13/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler
Date Wed, 16 Dec 2015 21:11:18 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
index 86a502b..f26a581 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionStats._Fields>, java.io.Serializable, Cloneable, Comparable<ActionStats> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class ActionStats implements org.apache.thrift.TBase<ActionStats, ActionStats._Fields>, java.io.Serializable, Cloneable, Comparable<ActionStats> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActionStats");
 
   private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -514,28 +517,28 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case STATUS:
-      return Integer.valueOf(getStatus());
+      return getStatus();
 
     case ELAPSED:
-      return Double.valueOf(getElapsed());
+      return getElapsed();
 
     case NUM:
-      return Integer.valueOf(getNum());
+      return getNum();
 
     case COUNT:
-      return Long.valueOf(getCount());
+      return getCount();
 
     case SUM_DEV:
-      return Double.valueOf(getSumDev());
+      return getSumDev();
 
     case FAIL:
-      return Integer.valueOf(getFail());
+      return getFail();
 
     case QUEUE_TIME:
-      return Double.valueOf(getQueueTime());
+      return getQueueTime();
 
     case QUEUE_SUM_DEV:
-      return Double.valueOf(getQueueSumDev());
+      return getQueueSumDev();
 
     }
     throw new IllegalStateException();
@@ -658,7 +661,49 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_status = true;
+    list.add(present_status);
+    if (present_status)
+      list.add(status);
+
+    boolean present_elapsed = true;
+    list.add(present_elapsed);
+    if (present_elapsed)
+      list.add(elapsed);
+
+    boolean present_num = true;
+    list.add(present_num);
+    if (present_num)
+      list.add(num);
+
+    boolean present_count = true;
+    list.add(present_count);
+    if (present_count)
+      list.add(count);
+
+    boolean present_sumDev = true;
+    list.add(present_sumDev);
+    if (present_sumDev)
+      list.add(sumDev);
+
+    boolean present_fail = true;
+    list.add(present_fail);
+    if (present_fail)
+      list.add(fail);
+
+    boolean present_queueTime = true;
+    list.add(present_queueTime);
+    if (present_queueTime)
+      list.add(queueTime);
+
+    boolean present_queueSumDev = true;
+    list.add(present_queueSumDev);
+    if (present_queueSumDev)
+      list.add(queueSumDev);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
index 9c1977d..b32b38e 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompaction, ActiveCompaction._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveCompaction> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class ActiveCompaction implements org.apache.thrift.TBase<ActiveCompaction, ActiveCompaction._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveCompaction> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveCompaction");
 
   private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -748,7 +751,7 @@ import org.slf4j.LoggerFactory;
       return getExtent();
 
     case AGE:
-      return Long.valueOf(getAge());
+      return getAge();
 
     case INPUT_FILES:
       return getInputFiles();
@@ -766,10 +769,10 @@ import org.slf4j.LoggerFactory;
       return getLocalityGroup();
 
     case ENTRIES_READ:
-      return Long.valueOf(getEntriesRead());
+      return getEntriesRead();
 
     case ENTRIES_WRITTEN:
-      return Long.valueOf(getEntriesWritten());
+      return getEntriesWritten();
 
     case SSI_LIST:
       return getSsiList();
@@ -931,7 +934,64 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_extent = true && (isSetExtent());
+    list.add(present_extent);
+    if (present_extent)
+      list.add(extent);
+
+    boolean present_age = true;
+    list.add(present_age);
+    if (present_age)
+      list.add(age);
+
+    boolean present_inputFiles = true && (isSetInputFiles());
+    list.add(present_inputFiles);
+    if (present_inputFiles)
+      list.add(inputFiles);
+
+    boolean present_outputFile = true && (isSetOutputFile());
+    list.add(present_outputFile);
+    if (present_outputFile)
+      list.add(outputFile);
+
+    boolean present_type = true && (isSetType());
+    list.add(present_type);
+    if (present_type)
+      list.add(type.getValue());
+
+    boolean present_reason = true && (isSetReason());
+    list.add(present_reason);
+    if (present_reason)
+      list.add(reason.getValue());
+
+    boolean present_localityGroup = true && (isSetLocalityGroup());
+    list.add(present_localityGroup);
+    if (present_localityGroup)
+      list.add(localityGroup);
+
+    boolean present_entriesRead = true;
+    list.add(present_entriesRead);
+    if (present_entriesRead)
+      list.add(entriesRead);
+
+    boolean present_entriesWritten = true;
+    list.add(present_entriesWritten);
+    if (present_entriesWritten)
+      list.add(entriesWritten);
+
+    boolean present_ssiList = true && (isSetSsiList());
+    list.add(present_ssiList);
+    if (present_ssiList)
+      list.add(ssiList);
+
+    boolean present_ssio = true && (isSetSsio());
+    list.add(present_ssio);
+    if (present_ssio)
+      list.add(ssio);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1217,11 +1277,11 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
                 struct.inputFiles = new ArrayList<String>(_list52.size);
-                for (int _i53 = 0; _i53 < _list52.size; ++_i53)
+                String _elem53;
+                for (int _i54 = 0; _i54 < _list52.size; ++_i54)
                 {
-                  String _elem54;
-                  _elem54 = iprot.readString();
-                  struct.inputFiles.add(_elem54);
+                  _elem53 = iprot.readString();
+                  struct.inputFiles.add(_elem53);
                 }
                 iprot.readListEnd();
               }
@@ -1240,7 +1300,7 @@ import org.slf4j.LoggerFactory;
             break;
           case 5: // TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = CompactionType.findByValue(iprot.readI32());
+              struct.type = org.apache.accumulo.core.tabletserver.thrift.CompactionType.findByValue(iprot.readI32());
               struct.setTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1248,7 +1308,7 @@ import org.slf4j.LoggerFactory;
             break;
           case 6: // REASON
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.reason = CompactionReason.findByValue(iprot.readI32());
+              struct.reason = org.apache.accumulo.core.tabletserver.thrift.CompactionReason.findByValue(iprot.readI32());
               struct.setReasonIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1283,12 +1343,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list55 = iprot.readListBegin();
                 struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list55.size);
-                for (int _i56 = 0; _i56 < _list55.size; ++_i56)
+                org.apache.accumulo.core.data.thrift.IterInfo _elem56;
+                for (int _i57 = 0; _i57 < _list55.size; ++_i57)
                 {
-                  org.apache.accumulo.core.data.thrift.IterInfo _elem57;
-                  _elem57 = new org.apache.accumulo.core.data.thrift.IterInfo();
-                  _elem57.read(iprot);
-                  struct.ssiList.add(_elem57);
+                  _elem56 = new org.apache.accumulo.core.data.thrift.IterInfo();
+                  _elem56.read(iprot);
+                  struct.ssiList.add(_elem56);
                 }
                 iprot.readListEnd();
               }
@@ -1302,25 +1362,25 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TMap _map58 = iprot.readMapBegin();
                 struct.ssio = new HashMap<String,Map<String,String>>(2*_map58.size);
-                for (int _i59 = 0; _i59 < _map58.size; ++_i59)
+                String _key59;
+                Map<String,String> _val60;
+                for (int _i61 = 0; _i61 < _map58.size; ++_i61)
                 {
-                  String _key60;
-                  Map<String,String> _val61;
-                  _key60 = iprot.readString();
+                  _key59 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TMap _map62 = iprot.readMapBegin();
-                    _val61 = new HashMap<String,String>(2*_map62.size);
-                    for (int _i63 = 0; _i63 < _map62.size; ++_i63)
+                    _val60 = new HashMap<String,String>(2*_map62.size);
+                    String _key63;
+                    String _val64;
+                    for (int _i65 = 0; _i65 < _map62.size; ++_i65)
                     {
-                      String _key64;
-                      String _val65;
-                      _key64 = iprot.readString();
-                      _val65 = iprot.readString();
-                      _val61.put(_key64, _val65);
+                      _key63 = iprot.readString();
+                      _val64 = iprot.readString();
+                      _val60.put(_key63, _val64);
                     }
                     iprot.readMapEnd();
                   }
-                  struct.ssio.put(_key60, _val61);
+                  struct.ssio.put(_key59, _val60);
                 }
                 iprot.readMapEnd();
               }
@@ -1553,11 +1613,11 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list74 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.inputFiles = new ArrayList<String>(_list74.size);
-          for (int _i75 = 0; _i75 < _list74.size; ++_i75)
+          String _elem75;
+          for (int _i76 = 0; _i76 < _list74.size; ++_i76)
           {
-            String _elem76;
-            _elem76 = iprot.readString();
-            struct.inputFiles.add(_elem76);
+            _elem75 = iprot.readString();
+            struct.inputFiles.add(_elem75);
           }
         }
         struct.setInputFilesIsSet(true);
@@ -1567,11 +1627,11 @@ import org.slf4j.LoggerFactory;
         struct.setOutputFileIsSet(true);
       }
       if (incoming.get(4)) {
-        struct.type = CompactionType.findByValue(iprot.readI32());
+        struct.type = org.apache.accumulo.core.tabletserver.thrift.CompactionType.findByValue(iprot.readI32());
         struct.setTypeIsSet(true);
       }
       if (incoming.get(5)) {
-        struct.reason = CompactionReason.findByValue(iprot.readI32());
+        struct.reason = org.apache.accumulo.core.tabletserver.thrift.CompactionReason.findByValue(iprot.readI32());
         struct.setReasonIsSet(true);
       }
       if (incoming.get(6)) {
@@ -1590,12 +1650,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list77 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list77.size);
-          for (int _i78 = 0; _i78 < _list77.size; ++_i78)
+          org.apache.accumulo.core.data.thrift.IterInfo _elem78;
+          for (int _i79 = 0; _i79 < _list77.size; ++_i79)
           {
-            org.apache.accumulo.core.data.thrift.IterInfo _elem79;
-            _elem79 = new org.apache.accumulo.core.data.thrift.IterInfo();
-            _elem79.read(iprot);
-            struct.ssiList.add(_elem79);
+            _elem78 = new org.apache.accumulo.core.data.thrift.IterInfo();
+            _elem78.read(iprot);
+            struct.ssiList.add(_elem78);
           }
         }
         struct.setSsiListIsSet(true);
@@ -1604,24 +1664,24 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TMap _map80 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
           struct.ssio = new HashMap<String,Map<String,String>>(2*_map80.size);
-          for (int _i81 = 0; _i81 < _map80.size; ++_i81)
+          String _key81;
+          Map<String,String> _val82;
+          for (int _i83 = 0; _i83 < _map80.size; ++_i83)
           {
-            String _key82;
-            Map<String,String> _val83;
-            _key82 = iprot.readString();
+            _key81 = iprot.readString();
             {
               org.apache.thrift.protocol.TMap _map84 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-              _val83 = new HashMap<String,String>(2*_map84.size);
-              for (int _i85 = 0; _i85 < _map84.size; ++_i85)
+              _val82 = new HashMap<String,String>(2*_map84.size);
+              String _key85;
+              String _val86;
+              for (int _i87 = 0; _i87 < _map84.size; ++_i87)
               {
-                String _key86;
-                String _val87;
-                _key86 = iprot.readString();
-                _val87 = iprot.readString();
-                _val83.put(_key86, _val87);
+                _key85 = iprot.readString();
+                _val86 = iprot.readString();
+                _val82.put(_key85, _val86);
               }
             }
-            struct.ssio.put(_key82, _val83);
+            struct.ssio.put(_key81, _val82);
           }
         }
         struct.setSsioIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
index e46c397..fe899db 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class ActiveScan implements org.apache.thrift.TBase<ActiveScan, ActiveScan._Fields>, java.io.Serializable, Cloneable, Comparable<ActiveScan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ActiveScan");
 
   private static final org.apache.thrift.protocol.TField CLIENT_FIELD_DESC = new org.apache.thrift.protocol.TField("client", org.apache.thrift.protocol.TType.STRING, (short)2);
@@ -205,7 +208,7 @@ import org.slf4j.LoggerFactory;
   private static final int __IDLETIME_ISSET_ID = 1;
   private static final int __SCANID_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.SCAN_ID};
+  private static final _Fields optionals[] = {_Fields.SCAN_ID};
   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);
@@ -907,10 +910,10 @@ import org.slf4j.LoggerFactory;
       return getTableId();
 
     case AGE:
-      return Long.valueOf(getAge());
+      return getAge();
 
     case IDLE_TIME:
-      return Long.valueOf(getIdleTime());
+      return getIdleTime();
 
     case TYPE:
       return getType();
@@ -934,7 +937,7 @@ import org.slf4j.LoggerFactory;
       return getAuthorizations();
 
     case SCAN_ID:
-      return Long.valueOf(getScanId());
+      return getScanId();
 
     case CLASS_LOADER_CONTEXT:
       return getClassLoaderContext();
@@ -1126,7 +1129,79 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_client = true && (isSetClient());
+    list.add(present_client);
+    if (present_client)
+      list.add(client);
+
+    boolean present_user = true && (isSetUser());
+    list.add(present_user);
+    if (present_user)
+      list.add(user);
+
+    boolean present_tableId = true && (isSetTableId());
+    list.add(present_tableId);
+    if (present_tableId)
+      list.add(tableId);
+
+    boolean present_age = true;
+    list.add(present_age);
+    if (present_age)
+      list.add(age);
+
+    boolean present_idleTime = true;
+    list.add(present_idleTime);
+    if (present_idleTime)
+      list.add(idleTime);
+
+    boolean present_type = true && (isSetType());
+    list.add(present_type);
+    if (present_type)
+      list.add(type.getValue());
+
+    boolean present_state = true && (isSetState());
+    list.add(present_state);
+    if (present_state)
+      list.add(state.getValue());
+
+    boolean present_extent = true && (isSetExtent());
+    list.add(present_extent);
+    if (present_extent)
+      list.add(extent);
+
+    boolean present_columns = true && (isSetColumns());
+    list.add(present_columns);
+    if (present_columns)
+      list.add(columns);
+
+    boolean present_ssiList = true && (isSetSsiList());
+    list.add(present_ssiList);
+    if (present_ssiList)
+      list.add(ssiList);
+
+    boolean present_ssio = true && (isSetSsio());
+    list.add(present_ssio);
+    if (present_ssio)
+      list.add(ssio);
+
+    boolean present_authorizations = true && (isSetAuthorizations());
+    list.add(present_authorizations);
+    if (present_authorizations)
+      list.add(authorizations);
+
+    boolean present_scanId = true && (isSetScanId());
+    list.add(present_scanId);
+    if (present_scanId)
+      list.add(scanId);
+
+    boolean present_classLoaderContext = true && (isSetClassLoaderContext());
+    list.add(present_classLoaderContext);
+    if (present_classLoaderContext)
+      list.add(classLoaderContext);
+
+    return list.hashCode();
   }
 
   @Override
@@ -1381,7 +1456,7 @@ import org.slf4j.LoggerFactory;
     if (this.authorizations == null) {
       sb.append("null");
     } else {
-      sb.append(this.authorizations);
+      org.apache.thrift.TBaseHelper.toString(this.authorizations, sb);
     }
     first = false;
     if (isSetScanId()) {
@@ -1488,7 +1563,7 @@ import org.slf4j.LoggerFactory;
             break;
           case 7: // TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = ScanType.findByValue(iprot.readI32());
+              struct.type = org.apache.accumulo.core.tabletserver.thrift.ScanType.findByValue(iprot.readI32());
               struct.setTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1496,7 +1571,7 @@ import org.slf4j.LoggerFactory;
             break;
           case 8: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.state = ScanState.findByValue(iprot.readI32());
+              struct.state = org.apache.accumulo.core.tabletserver.thrift.ScanState.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1516,12 +1591,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
                 struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list8.size);
-                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
+                org.apache.accumulo.core.data.thrift.TColumn _elem9;
+                for (int _i10 = 0; _i10 < _list8.size; ++_i10)
                 {
-                  org.apache.accumulo.core.data.thrift.TColumn _elem10;
-                  _elem10 = new org.apache.accumulo.core.data.thrift.TColumn();
-                  _elem10.read(iprot);
-                  struct.columns.add(_elem10);
+                  _elem9 = new org.apache.accumulo.core.data.thrift.TColumn();
+                  _elem9.read(iprot);
+                  struct.columns.add(_elem9);
                 }
                 iprot.readListEnd();
               }
@@ -1535,12 +1610,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list11 = iprot.readListBegin();
                 struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list11.size);
-                for (int _i12 = 0; _i12 < _list11.size; ++_i12)
+                org.apache.accumulo.core.data.thrift.IterInfo _elem12;
+                for (int _i13 = 0; _i13 < _list11.size; ++_i13)
                 {
-                  org.apache.accumulo.core.data.thrift.IterInfo _elem13;
-                  _elem13 = new org.apache.accumulo.core.data.thrift.IterInfo();
-                  _elem13.read(iprot);
-                  struct.ssiList.add(_elem13);
+                  _elem12 = new org.apache.accumulo.core.data.thrift.IterInfo();
+                  _elem12.read(iprot);
+                  struct.ssiList.add(_elem12);
                 }
                 iprot.readListEnd();
               }
@@ -1554,25 +1629,25 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TMap _map14 = iprot.readMapBegin();
                 struct.ssio = new HashMap<String,Map<String,String>>(2*_map14.size);
-                for (int _i15 = 0; _i15 < _map14.size; ++_i15)
+                String _key15;
+                Map<String,String> _val16;
+                for (int _i17 = 0; _i17 < _map14.size; ++_i17)
                 {
-                  String _key16;
-                  Map<String,String> _val17;
-                  _key16 = iprot.readString();
+                  _key15 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TMap _map18 = iprot.readMapBegin();
-                    _val17 = new HashMap<String,String>(2*_map18.size);
-                    for (int _i19 = 0; _i19 < _map18.size; ++_i19)
+                    _val16 = new HashMap<String,String>(2*_map18.size);
+                    String _key19;
+                    String _val20;
+                    for (int _i21 = 0; _i21 < _map18.size; ++_i21)
                     {
-                      String _key20;
-                      String _val21;
-                      _key20 = iprot.readString();
-                      _val21 = iprot.readString();
-                      _val17.put(_key20, _val21);
+                      _key19 = iprot.readString();
+                      _val20 = iprot.readString();
+                      _val16.put(_key19, _val20);
                     }
                     iprot.readMapEnd();
                   }
-                  struct.ssio.put(_key16, _val17);
+                  struct.ssio.put(_key15, _val16);
                 }
                 iprot.readMapEnd();
               }
@@ -1586,11 +1661,11 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
                 struct.authorizations = new ArrayList<ByteBuffer>(_list22.size);
-                for (int _i23 = 0; _i23 < _list22.size; ++_i23)
+                ByteBuffer _elem23;
+                for (int _i24 = 0; _i24 < _list22.size; ++_i24)
                 {
-                  ByteBuffer _elem24;
-                  _elem24 = iprot.readBinary();
-                  struct.authorizations.add(_elem24);
+                  _elem23 = iprot.readBinary();
+                  struct.authorizations.add(_elem23);
                 }
                 iprot.readListEnd();
               }
@@ -1895,11 +1970,11 @@ import org.slf4j.LoggerFactory;
         struct.setIdleTimeIsSet(true);
       }
       if (incoming.get(5)) {
-        struct.type = ScanType.findByValue(iprot.readI32());
+        struct.type = org.apache.accumulo.core.tabletserver.thrift.ScanType.findByValue(iprot.readI32());
         struct.setTypeIsSet(true);
       }
       if (incoming.get(6)) {
-        struct.state = ScanState.findByValue(iprot.readI32());
+        struct.state = org.apache.accumulo.core.tabletserver.thrift.ScanState.findByValue(iprot.readI32());
         struct.setStateIsSet(true);
       }
       if (incoming.get(7)) {
@@ -1911,12 +1986,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list35 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.columns = new ArrayList<org.apache.accumulo.core.data.thrift.TColumn>(_list35.size);
-          for (int _i36 = 0; _i36 < _list35.size; ++_i36)
+          org.apache.accumulo.core.data.thrift.TColumn _elem36;
+          for (int _i37 = 0; _i37 < _list35.size; ++_i37)
           {
-            org.apache.accumulo.core.data.thrift.TColumn _elem37;
-            _elem37 = new org.apache.accumulo.core.data.thrift.TColumn();
-            _elem37.read(iprot);
-            struct.columns.add(_elem37);
+            _elem36 = new org.apache.accumulo.core.data.thrift.TColumn();
+            _elem36.read(iprot);
+            struct.columns.add(_elem36);
           }
         }
         struct.setColumnsIsSet(true);
@@ -1925,12 +2000,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list38 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.ssiList = new ArrayList<org.apache.accumulo.core.data.thrift.IterInfo>(_list38.size);
-          for (int _i39 = 0; _i39 < _list38.size; ++_i39)
+          org.apache.accumulo.core.data.thrift.IterInfo _elem39;
+          for (int _i40 = 0; _i40 < _list38.size; ++_i40)
           {
-            org.apache.accumulo.core.data.thrift.IterInfo _elem40;
-            _elem40 = new org.apache.accumulo.core.data.thrift.IterInfo();
-            _elem40.read(iprot);
-            struct.ssiList.add(_elem40);
+            _elem39 = new org.apache.accumulo.core.data.thrift.IterInfo();
+            _elem39.read(iprot);
+            struct.ssiList.add(_elem39);
           }
         }
         struct.setSsiListIsSet(true);
@@ -1939,24 +2014,24 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TMap _map41 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.MAP, iprot.readI32());
           struct.ssio = new HashMap<String,Map<String,String>>(2*_map41.size);
-          for (int _i42 = 0; _i42 < _map41.size; ++_i42)
+          String _key42;
+          Map<String,String> _val43;
+          for (int _i44 = 0; _i44 < _map41.size; ++_i44)
           {
-            String _key43;
-            Map<String,String> _val44;
-            _key43 = iprot.readString();
+            _key42 = iprot.readString();
             {
               org.apache.thrift.protocol.TMap _map45 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-              _val44 = new HashMap<String,String>(2*_map45.size);
-              for (int _i46 = 0; _i46 < _map45.size; ++_i46)
+              _val43 = new HashMap<String,String>(2*_map45.size);
+              String _key46;
+              String _val47;
+              for (int _i48 = 0; _i48 < _map45.size; ++_i48)
               {
-                String _key47;
-                String _val48;
-                _key47 = iprot.readString();
-                _val48 = iprot.readString();
-                _val44.put(_key47, _val48);
+                _key46 = iprot.readString();
+                _val47 = iprot.readString();
+                _val43.put(_key46, _val47);
               }
             }
-            struct.ssio.put(_key43, _val44);
+            struct.ssio.put(_key42, _val43);
           }
         }
         struct.setSsioIsSet(true);
@@ -1965,11 +2040,11 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list49 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.authorizations = new ArrayList<ByteBuffer>(_list49.size);
-          for (int _i50 = 0; _i50 < _list49.size; ++_i50)
+          ByteBuffer _elem50;
+          for (int _i51 = 0; _i51 < _list49.size; ++_i51)
           {
-            ByteBuffer _elem51;
-            _elem51 = iprot.readBinary();
-            struct.authorizations.add(_elem51);
+            _elem50 = iprot.readBinary();
+            struct.authorizations.add(_elem50);
           }
         }
         struct.setAuthorizationsIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
index 591dffd..387908b 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionReason.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
index f2f2cd6..9252e3d 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/CompactionType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
index 7a94159..37ebe4f 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class ConstraintViolationException extends TException implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable, Comparable<ConstraintViolationException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class ConstraintViolationException extends TException implements org.apache.thrift.TBase<ConstraintViolationException, ConstraintViolationException._Fields>, java.io.Serializable, Cloneable, Comparable<ConstraintViolationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ConstraintViolationException");
 
   private static final org.apache.thrift.protocol.TField VIOLATION_SUMMARIES_FIELD_DESC = new org.apache.thrift.protocol.TField("violationSummaries", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -263,7 +266,14 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_violationSummaries = true && (isSetViolationSummaries());
+    list.add(present_violationSummaries);
+    if (present_violationSummaries)
+      list.add(violationSummaries);
+
+    return list.hashCode();
   }
 
   @Override
@@ -359,12 +369,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
                 struct.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list0.size);
-                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
+                org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem1;
+                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
-                  org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem2;
-                  _elem2 = new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary();
-                  _elem2.read(iprot);
-                  struct.violationSummaries.add(_elem2);
+                  _elem1 = new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary();
+                  _elem1.read(iprot);
+                  struct.violationSummaries.add(_elem1);
                 }
                 iprot.readListEnd();
               }
@@ -441,12 +451,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.violationSummaries = new ArrayList<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary>(_list5.size);
-          for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+          org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem6;
+          for (int _i7 = 0; _i7 < _list5.size; ++_i7)
           {
-            org.apache.accumulo.core.data.thrift.TConstraintViolationSummary _elem7;
-            _elem7 = new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary();
-            _elem7.read(iprot);
-            struct.violationSummaries.add(_elem7);
+            _elem6 = new org.apache.accumulo.core.data.thrift.TConstraintViolationSummary();
+            _elem6.read(iprot);
+            struct.violationSummaries.add(_elem6);
           }
         }
         struct.setViolationSummariesIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
index 9db0608..2ad12a9 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, IteratorConfig._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorConfig> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class IteratorConfig implements org.apache.thrift.TBase<IteratorConfig, IteratorConfig._Fields>, java.io.Serializable, Cloneable, Comparable<IteratorConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("IteratorConfig");
 
   private static final org.apache.thrift.protocol.TField ITERATORS_FIELD_DESC = new org.apache.thrift.protocol.TField("iterators", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -263,7 +266,14 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_iterators = true && (isSetIterators());
+    list.add(present_iterators);
+    if (present_iterators)
+      list.add(iterators);
+
+    return list.hashCode();
   }
 
   @Override
@@ -359,12 +369,12 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TList _list98 = iprot.readListBegin();
                 struct.iterators = new ArrayList<TIteratorSetting>(_list98.size);
-                for (int _i99 = 0; _i99 < _list98.size; ++_i99)
+                TIteratorSetting _elem99;
+                for (int _i100 = 0; _i100 < _list98.size; ++_i100)
                 {
-                  TIteratorSetting _elem100;
-                  _elem100 = new TIteratorSetting();
-                  _elem100.read(iprot);
-                  struct.iterators.add(_elem100);
+                  _elem99 = new TIteratorSetting();
+                  _elem99.read(iprot);
+                  struct.iterators.add(_elem99);
                 }
                 iprot.readListEnd();
               }
@@ -441,12 +451,12 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.iterators = new ArrayList<TIteratorSetting>(_list103.size);
-          for (int _i104 = 0; _i104 < _list103.size; ++_i104)
+          TIteratorSetting _elem104;
+          for (int _i105 = 0; _i105 < _list103.size; ++_i105)
           {
-            TIteratorSetting _elem105;
-            _elem105 = new TIteratorSetting();
-            _elem105.read(iprot);
-            struct.iterators.add(_elem105);
+            _elem104 = new TIteratorSetting();
+            _elem104.read(iprot);
+            struct.iterators.add(_elem104);
           }
         }
         struct.setIteratorsIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
index c0dc02b..348ccf3 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class NoSuchScanIDException extends TException implements org.apache.thrift.TBase<NoSuchScanIDException, NoSuchScanIDException._Fields>, java.io.Serializable, Cloneable, Comparable<NoSuchScanIDException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class NoSuchScanIDException extends TException implements org.apache.thrift.TBase<NoSuchScanIDException, NoSuchScanIDException._Fields>, java.io.Serializable, Cloneable, Comparable<NoSuchScanIDException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NoSuchScanIDException");
 
 
@@ -178,7 +181,9 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
index ef87937..b3b6848 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class NotServingTabletException extends TException implements org.apache.thrift.TBase<NotServingTabletException, NotServingTabletException._Fields>, java.io.Serializable, Cloneable, Comparable<NotServingTabletException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class NotServingTabletException extends TException implements org.apache.thrift.TBase<NotServingTabletException, NotServingTabletException._Fields>, java.io.Serializable, Cloneable, Comparable<NotServingTabletException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotServingTabletException");
 
   private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -243,7 +246,14 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_extent = true && (isSetExtent());
+    list.add(present_extent);
+    if (present_extent)
+      list.add(extent);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
index 5bb6857..b117890 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
index 34d7ac5..25d741d 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
index 629b770..b8c7cff 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TDurability.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
index 8eddaba..31770c3 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSetting, TIteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<TIteratorSetting> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TIteratorSetting implements org.apache.thrift.TBase<TIteratorSetting, TIteratorSetting._Fields>, java.io.Serializable, Cloneable, Comparable<TIteratorSetting> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TIteratorSetting");
 
   private static final org.apache.thrift.protocol.TField PRIORITY_FIELD_DESC = new org.apache.thrift.protocol.TField("priority", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -348,7 +351,7 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case PRIORITY:
-      return Integer.valueOf(getPriority());
+      return getPriority();
 
     case NAME:
       return getName();
@@ -436,7 +439,29 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_priority = true;
+    list.add(present_priority);
+    if (present_priority)
+      list.add(priority);
+
+    boolean present_name = true && (isSetName());
+    list.add(present_name);
+    if (present_name)
+      list.add(name);
+
+    boolean present_iteratorClass = true && (isSetIteratorClass());
+    list.add(present_iteratorClass);
+    if (present_iteratorClass)
+      list.add(iteratorClass);
+
+    boolean present_properties = true && (isSetProperties());
+    list.add(present_properties);
+    if (present_properties)
+      list.add(properties);
+
+    return list.hashCode();
   }
 
   @Override
@@ -608,13 +633,13 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TMap _map88 = iprot.readMapBegin();
                 struct.properties = new HashMap<String,String>(2*_map88.size);
-                for (int _i89 = 0; _i89 < _map88.size; ++_i89)
+                String _key89;
+                String _val90;
+                for (int _i91 = 0; _i91 < _map88.size; ++_i91)
                 {
-                  String _key90;
-                  String _val91;
-                  _key90 = iprot.readString();
-                  _val91 = iprot.readString();
-                  struct.properties.put(_key90, _val91);
+                  _key89 = iprot.readString();
+                  _val90 = iprot.readString();
+                  struct.properties.put(_key89, _val90);
                 }
                 iprot.readMapEnd();
               }
@@ -736,13 +761,13 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TMap _map94 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.properties = new HashMap<String,String>(2*_map94.size);
-          for (int _i95 = 0; _i95 < _map94.size; ++_i95)
+          String _key95;
+          String _val96;
+          for (int _i97 = 0; _i97 < _map94.size; ++_i97)
           {
-            String _key96;
-            String _val97;
-            _key96 = iprot.readString();
-            _val97 = iprot.readString();
-            struct.properties.put(_key96, _val97);
+            _key95 = iprot.readString();
+            _val96 = iprot.readString();
+            struct.properties.put(_key95, _val96);
           }
         }
         struct.setPropertiesIsSet(true);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
index c4ef7f3..8e5f43a 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSampleNotPresentException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TSampleNotPresentException extends TException implements org.apache.thrift.TBase<TSampleNotPresentException, TSampleNotPresentException._Fields>, java.io.Serializable, Cloneable, Comparable<TSampleNotPresentException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TSampleNotPresentException extends TException implements org.apache.thrift.TBase<TSampleNotPresentException, TSampleNotPresentException._Fields>, java.io.Serializable, Cloneable, Comparable<TSampleNotPresentException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSampleNotPresentException");
 
   private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -243,7 +246,14 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_extent = true && (isSetExtent());
+    list.add(present_extent);
+    if (present_extent)
+      list.add(extent);
+
+    return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
index 2d2b2d5..2c17b9e 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TSamplerConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,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;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class TSamplerConfiguration implements org.apache.thrift.TBase<TSamplerConfiguration, TSamplerConfiguration._Fields>, java.io.Serializable, Cloneable, Comparable<TSamplerConfiguration> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2015-12-16")
+public class TSamplerConfiguration implements org.apache.thrift.TBase<TSamplerConfiguration, TSamplerConfiguration._Fields>, java.io.Serializable, Cloneable, Comparable<TSamplerConfiguration> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSamplerConfiguration");
 
   private static final org.apache.thrift.protocol.TField CLASS_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("className", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -316,7 +319,19 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-    return 0;
+    List<Object> list = new ArrayList<Object>();
+
+    boolean present_className = true && (isSetClassName());
+    list.add(present_className);
+    if (present_className)
+      list.add(className);
+
+    boolean present_options = true && (isSetOptions());
+    list.add(present_options);
+    if (present_options)
+      list.add(options);
+
+    return list.hashCode();
   }
 
   @Override
@@ -438,13 +453,13 @@ import org.slf4j.LoggerFactory;
               {
                 org.apache.thrift.protocol.TMap _map106 = iprot.readMapBegin();
                 struct.options = new HashMap<String,String>(2*_map106.size);
-                for (int _i107 = 0; _i107 < _map106.size; ++_i107)
+                String _key107;
+                String _val108;
+                for (int _i109 = 0; _i109 < _map106.size; ++_i109)
                 {
-                  String _key108;
-                  String _val109;
-                  _key108 = iprot.readString();
-                  _val109 = iprot.readString();
-                  struct.options.put(_key108, _val109);
+                  _key107 = iprot.readString();
+                  _val108 = iprot.readString();
+                  struct.options.put(_key107, _val108);
                 }
                 iprot.readMapEnd();
               }
@@ -538,13 +553,13 @@ import org.slf4j.LoggerFactory;
         {
           org.apache.thrift.protocol.TMap _map112 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.options = new HashMap<String,String>(2*_map112.size);
-          for (int _i113 = 0; _i113 < _map112.size; ++_i113)
+          String _key113;
+          String _val114;
+          for (int _i115 = 0; _i115 < _map112.size; ++_i115)
           {
-            String _key114;
-            String _val115;
-            _key114 = iprot.readString();
-            _val115 = iprot.readString();
-            struct.options.put(_key114, _val115);
+            _key113 = iprot.readString();
+            _val114 = iprot.readString();
+            struct.options.put(_key113, _val114);
           }
         }
         struct.setOptionsIsSet(true);


Mime
View raw message