http://git-wip-us.apache.org/repos/asf/hbase/blob/7820ba1d/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java index 2fb3f76..0f27519 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnIncrement.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Represents a single cell and the amount to increment it by */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-27") public class TColumnIncrement implements org.apache.thrift.TBase<TColumnIncrement, TColumnIncrement._Fields>, java.io.Serializable, Cloneable, Comparable<TColumnIncrement> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumnIncrement");
http://git-wip-us.apache.org/repos/asf/hbase/blob/7820ba1d/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java index 3ceb4c0..6cded1b 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TColumnValue.java @@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory; /** * Represents a single cell and its value. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-27") public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColumnValue._Fields>, java.io.Serializable, Cloneable, Comparable<TColumnValue> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TColumnValue"); @@ -46,6 +46,7 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu 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 org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.BYTE, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -58,6 +59,7 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu public ByteBuffer value; // required public long timestamp; // optional public ByteBuffer tags; // optional + public byte type; // 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 { @@ -65,7 +67,8 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu QUALIFIER((short)2, "qualifier"), VALUE((short)3, "value"), TIMESTAMP((short)4, "timestamp"), - TAGS((short)5, "tags"); + TAGS((short)5, "tags"), + TYPE((short)6, "type"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -90,6 +93,8 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu return TIMESTAMP; case 5: // TAGS return TAGS; + case 6: // TYPE + return TYPE; default: return null; } @@ -131,8 +136,9 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu // isset id assignments private static final int __TIMESTAMP_ISSET_ID = 0; + private static final int __TYPE_ISSET_ID = 1; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.TAGS}; + private static final _Fields optionals[] = {_Fields.TIMESTAMP,_Fields.TAGS,_Fields.TYPE}; 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); @@ -146,6 +152,8 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu 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))); + tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TColumnValue.class, metaDataMap); } @@ -182,6 +190,7 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu if (other.isSetTags()) { this.tags = org.apache.thrift.TBaseHelper.copyBinary(other.tags); } + this.type = other.type; } public TColumnValue deepCopy() { @@ -196,6 +205,8 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu setTimestampIsSet(false); this.timestamp = 0; this.tags = null; + setTypeIsSet(false); + this.type = 0; } public byte[] getFamily() { @@ -357,6 +368,29 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu } } + public byte getType() { + return this.type; + } + + public TColumnValue setType(byte type) { + this.type = type; + setTypeIsSet(true); + return this; + } + + public void unsetType() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TYPE_ISSET_ID); + } + + /** Returns true if field type is set (has been assigned a value) and false otherwise */ + public boolean isSetType() { + return EncodingUtils.testBit(__isset_bitfield, __TYPE_ISSET_ID); + } + + public void setTypeIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TYPE_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case FAMILY: @@ -399,6 +433,14 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu } break; + case TYPE: + if (value == null) { + unsetType(); + } else { + setType((Byte)value); + } + break; + } } @@ -419,6 +461,9 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu case TAGS: return getTags(); + case TYPE: + return getType(); + } throw new IllegalStateException(); } @@ -440,6 +485,8 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu return isSetTimestamp(); case TAGS: return isSetTags(); + case TYPE: + return isSetType(); } throw new IllegalStateException(); } @@ -502,6 +549,15 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu return false; } + boolean this_present_type = true && this.isSetType(); + boolean that_present_type = true && that.isSetType(); + if (this_present_type || that_present_type) { + if (!(this_present_type && that_present_type)) + return false; + if (this.type != that.type) + return false; + } + return true; } @@ -534,6 +590,11 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu if (present_tags) list.add(tags); + boolean present_type = true && (isSetType()); + list.add(present_type); + if (present_type) + list.add(type); + return list.hashCode(); } @@ -595,6 +656,16 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu return lastComparison; } } + lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetType()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -654,6 +725,12 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu } first = false; } + if (isSetType()) { + if (!first) sb.append(", "); + sb.append("type:"); + sb.append(this.type); + first = false; + } sb.append(")"); return sb.toString(); } @@ -748,6 +825,14 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 6: // TYPE + if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) { + struct.type = iprot.readByte(); + struct.setTypeIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -790,6 +875,11 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu oprot.writeFieldEnd(); } } + if (struct.isSetType()) { + oprot.writeFieldBegin(TYPE_FIELD_DESC); + oprot.writeByte(struct.type); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -817,13 +907,19 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu if (struct.isSetTags()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetType()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetTimestamp()) { oprot.writeI64(struct.timestamp); } if (struct.isSetTags()) { oprot.writeBinary(struct.tags); } + if (struct.isSetType()) { + oprot.writeByte(struct.type); + } } @Override @@ -835,7 +931,7 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu struct.setQualifierIsSet(true); struct.value = iprot.readBinary(); struct.setValueIsSet(true); - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.timestamp = iprot.readI64(); struct.setTimestampIsSet(true); @@ -844,6 +940,10 @@ public class TColumnValue implements org.apache.thrift.TBase<TColumnValue, TColu struct.tags = iprot.readBinary(); struct.setTagsIsSet(true); } + if (incoming.get(2)) { + struct.type = iprot.readByte(); + struct.setTypeIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hbase/blob/7820ba1d/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCompressionAlgorithm.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCompressionAlgorithm.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCompressionAlgorithm.java new file mode 100644 index 0000000..46799be --- /dev/null +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TCompressionAlgorithm.java @@ -0,0 +1,60 @@ +/** + * Autogenerated by Thrift Compiler (0.9.3) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.apache.hadoop.hbase.thrift2.generated; + + +import java.util.Map; +import java.util.HashMap; +import org.apache.thrift.TEnum; + +public enum TCompressionAlgorithm implements org.apache.thrift.TEnum { + LZO(0), + GZ(1), + NONE(2), + SNAPPY(3), + LZ4(4), + BZIP2(5), + ZSTD(6); + + private final int value; + + private TCompressionAlgorithm(int value) { + this.value = value; + } + + /** + * Get the integer value of this enum value, as defined in the Thrift IDL. + */ + public int getValue() { + return value; + } + + /** + * Find a the enum type by its integer value, as defined in the Thrift IDL. + * @return null if the value is not found. + */ + public static TCompressionAlgorithm findByValue(int value) { + switch (value) { + case 0: + return LZO; + case 1: + return GZ; + case 2: + return NONE; + case 3: + return SNAPPY; + case 4: + return LZ4; + case 5: + return BZIP2; + case 6: + return ZSTD; + default: + return null; + } + } +} http://git-wip-us.apache.org/repos/asf/hbase/blob/7820ba1d/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDataBlockEncoding.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDataBlockEncoding.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDataBlockEncoding.java new file mode 100644 index 0000000..1594aac3 --- /dev/null +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDataBlockEncoding.java @@ -0,0 +1,57 @@ +/** + * Autogenerated by Thrift Compiler (0.9.3) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.apache.hadoop.hbase.thrift2.generated; + + +import java.util.Map; +import java.util.HashMap; +import org.apache.thrift.TEnum; + +public enum TDataBlockEncoding implements org.apache.thrift.TEnum { + /** + * Disable data block encoding. + */ + NONE(0), + PREFIX(2), + DIFF(3), + FAST_DIFF(4), + ROW_INDEX_V1(7); + + private final int value; + + private TDataBlockEncoding(int value) { + this.value = value; + } + + /** + * Get the integer value of this enum value, as defined in the Thrift IDL. + */ + public int getValue() { + return value; + } + + /** + * Find a the enum type by its integer value, as defined in the Thrift IDL. + * @return null if the value is not found. + */ + public static TDataBlockEncoding findByValue(int value) { + switch (value) { + case 0: + return NONE; + case 2: + return PREFIX; + case 3: + return DIFF; + case 4: + return FAST_DIFF; + case 7: + return ROW_INDEX_V1; + default: + return null; + } + } +} http://git-wip-us.apache.org/repos/asf/hbase/blob/7820ba1d/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java index 8f7f119..fb4ffe6 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDelete.java @@ -60,7 +60,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. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-05-25") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-27") public class TDelete implements org.apache.thrift.TBase<TDelete, TDelete._Fields>, java.io.Serializable, Cloneable, Comparable<TDelete> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TDelete"); http://git-wip-us.apache.org/repos/asf/hbase/blob/7820ba1d/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDurability.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDurability.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDurability.java index c1144f3..dbe7393 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDurability.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TDurability.java @@ -19,6 +19,7 @@ import org.apache.thrift.TEnum; * - FSYNC_WAL means Write the Mutation to the WAL synchronously and force the entries to disk. */ public enum TDurability implements org.apache.thrift.TEnum { + USE_DEFAULT(0), SKIP_WAL(1), ASYNC_WAL(2), SYNC_WAL(3), @@ -43,6 +44,8 @@ public enum TDurability implements org.apache.thrift.TEnum { */ public static TDurability findByValue(int value) { switch (value) { + case 0: + return USE_DEFAULT; case 1: return SKIP_WAL; case 2: http://git-wip-us.apache.org/repos/asf/hbase/blob/7820ba1d/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java ---------------------------------------------------------------------- diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java index cfb1d6c..1b01ef5 100644 --- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java +++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/generated/TGet.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; * If you specify a time range and a timestamp the range is ignored. * Timestamps on TColumns are ignored. */ -@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-07-03") +@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-27") 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"); @@ -61,6 +61,10 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i 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 org.apache.thrift.protocol.TField CONSISTENCY_FIELD_DESC = new org.apache.thrift.protocol.TField("consistency", org.apache.thrift.protocol.TType.I32, (short)9); private static final org.apache.thrift.protocol.TField TARGET_REPLICA_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("targetReplicaId", org.apache.thrift.protocol.TType.I32, (short)10); + private static final org.apache.thrift.protocol.TField CACHE_BLOCKS_FIELD_DESC = new org.apache.thrift.protocol.TField("cacheBlocks", org.apache.thrift.protocol.TType.BOOL, (short)11); + private static final org.apache.thrift.protocol.TField STORE_LIMIT_FIELD_DESC = new org.apache.thrift.protocol.TField("storeLimit", org.apache.thrift.protocol.TType.I32, (short)12); + private static final org.apache.thrift.protocol.TField STORE_OFFSET_FIELD_DESC = new org.apache.thrift.protocol.TField("storeOffset", org.apache.thrift.protocol.TType.I32, (short)13); + private static final org.apache.thrift.protocol.TField EXISTENCE_ONLY_FIELD_DESC = new org.apache.thrift.protocol.TField("existence_only", org.apache.thrift.protocol.TType.BOOL, (short)14); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -82,6 +86,10 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i */ public TConsistency consistency; // optional public int targetReplicaId; // optional + public boolean cacheBlocks; // optional + public int storeLimit; // optional + public int storeOffset; // optional + public boolean existence_only; // 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 { @@ -98,7 +106,11 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i * @see TConsistency */ CONSISTENCY((short)9, "consistency"), - TARGET_REPLICA_ID((short)10, "targetReplicaId"); + TARGET_REPLICA_ID((short)10, "targetReplicaId"), + CACHE_BLOCKS((short)11, "cacheBlocks"), + STORE_LIMIT((short)12, "storeLimit"), + STORE_OFFSET((short)13, "storeOffset"), + EXISTENCE_ONLY((short)14, "existence_only"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -133,6 +145,14 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i return CONSISTENCY; case 10: // TARGET_REPLICA_ID return TARGET_REPLICA_ID; + case 11: // CACHE_BLOCKS + return CACHE_BLOCKS; + case 12: // STORE_LIMIT + return STORE_LIMIT; + case 13: // STORE_OFFSET + return STORE_OFFSET; + case 14: // EXISTENCE_ONLY + return EXISTENCE_ONLY; default: return null; } @@ -176,8 +196,12 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i private static final int __TIMESTAMP_ISSET_ID = 0; private static final int __MAXVERSIONS_ISSET_ID = 1; private static final int __TARGETREPLICAID_ISSET_ID = 2; + private static final int __CACHEBLOCKS_ISSET_ID = 3; + private static final int __STORELIMIT_ISSET_ID = 4; + private static final int __STOREOFFSET_ISSET_ID = 5; + private static final int __EXISTENCE_ONLY_ISSET_ID = 6; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.COLUMNS,_Fields.TIMESTAMP,_Fields.TIME_RANGE,_Fields.MAX_VERSIONS,_Fields.FILTER_STRING,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS,_Fields.CONSISTENCY,_Fields.TARGET_REPLICA_ID}; + private static final _Fields optionals[] = {_Fields.COLUMNS,_Fields.TIMESTAMP,_Fields.TIME_RANGE,_Fields.MAX_VERSIONS,_Fields.FILTER_STRING,_Fields.ATTRIBUTES,_Fields.AUTHORIZATIONS,_Fields.CONSISTENCY,_Fields.TARGET_REPLICA_ID,_Fields.CACHE_BLOCKS,_Fields.STORE_LIMIT,_Fields.STORE_OFFSET,_Fields.EXISTENCE_ONLY}; 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); @@ -204,6 +228,14 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TConsistency.class))); tmpMap.put(_Fields.TARGET_REPLICA_ID, new org.apache.thrift.meta_data.FieldMetaData("targetReplicaId", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.CACHE_BLOCKS, new org.apache.thrift.meta_data.FieldMetaData("cacheBlocks", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); + tmpMap.put(_Fields.STORE_LIMIT, new org.apache.thrift.meta_data.FieldMetaData("storeLimit", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.STORE_OFFSET, new org.apache.thrift.meta_data.FieldMetaData("storeOffset", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); + tmpMap.put(_Fields.EXISTENCE_ONLY, new org.apache.thrift.meta_data.FieldMetaData("existence_only", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TGet.class, metaDataMap); } @@ -252,6 +284,10 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i this.consistency = other.consistency; } this.targetReplicaId = other.targetReplicaId; + this.cacheBlocks = other.cacheBlocks; + this.storeLimit = other.storeLimit; + this.storeOffset = other.storeOffset; + this.existence_only = other.existence_only; } public TGet deepCopy() { @@ -273,6 +309,14 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i this.consistency = null; setTargetReplicaIdIsSet(false); this.targetReplicaId = 0; + setCacheBlocksIsSet(false); + this.cacheBlocks = false; + setStoreLimitIsSet(false); + this.storeLimit = 0; + setStoreOffsetIsSet(false); + this.storeOffset = 0; + setExistence_onlyIsSet(false); + this.existence_only = false; } public byte[] getRow() { @@ -566,6 +610,98 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TARGETREPLICAID_ISSET_ID, value); } + public boolean isCacheBlocks() { + return this.cacheBlocks; + } + + public TGet setCacheBlocks(boolean cacheBlocks) { + this.cacheBlocks = cacheBlocks; + setCacheBlocksIsSet(true); + return this; + } + + public void unsetCacheBlocks() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CACHEBLOCKS_ISSET_ID); + } + + /** Returns true if field cacheBlocks is set (has been assigned a value) and false otherwise */ + public boolean isSetCacheBlocks() { + return EncodingUtils.testBit(__isset_bitfield, __CACHEBLOCKS_ISSET_ID); + } + + public void setCacheBlocksIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CACHEBLOCKS_ISSET_ID, value); + } + + public int getStoreLimit() { + return this.storeLimit; + } + + public TGet setStoreLimit(int storeLimit) { + this.storeLimit = storeLimit; + setStoreLimitIsSet(true); + return this; + } + + public void unsetStoreLimit() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STORELIMIT_ISSET_ID); + } + + /** Returns true if field storeLimit is set (has been assigned a value) and false otherwise */ + public boolean isSetStoreLimit() { + return EncodingUtils.testBit(__isset_bitfield, __STORELIMIT_ISSET_ID); + } + + public void setStoreLimitIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STORELIMIT_ISSET_ID, value); + } + + public int getStoreOffset() { + return this.storeOffset; + } + + public TGet setStoreOffset(int storeOffset) { + this.storeOffset = storeOffset; + setStoreOffsetIsSet(true); + return this; + } + + public void unsetStoreOffset() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STOREOFFSET_ISSET_ID); + } + + /** Returns true if field storeOffset is set (has been assigned a value) and false otherwise */ + public boolean isSetStoreOffset() { + return EncodingUtils.testBit(__isset_bitfield, __STOREOFFSET_ISSET_ID); + } + + public void setStoreOffsetIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STOREOFFSET_ISSET_ID, value); + } + + public boolean isExistence_only() { + return this.existence_only; + } + + public TGet setExistence_only(boolean existence_only) { + this.existence_only = existence_only; + setExistence_onlyIsSet(true); + return this; + } + + public void unsetExistence_only() { + __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EXISTENCE_ONLY_ISSET_ID); + } + + /** Returns true if field existence_only is set (has been assigned a value) and false otherwise */ + public boolean isSetExistence_only() { + return EncodingUtils.testBit(__isset_bitfield, __EXISTENCE_ONLY_ISSET_ID); + } + + public void setExistence_onlyIsSet(boolean value) { + __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EXISTENCE_ONLY_ISSET_ID, value); + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case ROW: @@ -648,6 +784,38 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i } break; + case CACHE_BLOCKS: + if (value == null) { + unsetCacheBlocks(); + } else { + setCacheBlocks((Boolean)value); + } + break; + + case STORE_LIMIT: + if (value == null) { + unsetStoreLimit(); + } else { + setStoreLimit((Integer)value); + } + break; + + case STORE_OFFSET: + if (value == null) { + unsetStoreOffset(); + } else { + setStoreOffset((Integer)value); + } + break; + + case EXISTENCE_ONLY: + if (value == null) { + unsetExistence_only(); + } else { + setExistence_only((Boolean)value); + } + break; + } } @@ -683,6 +851,18 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i case TARGET_REPLICA_ID: return getTargetReplicaId(); + case CACHE_BLOCKS: + return isCacheBlocks(); + + case STORE_LIMIT: + return getStoreLimit(); + + case STORE_OFFSET: + return getStoreOffset(); + + case EXISTENCE_ONLY: + return isExistence_only(); + } throw new IllegalStateException(); } @@ -714,6 +894,14 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i return isSetConsistency(); case TARGET_REPLICA_ID: return isSetTargetReplicaId(); + case CACHE_BLOCKS: + return isSetCacheBlocks(); + case STORE_LIMIT: + return isSetStoreLimit(); + case STORE_OFFSET: + return isSetStoreOffset(); + case EXISTENCE_ONLY: + return isSetExistence_only(); } throw new IllegalStateException(); } @@ -821,6 +1009,42 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i return false; } + boolean this_present_cacheBlocks = true && this.isSetCacheBlocks(); + boolean that_present_cacheBlocks = true && that.isSetCacheBlocks(); + if (this_present_cacheBlocks || that_present_cacheBlocks) { + if (!(this_present_cacheBlocks && that_present_cacheBlocks)) + return false; + if (this.cacheBlocks != that.cacheBlocks) + return false; + } + + boolean this_present_storeLimit = true && this.isSetStoreLimit(); + boolean that_present_storeLimit = true && that.isSetStoreLimit(); + if (this_present_storeLimit || that_present_storeLimit) { + if (!(this_present_storeLimit && that_present_storeLimit)) + return false; + if (this.storeLimit != that.storeLimit) + return false; + } + + boolean this_present_storeOffset = true && this.isSetStoreOffset(); + boolean that_present_storeOffset = true && that.isSetStoreOffset(); + if (this_present_storeOffset || that_present_storeOffset) { + if (!(this_present_storeOffset && that_present_storeOffset)) + return false; + if (this.storeOffset != that.storeOffset) + return false; + } + + boolean this_present_existence_only = true && this.isSetExistence_only(); + boolean that_present_existence_only = true && that.isSetExistence_only(); + if (this_present_existence_only || that_present_existence_only) { + if (!(this_present_existence_only && that_present_existence_only)) + return false; + if (this.existence_only != that.existence_only) + return false; + } + return true; } @@ -878,6 +1102,26 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i if (present_targetReplicaId) list.add(targetReplicaId); + boolean present_cacheBlocks = true && (isSetCacheBlocks()); + list.add(present_cacheBlocks); + if (present_cacheBlocks) + list.add(cacheBlocks); + + boolean present_storeLimit = true && (isSetStoreLimit()); + list.add(present_storeLimit); + if (present_storeLimit) + list.add(storeLimit); + + boolean present_storeOffset = true && (isSetStoreOffset()); + list.add(present_storeOffset); + if (present_storeOffset) + list.add(storeOffset); + + boolean present_existence_only = true && (isSetExistence_only()); + list.add(present_existence_only); + if (present_existence_only) + list.add(existence_only); + return list.hashCode(); } @@ -989,6 +1233,46 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i return lastComparison; } } + lastComparison = Boolean.valueOf(isSetCacheBlocks()).compareTo(other.isSetCacheBlocks()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCacheBlocks()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cacheBlocks, other.cacheBlocks); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetStoreLimit()).compareTo(other.isSetStoreLimit()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetStoreLimit()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storeLimit, other.storeLimit); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetStoreOffset()).compareTo(other.isSetStoreOffset()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetStoreOffset()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.storeOffset, other.storeOffset); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = Boolean.valueOf(isSetExistence_only()).compareTo(other.isSetExistence_only()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetExistence_only()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.existence_only, other.existence_only); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -1094,6 +1378,30 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i sb.append(this.targetReplicaId); first = false; } + if (isSetCacheBlocks()) { + if (!first) sb.append(", "); + sb.append("cacheBlocks:"); + sb.append(this.cacheBlocks); + first = false; + } + if (isSetStoreLimit()) { + if (!first) sb.append(", "); + sb.append("storeLimit:"); + sb.append(this.storeLimit); + first = false; + } + if (isSetStoreOffset()) { + if (!first) sb.append(", "); + sb.append("storeOffset:"); + sb.append(this.storeOffset); + first = false; + } + if (isSetExistence_only()) { + if (!first) sb.append(", "); + sb.append("existence_only:"); + sb.append(this.existence_only); + first = false; + } sb.append(")"); return sb.toString(); } @@ -1253,6 +1561,38 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 11: // CACHE_BLOCKS + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.cacheBlocks = iprot.readBool(); + struct.setCacheBlocksIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 12: // STORE_LIMIT + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.storeLimit = iprot.readI32(); + struct.setStoreLimitIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 13: // STORE_OFFSET + if (schemeField.type == org.apache.thrift.protocol.TType.I32) { + struct.storeOffset = iprot.readI32(); + struct.setStoreOffsetIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 14: // EXISTENCE_ONLY + if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { + struct.existence_only = iprot.readBool(); + struct.setExistence_onlyIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1345,6 +1685,26 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i oprot.writeI32(struct.targetReplicaId); oprot.writeFieldEnd(); } + if (struct.isSetCacheBlocks()) { + oprot.writeFieldBegin(CACHE_BLOCKS_FIELD_DESC); + oprot.writeBool(struct.cacheBlocks); + oprot.writeFieldEnd(); + } + if (struct.isSetStoreLimit()) { + oprot.writeFieldBegin(STORE_LIMIT_FIELD_DESC); + oprot.writeI32(struct.storeLimit); + oprot.writeFieldEnd(); + } + if (struct.isSetStoreOffset()) { + oprot.writeFieldBegin(STORE_OFFSET_FIELD_DESC); + oprot.writeI32(struct.storeOffset); + oprot.writeFieldEnd(); + } + if (struct.isSetExistence_only()) { + oprot.writeFieldBegin(EXISTENCE_ONLY_FIELD_DESC); + oprot.writeBool(struct.existence_only); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1391,7 +1751,19 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i if (struct.isSetTargetReplicaId()) { optionals.set(8); } - oprot.writeBitSet(optionals, 9); + if (struct.isSetCacheBlocks()) { + optionals.set(9); + } + if (struct.isSetStoreLimit()) { + optionals.set(10); + } + if (struct.isSetStoreOffset()) { + optionals.set(11); + } + if (struct.isSetExistence_only()) { + optionals.set(12); + } + oprot.writeBitSet(optionals, 13); if (struct.isSetColumns()) { { oprot.writeI32(struct.columns.size()); @@ -1432,6 +1804,18 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i if (struct.isSetTargetReplicaId()) { oprot.writeI32(struct.targetReplicaId); } + if (struct.isSetCacheBlocks()) { + oprot.writeBool(struct.cacheBlocks); + } + if (struct.isSetStoreLimit()) { + oprot.writeI32(struct.storeLimit); + } + if (struct.isSetStoreOffset()) { + oprot.writeI32(struct.storeOffset); + } + if (struct.isSetExistence_only()) { + oprot.writeBool(struct.existence_only); + } } @Override @@ -1439,7 +1823,7 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i TTupleProtocol iprot = (TTupleProtocol) prot; struct.row = iprot.readBinary(); struct.setRowIsSet(true); - BitSet incoming = iprot.readBitSet(9); + BitSet incoming = iprot.readBitSet(13); if (incoming.get(0)) { { org.apache.thrift.protocol.TList _list27 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); @@ -1499,6 +1883,22 @@ public class TGet implements org.apache.thrift.TBase<TGet, TGet._Fields>, java.i struct.targetReplicaId = iprot.readI32(); struct.setTargetReplicaIdIsSet(true); } + if (incoming.get(9)) { + struct.cacheBlocks = iprot.readBool(); + struct.setCacheBlocksIsSet(true); + } + if (incoming.get(10)) { + struct.storeLimit = iprot.readI32(); + struct.setStoreLimitIsSet(true); + } + if (incoming.get(11)) { + struct.storeOffset = iprot.readI32(); + struct.setStoreOffsetIsSet(true); + } + if (incoming.get(12)) { + struct.existence_only = iprot.readBool(); + struct.setExistence_onlyIsSet(true); + } } }
