hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ramkris...@apache.org
Subject svn commit: r1546988 [2/3] - in /hbase/trunk: hbase-server/src/main/java/org/apache/hadoop/hbase/rest/ hbase-server/src/main/java/org/apache/hadoop/hbase/rest/model/ hbase-server/src/main/java/org/apache/hadoop/hbase/rest/protobuf/generated/ hbase-serv...
Date Mon, 02 Dec 2013 12:44:03 GMT
Modified: hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java?rev=1546988&r1=1546987&r2=1546988&view=diff
==============================================================================
--- hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java (original)
+++ hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java Mon Dec  2 12:44:03 2013
@@ -40,6 +40,7 @@ public class TColumnValue implements org
   private static final org.apache.thrift.protocol.TField QUALIFIER_FIELD_DESC = new org.apache.thrift.protocol.TField("qualifier", org.apache.thrift.protocol.TType.STRING, (short)2);
   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)3);
   private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)4);
+  private static final org.apache.thrift.protocol.TField TAGS_FIELD_DESC = new org.apache.thrift.protocol.TField("tags", org.apache.thrift.protocol.TType.STRING, (short)5);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -51,13 +52,15 @@ public class TColumnValue implements org
   public ByteBuffer qualifier; // required
   public ByteBuffer value; // required
   public long timestamp; // optional
+  public ByteBuffer tags; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     FAMILY((short)1, "family"),
     QUALIFIER((short)2, "qualifier"),
     VALUE((short)3, "value"),
-    TIMESTAMP((short)4, "timestamp");
+    TIMESTAMP((short)4, "timestamp"),
+    TAGS((short)5, "tags");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -80,6 +83,8 @@ public class TColumnValue implements org
           return VALUE;
         case 4: // TIMESTAMP
           return TIMESTAMP;
+        case 5: // TAGS
+          return TAGS;
         default:
           return null;
       }
@@ -122,7 +127,7 @@ public class TColumnValue implements org
   // isset id assignments
   private static final int __TIMESTAMP_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.TIMESTAMP};
+  private _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.TAGS};
   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);
@@ -134,6 +139,8 @@ public class TColumnValue implements org
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.TIMESTAMP, new org.apache.thrift.meta_data.FieldMetaData("timestamp", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.TAGS, new org.apache.thrift.meta_data.FieldMetaData("tags", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TColumnValue.class, metaDataMap);
   }
@@ -170,6 +177,10 @@ public class TColumnValue implements org
 ;
     }
     this.timestamp = other.timestamp;
+    if (other.isSetTags()) {
+      this.tags = org.apache.thrift.TBaseHelper.copyBinary(other.tags);
+;
+    }
   }
 
   public TColumnValue deepCopy() {
@@ -183,6 +194,7 @@ public class TColumnValue implements org
     this.value = null;
     setTimestampIsSet(false);
     this.timestamp = 0;
+    this.tags = null;
   }
 
   public byte[] getFamily() {
@@ -310,6 +322,40 @@ public class TColumnValue implements org
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMESTAMP_ISSET_ID, value);
   }
 
+  public byte[] getTags() {
+    setTags(org.apache.thrift.TBaseHelper.rightSize(tags));
+    return tags == null ? null : tags.array();
+  }
+
+  public ByteBuffer bufferForTags() {
+    return tags;
+  }
+
+  public TColumnValue setTags(byte[] tags) {
+    setTags(tags == null ? (ByteBuffer)null : ByteBuffer.wrap(tags));
+    return this;
+  }
+
+  public TColumnValue setTags(ByteBuffer tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public void unsetTags() {
+    this.tags = null;
+  }
+
+  /** Returns true if field tags is set (has been assigned a value) and false otherwise */
+  public boolean isSetTags() {
+    return this.tags != null;
+  }
+
+  public void setTagsIsSet(boolean value) {
+    if (!value) {
+      this.tags = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case FAMILY:
@@ -344,6 +390,14 @@ public class TColumnValue implements org
       }
       break;
 
+    case TAGS:
+      if (value == null) {
+        unsetTags();
+      } else {
+        setTags((ByteBuffer)value);
+      }
+      break;
+
     }
   }
 
@@ -361,6 +415,9 @@ public class TColumnValue implements org
     case TIMESTAMP:
       return Long.valueOf(getTimestamp());
 
+    case TAGS:
+      return getTags();
+
     }
     throw new IllegalStateException();
   }
@@ -380,6 +437,8 @@ public class TColumnValue implements org
       return isSetValue();
     case TIMESTAMP:
       return isSetTimestamp();
+    case TAGS:
+      return isSetTags();
     }
     throw new IllegalStateException();
   }
@@ -433,6 +492,15 @@ public class TColumnValue implements org
         return false;
     }
 
+    boolean this_present_tags = true && this.isSetTags();
+    boolean that_present_tags = true && that.isSetTags();
+    if (this_present_tags || that_present_tags) {
+      if (!(this_present_tags && that_present_tags))
+        return false;
+      if (!this.tags.equals(that.tags))
+        return false;
+    }
+
     return true;
   }
 
@@ -489,6 +557,16 @@ public class TColumnValue implements org
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetTags()).compareTo(typedOther.isSetTags());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetTags()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tags, typedOther.tags);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -538,6 +616,16 @@ public class TColumnValue implements org
       sb.append(this.timestamp);
       first = false;
     }
+    if (isSetTags()) {
+      if (!first) sb.append(", ");
+      sb.append("tags:");
+      if (this.tags == null) {
+        sb.append("null");
+      } else {
+        org.apache.thrift.TBaseHelper.toString(this.tags, sb);
+      }
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -624,6 +712,14 @@ public class TColumnValue implements org
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 5: // TAGS
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.tags = iprot.readBinary();
+              struct.setTagsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -659,6 +755,13 @@ public class TColumnValue implements org
         oprot.writeI64(struct.timestamp);
         oprot.writeFieldEnd();
       }
