accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [13/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0
Date Thu, 09 Feb 2017 19:29:41 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
index 777e075..8b9e20f 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOptions, BatchScanOptions._Fields>, java.io.Serializable, Cloneable, Comparable<BatchScanOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BatchScanOptions");
 
@@ -60,16 +33,13 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
   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)4);
   private static final org.apache.thrift.protocol.TField THREADS_FIELD_DESC = new org.apache.thrift.protocol.TField("threads", org.apache.thrift.protocol.TType.I32, (short)5);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new BatchScanOptionsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new BatchScanOptionsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new BatchScanOptionsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new BatchScanOptionsTupleSchemeFactory();
 
-  public Set<ByteBuffer> authorizations; // optional
-  public List<Range> ranges; // optional
-  public List<ScanColumn> columns; // optional
-  public List<IteratorSetting> iterators; // optional
+  public java.util.Set<java.nio.ByteBuffer> authorizations; // optional
+  public java.util.List<Range> ranges; // optional
+  public java.util.List<ScanColumn> columns; // optional
+  public java.util.List<IteratorSetting> iterators; // optional
   public int threads; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -80,10 +50,10 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
     ITERATORS((short)4, "iterators"),
     THREADS((short)5, "threads");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -114,21 +84,21 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -137,7 +107,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -146,9 +116,9 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
   private static final int __THREADS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.AUTHORIZATIONS,_Fields.RANGES,_Fields.COLUMNS,_Fields.ITERATORS,_Fields.THREADS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.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);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AUTHORIZATIONS, new org.apache.thrift.meta_data.FieldMetaData("authorizations", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
@@ -163,7 +133,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, IteratorSetting.class))));
     tmpMap.put(_Fields.THREADS, new org.apache.thrift.meta_data.FieldMetaData("threads", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(BatchScanOptions.class, metaDataMap);
   }
 
@@ -176,25 +146,25 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
   public BatchScanOptions(BatchScanOptions other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetAuthorizations()) {
-      Set<ByteBuffer> __this__authorizations = new HashSet<ByteBuffer>(other.authorizations);
+      java.util.Set<java.nio.ByteBuffer> __this__authorizations = new java.util.HashSet<java.nio.ByteBuffer>(other.authorizations);
       this.authorizations = __this__authorizations;
     }
     if (other.isSetRanges()) {
-      List<Range> __this__ranges = new ArrayList<Range>(other.ranges.size());
+      java.util.List<Range> __this__ranges = new java.util.ArrayList<Range>(other.ranges.size());
       for (Range other_element : other.ranges) {
         __this__ranges.add(new Range(other_element));
       }
       this.ranges = __this__ranges;
     }
     if (other.isSetColumns()) {
-      List<ScanColumn> __this__columns = new ArrayList<ScanColumn>(other.columns.size());
+      java.util.List<ScanColumn> __this__columns = new java.util.ArrayList<ScanColumn>(other.columns.size());
       for (ScanColumn other_element : other.columns) {
         __this__columns.add(new ScanColumn(other_element));
       }
       this.columns = __this__columns;
     }
     if (other.isSetIterators()) {
-      List<IteratorSetting> __this__iterators = new ArrayList<IteratorSetting>(other.iterators.size());
+      java.util.List<IteratorSetting> __this__iterators = new java.util.ArrayList<IteratorSetting>(other.iterators.size());
       for (IteratorSetting other_element : other.iterators) {
         __this__iterators.add(new IteratorSetting(other_element));
       }
@@ -221,22 +191,22 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
     return (this.authorizations == null) ? 0 : this.authorizations.size();
   }
 
-  public java.util.Iterator<ByteBuffer> getAuthorizationsIterator() {
+  public java.util.Iterator<java.nio.ByteBuffer> getAuthorizationsIterator() {
     return (this.authorizations == null) ? null : this.authorizations.iterator();
   }
 
-  public void addToAuthorizations(ByteBuffer elem) {
+  public void addToAuthorizations(java.nio.ByteBuffer elem) {
     if (this.authorizations == null) {
-      this.authorizations = new HashSet<ByteBuffer>();
+      this.authorizations = new java.util.HashSet<java.nio.ByteBuffer>();
     }
     this.authorizations.add(elem);
   }
 
-  public Set<ByteBuffer> getAuthorizations() {
+  public java.util.Set<java.nio.ByteBuffer> getAuthorizations() {
     return this.authorizations;
   }
 
-  public BatchScanOptions setAuthorizations(Set<ByteBuffer> authorizations) {
+  public BatchScanOptions setAuthorizations(java.util.Set<java.nio.ByteBuffer> authorizations) {
     this.authorizations = authorizations;
     return this;
   }
@@ -266,16 +236,16 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
 
   public void addToRanges(Range elem) {
     if (this.ranges == null) {
-      this.ranges = new ArrayList<Range>();
+      this.ranges = new java.util.ArrayList<Range>();
     }
     this.ranges.add(elem);
   }
 
-  public List<Range> getRanges() {
+  public java.util.List<Range> getRanges() {
     return this.ranges;
   }
 
-  public BatchScanOptions setRanges(List<Range> ranges) {
+  public BatchScanOptions setRanges(java.util.List<Range> ranges) {
     this.ranges = ranges;
     return this;
   }
@@ -305,16 +275,16 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
 
   public void addToColumns(ScanColumn elem) {
     if (this.columns == null) {
-      this.columns = new ArrayList<ScanColumn>();
+      this.columns = new java.util.ArrayList<ScanColumn>();
     }
     this.columns.add(elem);
   }
 
-  public List<ScanColumn> getColumns() {
+  public java.util.List<ScanColumn> getColumns() {
     return this.columns;
   }
 
-  public BatchScanOptions setColumns(List<ScanColumn> columns) {
+  public BatchScanOptions setColumns(java.util.List<ScanColumn> columns) {
     this.columns = columns;
     return this;
   }
@@ -344,16 +314,16 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
 
   public void addToIterators(IteratorSetting elem) {
     if (this.iterators == null) {
-      this.iterators = new ArrayList<IteratorSetting>();
+      this.iterators = new java.util.ArrayList<IteratorSetting>();
     }
     this.iterators.add(elem);
   }
 
-  public List<IteratorSetting> getIterators() {
+  public java.util.List<IteratorSetting> getIterators() {
     return this.iterators;
   }
 
-  public BatchScanOptions setIterators(List<IteratorSetting> iterators) {
+  public BatchScanOptions setIterators(java.util.List<IteratorSetting> iterators) {
     this.iterators = iterators;
     return this;
   }
@@ -384,25 +354,25 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
   }
 
   public void unsetThreads() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __THREADS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __THREADS_ISSET_ID);
   }
 
   /** Returns true if field threads is set (has been assigned a value) and false otherwise */
   public boolean isSetThreads() {
-    return EncodingUtils.testBit(__isset_bitfield, __THREADS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __THREADS_ISSET_ID);
   }
 
   public void setThreadsIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __THREADS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __THREADS_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case AUTHORIZATIONS:
       if (value == null) {
         unsetAuthorizations();
       } else {
-        setAuthorizations((Set<ByteBuffer>)value);
+        setAuthorizations((java.util.Set<java.nio.ByteBuffer>)value);
       }
       break;
 
@@ -410,7 +380,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       if (value == null) {
         unsetRanges();
       } else {
-        setRanges((List<Range>)value);
+        setRanges((java.util.List<Range>)value);
       }
       break;
 
@@ -418,7 +388,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       if (value == null) {
         unsetColumns();
       } else {
-        setColumns((List<ScanColumn>)value);
+        setColumns((java.util.List<ScanColumn>)value);
       }
       break;
 
@@ -426,7 +396,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       if (value == null) {
         unsetIterators();
       } else {
-        setIterators((List<IteratorSetting>)value);
+        setIterators((java.util.List<IteratorSetting>)value);
       }
       break;
 
@@ -434,14 +404,14 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       if (value == null) {
         unsetThreads();
       } else {
-        setThreads((Integer)value);
+        setThreads((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AUTHORIZATIONS:
       return getAuthorizations();
@@ -459,13 +429,13 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       return getThreads();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -480,11 +450,11 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
     case THREADS:
       return isSetThreads();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof BatchScanOptions)
@@ -495,6 +465,8 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
   public boolean equals(BatchScanOptions that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_authorizations = true && this.isSetAuthorizations();
     boolean that_present_authorizations = true && that.isSetAuthorizations();
@@ -546,34 +518,29 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_authorizations = true && (isSetAuthorizations());
-    list.add(present_authorizations);
-    if (present_authorizations)
-      list.add(authorizations);
-
-    boolean present_ranges = true && (isSetRanges());
-    list.add(present_ranges);
-    if (present_ranges)
-      list.add(ranges);
-
-    boolean present_columns = true && (isSetColumns());
-    list.add(present_columns);
-    if (present_columns)
-      list.add(columns);
-
-    boolean present_iterators = true && (isSetIterators());
-    list.add(present_iterators);
-    if (present_iterators)
-      list.add(iterators);
-
-    boolean present_threads = true && (isSetThreads());
-    list.add(present_threads);
-    if (present_threads)
-      list.add(threads);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetAuthorizations()) ? 131071 : 524287);
+    if (isSetAuthorizations())
+      hashCode = hashCode * 8191 + authorizations.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetRanges()) ? 131071 : 524287);
+    if (isSetRanges())
+      hashCode = hashCode * 8191 + ranges.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetColumns()) ? 131071 : 524287);
+    if (isSetColumns())
+      hashCode = hashCode * 8191 + columns.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetIterators()) ? 131071 : 524287);
+    if (isSetIterators())
+      hashCode = hashCode * 8191 + iterators.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetThreads()) ? 131071 : 524287);
+    if (isSetThreads())
+      hashCode = hashCode * 8191 + threads;
+
+    return hashCode;
   }
 
   @Override