+      if (struct.tags != null) {
+        if (struct.isSetTags()) {
+          oprot.writeFieldBegin(TAGS_FIELD_DESC);
+          oprot.writeBinary(struct.tags);
+          oprot.writeFieldEnd();
+        }
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -683,10 +786,16 @@ public class TColumnValue implements org
       if (struct.isSetTimestamp()) {
         optionals.set(0);
       }
-      oprot.writeBitSet(optionals, 1);
+      if (struct.isSetTags()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
       if (struct.isSetTimestamp()) {
         oprot.writeI64(struct.timestamp);
       }
+      if (struct.isSetTags()) {
+        oprot.writeBinary(struct.tags);
+      }
     }
 
     @Override
@@ -698,11 +807,15 @@ public class TColumnValue implements org
       struct.setQualifierIsSet(true);
       struct.value = iprot.readBinary();
       struct.setValueIsSet(true);
-      BitSet incoming = iprot.readBitSet(1);
+      BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.timestamp = iprot.readI64();
         struct.setTimestampIsSet(true);
       }
+      if (incoming.get(1)) {
+        struct.tags = iprot.readBinary();
+        struct.setTagsIsSet(true);
+      }
     }
   }
 

Modified: hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java?rev=1546988&r1=1546987&r2=1546988&view=diff
==============================================================================
--- hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java (original)
+++ hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java Mon Dec  2 12:44:03 2013
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTuple
 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;
@@ -43,7 +45,7 @@ import org.slf4j.LoggerFactory;
  * If you specify a time range and a timestamp the range is ignored.
  * Timestamps on TColumns are ignored.
  */
-public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.io.Serializable, Cloneable {
+public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.io.Serializable, Cloneable, Comparable<TGet> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGet");
 
   private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -53,6 +55,7 @@ public class TGet implements org.apache.
   private static final org.apache.thrift.protocol.TField MAX_VERSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("maxVersions", org.apache.thrift.protocol.TType.I32, (short)5);
   private static final org.apache.thrift.protocol.TField FILTER_STRING_FIELD_DESC = new org.apache.thrift.protocol.TField("filterString", org.apache.thrift.protocol.TType.STRING, (short)6);
   private static final org.apache.thrift.protocol.TField ATTRIBUTES_FIELD_DESC = new org.apache.thrift.protocol.TField("attributes", org.apache.thrift.protocol.TType.MAP, (short)7);
+  private static final org.apache.thrift.protocol.TField AUTHORIZATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("authorizations", org.apache.thrift.protocol.TType.STRUCT, (short)8);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -67,6 +70,7 @@ public class TGet implements org.apache.
   public int maxVersions; // optional
   public ByteBuffer filterString; // optional
   public Map<ByteBuffer,ByteBuffer> attributes; // optional
+  public TAuthorization authorizations; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -76,7 +80,8 @@ public class TGet implements org.apache.
     TIME_RANGE((short)4, "timeRange"),
     MAX_VERSIONS((short)5, "maxVersions"),
     FILTER_STRING((short)6, "filterString"),
-    ATTRIBUTES((short)7, "attributes");
+    ATTRIBUTES((short)7, "attributes"),
+    AUTHORIZATIONS((short)8, "authorizations");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -105,6 +110,8 @@ public class TGet implements org.apache.
           return FILTER_STRING;
         case 7: // ATTRIBUTES
           return ATTRIBUTES;
+        case 8: // AUTHORIZATIONS
+          return AUTHORIZATIONS;
         default:
           return null;
       }
@@ -148,7 +155,7 @@ public class TGet implements org.apache.
   private static final int __TIMESTAMP_ISSET_ID = 0;
   private static final int __MAXVERSIONS_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.COLUMNS,_Fields.TIMESTAMP,_Fields.TIME_RANGE,_Fields.MAX_VERSIONS,_Fields.FILTER_STRING,_Fields.ATTRIBUTES};
+  private _Fields optionals[] = {_Fields.COLUMNS,_Fields.TIMESTAMP,_Fields.TIME_RANGE,_Fields.MAX_VERSIONS,_Fields.FILTER_STRING,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS};
   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);
@@ -169,6 +176,8 @@ public class TGet implements org.apache.
         new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true), 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
+    tmpMap.put(_Fields.AUTHORIZATIONS, new org.apache.thrift.meta_data.FieldMetaData("authorizations", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorization.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TGet.class, metaDataMap);
   }
@@ -193,7 +202,7 @@ public class TGet implements org.apache.
 ;
     }
     if (other.isSetColumns()) {
-      List<TColumn> __this__columns = new ArrayList<TColumn>();
+      List<TColumn> __this__columns = new ArrayList<TColumn>(other.columns.size());
       for (TColumn other_element : other.columns) {
         __this__columns.add(new TColumn(other_element));
       }
@@ -209,22 +218,12 @@ public class TGet implements org.apache.
 ;
     }
     if (other.isSetAttributes()) {
-      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>();
-      for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
-
-        ByteBuffer other_element_key = other_element.getKey();
-        ByteBuffer other_element_value = other_element.getValue();
-
-        ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
-;
-
-        ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
-;
-
-        __this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
-      }
+      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
       this.attributes = __this__attributes;
     }
+    if (other.isSetAuthorizations()) {
+      this.authorizations = new TAuthorization(other.authorizations);
+    }
   }
 
   public TGet deepCopy() {
@@ -242,6 +241,7 @@ public class TGet implements org.apache.
     this.maxVersions = 0;
     this.filterString = null;
     this.attributes = null;
+    this.authorizations = null;
   }
 
   public byte[] getRow() {
@@ -456,6 +456,30 @@ public class TGet implements org.apache.
     }
   }
 
+  public TAuthorization getAuthorizations() {
+    return this.authorizations;
+  }
+
+  public TGet setAuthorizations(TAuthorization authorizations) {
+    this.authorizations = authorizations;
+    return this;
+  }
+
+  public void unsetAuthorizations() {
+    this.authorizations = null;
+  }
+
+  /** Returns true if field authorizations is set (has been assigned a value) and false otherwise */
+  public boolean isSetAuthorizations() {
+    return this.authorizations != null;
+  }
+
+  public void setAuthorizationsIsSet(boolean value) {
+    if (!value) {
+      this.authorizations = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case ROW:
@@ -514,6 +538,14 @@ public class TGet implements org.apache.
       }
       break;
 
+    case AUTHORIZATIONS:
+      if (value == null) {
+        unsetAuthorizations();
+      } else {
+        setAuthorizations((TAuthorization)value);
+      }
+      break;
+
     }
   }
 
@@ -540,6 +572,9 @@ public class TGet implements org.apache.
     case ATTRIBUTES:
       return getAttributes();
 
+    case AUTHORIZATIONS:
+      return getAuthorizations();
+
     }
     throw new IllegalStateException();
   }
@@ -565,6 +600,8 @@ public class TGet implements org.apache.
       return isSetFilterString();
     case ATTRIBUTES:
       return isSetAttributes();
+    case AUTHORIZATIONS:
+      return isSetAuthorizations();
     }
     throw new IllegalStateException();
   }
@@ -645,6 +682,15 @@ public class TGet implements org.apache.
         return false;
     }
 
+    boolean this_present_authorizations = true && this.isSetAuthorizations();
+    boolean that_present_authorizations = true && that.isSetAuthorizations();
+    if (this_present_authorizations || that_present_authorizations) {
+      if (!(this_present_authorizations && that_present_authorizations))
+        return false;
+      if (!this.authorizations.equals(that.authorizations))
+        return false;
+    }
+
     return true;
   }
 
@@ -653,80 +699,90 @@ public class TGet implements org.apache.
     return 0;
   }
 
+  @Override
   public int compareTo(TGet other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TGet typedOther = (TGet)other;
 
-    lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow());
+    lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
+    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
+    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTimestamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(typedOther.isSetTimeRange());
+    lastComparison = Boolean.valueOf(isSetTimeRange()).compareTo(other.isSetTimeRange());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTimeRange()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, typedOther.timeRange);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeRange, other.timeRange);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(typedOther.isSetMaxVersions());
+    lastComparison = Boolean.valueOf(isSetMaxVersions()).compareTo(other.isSetMaxVersions());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMaxVersions()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, typedOther.maxVersions);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.maxVersions, other.maxVersions);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(typedOther.isSetFilterString());
+    lastComparison = Boolean.valueOf(isSetFilterString()).compareTo(other.isSetFilterString());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFilterString()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, typedOther.filterString);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filterString, other.filterString);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes());
+    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetAuthorizations()).compareTo(other.isSetAuthorizations());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetAuthorizations()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authorizations, other.authorizations);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -810,6 +866,16 @@ public class TGet implements org.apache.
       }
       first = false;
     }
+    if (isSetAuthorizations()) {
+      if (!first) sb.append(", ");
+      sb.append("authorizations:");
+      if (this.authorizations == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.authorizations);
+      }
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -823,6 +889,9 @@ public class TGet implements org.apache.
     if (timeRange != null) {
       timeRange.validate();
     }
+    if (authorizations != null) {
+      authorizations.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -872,14 +941,14 @@ public class TGet implements org.apache.
           case 2: // COLUMNS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
-                struct.columns = new ArrayList<TColumn>(_list8.size);
-                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
+                org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
+                struct.columns = new ArrayList<TColumn>(_list16.size);
+                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
                 {
-                  TColumn _elem10; // required
-                  _elem10 = new TColumn();
-                  _elem10.read(iprot);
-                  struct.columns.add(_elem10);
+                  TColumn _elem18;
+                  _elem18 = new TColumn();
+                  _elem18.read(iprot);
+                  struct.columns.add(_elem18);
                 }
                 iprot.readListEnd();
               }
@@ -924,15 +993,15 @@ public class TGet implements org.apache.
           case 7: // ATTRIBUTES
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map11 = iprot.readMapBegin();
-                struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map11.size);
-                for (int _i12 = 0; _i12 < _map11.size; ++_i12)
+                org.apache.thrift.protocol.TMap _map19 = iprot.readMapBegin();
+                struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map19.size);
+                for (int _i20 = 0; _i20 < _map19.size; ++_i20)
                 {
-                  ByteBuffer _key13; // required
-                  ByteBuffer _val14; // required
-                  _key13 = iprot.readBinary();
-                  _val14 = iprot.readBinary();
-                  struct.attributes.put(_key13, _val14);
+                  ByteBuffer _key21;
+                  ByteBuffer _val22;
+                  _key21 = iprot.readBinary();
+                  _val22 = iprot.readBinary();
+                  struct.attributes.put(_key21, _val22);
                 }
                 iprot.readMapEnd();
               }
@@ -941,6 +1010,15 @@ public class TGet implements org.apache.
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 8: // AUTHORIZATIONS
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.authorizations = new TAuthorization();
+              struct.authorizations.read(iprot);
+              struct.setAuthorizationsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -966,9 +1044,9 @@ public class TGet implements org.apache.
           oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
-            for (TColumn _iter15 : struct.columns)
+            for (TColumn _iter23 : struct.columns)
             {
-              _iter15.write(oprot);
+              _iter23.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -1004,16 +1082,23 @@ public class TGet implements org.apache.
           oprot.writeFieldBegin(ATTRIBUTES_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.attributes.size()));
-            for (Map.Entry<ByteBuffer, ByteBuffer> _iter16 : struct.attributes.entrySet())
+            for (Map.Entry<ByteBuffer, ByteBuffer> _iter24 : struct.attributes.entrySet())
             {
-              oprot.writeBinary(_iter16.getKey());
-              oprot.writeBinary(_iter16.getValue());
+              oprot.writeBinary(_iter24.getKey());
+              oprot.writeBinary(_iter24.getValue());
             }
             oprot.writeMapEnd();
           }
           oprot.writeFieldEnd();
         }
       }