@@ -584,7 +551,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
+    lastComparison = java.lang.Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -594,7 +561,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRanges()).compareTo(other.isSetRanges());
+    lastComparison = java.lang.Boolean.valueOf(isSetRanges()).compareTo(other.isSetRanges());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -604,7 +571,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
+    lastComparison = java.lang.Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -614,7 +581,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
+    lastComparison = java.lang.Boolean.valueOf(isSetIterators()).compareTo(other.isSetIterators());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -624,7 +591,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetThreads()).compareTo(other.isSetThreads());
+    lastComparison = java.lang.Boolean.valueOf(isSetThreads()).compareTo(other.isSetThreads());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -642,16 +609,16 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("BatchScanOptions(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("BatchScanOptions(");
     boolean first = true;
 
     if (isSetAuthorizations()) {
@@ -716,7 +683,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -726,13 +693,13 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
     }
   }
 
-  private static class BatchScanOptionsStandardSchemeFactory implements SchemeFactory {
+  private static class BatchScanOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public BatchScanOptionsStandardScheme getScheme() {
       return new BatchScanOptionsStandardScheme();
     }
   }
 
-  private static class BatchScanOptionsStandardScheme extends StandardScheme<BatchScanOptions> {
+  private static class BatchScanOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<BatchScanOptions> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, BatchScanOptions struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -748,8 +715,8 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
             if (schemeField.type == org.apache.thrift.protocol.TType.SET) {
               {
                 org.apache.thrift.protocol.TSet _set50 = iprot.readSetBegin();
-                struct.authorizations = new HashSet<ByteBuffer>(2*_set50.size);
-                ByteBuffer _elem51;
+                struct.authorizations = new java.util.HashSet<java.nio.ByteBuffer>(2*_set50.size);
+                java.nio.ByteBuffer _elem51;
                 for (int _i52 = 0; _i52 < _set50.size; ++_i52)
                 {
                   _elem51 = iprot.readBinary();
@@ -766,7 +733,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list53 = iprot.readListBegin();
-                struct.ranges = new ArrayList<Range>(_list53.size);
+                struct.ranges = new java.util.ArrayList<Range>(_list53.size);
                 Range _elem54;
                 for (int _i55 = 0; _i55 < _list53.size; ++_i55)
                 {
@@ -785,7 +752,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list56 = iprot.readListBegin();
-                struct.columns = new ArrayList<ScanColumn>(_list56.size);
+                struct.columns = new java.util.ArrayList<ScanColumn>(_list56.size);
                 ScanColumn _elem57;
                 for (int _i58 = 0; _i58 < _list56.size; ++_i58)
                 {
@@ -804,7 +771,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list59 = iprot.readListBegin();
-                struct.iterators = new ArrayList<IteratorSetting>(_list59.size);
+                struct.iterators = new java.util.ArrayList<IteratorSetting>(_list59.size);
                 IteratorSetting _elem60;
                 for (int _i61 = 0; _i61 < _list59.size; ++_i61)
                 {
@@ -847,7 +814,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
           oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
           {
             oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.authorizations.size()));
-            for (ByteBuffer _iter62 : struct.authorizations)
+            for (java.nio.ByteBuffer _iter62 : struct.authorizations)
             {
               oprot.writeBinary(_iter62);
             }
@@ -909,18 +876,18 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
 
   }
 
-  private static class BatchScanOptionsTupleSchemeFactory implements SchemeFactory {
+  private static class BatchScanOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public BatchScanOptionsTupleScheme getScheme() {
       return new BatchScanOptionsTupleScheme();
     }
   }
 
-  private static class BatchScanOptionsTupleScheme extends TupleScheme<BatchScanOptions> {
+  private static class BatchScanOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<BatchScanOptions> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, BatchScanOptions struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAuthorizations()) {
         optionals.set(0);
       }
@@ -940,7 +907,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       if (struct.isSetAuthorizations()) {
         {
           oprot.writeI32(struct.authorizations.size());
-          for (ByteBuffer _iter66 : struct.authorizations)
+          for (java.nio.ByteBuffer _iter66 : struct.authorizations)
           {
             oprot.writeBinary(_iter66);
           }
@@ -980,13 +947,13 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, BatchScanOptions struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(5);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(5);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TSet _set70 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.authorizations = new HashSet<ByteBuffer>(2*_set70.size);
-          ByteBuffer _elem71;
+          struct.authorizations = new java.util.HashSet<java.nio.ByteBuffer>(2*_set70.size);
+          java.nio.ByteBuffer _elem71;
           for (int _i72 = 0; _i72 < _set70.size; ++_i72)
           {
             _elem71 = iprot.readBinary();
@@ -998,7 +965,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       if (incoming.get(1)) {
         {
           org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.ranges = new ArrayList<Range>(_list73.size);
+          struct.ranges = new java.util.ArrayList<Range>(_list73.size);
           Range _elem74;
           for (int _i75 = 0; _i75 < _list73.size; ++_i75)
           {
@@ -1012,7 +979,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TList _list76 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.columns = new ArrayList<ScanColumn>(_list76.size);
+          struct.columns = new java.util.ArrayList<ScanColumn>(_list76.size);
           ScanColumn _elem77;
           for (int _i78 = 0; _i78 < _list76.size; ++_i78)
           {
@@ -1026,7 +993,7 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
       if (incoming.get(3)) {
         {
           org.apache.thrift.protocol.TList _list79 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.iterators = new ArrayList<IteratorSetting>(_list79.size);
+          struct.iterators = new java.util.ArrayList<IteratorSetting>(_list79.size);
           IteratorSetting _elem80;
           for (int _i81 = 0; _i81 < _list79.size; ++_i81)
           {
@@ -1044,5 +1011,9 @@ public class BatchScanOptions implements org.apache.thrift.TBase<BatchScanOption
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
+  private static void unusedMethod() {}
 }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
index 96ae162..7220637 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Column.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class Column implements org.apache.thrift.TBase<Column, Column._Fields>, java.io.Serializable, Cloneable, Comparable<Column> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Column");
 
@@ -58,15 +31,12 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
   private static final org.apache.thrift.protocol.TField COL_QUALIFIER_FIELD_DESC = new org.apache.thrift.protocol.TField("colQualifier", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField COL_VISIBILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("colVisibility", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ColumnStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ColumnTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ColumnStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ColumnTupleSchemeFactory();
 
-  public ByteBuffer colFamily; // required
-  public ByteBuffer colQualifier; // required
-  public ByteBuffer colVisibility; // required
+  public java.nio.ByteBuffer colFamily; // required
+  public java.nio.ByteBuffer colQualifier; // required
+  public java.nio.ByteBuffer colVisibility; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -74,10 +44,10 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     COL_QUALIFIER((short)2, "colQualifier"),
     COL_VISIBILITY((short)3, "colVisibility");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -104,21 +74,21 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -127,22 +97,22 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.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);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.COL_FAMILY, new org.apache.thrift.meta_data.FieldMetaData("colFamily", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.COL_QUALIFIER, new org.apache.thrift.meta_data.FieldMetaData("colQualifier", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.COL_VISIBILITY, new org.apache.thrift.meta_data.FieldMetaData("colVisibility", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Column.class, metaDataMap);
   }
 
@@ -150,9 +120,9 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
   }
 
   public Column(
-    ByteBuffer colFamily,
-    ByteBuffer colQualifier,
-    ByteBuffer colVisibility)
+    java.nio.ByteBuffer colFamily,
+    java.nio.ByteBuffer colQualifier,
+    java.nio.ByteBuffer colVisibility)
   {
     this();
     this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily);
@@ -191,16 +161,16 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     return colFamily == null ? null : colFamily.array();
   }
 
-  public ByteBuffer bufferForColFamily() {
+  public java.nio.ByteBuffer bufferForColFamily() {
     return org.apache.thrift.TBaseHelper.copyBinary(colFamily);
   }
 
   public Column setColFamily(byte[] colFamily) {
-    this.colFamily = colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colFamily, colFamily.length));
+    this.colFamily = colFamily == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(colFamily.clone());
     return this;
   }
 
-  public Column setColFamily(ByteBuffer colFamily) {
+  public Column setColFamily(java.nio.ByteBuffer colFamily) {
     this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily);
     return this;
   }
@@ -225,16 +195,16 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     return colQualifier == null ? null : colQualifier.array();
   }
 
-  public ByteBuffer bufferForColQualifier() {
+  public java.nio.ByteBuffer bufferForColQualifier() {
     return org.apache.thrift.TBaseHelper.copyBinary(colQualifier);
   }
 
   public Column setColQualifier(byte[] colQualifier) {
-    this.colQualifier = colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colQualifier, colQualifier.length));
+    this.colQualifier = colQualifier == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(colQualifier.clone());
     return this;
   }
 
-  public Column setColQualifier(ByteBuffer colQualifier) {
+  public Column setColQualifier(java.nio.ByteBuffer colQualifier) {
     this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier);
     return this;
   }
@@ -259,16 +229,16 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     return colVisibility == null ? null : colVisibility.array();
   }
 
-  public ByteBuffer bufferForColVisibility() {
+  public java.nio.ByteBuffer bufferForColVisibility() {
     return org.apache.thrift.TBaseHelper.copyBinary(colVisibility);
   }
 
   public Column setColVisibility(byte[] colVisibility) {
-    this.colVisibility = colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colVisibility, colVisibility.length));
+    this.colVisibility = colVisibility == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(colVisibility.clone());
     return this;
   }
 
-  public Column setColVisibility(ByteBuffer colVisibility) {
+  public Column setColVisibility(java.nio.ByteBuffer colVisibility) {
     this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility);
     return this;
   }
@@ -288,13 +258,17 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case COL_FAMILY:
       if (value == null) {
         unsetColFamily();
       } else {
-        setColFamily((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setColFamily((byte[])value);
+        } else {
+          setColFamily((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -302,7 +276,11 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
       if (value == null) {
         unsetColQualifier();
       } else {
-        setColQualifier((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setColQualifier((byte[])value);
+        } else {
+          setColQualifier((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -310,14 +288,18 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
       if (value == null) {
         unsetColVisibility();
       } else {
-        setColVisibility((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setColVisibility((byte[])value);
+        } else {
+          setColVisibility((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COL_FAMILY:
       return getColFamily();
@@ -329,13 +311,13 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
       return getColVisibility();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -346,11 +328,11 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     case COL_VISIBILITY:
       return isSetColVisibility();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof Column)
@@ -361,6 +343,8 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
   public boolean equals(Column that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_colFamily = true && this.isSetColFamily();
     boolean that_present_colFamily = true && that.isSetColFamily();
@@ -394,24 +378,21 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_colFamily = true && (isSetColFamily());
-    list.add(present_colFamily);
-    if (present_colFamily)
-      list.add(colFamily);
+    hashCode = hashCode * 8191 + ((isSetColFamily()) ? 131071 : 524287);
+    if (isSetColFamily())
+      hashCode = hashCode * 8191 + colFamily.hashCode();
 
-    boolean present_colQualifier = true && (isSetColQualifier());
-    list.add(present_colQualifier);
-    if (present_colQualifier)
-      list.add(colQualifier);
+    hashCode = hashCode * 8191 + ((isSetColQualifier()) ? 131071 : 524287);
+    if (isSetColQualifier())
+      hashCode = hashCode * 8191 + colQualifier.hashCode();
 
-    boolean present_colVisibility = true && (isSetColVisibility());
-    list.add(present_colVisibility);
-    if (present_colVisibility)
-      list.add(colVisibility);
+    hashCode = hashCode * 8191 + ((isSetColVisibility()) ? 131071 : 524287);
+    if (isSetColVisibility())
+      hashCode = hashCode * 8191 + colVisibility.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -422,7 +403,7 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetColFamily()).compareTo(other.isSetColFamily());
+    lastComparison = java.lang.Boolean.valueOf(isSetColFamily()).compareTo(other.isSetColFamily());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -432,7 +413,7 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColQualifier()).compareTo(other.isSetColQualifier());
+    lastComparison = java.lang.Boolean.valueOf(isSetColQualifier()).compareTo(other.isSetColQualifier());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -442,7 +423,7 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColVisibility()).compareTo(other.isSetColVisibility());
+    lastComparison = java.lang.Boolean.valueOf(isSetColVisibility()).compareTo(other.isSetColVisibility());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -460,16 +441,16 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Column(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("Column(");
     boolean first = true;
 
     sb.append("colFamily:");
@@ -512,7 +493,7 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -520,13 +501,13 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     }
   }
 
-  private static class ColumnStandardSchemeFactory implements SchemeFactory {
+  private static class ColumnStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ColumnStandardScheme getScheme() {
       return new ColumnStandardScheme();
     }
   }
 
-  private static class ColumnStandardScheme extends StandardScheme<Column> {
+  private static class ColumnStandardScheme extends org.apache.thrift.scheme.StandardScheme<Column> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, Column struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -598,18 +579,18 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
 
   }
 
-  private static class ColumnTupleSchemeFactory implements SchemeFactory {
+  private static class ColumnTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ColumnTupleScheme getScheme() {
       return new ColumnTupleScheme();
     }
   }
 
-  private static class ColumnTupleScheme extends TupleScheme<Column> {
+  private static class ColumnTupleScheme extends org.apache.thrift.scheme.TupleScheme<Column> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, Column struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetColFamily()) {
         optionals.set(0);
       }
@@ -633,8 +614,8 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Column struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.colFamily = iprot.readBinary();
         struct.setColFamilyIsSet(true);
@@ -650,5 +631,9 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
+  private static void unusedMethod() {}
 }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
index 33dfdbe..f655f46 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ColumnUpdate.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.10.0)")
 public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, ColumnUpdate._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnUpdate> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnUpdate");
 
@@ -61,17 +34,14 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
   private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)5);
   private static final org.apache.thrift.protocol.TField DELETE_CELL_FIELD_DESC = new org.apache.thrift.protocol.TField("deleteCell", org.apache.thrift.protocol.TType.BOOL, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ColumnUpdateStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ColumnUpdateTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ColumnUpdateStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ColumnUpdateTupleSchemeFactory();
 
-  public ByteBuffer colFamily; // required
-  public ByteBuffer colQualifier; // required
-  public ByteBuffer colVisibility; // optional
+  public java.nio.ByteBuffer colFamily; // required
+  public java.nio.ByteBuffer colQualifier; // required
+  public java.nio.ByteBuffer colVisibility; // optional
   public long timestamp; // optional
-  public ByteBuffer value; // optional
+  public java.nio.ByteBuffer value; // optional
   public boolean deleteCell; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -83,10 +53,10 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     VALUE((short)5, "value"),
     DELETE_CELL((short)6, "deleteCell");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -119,21 +89,21 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -142,7 +112,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -152,9 +122,9 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
   private static final int __DELETECELL_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.COL_VISIBILITY,_Fields.TIMESTAMP,_Fields.VALUE,_Fields.DELETE_CELL};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.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);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.COL_FAMILY, new org.apache.thrift.meta_data.FieldMetaData("colFamily", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.COL_QUALIFIER, new org.apache.thrift.meta_data.FieldMetaData("colQualifier", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -167,7 +137,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.DELETE_CELL, new org.apache.thrift.meta_data.FieldMetaData("deleteCell", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnUpdate.class, metaDataMap);
   }
 
@@ -175,8 +145,8 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
   }
 
   public ColumnUpdate(
-    ByteBuffer colFamily,
-    ByteBuffer colQualifier)
+    java.nio.ByteBuffer colFamily,
+    java.nio.ByteBuffer colQualifier)
   {
     this();
     this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily);
@@ -225,16 +195,16 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     return colFamily == null ? null : colFamily.array();
   }
 
-  public ByteBuffer bufferForColFamily() {
+  public java.nio.ByteBuffer bufferForColFamily() {
     return org.apache.thrift.TBaseHelper.copyBinary(colFamily);
   }
 
   public ColumnUpdate setColFamily(byte[] colFamily) {
-    this.colFamily = colFamily == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colFamily, colFamily.length));
+    this.colFamily = colFamily == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(colFamily.clone());
     return this;
   }
 
-  public ColumnUpdate setColFamily(ByteBuffer colFamily) {
+  public ColumnUpdate setColFamily(java.nio.ByteBuffer colFamily) {
     this.colFamily = org.apache.thrift.TBaseHelper.copyBinary(colFamily);
     return this;
   }
@@ -259,16 +229,16 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     return colQualifier == null ? null : colQualifier.array();
   }
 
-  public ByteBuffer bufferForColQualifier() {
+  public java.nio.ByteBuffer bufferForColQualifier() {
     return org.apache.thrift.TBaseHelper.copyBinary(colQualifier);
   }
 
   public ColumnUpdate setColQualifier(byte[] colQualifier) {
-    this.colQualifier = colQualifier == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colQualifier, colQualifier.length));
+    this.colQualifier = colQualifier == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(colQualifier.clone());
     return this;
   }
 
-  public ColumnUpdate setColQualifier(ByteBuffer colQualifier) {
+  public ColumnUpdate setColQualifier(java.nio.ByteBuffer colQualifier) {
     this.colQualifier = org.apache.thrift.TBaseHelper.copyBinary(colQualifier);
     return this;
   }
@@ -293,16 +263,16 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     return colVisibility == null ? null : colVisibility.array();
   }
 
-  public ByteBuffer bufferForColVisibility() {
+  public java.nio.ByteBuffer bufferForColVisibility() {
     return org.apache.thrift.TBaseHelper.copyBinary(colVisibility);
   }
 
   public ColumnUpdate setColVisibility(byte[] colVisibility) {
-    this.colVisibility = colVisibility == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(colVisibility, colVisibility.length));
+    this.colVisibility = colVisibility == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(colVisibility.clone());
     return this;
   }
 
-  public ColumnUpdate setColVisibility(ByteBuffer colVisibility) {
+  public ColumnUpdate setColVisibility(java.nio.ByteBuffer colVisibility) {
     this.colVisibility = org.apache.thrift.TBaseHelper.copyBinary(colVisibility);
     return this;
   }
@@ -333,16 +303,16 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
   }
 
   public void unsetTimestamp() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   /** Returns true if field timestamp is set (has been assigned a value) and false otherwise */
   public boolean isSetTimestamp() {
-    return EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __TIMESTAMP_ISSET_ID);
   }
 
   public void setTimestampIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
   }
 
   public byte[] getValue() {
@@ -350,16 +320,16 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     return value == null ? null : value.array();
   }
 
-  public ByteBuffer bufferForValue() {
+  public java.nio.ByteBuffer bufferForValue() {
     return org.apache.thrift.TBaseHelper.copyBinary(value);
   }
 
   public ColumnUpdate setValue(byte[] value) {
-    this.value = value == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(value, value.length));
+    this.value = value == null ? (java.nio.ByteBuffer)null : java.nio.ByteBuffer.wrap(value.clone());
     return this;
   }
 
-  public ColumnUpdate setValue(ByteBuffer value) {
+  public ColumnUpdate setValue(java.nio.ByteBuffer value) {
     this.value = org.apache.thrift.TBaseHelper.copyBinary(value);
     return this;
   }
@@ -390,25 +360,29 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
   }
 
   public void unsetDeleteCell() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DELETECELL_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DELETECELL_ISSET_ID);
   }
 
   /** Returns true if field deleteCell is set (has been assigned a value) and false otherwise */
   public boolean isSetDeleteCell() {
-    return EncodingUtils.testBit(__isset_bitfield, __DELETECELL_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DELETECELL_ISSET_ID);
   }
 
   public void setDeleteCellIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DELETECELL_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DELETECELL_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, java.lang.Object value) {
     switch (field) {
     case COL_FAMILY:
       if (value == null) {
         unsetColFamily();
       } else {
-        setColFamily((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setColFamily((byte[])value);
+        } else {
+          setColFamily((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -416,7 +390,11 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
       if (value == null) {
         unsetColQualifier();
       } else {
-        setColQualifier((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setColQualifier((byte[])value);
+        } else {
+          setColQualifier((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -424,7 +402,11 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
       if (value == null) {
         unsetColVisibility();
       } else {
-        setColVisibility((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setColVisibility((byte[])value);
+        } else {
+          setColVisibility((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -432,7 +414,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
       if (value == null) {
         unsetTimestamp();
       } else {
-        setTimestamp((Long)value);
+        setTimestamp((java.lang.Long)value);
       }
       break;
 
@@ -440,7 +422,11 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
       if (value == null) {
         unsetValue();
       } else {
-        setValue((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setValue((byte[])value);
+        } else {
+          setValue((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -448,14 +434,14 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
       if (value == null) {
         unsetDeleteCell();
       } else {
-        setDeleteCell((Boolean)value);
+        setDeleteCell((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case COL_FAMILY:
       return getColFamily();
@@ -476,13 +462,13 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
       return isDeleteCell();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -499,11 +485,11 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     case DELETE_CELL:
       return isSetDeleteCell();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
+  public boolean equals(java.lang.Object that) {
     if (that == null)
       return false;
     if (that instanceof ColumnUpdate)
@@ -514,6 +500,8 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
   public boolean equals(ColumnUpdate that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_colFamily = true && this.isSetColFamily();
     boolean that_present_colFamily = true && that.isSetColFamily();
@@ -574,39 +562,33 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_colFamily = true && (isSetColFamily());
-    list.add(present_colFamily);
-    if (present_colFamily)
-      list.add(colFamily);
+    hashCode = hashCode * 8191 + ((isSetColFamily()) ? 131071 : 524287);
+    if (isSetColFamily())
+      hashCode = hashCode * 8191 + colFamily.hashCode();
 
-    boolean present_colQualifier = true && (isSetColQualifier());
-    list.add(present_colQualifier);
-    if (present_colQualifier)
-      list.add(colQualifier);
+    hashCode = hashCode * 8191 + ((isSetColQualifier()) ? 131071 : 524287);
+    if (isSetColQualifier())
+      hashCode = hashCode * 8191 + colQualifier.hashCode();
 
-    boolean present_colVisibility = true && (isSetColVisibility());
-    list.add(present_colVisibility);
-    if (present_colVisibility)
-      list.add(colVisibility);
+    hashCode = hashCode * 8191 + ((isSetColVisibility()) ? 131071 : 524287);
+    if (isSetColVisibility())
+      hashCode = hashCode * 8191 + colVisibility.hashCode();
 
-    boolean present_timestamp = true && (isSetTimestamp());
-    list.add(present_timestamp);
-    if (present_timestamp)
-      list.add(timestamp);
+    hashCode = hashCode * 8191 + ((isSetTimestamp()) ? 131071 : 524287);
+    if (isSetTimestamp())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(timestamp);
 
-    boolean present_value = true && (isSetValue());
-    list.add(present_value);
-    if (present_value)
-      list.add(value);
+    hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+    if (isSetValue())
+      hashCode = hashCode * 8191 + value.hashCode();
 
-    boolean present_deleteCell = true && (isSetDeleteCell());
-    list.add(present_deleteCell);
-    if (present_deleteCell)
-      list.add(deleteCell);
+    hashCode = hashCode * 8191 + ((isSetDeleteCell()) ? 131071 : 524287);
+    if (isSetDeleteCell())
+      hashCode = hashCode * 8191 + ((deleteCell) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -617,7 +599,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetColFamily()).compareTo(other.isSetColFamily());
+    lastComparison = java.lang.Boolean.valueOf(isSetColFamily()).compareTo(other.isSetColFamily());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -627,7 +609,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColQualifier()).compareTo(other.isSetColQualifier());
+    lastComparison = java.lang.Boolean.valueOf(isSetColQualifier()).compareTo(other.isSetColQualifier());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -637,7 +619,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColVisibility()).compareTo(other.isSetColVisibility());
+    lastComparison = java.lang.Boolean.valueOf(isSetColVisibility()).compareTo(other.isSetColVisibility());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -647,7 +629,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
+    lastComparison = java.lang.Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -657,7 +639,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = java.lang.Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -667,7 +649,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDeleteCell()).compareTo(other.isSetDeleteCell());
+    lastComparison = java.lang.Boolean.valueOf(isSetDeleteCell()).compareTo(other.isSetDeleteCell());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -685,16 +667,16 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ColumnUpdate(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ColumnUpdate(");
     boolean first = true;
 
     sb.append("colFamily:");
@@ -761,7 +743,7 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -771,13 +753,13 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     }
   }
 
-  private static class ColumnUpdateStandardSchemeFactory implements SchemeFactory {
+  private static class ColumnUpdateStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ColumnUpdateStandardScheme getScheme() {
       return new ColumnUpdateStandardScheme();
     }
   }
 
-  private static class ColumnUpdateStandardScheme extends StandardScheme<ColumnUpdate> {
+  private static class ColumnUpdateStandardScheme extends org.apache.thrift.scheme.StandardScheme<ColumnUpdate> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnUpdate struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -892,18 +874,18 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
 
   }
 
-  private static class ColumnUpdateTupleSchemeFactory implements SchemeFactory {
+  private static class ColumnUpdateTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ColumnUpdateTupleScheme getScheme() {
       return new ColumnUpdateTupleScheme();
     }
   }
 
-  private static class ColumnUpdateTupleScheme extends TupleScheme<ColumnUpdate> {
+  private static class ColumnUpdateTupleScheme extends org.apache.thrift.scheme.TupleScheme<ColumnUpdate> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ColumnUpdate struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetColFamily()) {
         optionals.set(0);
       }
@@ -945,8 +927,8 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ColumnUpdate struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(6);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.colFamily = iprot.readBinary();
         struct.setColFamilyIsSet(true);
@@ -974,5 +956,9 @@ public class ColumnUpdate implements org.apache.thrift.TBase<ColumnUpdate, Colum
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
+  private static void unusedMethod() {}
 }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
index 77cf53d..b4b3255 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionReason.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,11 +23,8 @@
 package org.apache.accumulo.proxy.thrift;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
 
-@SuppressWarnings({"unused"}) public enum CompactionReason implements org.apache.thrift.TEnum {
+public enum CompactionReason implements org.apache.thrift.TEnum {
   USER(0),
   SYSTEM(1),
   CHOP(2),


Mime
View raw message