+      if (struct.authorizations != null) {
+        if (struct.isSetAuthorizations()) {
+          oprot.writeFieldBegin(AUTHORIZATIONS_FIELD_DESC);
+          struct.authorizations.write(oprot);
+          oprot.writeFieldEnd();
+        }
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1051,13 +1136,16 @@ public class TGet implements org.apache.
       if (struct.isSetAttributes()) {
         optionals.set(5);
       }
-      oprot.writeBitSet(optionals, 6);
+      if (struct.isSetAuthorizations()) {
+        optionals.set(6);
+      }
+      oprot.writeBitSet(optionals, 7);
       if (struct.isSetColumns()) {
         {
           oprot.writeI32(struct.columns.size());
-          for (TColumn _iter17 : struct.columns)
+          for (TColumn _iter25 : struct.columns)
           {
-            _iter17.write(oprot);
+            _iter25.write(oprot);
           }
         }
       }
@@ -1076,13 +1164,16 @@ public class TGet implements org.apache.
       if (struct.isSetAttributes()) {
         {
           oprot.writeI32(struct.attributes.size());
-          for (Map.Entry<ByteBuffer, ByteBuffer> _iter18 : struct.attributes.entrySet())
+          for (Map.Entry<ByteBuffer, ByteBuffer> _iter26 : struct.attributes.entrySet())
           {
-            oprot.writeBinary(_iter18.getKey());
-            oprot.writeBinary(_iter18.getValue());
+            oprot.writeBinary(_iter26.getKey());
+            oprot.writeBinary(_iter26.getValue());
           }
         }
       }
+      if (struct.isSetAuthorizations()) {
+        struct.authorizations.write(oprot);
+      }
     }
 
     @Override
@@ -1090,17 +1181,17 @@ public class TGet implements org.apache.
       TTupleProtocol iprot = (TTupleProtocol) prot;
       struct.row = iprot.readBinary();
       struct.setRowIsSet(true);
-      BitSet incoming = iprot.readBitSet(6);
+      BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list19 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.columns = new ArrayList<TColumn>(_list19.size);
-          for (int _i20 = 0; _i20 < _list19.size; ++_i20)
+          org.apache.thrift.protocol.TList _list27 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.columns = new ArrayList<TColumn>(_list27.size);
+          for (int _i28 = 0; _i28 < _list27.size; ++_i28)
           {
-            TColumn _elem21; // required
-            _elem21 = new TColumn();
-            _elem21.read(iprot);
-            struct.columns.add(_elem21);
+            TColumn _elem29;
+            _elem29 = new TColumn();
+            _elem29.read(iprot);
+            struct.columns.add(_elem29);
           }
         }
         struct.setColumnsIsSet(true);
@@ -1124,19 +1215,24 @@ public class TGet implements org.apache.
       }
       if (incoming.get(5)) {
         {
-          org.apache.thrift.protocol.TMap _map22 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map22.size);
-          for (int _i23 = 0; _i23 < _map22.size; ++_i23)
+          org.apache.thrift.protocol.TMap _map30 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map30.size);
+          for (int _i31 = 0; _i31 < _map30.size; ++_i31)
           {
-            ByteBuffer _key24; // required
-            ByteBuffer _val25; // required
-            _key24 = iprot.readBinary();
-            _val25 = iprot.readBinary();
-            struct.attributes.put(_key24, _val25);
+            ByteBuffer _key32;
+            ByteBuffer _val33;
+            _key32 = iprot.readBinary();
+            _val33 = iprot.readBinary();
+            struct.attributes.put(_key32, _val33);
           }
         }
         struct.setAttributesIsSet(true);
       }
+      if (incoming.get(6)) {
+        struct.authorizations = new TAuthorization();
+        struct.authorizations.read(iprot);
+        struct.setAuthorizationsIsSet(true);
+      }
     }
   }
 

Modified: hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java?rev=1546988&r1=1546987&r2=1546988&view=diff
==============================================================================
--- hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java (original)
+++ hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TIncrement.java Mon Dec  2 12:44:03 2013
@@ -44,6 +44,7 @@ public class TIncrement implements org.a
   private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)2);
   private static final org.apache.thrift.protocol.TField ATTRIBUTES_FIELD_DESC = new org.apache.thrift.protocol.TField("attributes", org.apache.thrift.protocol.TType.MAP, (short)4);
   private static final org.apache.thrift.protocol.TField DURABILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("durability", org.apache.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.thrift.protocol.TField CELL_VISIBILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("cellVisibility", org.apache.thrift.protocol.TType.STRUCT, (short)6);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -59,6 +60,7 @@ public class TIncrement implements org.a
    * @see TDurability
    */
   public TDurability durability; // optional
+  public TCellVisibility cellVisibility; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -69,7 +71,8 @@ public class TIncrement implements org.a
      * 
      * @see TDurability
      */
-    DURABILITY((short)5, "durability");
+    DURABILITY((short)5, "durability"),
+    CELL_VISIBILITY((short)6, "cellVisibility");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -92,6 +95,8 @@ public class TIncrement implements org.a
           return ATTRIBUTES;
         case 5: // DURABILITY
           return DURABILITY;
+        case 6: // CELL_VISIBILITY
+          return CELL_VISIBILITY;
         default:
           return null;
       }
@@ -132,7 +137,7 @@ public class TIncrement implements org.a
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY};
+  private _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
   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);
@@ -147,6 +152,8 @@ public class TIncrement implements org.a
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
     tmpMap.put(_Fields.DURABILITY, new org.apache.thrift.meta_data.FieldMetaData("durability", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TDurability.class)));
+    tmpMap.put(_Fields.CELL_VISIBILITY, new org.apache.thrift.meta_data.FieldMetaData("cellVisibility", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TCellVisibility.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TIncrement.class, metaDataMap);
   }
@@ -198,6 +205,9 @@ public class TIncrement implements org.a
     if (other.isSetDurability()) {
       this.durability = other.durability;
     }
+    if (other.isSetCellVisibility()) {
+      this.cellVisibility = new TCellVisibility(other.cellVisibility);
+    }
   }
 
   public TIncrement deepCopy() {
@@ -210,6 +220,7 @@ public class TIncrement implements org.a
     this.columns = null;
     this.attributes = null;
     this.durability = null;
+    this.cellVisibility = null;
   }
 
   public byte[] getRow() {
@@ -352,6 +363,30 @@ public class TIncrement implements org.a
     }
   }
 
+  public TCellVisibility getCellVisibility() {
+    return this.cellVisibility;
+  }
+
+  public TIncrement setCellVisibility(TCellVisibility cellVisibility) {
+    this.cellVisibility = cellVisibility;
+    return this;
+  }
+
+  public void unsetCellVisibility() {
+    this.cellVisibility = null;
+  }
+
+  /** Returns true if field cellVisibility is set (has been assigned a value) and false otherwise */
+  public boolean isSetCellVisibility() {
+    return this.cellVisibility != null;
+  }
+
+  public void setCellVisibilityIsSet(boolean value) {
+    if (!value) {
+      this.cellVisibility = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case ROW:
@@ -386,6 +421,14 @@ public class TIncrement implements org.a
       }
       break;
 
+    case CELL_VISIBILITY:
+      if (value == null) {
+        unsetCellVisibility();
+      } else {
+        setCellVisibility((TCellVisibility)value);
+      }
+      break;
+
     }
   }
 
@@ -403,6 +446,9 @@ public class TIncrement implements org.a
     case DURABILITY:
       return getDurability();
 
+    case CELL_VISIBILITY:
+      return getCellVisibility();
+
     }
     throw new IllegalStateException();
   }
@@ -422,6 +468,8 @@ public class TIncrement implements org.a
       return isSetAttributes();
     case DURABILITY:
       return isSetDurability();
+    case CELL_VISIBILITY:
+      return isSetCellVisibility();
     }
     throw new IllegalStateException();
   }
@@ -475,6 +523,15 @@ public class TIncrement implements org.a
         return false;
     }
 
+    boolean this_present_cellVisibility = true && this.isSetCellVisibility();
+    boolean that_present_cellVisibility = true && that.isSetCellVisibility();
+    if (this_present_cellVisibility || that_present_cellVisibility) {
+      if (!(this_present_cellVisibility && that_present_cellVisibility))
+        return false;
+      if (!this.cellVisibility.equals(that.cellVisibility))
+        return false;
+    }
+
     return true;
   }
 
@@ -531,6 +588,16 @@ public class TIncrement implements org.a
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(typedOther.isSetCellVisibility());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCellVisibility()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, typedOther.cellVisibility);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -586,6 +653,16 @@ public class TIncrement implements org.a
       }
       first = false;
     }
+    if (isSetCellVisibility()) {
+      if (!first) sb.append(", ");
+      sb.append("cellVisibility:");
+      if (this.cellVisibility == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.cellVisibility);
+      }
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -599,6 +676,9 @@ public class TIncrement implements org.a
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'columns' was not present! Struct: " + toString());
     }
     // check for sub-struct validity
+    if (cellVisibility != null) {
+      cellVisibility.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -646,14 +726,14 @@ public class TIncrement implements org.a
           case 2: // COLUMNS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
-                struct.columns = new ArrayList<TColumnIncrement>(_list62.size);
-                for (int _i63 = 0; _i63 < _list62.size; ++_i63)
+                org.apache.thrift.protocol.TList _list70 = iprot.readListBegin();
+                struct.columns = new ArrayList<TColumnIncrement>(_list70.size);
+                for (int _i71 = 0; _i71 < _list70.size; ++_i71)
                 {
-                  TColumnIncrement _elem64; // optional
-                  _elem64 = new TColumnIncrement();
-                  _elem64.read(iprot);
-                  struct.columns.add(_elem64);
+                  TColumnIncrement _elem72; // required
+                  _elem72 = new TColumnIncrement();
+                  _elem72.read(iprot);
+                  struct.columns.add(_elem72);
                 }
                 iprot.readListEnd();
               }
@@ -665,15 +745,15 @@ public class TIncrement implements org.a
           case 4: // ATTRIBUTES
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
-                struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map65.size);
-                for (int _i66 = 0; _i66 < _map65.size; ++_i66)
+                org.apache.thrift.protocol.TMap _map73 = iprot.readMapBegin();
+                struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map73.size);
+                for (int _i74 = 0; _i74 < _map73.size; ++_i74)
                 {
-                  ByteBuffer _key67; // required
-                  ByteBuffer _val68; // required
-                  _key67 = iprot.readBinary();
-                  _val68 = iprot.readBinary();
-                  struct.attributes.put(_key67, _val68);
+                  ByteBuffer _key75; // required
+                  ByteBuffer _val76; // required
+                  _key75 = iprot.readBinary();
+                  _val76 = iprot.readBinary();
+                  struct.attributes.put(_key75, _val76);
                 }
                 iprot.readMapEnd();
               }
@@ -690,6 +770,15 @@ public class TIncrement implements org.a
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 6: // CELL_VISIBILITY
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.cellVisibility = new TCellVisibility();
+              struct.cellVisibility.read(iprot);
+              struct.setCellVisibilityIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -714,9 +803,9 @@ public class TIncrement implements org.a
         oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
-          for (TColumnIncrement _iter69 : struct.columns)
+          for (TColumnIncrement _iter77 : struct.columns)
           {
-            _iter69.write(oprot);
+            _iter77.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -727,10 +816,10 @@ public class TIncrement implements org.a
           oprot.writeFieldBegin(ATTRIBUTES_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.attributes.size()));
-            for (Map.Entry<ByteBuffer, ByteBuffer> _iter70 : struct.attributes.entrySet())
+            for (Map.Entry<ByteBuffer, ByteBuffer> _iter78 : struct.attributes.entrySet())
             {
-              oprot.writeBinary(_iter70.getKey());
-              oprot.writeBinary(_iter70.getValue());
+              oprot.writeBinary(_iter78.getKey());
+              oprot.writeBinary(_iter78.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -744,6 +833,13 @@ public class TIncrement implements org.a
           oprot.writeFieldEnd();
         }
       }
+      if (struct.cellVisibility != null) {
+        if (struct.isSetCellVisibility()) {
+          oprot.writeFieldBegin(CELL_VISIBILITY_FIELD_DESC);
+          struct.cellVisibility.write(oprot);
+          oprot.writeFieldEnd();
+        }
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -764,9 +860,9 @@ public class TIncrement implements org.a
       oprot.writeBinary(struct.row);
       {
         oprot.writeI32(struct.columns.size());
-        for (TColumnIncrement _iter71 : struct.columns)
+        for (TColumnIncrement _iter79 : struct.columns)
         {
-          _iter71.write(oprot);
+          _iter79.write(oprot);
         }
       }
       BitSet optionals = new BitSet();
@@ -776,20 +872,26 @@ public class TIncrement implements org.a
       if (struct.isSetDurability()) {
         optionals.set(1);
       }
-      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetCellVisibility()) {
+        optionals.set(2);
+      }
+      oprot.writeBitSet(optionals, 3);
       if (struct.isSetAttributes()) {
         {
           oprot.writeI32(struct.attributes.size());
-          for (Map.Entry<ByteBuffer, ByteBuffer> _iter72 : struct.attributes.entrySet())
+          for (Map.Entry<ByteBuffer, ByteBuffer> _iter80 : struct.attributes.entrySet())
           {
-            oprot.writeBinary(_iter72.getKey());
-            oprot.writeBinary(_iter72.getValue());
+            oprot.writeBinary(_iter80.getKey());
+            oprot.writeBinary(_iter80.getValue());
           }
         }
       }
       if (struct.isSetDurability()) {
         oprot.writeI32(struct.durability.getValue());
       }
+      if (struct.isSetCellVisibility()) {
+        struct.cellVisibility.write(oprot);
+      }
     }
 
     @Override
@@ -798,29 +900,29 @@ public class TIncrement implements org.a
       struct.row = iprot.readBinary();
       struct.setRowIsSet(true);
       {
-        org.apache.thrift.protocol.TList _list73 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.columns = new ArrayList<TColumnIncrement>(_list73.size);
-        for (int _i74 = 0; _i74 < _list73.size; ++_i74)
+        org.apache.thrift.protocol.TList _list81 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.columns = new ArrayList<TColumnIncrement>(_list81.size);
+        for (int _i82 = 0; _i82 < _list81.size; ++_i82)
         {
-          TColumnIncrement _elem75; // optional
-          _elem75 = new TColumnIncrement();
-          _elem75.read(iprot);
-          struct.columns.add(_elem75);
+          TColumnIncrement _elem83; // required
+          _elem83 = new TColumnIncrement();
+          _elem83.read(iprot);
+          struct.columns.add(_elem83);
         }
       }
       struct.setColumnsIsSet(true);
-      BitSet incoming = iprot.readBitSet(2);
+      BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TMap _map76 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map76.size);
-          for (int _i77 = 0; _i77 < _map76.size; ++_i77)
+          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());
+          struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map84.size);
+          for (int _i85 = 0; _i85 < _map84.size; ++_i85)
           {
-            ByteBuffer _key78; // required
-            ByteBuffer _val79; // required
-            _key78 = iprot.readBinary();
-            _val79 = iprot.readBinary();
-            struct.attributes.put(_key78, _val79);
+            ByteBuffer _key86; // required
+            ByteBuffer _val87; // required
+            _key86 = iprot.readBinary();
+            _val87 = iprot.readBinary();
+            struct.attributes.put(_key86, _val87);
           }
         }
         struct.setAttributesIsSet(true);
@@ -829,6 +931,11 @@ public class TIncrement implements org.a
         struct.durability = TDurability.findByValue(iprot.readI32());
         struct.setDurabilityIsSet(true);
       }
+      if (incoming.get(2)) {
+        struct.cellVisibility = new TCellVisibility();
+        struct.cellVisibility.read(iprot);
+        struct.setCellVisibilityIsSet(true);
+      }
     }
   }
 

Modified: hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java?rev=1546988&r1=1546987&r2=1546988&view=diff
==============================================================================
--- hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java (original)
+++ hbase/trunk/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TPut.java Mon Dec  2 12:44:03 2013
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTuple
 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;
@@ -42,7 +44,7 @@ import org.slf4j.LoggerFactory;
  * by changing the durability. If you don't provide durability, it defaults to
  * column family's default setting for durability.
  */
-public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.io.Serializable, Cloneable {
+public class TPut implements org.apache.thrift.TBase<TPut, TPut._Fields>, java.io.Serializable, Cloneable, Comparable<TPut> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TPut");
 
   private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -50,6 +52,7 @@ public class TPut implements org.apache.
   private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC = new org.apache.thrift.protocol.TField("timestamp", org.apache.thrift.protocol.TType.I64, (short)3);
   private static final org.apache.thrift.protocol.TField ATTRIBUTES_FIELD_DESC = new org.apache.thrift.protocol.TField("attributes", org.apache.thrift.protocol.TType.MAP, (short)5);
   private static final org.apache.thrift.protocol.TField DURABILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("durability", org.apache.thrift.protocol.TType.I32, (short)6);
+  private static final org.apache.thrift.protocol.TField CELL_VISIBILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("cellVisibility", org.apache.thrift.protocol.TType.STRUCT, (short)7);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -66,6 +69,7 @@ public class TPut implements org.apache.
    * @see TDurability
    */
   public TDurability durability; // optional
+  public TCellVisibility cellVisibility; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -77,7 +81,8 @@ public class TPut implements org.apache.
      * 
      * @see TDurability
      */
-    DURABILITY((short)6, "durability");
+    DURABILITY((short)6, "durability"),
+    CELL_VISIBILITY((short)7, "cellVisibility");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -102,6 +107,8 @@ public class TPut implements org.apache.
           return ATTRIBUTES;
         case 6: // DURABILITY
           return DURABILITY;
+        case 7: // CELL_VISIBILITY
+          return CELL_VISIBILITY;
         default:
           return null;
       }
@@ -144,7 +151,7 @@ public class TPut implements org.apache.
   // isset id assignments
   private static final int __TIMESTAMP_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.ATTRIBUTES,_Fields.DURABILITY};
+  private _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.ATTRIBUTES,_Fields.DURABILITY,_Fields.CELL_VISIBILITY};
   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);
@@ -161,6 +168,8 @@ public class TPut implements org.apache.
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
     tmpMap.put(_Fields.DURABILITY, new org.apache.thrift.meta_data.FieldMetaData("durability", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TDurability.class)));
+    tmpMap.put(_Fields.CELL_VISIBILITY, new org.apache.thrift.meta_data.FieldMetaData("cellVisibility", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TCellVisibility.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TPut.class, metaDataMap);
   }
@@ -187,7 +196,7 @@ public class TPut implements org.apache.
 ;
     }
     if (other.isSetColumnValues()) {
-      List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>();
+      List<TColumnValue> __this__columnValues = new ArrayList<TColumnValue>(other.columnValues.size());
       for (TColumnValue other_element : other.columnValues) {
         __this__columnValues.add(new TColumnValue(other_element));
       }
@@ -195,25 +204,15 @@ public class TPut implements org.apache.
     }
     this.timestamp = other.timestamp;
     if (other.isSetAttributes()) {
-      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>();
-      for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
-
-        ByteBuffer other_element_key = other_element.getKey();
-        ByteBuffer other_element_value = other_element.getValue();
-
-        ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
-;
-
-        ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
-;
-
-        __this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
-      }
+      Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>(other.attributes);
       this.attributes = __this__attributes;
     }
     if (other.isSetDurability()) {
       this.durability = other.durability;
     }
+    if (other.isSetCellVisibility()) {
+      this.cellVisibility = new TCellVisibility(other.cellVisibility);
+    }
   }
 
   public TPut deepCopy() {
@@ -228,6 +227,7 @@ public class TPut implements org.apache.
     this.timestamp = 0;
     this.attributes = null;
     this.durability = null;
+    this.cellVisibility = null;
   }
 
   public byte[] getRow() {
@@ -393,6 +393,30 @@ public class TPut implements org.apache.
     }
   }
 
+  public TCellVisibility getCellVisibility() {
+    return this.cellVisibility;
+  }
+
+  public TPut setCellVisibility(TCellVisibility cellVisibility) {
+    this.cellVisibility = cellVisibility;
+    return this;
+  }
+
+  public void unsetCellVisibility() {
+    this.cellVisibility = null;
+  }
+
+  /** Returns true if field cellVisibility is set (has been assigned a value) and false otherwise */
+  public boolean isSetCellVisibility() {
+    return this.cellVisibility != null;
+  }
+
+  public void setCellVisibilityIsSet(boolean value) {
+    if (!value) {
+      this.cellVisibility = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case ROW:
@@ -435,6 +459,14 @@ public class TPut implements org.apache.
       }
       break;
 
+    case CELL_VISIBILITY:
+      if (value == null) {
+        unsetCellVisibility();
+      } else {
+        setCellVisibility((TCellVisibility)value);
+      }
+      break;
+
     }
   }
 
@@ -455,6 +487,9 @@ public class TPut implements org.apache.
     case DURABILITY:
       return getDurability();
 
+    case CELL_VISIBILITY:
+      return getCellVisibility();
+
     }
     throw new IllegalStateException();
   }
@@ -476,6 +511,8 @@ public class TPut implements org.apache.
       return isSetAttributes();
     case DURABILITY:
       return isSetDurability();
+    case CELL_VISIBILITY:
+      return isSetCellVisibility();
     }
     throw new IllegalStateException();
   }
@@ -538,6 +575,15 @@ public class TPut implements org.apache.
         return false;
     }
 
+    boolean this_present_cellVisibility = true && this.isSetCellVisibility();
+    boolean that_present_cellVisibility = true && that.isSetCellVisibility();
+    if (this_present_cellVisibility || that_present_cellVisibility) {
+      if (!(this_present_cellVisibility && that_present_cellVisibility))
+        return false;
+      if (!this.cellVisibility.equals(that.cellVisibility))
+        return false;
+    }
+
     return true;
   }
 
@@ -546,60 +592,70 @@ public class TPut implements org.apache.
     return 0;
   }
 
+  @Override
   public int compareTo(TPut other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TPut typedOther = (TPut)other;
 
-    lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow());
+    lastComparison = Boolean.valueOf(isSetRow()).compareTo(other.isSetRow());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRow()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, other.row);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(typedOther.isSetColumnValues());
+    lastComparison = Boolean.valueOf(isSetColumnValues()).compareTo(other.isSetColumnValues());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumnValues()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, typedOther.columnValues);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnValues, other.columnValues);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(typedOther.isSetTimestamp());
+    lastComparison = Boolean.valueOf(isSetTimestamp()).compareTo(other.isSetTimestamp());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTimestamp()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, typedOther.timestamp);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timestamp, other.timestamp);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes());
+    lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(other.isSetAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, other.attributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability());
+    lastComparison = Boolean.valueOf(isSetDurability()).compareTo(other.isSetDurability());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDurability()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, other.durability);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetCellVisibility()).compareTo(other.isSetCellVisibility());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCellVisibility()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cellVisibility, other.cellVisibility);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -665,6 +721,16 @@ public class TPut implements org.apache.
       }
       first = false;
     }
+    if (isSetCellVisibility()) {
+      if (!first) sb.append(", ");
+      sb.append("cellVisibility:");
+      if (this.cellVisibility == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.cellVisibility);
+      }
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -678,6 +744,9 @@ public class TPut implements org.apache.
       throw new org.apache.thrift.protocol.TProtocolException("Required field 'columnValues' was not present! Struct: " + toString());
     }
     // check for sub-struct validity
+    if (cellVisibility != null) {
+      cellVisibility.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -727,14 +796,14 @@ public class TPut implements org.apache.
           case 2: // COLUMN_VALUES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list26 = iprot.readListBegin();
-                struct.columnValues = new ArrayList<TColumnValue>(_list26.size);
-                for (int _i27 = 0; _i27 < _list26.size; ++_i27)
+                org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
+                struct.columnValues = new ArrayList<TColumnValue>(_list34.size);
+                for (int _i35 = 0; _i35 < _list34.size; ++_i35)
                 {
-                  TColumnValue _elem28; // optional
-                  _elem28 = new TColumnValue();
-                  _elem28.read(iprot);
-                  struct.columnValues.add(_elem28);
+                  TColumnValue _elem36;
+                  _elem36 = new TColumnValue();
+                  _elem36.read(iprot);
+                  struct.columnValues.add(_elem36);
                 }
                 iprot.readListEnd();
               }
@@ -754,15 +823,15 @@ public class TPut implements org.apache.
           case 5: // ATTRIBUTES
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map29 = iprot.readMapBegin();
-                struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map29.size);
-                for (int _i30 = 0; _i30 < _map29.size; ++_i30)
+                org.apache.thrift.protocol.TMap _map37 = iprot.readMapBegin();
+                struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map37.size);
+                for (int _i38 = 0; _i38 < _map37.size; ++_i38)
                 {
-                  ByteBuffer _key31; // required
-                  ByteBuffer _val32; // required
-                  _key31 = iprot.readBinary();
-                  _val32 = iprot.readBinary();
-                  struct.attributes.put(_key31, _val32);
+                  ByteBuffer _key39;
+                  ByteBuffer _val40;
+                  _key39 = iprot.readBinary();
+                  _val40 = iprot.readBinary();
+                  struct.attributes.put(_key39, _val40);
                 }
                 iprot.readMapEnd();
               }
@@ -779,6 +848,15 @@ public class TPut implements org.apache.
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 7: // CELL_VISIBILITY
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.cellVisibility = new TCellVisibility();
+              struct.cellVisibility.read(iprot);
+              struct.setCellVisibilityIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -803,9 +881,9 @@ public class TPut implements org.apache.
         oprot.writeFieldBegin(COLUMN_VALUES_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columnValues.size()));
-          for (TColumnValue _iter33 : struct.columnValues)
+          for (TColumnValue _iter41 : struct.columnValues)
           {
-            _iter33.write(oprot);
+            _iter41.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -821,10 +899,10 @@ public class TPut implements org.apache.
           oprot.writeFieldBegin(ATTRIBUTES_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.attributes.size()));
-            for (Map.Entry<ByteBuffer, ByteBuffer> _iter34 : struct.attributes.entrySet())
+            for (Map.Entry<ByteBuffer, ByteBuffer> _iter42 : struct.attributes.entrySet())
             {
-              oprot.writeBinary(_iter34.getKey());
-              oprot.writeBinary(_iter34.getValue());
+              oprot.writeBinary(_iter42.getKey());
+              oprot.writeBinary(_iter42.getValue());
             }
             oprot.writeMapEnd();
           }
@@ -838,6 +916,13 @@ public class TPut implements org.apache.
           oprot.writeFieldEnd();
         }
       }
+      if (struct.cellVisibility != null) {
+        if (struct.isSetCellVisibility()) {
+          oprot.writeFieldBegin(CELL_VISIBILITY_FIELD_DESC);
+          struct.cellVisibility.write(oprot);
+          oprot.writeFieldEnd();
+        }
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -858,9 +943,9 @@ public class TPut implements org.apache.
       oprot.writeBinary(struct.row);
       {
         oprot.writeI32(struct.columnValues.size());
-        for (TColumnValue _iter35 : struct.columnValues)
+        for (TColumnValue _iter43 : struct.columnValues)
         {
-          _iter35.write(oprot);
+          _iter43.write(oprot);
         }
       }
       BitSet optionals = new BitSet();
@@ -873,23 +958,29 @@ public class TPut implements org.apache.
       if (struct.isSetDurability()) {
         optionals.set(2);
       }
-      oprot.writeBitSet(optionals, 3);
+      if (struct.isSetCellVisibility()) {
+        optionals.set(3);
+      }
+      oprot.writeBitSet(optionals, 4);
       if (struct.isSetTimestamp()) {
         oprot.writeI64(struct.timestamp);
       }
       if (struct.isSetAttributes()) {
         {
           oprot.writeI32(struct.attributes.size());
-          for (Map.Entry<ByteBuffer, ByteBuffer> _iter36 : struct.attributes.entrySet())
+          for (Map.Entry<ByteBuffer, ByteBuffer> _iter44 : struct.attributes.entrySet())
           {
-            oprot.writeBinary(_iter36.getKey());
-            oprot.writeBinary(_iter36.getValue());
+            oprot.writeBinary(_iter44.getKey());
+            oprot.writeBinary(_iter44.getValue());
           }
         }
       }
       if (struct.isSetDurability()) {
         oprot.writeI32(struct.durability.getValue());
       }
+      if (struct.isSetCellVisibility()) {
+        struct.cellVisibility.write(oprot);
+      }
     }
 
     @Override
@@ -898,33 +989,33 @@ public class TPut implements org.apache.
       struct.row = iprot.readBinary();
       struct.setRowIsSet(true);
       {
-        org.apache.thrift.protocol.TList _list37 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-        struct.columnValues = new ArrayList<TColumnValue>(_list37.size);
-        for (int _i38 = 0; _i38 < _list37.size; ++_i38)
+        org.apache.thrift.protocol.TList _list45 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+        struct.columnValues = new ArrayList<TColumnValue>(_list45.size);
+        for (int _i46 = 0; _i46 < _list45.size; ++_i46)
         {
-          TColumnValue _elem39; // optional
-          _elem39 = new TColumnValue();
-          _elem39.read(iprot);
-          struct.columnValues.add(_elem39);
+          TColumnValue _elem47;
+          _elem47 = new TColumnValue();
+          _elem47.read(iprot);
+          struct.columnValues.add(_elem47);
         }
       }
       struct.setColumnValuesIsSet(true);
-      BitSet incoming = iprot.readBitSet(3);
+      BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.timestamp = iprot.readI64();
         struct.setTimestampIsSet(true);
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map40.size);
-          for (int _i41 = 0; _i41 < _map40.size; ++_i41)
+          org.apache.thrift.protocol.TMap _map48 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map48.size);
+          for (int _i49 = 0; _i49 < _map48.size; ++_i49)
           {
-            ByteBuffer _key42; // required
-            ByteBuffer _val43; // required
-            _key42 = iprot.readBinary();
-            _val43 = iprot.readBinary();
-            struct.attributes.put(_key42, _val43);
+            ByteBuffer _key50;
+            ByteBuffer _val51;
+            _key50 = iprot.readBinary();
+            _val51 = iprot.readBinary();
+            struct.attributes.put(_key50, _val51);
           }
         }
         struct.setAttributesIsSet(true);
@@ -933,6 +1024,11 @@ public class TPut implements org.apache.
         struct.durability = TDurability.findByValue(iprot.readI32());
         struct.setDurabilityIsSet(true);
       }
+      if (incoming.get(3)) {
+        struct.cellVisibility = new TCellVisibility();
+        struct.cellVisibility.read(iprot);
+        struct.setCellVisibilityIsSet(true);
+      }
     }
   }
 



Mime
View raw message